Skip to content

bpf: More sock_ops callbacks

Lawrence Brakmo netdev 10 versions – Applied

Status from this message: Applied to bpf-next, thank you Larry.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v10 Latest12 patches 1 replyApplied
  2. v912 patches 0 repliesSuperseded
  3. v812 patches 11 repliesSuperseded
Earlier versions · 7
VersionPostedPatchesRepliesStatus
v712 patches0 repliesSuperseded
v611 patches10 repliesSuperseded
v511 patches4 repliesSuperseded
v411 patches1 replySuperseded
v311 patches1 replySuperseded
v211 patches3 repliesSuperseded
v111 patches2 repliesSuperseded

Patches in v10 Applied

#Subject and filesSizeRepliesApplied
1/12bpf: Only reply field should be writeablenet/core/filter.c+1 -20 replies
2/12bpf: Make SOCK_OPS_GET_TCP size independentnet/core/filter.c+8 -50 replies
3/12bpf: Make SOCK_OPS_GET_TCP struct independentnet/core/filter.c+10 -100 replies
4/12bpf: Add write access to tcp_sock and sock fieldsinclude/linux/filter.h include/net/tcp.h net/core/filter.c+58 -10 replies
5/12bpf: Support passing args to sock_ops bpf functioninclude/linux/filter.h include/net/tcp.h include/uapi/linux/bpf.h +3 more+42 -100 replies
6/12bpf: Adds field bpf_sock_ops_cb_flags to tcp_sockinclude/linux/tcp.h include/uapi/linux/bpf.h net/core/filter.c+61 -10 replies
7/12bpf: Add sock_ops RTO callbackinclude/uapi/linux/bpf.h net/ipv4/tcp_timer.c+14 -10 replies
8/12bpf: Add support for reading sk_state and moreinclude/uapi/linux/bpf.h net/core/filter.c+154 -110 replies
9/12bpf: Add sock_ops R/W access to tclassnet/core/filter.c+45 -20 replies
10/12bpf: Add BPF_SOCK_OPS_RETRANS_CBinclude/uapi/linux/bpf.h net/ipv4/tcp_output.c+12 -10 replies
11/12bpf: Add BPF_SOCK_OPS_STATE_CBinclude/uapi/linux/bpf.h net/ipv4/tcp.c+52 -10 replies
12/12bpf: add selftest for tcpbpftools/include/uapi/linux/bpf.h tools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/bpf_helpers.h +5 more+480 -60 replies

Reviews trailers per patch

4 of 12 patches have a Reviewed-by or Acked-by.

PatchYuchung ChengAlexei Starovoitov
1/12A-b
2/12
3/12
4/12A-b
5/12
6/12A-b
7/12
8/12
9/12
10/12
11/12
12/12A-b

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

Read the v10 thread

Cover letter [PATCH bpf-next v10 00/12] bpf: More sock_ops callbacks

This patchset adds support for:

- direct R or R/W access to many tcp_sock fields
- passing up to 4 arguments to sock_ops BPF functions
- tcp_sock field bpf_sock_ops_cb_flags for controlling callbacks
- optionally calling sock_ops BPF program when RTO fires
- optionally calling sock_ops BPF program when packet is retransmitted
- optionally calling sock_ops BPF program when TCP state changes
- access to tclass and sk_txhash
- new selftest

v2: Fixed commit message 0/11. The commit is to "bpf-next" but the patch
below used "bpf" and Patchwork didn't work correctly.
v3: Cleaned RTO callback as per Yuchung's comment
Added BPF enum for TCP states as per Alexei's comment
v4: Fixed compile warnings related to detecting changes between TCP
internal states and the BPF defined states.
v5: Fixed comment issues in some selftest files
Fixed accesss issue with u64 fields in bpf_sock_ops struct
v6: Made fixes based on comments form Eric Dumazet:
The field bpf_sock_ops_cb_flags was addded in a hole on 64bit kernels Field bpf_sock_ops_cb_flags is now set through a helper function which returns an error when a BPF program tries to set bits for callbacks that are not supported in the current kernel.
Added a comment indicating that when adding fields to bpf_sock_ops_kern they should be added before the field named "temp" if they need to be cleared before calling the BPF function.
v7: Enfornced fields "op" and "replylong[1] .. replylong[3]" not be writable
based on comments form Eric Dumazet and Alexei Starovoitov. Filled 32 bit hole in bpf_sock_ops struct with sk_txhash based on comments from Daniel Borkmann.
Removed unused functions (tcp_call_bpf_1arg, tcp_call_bpf_4arg) based on comments from Daniel Borkmann.
v8: Add commit message 00/12
Add Acked-by as appropriate
v9: Moved the bug fix to the front of the patchset
Changed RETRANS_CB so it is always called (before it was only called if the retransmit succeeded). It is now called with an extra argument, the return value of tcp_transmit_skb (0 => success). Based on comments from Yuchung Cheng.
Added support for reading 2 new fields, sacked_out and lost_out, based on comments from Yuchung Cheng.
v10: Moved the callback flags from include/uapi/linux/tcp.h to
include/uapi/linux/bpf.h
Cleaned up the test in selftest. Added a timeout so it always completes, even if the client is not communicating with the server. Made it faster by removing the sleeps. Made sure it works even when called back-to-back 20 times.

Consists of the following patches:
[PATCH bpf-next v10 01/12] bpf: Only reply field should be writeable [PATCH bpf-next v10 02/12] bpf: Make SOCK_OPS_GET_TCP size [PATCH bpf-next v10 03/12] bpf: Make SOCK_OPS_GET_TCP struct [PATCH bpf-next v10 04/12] bpf: Add write access to tcp_sock and sock [PATCH bpf-next v10 05/12] bpf: Support passing args to sock_ops bpf [PATCH bpf-next v10 06/12] bpf: Adds field bpf_sock_ops_cb_flags to [PATCH bpf-next v10 07/12] bpf: Add sock_ops RTO callback [PATCH bpf-next v10 08/12] bpf: Add support for reading sk_state and [PATCH bpf-next v10 09/12] bpf: Add sock_ops R/W access to tclass [PATCH bpf-next v10 10/12] bpf: Add BPF_SOCK_OPS_RETRANS_CB [PATCH bpf-next v10 11/12] bpf: Add BPF_SOCK_OPS_STATE_CB [PATCH bpf-next v10 12/12] bpf: add selftest for tcpbpf

 include/linux/filter.h                         |  10 ++
 include/linux/tcp.h                            |  11 ++
 include/net/tcp.h                              |  42 ++++-
 include/uapi/linux/bpf.h                       |  84 ++++++++-
 net/core/filter.c                              | 290 ++++++++++++++++++++++++++++---
 net/ipv4/tcp.c                                 |  26 ++-
 net/ipv4/tcp_nv.c                              |   2 +-
 net/ipv4/tcp_output.c                          |   6 +-
 net/ipv4/tcp_timer.c                           |   7 +
 tools/include/uapi/linux/bpf.h                 |  86 ++++++++-
 tools/testing/selftests/bpf/Makefile           |   4 +-
 tools/testing/selftests/bpf/bpf_helpers.h      |   2 +
 tools/testing/selftests/bpf/tcp_client.py      |  51 ++++++
 tools/testing/selftests/bpf/tcp_server.py      |  83 +++++++++
 tools/testing/selftests/bpf/test_tcpbpf.h      |  16 ++
 tools/testing/selftests/bpf/test_tcpbpf_kern.c | 118 +++++++++++++
 tools/testing/selftests/bpf/test_tcpbpf_user.c | 126 ++++++++++++++
 17 files changed, 925 insertions(+), 39 deletions(-)