Hi David, The following pull-request contains BPF updates for your *net* tree.
The main changes are: 1) Fixing broken uapi for BPF tracing programs for s390 and arm64 architectures due to pt_regs being in-kernel only, and not part of uapi right now. A wrapper is added that exports pt_regs in an asm-generic way. For arm64 this maps to existing user_pt_regs structure and for s390 a user_pt_regs structure exporting the beginning of pt_regs is added and uapi-exported, thus fixing the BPF issues seen in perf (and BPF selftests), all from Hendrik. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! ---------------------------------------------------------------- The following changes since commit 2391f0b4808e3d5af348324d69f5f45c56a26836: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (2017-12-04 11:32:02 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to 037776e4c667a658616a9ea63d792874328c5fba: Merge branch 'bpf-fix-broken-uapi-for-pt-regs' (2017-12-05 15:02:42 +0100) ---------------------------------------------------------------- Daniel Borkmann (1): Merge branch 'bpf-fix-broken-uapi-for-pt-regs' Hendrik Brueckner (6): bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type s390/bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type arm64/bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type s390/uapi: correct whitespace & coding style in asm/ptrace.h selftests/bpf: sync kernel headers and introduce arch support in Makefile perf s390: add regs_query_register_offset() arch/alpha/include/uapi/asm/Kbuild | 2 + arch/arc/include/uapi/asm/Kbuild | 1 + arch/arm/include/uapi/asm/Kbuild | 1 + arch/arm64/include/asm/perf_event.h | 2 + arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 + arch/blackfin/include/uapi/asm/Kbuild | 1 + arch/c6x/include/uapi/asm/Kbuild | 1 + arch/cris/include/uapi/asm/Kbuild | 1 + arch/frv/include/uapi/asm/Kbuild | 2 + arch/h8300/include/uapi/asm/Kbuild | 1 + arch/hexagon/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/Kbuild | 1 + arch/m32r/include/uapi/asm/Kbuild | 1 + arch/m68k/include/uapi/asm/Kbuild | 1 + arch/metag/include/uapi/asm/Kbuild | 1 + arch/microblaze/include/uapi/asm/Kbuild | 1 + arch/mips/include/uapi/asm/Kbuild | 1 + arch/mn10300/include/uapi/asm/Kbuild | 1 + arch/nios2/include/uapi/asm/Kbuild | 1 + arch/openrisc/include/uapi/asm/Kbuild | 1 + arch/parisc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/riscv/include/uapi/asm/Kbuild | 1 + arch/s390/include/asm/perf_event.h | 1 + arch/s390/include/asm/ptrace.h | 11 +- arch/s390/include/uapi/asm/bpf_perf_event.h | 9 + arch/s390/include/uapi/asm/ptrace.h | 125 +++--- arch/score/include/uapi/asm/Kbuild | 1 + arch/sh/include/uapi/asm/Kbuild | 1 + arch/sparc/include/uapi/asm/Kbuild | 1 + arch/tile/include/uapi/asm/Kbuild | 1 + arch/unicore32/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/Kbuild | 1 + include/linux/perf_event.h | 6 +- include/uapi/asm-generic/bpf_perf_event.h | 9 + include/uapi/linux/bpf_perf_event.h | 5 +- kernel/events/core.c | 2 +- tools/arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 + tools/arch/s390/include/uapi/asm/bpf_perf_event.h | 9 + tools/arch/s390/include/uapi/asm/ptrace.h | 457 +++++++++++++++++++++ tools/include/uapi/asm-generic/bpf_perf_event.h | 9 + tools/include/uapi/linux/bpf_perf_event.h | 6 +- tools/perf/arch/s390/Makefile | 1 + tools/perf/arch/s390/util/dwarf-regs.c | 32 +- tools/perf/check-headers.sh | 1 + tools/testing/selftests/bpf/Makefile | 14 +- 47 files changed, 668 insertions(+), 79 deletions(-) create mode 100644 arch/arm64/include/uapi/asm/bpf_perf_event.h create mode 100644 arch/s390/include/uapi/asm/bpf_perf_event.h create mode 100644 include/uapi/asm-generic/bpf_perf_event.h create mode 100644 tools/arch/arm64/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/arch/s390/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h create mode 100644 tools/include/uapi/asm-generic/bpf_perf_event.h