Skip to content

sockmap: add sockmap support for unix datagram socket

Cong Wang bpf netdev 4 versions – Applied

Status from this message: Applied. Thanks

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest11 patches 7 repliesApplied
  2. v412 patches 1 replySuperseded
  3. v310 patches 13 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v29 patches0 repliesSuperseded

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/11sock_map: relax config dependency to CONFIG_NETinclude/linux/bpf.h kernel/bpf/Kconfig net/core/Makefile+21 -210 replies
2/11sock_map: lift socket state restriction for datagram socketsnet/core/sock_map.c net/ipv4/udp_bpf.c tools/testing/selftests/bpf/prog_tests/sockmap_listen.c+6 -240 replies
3/11af_unix: implement ->read_sock() for sockmapnet/unix/af_unix.c+37 -01 reply
4/11af_unix: set TCP_ESTABLISHED for datagram sockets toonet/unix/af_unix.c+8 -60 replies
5/11af_unix: add a dummy ->close() for sockmapnet/unix/af_unix.c+9 -00 replies
6/11af_unix: implement ->psock_update_sk_prot()MAINTAINERS include/net/af_unix.h net/core/sock_map.c +3 more+65 -10 replies
7/11af_unix: implement unix_dgram_bpf_recvmsg()include/net/af_unix.h net/unix/af_unix.c net/unix/unix_bpf.c+93 -32 replies
8/11selftests/bpf: factor out udp_socketpair()tools/testing/selftests/bpf/prog_tests/sockmap_listen.c+40 -380 replies
9/11selftests/bpf: factor out add_to_sockmap()tools/testing/selftests/bpf/prog_tests/sockmap_listen.c+21 -380 replies
10/11selftests/bpf: add a test case for unix sockmaptools/testing/selftests/bpf/prog_tests/sockmap_listen.c+97 -00 replies
11/11selftests/bpf: add test cases for redirection between udp and unixtools/testing/selftests/bpf/prog_tests/sockmap_listen.c+170 -02 replies

Reviews trailers per patch

None of the 11 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchJohn Fastabend
SeriesA-b
1/11
2/11
3/11
4/11
5/11
6/11
7/11
8/11
9/11
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH bpf-next v5 00/11] sockmap: add sockmap support for unix datagram socket

From: Cong Wang <[email protected]>

This is the last patchset of the original large patchset. In the previous patchset, a new BPF sockmap program BPF_SK_SKB_VERDICT was introduced and UDP began to support it too. In this patchset, we add BPF_SK_SKB_VERDICT support to Unix datagram socket, so that we can finally splice Unix datagram socket and UDP socket. Please check each patch description for more details.

To see the big picture, the previous patchsets are available here:
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=1e0ab70778bd86a90de438cc5e1535c115a7c396
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=89d69c5d0fbcabd8656459bc8b1a476d6f1efee4

and this patchset is available here:
https://github.com/congwang/linux/tree/sockmap3

---
v5: lift socket state check for dgram
remove ->unhash() case
add retries for EAGAIN in all test cases remove an unused parameter of __unix_dgram_recvmsg() rebase on the latest bpf-next

v4: fix af_unix disconnect case
add unix_unhash()
split out two small patches
reduce u->iolock critical section
remove an unused parameter of __unix_dgram_recvmsg()

v3: fix Kconfig dependency
make unix_read_sock() static
fix a UAF in unix_release()
add a missing header unix_bpf.c

v2: separate out from the original large patchset
rebase to the latest bpf-next
clean up unix_read_sock()
export sock_map_close()
factor out some helpers in selftests for code reuse

Cong Wang (11):
sock_map: relax config dependency to CONFIG_NET
sock_map: lift socket state restriction for datagram sockets
af_unix: implement ->read_sock() for sockmap
af_unix: set TCP_ESTABLISHED for datagram sockets too
af_unix: add a dummy ->close() for sockmap
af_unix: implement ->psock_update_sk_prot()
af_unix: implement unix_dgram_bpf_recvmsg() selftests/bpf: factor out udp_socketpair() selftests/bpf: factor out add_to_sockmap() selftests/bpf: add a test case for unix sockmap selftests/bpf: add test cases for redirection between udp and unix

 MAINTAINERS                                   |   1 +
 include/linux/bpf.h                           |  38 +-
 include/net/af_unix.h                         |  12 +
 kernel/bpf/Kconfig                            |   2 +-
 net/core/Makefile                             |   2 -
 net/core/sock_map.c                           |  22 +-
 net/ipv4/udp_bpf.c                            |   1 -
 net/unix/Makefile                             |   1 +
 net/unix/af_unix.c                            |  85 +++-
 net/unix/unix_bpf.c                           | 122 ++++++
 .../selftests/bpf/prog_tests/sockmap_listen.c | 406 ++++++++++++++----
 11 files changed, 564 insertions(+), 128 deletions(-)
 create mode 100644 net/unix/unix_bpf.c
Signature · 1 line
2.27.0