Hi David, The following pull-request contains BPF updates for your *net* tree. We've added 8 non-merge commits during the last 1 day(s) which contain a total of 10 files changed, 126 insertions(+), 18 deletions(-). The main changes are: 1) Make BPF trampoline co-exist with ftrace-based tracers, from Alexei. 2) Fix build in minimal configurations, from Arnd. 3) Fix mips, riscv bpf_tail_call limit, from Paul. 4) Fix bpftool segfault, from Toke. 5) Fix samples/bpf, from Daniel. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! Also thanks to reporters, reviewers and testers of commits in this pull-request: Björn Töpel, Daniel Borkmann, Mahshid Khezri, Martin KaFai Lau ---------------------------------------------------------------- The following changes since commit 24dee0c7478d1a1e00abdf5625b7f921467325dc: net: ena: fix napi handler misbehavior when the napi budget is zero (2019-12-10 17:54:55 -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 fe3300897cbfd76c6cb825776e5ac0ca50a91ca4: samples: bpf: fix syscall_tp due to unused syscall (2019-12-11 15:28:06 -0800) ---------------------------------------------------------------- Alexei Starovoitov (2): bpf: Make BPF trampoline use register_ftrace_direct() API selftests/bpf: Test function_graph tracer and bpf trampoline together Arnd Bergmann (1): bpf: Fix build in minimal configurations, again Daniel T. Lee (2): samples: bpf: Replace symbol compare of trace_event samples: bpf: fix syscall_tp due to unused syscall Paul Chaignon (2): bpf, riscv: Limit to 33 tail calls bpf, mips: Limit to 33 tail calls Toke Høiland-Jørgensen (1): bpftool: Don't crash on missing jited insns or ksyms arch/mips/net/ebpf_jit.c | 9 +++-- arch/riscv/net/bpf_jit_comp.c | 4 +- include/linux/bpf.h | 1 + kernel/bpf/btf.c | 1 + kernel/bpf/trampoline.c | 64 +++++++++++++++++++++++++++--- samples/bpf/syscall_tp_kern.c | 18 ++++++++- samples/bpf/trace_event_user.c | 4 +- tools/bpf/bpftool/prog.c | 2 +- tools/bpf/bpftool/xlated_dumper.c | 2 +- tools/testing/selftests/bpf/test_ftrace.sh | 39 ++++++++++++++++++ 10 files changed, 126 insertions(+), 18 deletions(-) create mode 100755 tools/testing/selftests/bpf/test_ftrace.sh