Merge branch 'bpf_sk_storage_via_inet_diag'
Martin KaFai Lau says:
====================
The bpf_prog can store specific info to a sk by using bpf_sk_storage.
In other words, a sk can be extended by a bpf_prog.
This series is to support providing bpf_sk_storage data during inet_diag's
dump. The primary target is the usage like iproute2's "ss".
The first two patches are refactoring works in inet_diag to make
adding bpf_sk_storage support easier. The next two patches do
the actual work.
Please see individual patch for details.
v2:
- Add commit message for u16 to u32 change in min_dump_alloc in Patch 4 (Song)
- Add comment to explain the !skb->len check in __inet_diag_dump in Patch 4.
- Do the map->map_type check earlier in Patch 3 for readability.
====================
Signed-off-by:
Alexei Starovoitov <ast@kernel.org>
Showing
- include/linux/bpf.h 1 addition, 0 deletionsinclude/linux/bpf.h
- include/linux/inet_diag.h 16 additions, 11 deletionsinclude/linux/inet_diag.h
- include/linux/netlink.h 2 additions, 2 deletionsinclude/linux/netlink.h
- include/net/bpf_sk_storage.h 27 additions, 0 deletionsinclude/net/bpf_sk_storage.h
- include/uapi/linux/inet_diag.h 4 additions, 1 deletioninclude/uapi/linux/inet_diag.h
- include/uapi/linux/sock_diag.h 26 additions, 0 deletionsinclude/uapi/linux/sock_diag.h
- kernel/bpf/syscall.c 15 additions, 0 deletionskernel/bpf/syscall.c
- net/core/bpf_sk_storage.c 277 additions, 6 deletionsnet/core/bpf_sk_storage.c
- net/dccp/diag.c 4 additions, 5 deletionsnet/dccp/diag.c
- net/ipv4/inet_diag.c 188 additions, 119 deletionsnet/ipv4/inet_diag.c
- net/ipv4/raw_diag.c 11 additions, 13 deletionsnet/ipv4/raw_diag.c
- net/ipv4/tcp_diag.c 4 additions, 4 deletionsnet/ipv4/tcp_diag.c
- net/ipv4/udp_diag.c 20 additions, 21 deletionsnet/ipv4/udp_diag.c
- net/sctp/diag.c 4 additions, 3 deletionsnet/sctp/diag.c
Loading
Please register or sign in to comment