Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-12
The following pull-request contains BPF updates for your *net* tree.
We've added 26 non-merge commits during the last 10 day(s) which contain
a total of 27 files changed, 348 insertions(+), 93 deletions(-).
The main changes are:
1) sock_hash accounting fix, from Andrey.
2) libbpf fix and probe_mem sanitizing, from Andrii.
3) sock_hash fixes, from Jakub.
4) devmap_val fix, from Jesper.
5) load_bytes_relative fix, from YiFei.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- include/uapi/linux/bpf.h 13 additions, 0 deletionsinclude/uapi/linux/bpf.h
- kernel/bpf/cgroup.c 1 addition, 1 deletionkernel/bpf/cgroup.c
- kernel/bpf/devmap.c 5 additions, 13 deletionskernel/bpf/devmap.c
- kernel/bpf/syscall.c 12 additions, 5 deletionskernel/bpf/syscall.c
- kernel/bpf/verifier.c 1 addition, 1 deletionkernel/bpf/verifier.c
- kernel/trace/trace_kprobe.c 1 addition, 1 deletionkernel/trace/trace_kprobe.c
- kernel/trace/trace_uprobe.c 1 addition, 1 deletionkernel/trace/trace_uprobe.c
- net/core/filter.c 9 additions, 10 deletionsnet/core/filter.c
- net/core/sock_map.c 32 additions, 6 deletionsnet/core/sock_map.c
- net/ipv4/tcp_bpf.c 6 additions, 0 deletionsnet/ipv4/tcp_bpf.c
- net/xdp/xsk.c 1 addition, 3 deletionsnet/xdp/xsk.c
- scripts/link-vmlinux.sh 2 additions, 2 deletionsscripts/link-vmlinux.sh
- tools/bpf/Makefile 0 additions, 1 deletiontools/bpf/Makefile
- tools/bpf/bpftool/gen.c 6 additions, 5 deletionstools/bpf/bpftool/gen.c
- tools/include/uapi/linux/bpf.h 13 additions, 0 deletionstools/include/uapi/linux/bpf.h
- tools/lib/bpf/btf_dump.c 24 additions, 9 deletionstools/lib/bpf/btf_dump.c
- tools/lib/bpf/hashmap.h 3 additions, 4 deletionstools/lib/bpf/hashmap.h
- tools/lib/bpf/libbpf.c 0 additions, 4 deletionstools/lib/bpf/libbpf.c
- tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c 7 additions, 0 deletionstools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c
- tools/testing/selftests/bpf/prog_tests/load_bytes_relative.c 71 additions, 0 deletionstools/testing/selftests/bpf/prog_tests/load_bytes_relative.c
Loading
Please register or sign in to comment