Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says: ==================== pull-request: bpf 2022-03-29 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. * https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: selftests/bpf: Fix clang compilation errors ice: xsk: Fix indexing in ice_tx_xsk_pool() ice: xsk: Stop Rx processing when ntc catches ntu ice: xsk: Eliminate unnecessary loop iteration xsk: Do not write NULL in SW ring at allocation failure x86,kprobes: Fix optprobe trampoline to generate complete pt_regs x86,rethook: Fix arch_rethook_trampoline() to generate a complete pt_regs x86,rethook,kprobes: Replace kretprobe with rethook on x86 kprobes: Use rethook for kr...
Showing
- arch/Kconfig 7 additions, 1 deletionarch/Kconfig
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/unwind.h 11 additions, 12 deletionsarch/x86/include/asm/unwind.h
- arch/x86/kernel/Makefile 1 addition, 0 deletionsarch/x86/kernel/Makefile
- arch/x86/kernel/kprobes/common.h 1 addition, 0 deletionsarch/x86/kernel/kprobes/common.h
- arch/x86/kernel/kprobes/core.c 0 additions, 107 deletionsarch/x86/kernel/kprobes/core.c
- arch/x86/kernel/kprobes/opt.c 16 additions, 9 deletionsarch/x86/kernel/kprobes/opt.c
- arch/x86/kernel/rethook.c 127 additions, 0 deletionsarch/x86/kernel/rethook.c
- arch/x86/kernel/unwind_orc.c 5 additions, 5 deletionsarch/x86/kernel/unwind_orc.c
- drivers/net/ethernet/intel/ice/ice.h 1 addition, 1 deletiondrivers/net/ethernet/intel/ice/ice.h
- drivers/net/ethernet/intel/ice/ice_xsk.c 4 additions, 1 deletiondrivers/net/ethernet/intel/ice/ice_xsk.c
- include/linux/kprobes.h 49 additions, 2 deletionsinclude/linux/kprobes.h
- kernel/Makefile 1 addition, 0 deletionskernel/Makefile
- kernel/bpf/btf.c 1 addition, 1 deletionkernel/bpf/btf.c
- kernel/kprobes.c 104 additions, 20 deletionskernel/kprobes.c
- kernel/trace/fprobe.c 4 additions, 4 deletionskernel/trace/fprobe.c
- kernel/trace/trace_kprobe.c 2 additions, 2 deletionskernel/trace/trace_kprobe.c
- net/xdp/xsk_buff_pool.c 6 additions, 2 deletionsnet/xdp/xsk_buff_pool.c
- tools/bpf/bpftool/feature.c 4 additions, 1 deletiontools/bpf/bpftool/feature.c
- tools/bpf/bpftool/gen.c 1 addition, 1 deletiontools/bpf/bpftool/gen.c
Please register or sign in to comment