Skip to content

bpf, sockmap: fixes stress testing and regression

John Fastabend bpf netdev 2 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 2 repliesApplied 5/5
  2. v14 patches 9 repliesSuperseded

Patches in v2 All 5 applied

#Subject and filesSizeRepliesApplied
1/5bpf, sockmap: Use stricter sk state checks in sk_lookup_assigninclude/linux/skmsg.h net/core/filter.c net/core/sock_map.c+16 -81 replyApplied
2/5bpf, sockmap: Remove unhash handler for BPF sockmap usagenet/ipv4/tcp_bpf.c+0 -10 repliesApplied
3/5bpf, sockmap: Fix race in ingress receive verdict with redirect to selfnet/ipv4/tcp_bpf.c+47 -00 repliesApplied
4/5bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and collidinginclude/net/strparser.h net/core/filter.c net/strparser/strparser.c+38 -100 repliesApplied
5/5bpf, sockmap: sk_skb data_end access incorrect when src_reg = dst_reginclude/net/strparser.h net/core/filter.c+34 -60 repliesApplied

Reviews trailers per patch

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

PatchJussi MakiJakub Sitnicki
SeriesR-b
1/5R-b
2/5T-b
3/5T-b A-b
4/5T-b R-b
5/5R-b

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

Read the v2 thread

Cover letter [PATCH bpf v2 0/5] bpf, sockmap: fixes stress testing and regression

Attached are 5 patches that fix issues we found by either stress testing or updating our CI to LTS kernels.

Thanks to Jussi for all the hard work tracking down issues and getting stress testing/CI running.

First patch was suggested by Jakub to ensure sockets in CLOSE state were safe from helper side.

Next two patches are issues discovered by Jussi after writing a stess testing tool.

The last two fix an issue noticed while reviewing patches and xlated code paths also discovered by Jussi.

v2: Add an initial patch to make sockmap helpers safe with CLOSE
sockets in sockmap
Added Jussi's tested-by line he tested the original patch series.

John Fastabend (4):
bpf, sockmap: Use stricter sk state checks in sk_lookup_assign bpf, sockmap: Remove unhash handler for BPF sockmap usage bpf, sockmap: Fix race in ingress receive verdict with redirect to
self
bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and
colliding

Jussi Maki (1):
bpf, sockmap: sk_skb data_end access incorrect when src_reg = dst_reg

 include/linux/skmsg.h     | 12 ++++++++
 include/net/strparser.h   | 20 +++++++++++-
 net/core/filter.c         | 64 ++++++++++++++++++++++++++++++++++-----
 net/core/sock_map.c       |  6 ----
 net/ipv4/tcp_bpf.c        | 48 ++++++++++++++++++++++++++++-
 net/strparser/strparser.c | 10 +-----
 6 files changed, 135 insertions(+), 25 deletions(-)
Signature · 1 line
2.33.0