Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says: ==================== pull-request: bpf 2022-04-06 We've added 8 non-merge commits during the last 8 day(s) which contain a total of 9 files changed, 139 insertions(+), 36 deletions(-). The main changes are: 1) rethook related fixes, from Jiri and Masami. 2) Fix the case when tracing bpf prog is attached to struct_ops, from Martin. 3) Support dual-stack sockets in bpf_tcp_check_syncookie, from Maxim. * https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: bpf: Adjust bpf_tcp_check_syncookie selftest to test dual-stack sockets bpf: Support dual-stack sockets in bpf_tcp_check_syncookie bpf: selftests: Test fentry tracing a struct_ops program bpf: Resolve to prog->aux->dst_prog->type only for BPF_PROG_TYPE_EXT rethook: Fix to use WRITE_ONCE() for rethook:: Handler selftests/bpf: Fix warning comparing pointer to 0 bpf: Fix sparse warnings in kprobe_multi_resolve_syms bpftool: Explicit errno handling in skeletons ==================== Link: https://lore.kernel.org/r/20220407031245.73026-1-alexei.starovoitov@gmail.com Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- include/linux/bpf_verifier.h 3 additions, 1 deletioninclude/linux/bpf_verifier.h
- kernel/trace/bpf_trace.c 2 additions, 2 deletionskernel/trace/bpf_trace.c
- kernel/trace/rethook.c 1 addition, 1 deletionkernel/trace/rethook.c
- net/core/filter.c 13 additions, 4 deletionsnet/core/filter.c
- tools/bpf/bpftool/gen.c 15 additions, 7 deletionstools/bpf/bpftool/gen.c
- tools/testing/selftests/bpf/prog_tests/dummy_st_ops.c 23 additions, 0 deletionstools/testing/selftests/bpf/prog_tests/dummy_st_ops.c
- tools/testing/selftests/bpf/progs/map_ptr_kern.c 2 additions, 2 deletionstools/testing/selftests/bpf/progs/map_ptr_kern.c
- tools/testing/selftests/bpf/progs/trace_dummy_st_ops.c 21 additions, 0 deletionstools/testing/selftests/bpf/progs/trace_dummy_st_ops.c
- tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c 59 additions, 19 deletionstools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
Please register or sign in to comment