bpf, sockmap complete fixes for avail bytes
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
- v3 Latest3 patches 1 replyApplied 3/3
- v2 posting 2/20 of 3 patches 0 repliesSuperseded
- v2 posting 1/23 patches 0 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 3 patches | 4 replies | Superseded |
Patches in v3 All 3 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | bpf: tcp_read_skb needs to pop skb regardless of seqnet/ | +2 | 0 replies | Applied |
| 2/3 | bpf: sockmap, do not inc copied_seq when PEEK flag setnet/ | +3 | 0 replies | Applied |
| 3/3 | bpf: sockmap, add tests for MSG_F_PEEKtools/ | +52 | 0 replies | Applied |
Reviews trailers per patch
None of the 3 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Jakub Sitnicki |
|---|---|
| Series | R-b |
| 1/3 | |
| 2/3 | |
| 3/3 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH bpf v3 0/3] bpf, sockmap complete fixes for avail bytes
With e5c6de5fa0258 ("bpf, sockmap: Incorrectly handling copied_seq") we started fixing the available bytes accounting by moving copied_seq to where the user actually reads the bytes.
However we missed handling MSG_PEEK correctly and we need to ensure that we don't kfree_skb() a skb off the receive_queue when the copied_seq number is not incremented by user reads for some time.
v2: drop seq var in tcp_read_skb its no longer necessary per Jakub's
suggestion
v3: drop tcp_sock as well its also not used anymore. sorry for the extra
noise there.
John Fastabend (3):
bpf: tcp_read_skb needs to pop skb regardless of seq
bpf: sockmap, do not inc copied_seq when PEEK flag set
bpf: sockmap, add tests for MSG_F_PEEK
net/ipv4/tcp.c | 10 +--- net/ipv4/tcp_bpf.c | 4 +- .../selftests/bpf/prog_tests/sockmap_basic.c | 52 +++++++++++++++++++ 3 files changed, 57 insertions(+), 9 deletions(-)
Signature · 1 line
2.33.0