Skip to content

bpf, sockmap: Fix some issues with using apply_bytes

Pengcheng Yang bpf netdev 5 versions – Applied

Status from this message: This series was applied to bpf/bpf-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 1 replyApplied 4/4
  2. v24 patches 1 replySuperseded
  3. v1 posting 3/34 patches 8 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v1 posting 2/30 of 4 patches0 repliesSuperseded
v1 posting 1/32 of 4 patches3 repliesSuperseded

Changes in v3 from the cover letter

*Patch 2: Rename 'flags', modify based on Jakub Sitnicki's patch

Patches in v3 All 4 applied

#Subject and filesSizeRepliesApplied
1/4bpf, sockmap: Fix repeated calls to sock_put() when msg has more_datanet/ipv4/tcp_bpf.c+2 -10 repliesApplied
2/4bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytesinclude/linux/skmsg.h include/net/tcp.h net/core/skmsg.c +2 more+19 -120 repliesApplied
3/4bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirectnet/ipv4/tcp_bpf.c+4 -10 repliesApplied
4/4selftests/bpf: Add ingress tests for txmsg with apply_bytestools/testing/selftests/bpf/test_sockmap.c+18 -00 repliesApplied

Reviews trailers per patch

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

PatchJakub Sitnicki
SeriesA-b
1/4
2/4
3/4
4/4

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

Read the v3 thread

Cover letter [PATCH bpf v3 0/4] bpf, sockmap: Fix some issues with using apply_bytes

Patch 1~3 fixes three issues with using apply_bytes when redirecting. Patch 4 adds ingress tests for txmsg with apply_bytes in selftests.

Thanks to John Fastabend and Jakub Sitnicki for correct solution.

---
Changes in v3:
*Patch 2: Rename 'flags', modify based on Jakub Sitnicki's patch

Changes in v2:
*Patch 2: Clear psock->flags explicitly before releasing the sock lock

Pengcheng Yang (4):
bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytes bpf, sockmap: Fix data loss caused by using apply_bytes on ingress
redirect
selftests/bpf: Add ingress tests for txmsg with apply_bytes

 include/linux/skmsg.h                      |  1 +
 include/net/tcp.h                          |  4 ++--
 net/core/skmsg.c                           |  9 ++++++---
 net/ipv4/tcp_bpf.c                         | 19 ++++++++++++-------
 net/tls/tls_sw.c                           |  6 ++++--
 tools/testing/selftests/bpf/test_sockmap.c | 18 ++++++++++++++++++
 6 files changed, 43 insertions(+), 14 deletions(-)
Signature · 1 line
1.8.3.1