From: Lawrence Brakmo <brakmo@fb•com>
To: netdev <netdev@vger•kernel.org>
Cc: Kernel Team <kernel-team@fb•com>, Blake Matheny <bmatheny@fb•com>,
Alexei Starovoitov <ast@fb•com>,
Daniel Borkmann <daniel@iogearbox•net>,
Eric Dumazet <eric.dumazet@gmail•com>,
Neal Cardwell <ncardwell@google•com>,
Yuchung Cheng <ycheng@google•com>
Subject: [PATCH bpf-next v8 00/12] bpf: More sock_ops callbacks
Date: Tue, 23 Jan 2018 23:57:50 -0800 [thread overview]
Message-ID: <20180124075802.1522053-1-brakmo@fb.com> (raw)
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
Signed-off-by: Lawrence Brakmo <brakmo@fb•com>
Consists of the following patches:
[PATCH bpf-next v8 01/12] bpf: Make SOCK_OPS_GET_TCP size independent
[PATCH bpf-next v8 02/12] bpf: Make SOCK_OPS_GET_TCP struct
[PATCH bpf-next v8 03/12] bpf: Add write access to tcp_sock and sock
[PATCH bpf-next v8 04/12] bpf: Only reply field should be writeable
[PATCH bpf-next v8 05/12] bpf: Support passing args to sock_ops bpf
[PATCH bpf-next v8 06/12] bpf: Adds field bpf_sock_ops_cb_flags to
[PATCH bpf-next v8 07/12] bpf: Add sock_ops RTO callback
[PATCH bpf-next v8 08/12] bpf: Add support for reading sk_state and
[PATCH bpf-next v8 09/12] bpf: Add sock_ops R/W access to tclass
[PATCH bpf-next v8 10/12] bpf: Add BPF_SOCK_OPS_RETRANS_CB
[PATCH bpf-next v8 11/12] bpf: Add BPF_SOCK_OPS_STATE_CB
[PATCH bpf-next v8 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 | 72 +++++++-
include/uapi/linux/tcp.h | 8 +
net/core/filter.c | 282 ++++++++++++++++++++++++++++---
net/ipv4/tcp.c | 26 ++-
net/ipv4/tcp_nv.c | 2 +-
net/ipv4/tcp_output.c | 5 +-
net/ipv4/tcp_timer.c | 7 +
tools/include/uapi/linux/bpf.h | 74 +++++++-
tools/testing/selftests/bpf/Makefile | 4 +-
tools/testing/selftests/bpf/bpf_helpers.h | 2 +
tools/testing/selftests/bpf/tcp_client.py | 52 ++++++
tools/testing/selftests/bpf/tcp_server.py | 79 +++++++++
tools/testing/selftests/bpf/test_tcpbpf.h | 16 ++
tools/testing/selftests/bpf/test_tcpbpf_kern.c | 131 ++++++++++++++
tools/testing/selftests/bpf/test_tcpbpf_user.c | 126 ++++++++++++++
18 files changed, 910 insertions(+), 39 deletions(-)
next reply other threads:[~2018-01-24 7:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 7:57 Lawrence Brakmo [this message]
2018-01-24 7:57 ` [PATCH bpf-next v8 01/12] bpf: Make SOCK_OPS_GET_TCP size independent Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 02/12] bpf: Make SOCK_OPS_GET_TCP struct independent Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 03/12] bpf: Add write access to tcp_sock and sock fields Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 04/12] bpf: Only reply field should be writeable Lawrence Brakmo
2018-01-24 19:58 ` Yuchung Cheng
2018-01-24 20:23 ` Alexei Starovoitov
2018-01-24 7:57 ` [PATCH bpf-next v8 05/12] bpf: Support passing args to sock_ops bpf function Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 06/12] bpf: Adds field bpf_sock_ops_cb_flags to tcp_sock Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 07/12] bpf: Add sock_ops RTO callback Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 08/12] bpf: Add support for reading sk_state and more Lawrence Brakmo
2018-01-24 20:05 ` Yuchung Cheng
2018-01-24 22:07 ` Lawrence Brakmo
2018-01-24 7:57 ` [PATCH bpf-next v8 09/12] bpf: Add sock_ops R/W access to tclass Lawrence Brakmo
2018-01-24 7:58 ` [PATCH bpf-next v8 10/12] bpf: Add BPF_SOCK_OPS_RETRANS_CB Lawrence Brakmo
2018-01-24 20:01 ` Yuchung Cheng
2018-01-24 21:14 ` Lawrence Brakmo
2018-01-24 7:58 ` [PATCH bpf-next v8 11/12] bpf: Add BPF_SOCK_OPS_STATE_CB Lawrence Brakmo
2018-01-24 7:58 ` [PATCH bpf-next v8 12/12] bpf: add selftest for tcpbpf Lawrence Brakmo
2018-01-24 14:14 ` [PATCH bpf-next v8 00/12] bpf: More sock_ops callbacks Eric Dumazet
2018-01-24 15:27 ` Alexei Starovoitov
2018-01-24 15:48 ` Eric Dumazet
2018-01-24 16:48 ` Alexei Starovoitov
2018-01-24 16:58 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180124075802.1522053-1-brakmo@fb.com \
--to=brakmo@fb$(echo .)com \
--cc=ast@fb$(echo .)com \
--cc=bmatheny@fb$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=kernel-team@fb$(echo .)com \
--cc=ncardwell@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ycheng@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox