[PATCH v2 bpf-next 00/17] bpf: net: Remove duplicated code from bpf_getsockopt()

Martin KaFai Lau
2022-09-02T00:28:10Z

The earlier commits [0] removed duplicated code from bpf_setsockopt().
This series is to remove duplicated code from bpf_getsockopt().

Unlike the setsockopt() which had already changed to take
the sockptr_t argument, the same has not been done to
getsockopt(). This is the extra step being done in this
series.

[0]: https://lore.kernel.org/all/20220817061704.4174272-1-kafai@fb.com/

v2:
- The previous v2 did not reach the list. It is a resend.
- Add comments on bpf_getsockopt() should not free
the saved_syn (Stanislav)
- Explicitly null-terminate the tcp-cc name (Stanislav)

Martin KaFai Lau (17):
net: Change sock_getsockopt() to take the sk ptr instead of the sock
ptr
bpf: net: Change sk_getsockopt() to take the sockptr_t argument
bpf: net: Avoid sk_getsockopt() taking sk lock when called from bpf
bpf: net: Change do_tcp_getsockopt() to take the sockptr_t argument
bpf: net: Avoid do_tcp_getsockopt() taking sk lock when called from
bpf
bpf: net: Change do_ip_getsockopt() to take the sockptr_t argument
bpf: net: Avoid do_ip_getsockopt() taking sk lock when called from bpf
net: Remove unused flags argument from do_ipv6_getsockopt
net: Add a len argument to compat_ipv6_get_msfilter()
bpf: net: Change do_ipv6_getsockopt() to take the sockptr_t argument
bpf: net: Avoid do_ipv6_getsockopt() taking sk lock when called from
bpf
bpf: Embed kernel CONFIG check into the if statement in bpf_getsockopt
bpf: Change bpf_getsockopt(SOL_SOCKET) to reuse sk_getsockopt()
bpf: Change bpf_getsockopt(SOL_TCP) to reuse do_tcp_getsockopt()
bpf: Change bpf_getsockopt(SOL_IP) to reuse do_ip_getsockopt()
bpf: Change bpf_getsockopt(SOL_IPV6) to reuse do_ipv6_getsockopt()
selftest/bpf: Add test for bpf_getsockopt()

include/linux/filter.h | 3 +-
include/linux/igmp.h | 4 +-
include/linux/mroute.h | 6 +-
include/linux/mroute6.h | 4 +-
include/linux/sockptr.h | 5 +
include/net/ip.h | 2 +
include/net/ipv6.h | 4 +-
include/net/ipv6_stubs.h | 2 +
include/net/sock.h | 2 +
include/net/tcp.h | 2 +
net/core/filter.c | 220 ++++++++----------
net/core/sock.c | 51 ++--
net/ipv4/igmp.c | 22 +-
net/ipv4/ip_sockglue.c | 98 ++++----
net/ipv4/ipmr.c | 9 +-
net/ipv4/tcp.c | 92 ++++----
net/ipv6/af_inet6.c | 1 +
net/ipv6/ip6mr.c | 10 +-
net/ipv6/ipv6_sockglue.c | 95 ++++----
net/ipv6/mcast.c | 8 +-
.../selftests/bpf/progs/bpf_tracing_net.h | 1 +
.../selftests/bpf/progs/setget_sockopt.c | 148 ++++--------
22 files changed, 379 insertions(+), 410 deletions(-)

--
2.30.2