Hi David, hi Jakub, The following pull-request contains BPF updates for your *net* tree. We've added 16 non-merge commits during the last 1 day(s) which contain a total of 24 files changed, 354 insertions(+), 187 deletions(-). The main changes are: 1) x86 specific bits of fprobe/rethook, from Masami and Peter. 2) ice/xsk fixes, from Maciej and Magnus. 3) Various small fixes, from Andrii, Yonghong, Geliang and others. 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: Arnaldo Carvalho de Melo, Dan Carpenter, Jiri Olsa, kernel test robot, KP Singh, Martin KaFai Lau, Masami Hiramatsu, Quentin Monnet, Yonghong Song ---------------------------------------------------------------- The following changes since commit d717e4cae0fe77e10a27e8545a967b8c379873ac: Merge tag 'net-5.18-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2022-03-28 17:02:04 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to ccaff3d56acc47c257a99b2807b7c78a9467cf09: selftests/bpf: Fix clang compilation errors (2022-03-28 20:00:11 -0700) ---------------------------------------------------------------- Alexei Starovoitov (3): Merge branch 'fprobe: Fixes for Sparse and Smatch warnings' Merge branch 'kprobes: rethook: x86: Replace kretprobe trampoline with rethook' Merge branch 'xsk: another round of fixes' Andrii Nakryiko (1): selftests/bpf: fix selftest after random: Urandom_read tracepoint removal Geliang Tang (1): bpf: Sync comments for bpf_get_stack Jiri Olsa (1): bpftool: Fix generated code in codegen_asserts Maciej Fijalkowski (2): ice: xsk: Stop Rx processing when ntc catches ntu ice: xsk: Fix indexing in ice_tx_xsk_pool() Magnus Karlsson (2): xsk: Do not write NULL in SW ring at allocation failure ice: xsk: Eliminate unnecessary loop iteration Masami Hiramatsu (5): fprobe: Fix smatch type mismatch warning fprobe: Fix sparse warning for acccessing __rcu ftrace_hash kprobes: Use rethook for kretprobe if possible x86,rethook,kprobes: Replace kretprobe with rethook on x86 x86,kprobes: Fix optprobe trampoline to generate complete pt_regs Milan Landaverde (1): bpf/bpftool: Add unprivileged_bpf_disabled check against value of 2 Peter Zijlstra (1): x86,rethook: Fix arch_rethook_trampoline() to generate a complete pt_regs Yonghong Song (1): selftests/bpf: Fix clang compilation errors Yuntao Wang (1): bpf: Fix maximum permitted number of arguments check arch/Kconfig | 8 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/unwind.h | 23 ++-- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/kprobes/common.h | 1 + arch/x86/kernel/kprobes/core.c | 107 ----------------- arch/x86/kernel/kprobes/opt.c | 25 ++-- arch/x86/kernel/rethook.c | 127 +++++++++++++++++++++ arch/x86/kernel/unwind_orc.c | 10 +- drivers/net/ethernet/intel/ice/ice.h | 2 +- drivers/net/ethernet/intel/ice/ice_xsk.c | 5 +- include/linux/kprobes.h | 51 ++++++++- kernel/Makefile | 1 + kernel/bpf/btf.c | 2 +- kernel/kprobes.c | 124 ++++++++++++++++---- kernel/trace/fprobe.c | 8 +- kernel/trace/trace_kprobe.c | 4 +- net/xdp/xsk_buff_pool.c | 8 +- tools/bpf/bpftool/feature.c | 5 +- tools/bpf/bpftool/gen.c | 2 +- tools/include/uapi/linux/bpf.h | 8 +- .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 3 - .../selftests/bpf/progs/test_stacktrace_build_id.c | 12 +- tools/testing/selftests/bpf/test_lpm_map.c | 3 +- 24 files changed, 354 insertions(+), 187 deletions(-) create mode 100644 arch/x86/kernel/rethook.c
