bpf: More sock_ops callbacks
Subsystems (8)
v3 cover 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_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
Consists of the following patches:
[PATCH v3 bpf-next 01/11] bpf: Make SOCK_OPS_GET_TCP size independent [PATCH v3 bpf-next 02/11] bpf: Make SOCK_OPS_GET_TCP struct [PATCH v3 bpf-next 03/11] bpf: Add write access to tcp_sock and sock [PATCH v3 bpf-next 04/11] bpf: Support passing args to sock_ops bpf [PATCH v3 bpf-next 05/11] bpf: Adds field bpf_sock_ops_flags to [PATCH v3 bpf-next 06/11] bpf: Add sock_ops RTO callback [PATCH v3 bpf-next 07/11] bpf: Add support for reading sk_state and [PATCH v3 bpf-next 08/11] bpf: Add sock_ops R/W access to tclass & [PATCH v3 bpf-next 09/11] bpf: Add BPF_SOCK_OPS_RETRANS_CB [PATCH v3 bpf-next 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB [PATCH v3 bpf-next 11/11] bpf: add selftest for tcpbpf
include/linux/filter.h | 4 + include/linux/tcp.h | 8 ++ include/net/tcp.h | 66 +++++++++- include/uapi/linux/bpf.h | 61 ++++++++- include/uapi/linux/tcp.h | 5 + net/core/filter.c | 221 ++++++++++++++++++++++++++++++-- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_nv.c | 2 +- net/ipv4/tcp_output.c | 5 +- net/ipv4/tcp_timer.c | 7 + tools/include/uapi/linux/bpf.h | 70 +++++++++- tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/tcp_client.py | 52 ++++++++ tools/testing/selftests/bpf/tcp_server.py | 79 ++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_kern.c | 125 ++++++++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_user.c | 113 ++++++++++++++++ 16 files changed, 803 insertions(+), 25 deletions(-)
PATCH v3 1/11 bpf: Make SOCK_OPS_GET_TCP size independent
Make SOCK_OPS_GET_TCP helper macro size independent (before only worked with 4-byte fields.
--- net/core/filter.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/core/filter.c +8 -5
@@ -4449,9 +4449,10 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,break ;/* Helper macro for adding read access to tcp_sock fields. */ -#define SOCK_OPS_GET_TCP32 (FIELD_NAME ) \ +#define SOCK_OPS_GET_TCP (FIELD_NAME ) \ do { \ - BUILD_BUG_ON(FIELD_SIZEOF(struct tcp_sock, FIELD_NAME) != 4); \ + BUILD_BUG_ON(FIELD_SIZEOF(struct tcp_sock, FIELD_NAME) > \ + FIELD_SIZEOF(struct bpf_sock_ops, FIELD_NAME)); \ *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ struct bpf_sock_ops_kern, \ is_fullsock), \
@@ -4463,16 +4464,18 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, struct bpf_sock_ops_kern, sk),\ si->dst_reg, si->src_reg, \ offsetof(struct bpf_sock_ops_kern, sk));\ - *insn++ =BPF_LDX_MEM (BPF_W , si->dst_reg, si->dst_reg, \ + *insn++ = BPF_LDX_MEM(FIELD_SIZEOF(struct tcp_sock, \ +FIELD_NAME ), si->dst_reg, \ + si->dst_reg, \ offsetof(struct tcp_sock , FIELD_NAME)); \ }while (0 )case offsetof(struct bpf_sock_ops , snd_cwnd): -SOCK_OPS_GET_TCP32 (snd_cwnd); +SOCK_OPS_GET_TCP (snd_cwnd);break ;case offsetof(struct bpf_sock_ops , srtt_us): -SOCK_OPS_GET_TCP32 (srtt_us); +SOCK_OPS_GET_TCP (srtt_us);break ; }return insn - insn_buf;
Signature · 1 line
2.9.5
PATCH v3 2/11 bpf: Make SOCK_OPS_GET_TCP struct independent
In reply to Lawrence BrakmoChanged SOCK_OPS_GET_TCP to SOCK_OPS_GET_FIELD and added 2 arguments so now it can also work with struct sock fields. The first argument is the name of the field in the bpf_sock_ops struct, the 2nd argument is the name of the field in the OBJ struct.
Previous: SOCK_OPS_GET_TCP(FIELD_NAME) New: SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ)
Where OBJ is either "struct tcp_sock" or "struct sock" (without quotation). BPF_FIELD is the name of the field in the bpf_sock_ops struct and OBJ_FIELD is the name of the field in the OBJ struct.
Although the field names are currently the same, the kernel struct names could change in the future and this change makes it easier to support that.
Note that adding access to tcp_sock fields in sock_ops programs does not preclude the tcp_sock fields from being removed as long as we are willing to do one of the following:
1) Return a fixed value (e.x. 0 or 0xffffffff), or
2) Make the verifier fail if that field is accessed (i.e. program fails to load) so the user will know that field is no longer supported.
--- net/core/filter.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
net/core/filter.c +10 -10
@@ -4448,11 +4448,11 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, is_fullsock));break ; -/* Helper macro for adding read access to tcp_sock fields. */ -#define SOCK_OPS_GET_TCP (FIELD_NAME ) \ +/* Helper macro for adding read access to tcp_sock or sock fields. */ +#define SOCK_OPS_GET_FIELD (BPF_FIELD ,OBJ_FIELD ,OBJ ) \ do { \ - BUILD_BUG_ON(FIELD_SIZEOF(struct tcp_sock, FIELD_NAME) > \ - FIELD_SIZEOF(struct bpf_sock_ops, FIELD_NAME)); \ + BUILD_BUG_ON(FIELD_SIZEOF(OBJ, OBJ_FIELD) > \ + FIELD_SIZEOF(struct bpf_sock_ops, BPF_FIELD)); \ *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ struct bpf_sock_ops_kern, \ is_fullsock), \
@@ -4464,18 +4464,18 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, struct bpf_sock_ops_kern, sk),\ si->dst_reg, si->src_reg, \ offsetof(struct bpf_sock_ops_kern, sk));\ - *insn++ = BPF_LDX_MEM(FIELD_SIZEOF(struct tcp_sock, \ -FIELD_NAME ), si->dst_reg, \ - si->dst_reg, \ - offsetof(struct tcp_sock , FIELD_NAME)); \ + *insn++ =BPF_LDX_MEM (BPF_FIELD_SIZEOF (OBJ , \ +OBJ_FIELD ), \ + si->dst_reg, si->dst_reg, \ + offsetof(OBJ , OBJ_FIELD)); \ }while (0 )case offsetof(struct bpf_sock_ops , snd_cwnd): -SOCK_OPS_GET_TCP (snd_cwnd); + SOCK_OPS_GET_FIELD(snd_cwnd, snd_cwnd, struct tcp_sock);break ;case offsetof(struct bpf_sock_ops , srtt_us): -SOCK_OPS_GET_TCP (srtt_us); + SOCK_OPS_GET_FIELD(srtt_us, srtt_us, struct tcp_sock);break ; }return insn - insn_buf;
Signature · 1 line
2.9.5
PATCH v3 3/11 bpf: Add write access to tcp_sock and sock fields
In reply to Lawrence BrakmoThis patch adds a macro, SOCK_OPS_SET_FIELD, for writing to struct tcp_sock or struct sock fields. This required adding a new field "temp" to struct bpf_sock_ops_kern for temporary storage that is used by sock_ops_convert_ctx_access. It is used to store and recover the contents of a register, so the register can be used to store the address of the sk. Since we cannot overwrite the dst_reg because it contains the pointer to ctx, nor the src_reg since it contains the value we want to store, we need an extra register to contain the address of the sk.
Also adds the macro SOCK_OPS_GET_OR_SET_FIELD that calls one of the GET or SET macros depending on the value of the TYPE field.
--- include/linux/filter.h | 3 +++ include/net/tcp.h | 2 +- net/core/filter.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-)
include/linux/filter.h +3 -0
@@ -1005,6 +1005,9 @@ struct bpf_sock_ops_kern { u32 replylong[4]; };u32 is_fullsock; +u64 temp;/* Used by sock_ops_convert_ctx_access +* as temporary storaage of a register +*/ };#endif /* __LINUX_FILTER_H__ */
include/net/tcp.h +1 -1
@@ -2010,7 +2010,7 @@ static inline int tcp_call_bpf(struct sock *sk, int op)struct bpf_sock_ops_kern sock_ops;int ret; -memset (&sock_ops,0 ,sizeof (sock_ops)); +memset (&sock_ops,0 , offsetof(struct bpf_sock_ops_kern , temp));if (sk_fullsock (sk)) { sock_ops.is_fullsock =1 ;sock_owned_by_me (sk);
net/core/filter.c +48 -0
54 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v3 4/11 bpf: Support passing args to sock_ops bpf function
In reply to Lawrence BrakmoAdds support for passing up to 4 arguments to sock_ops bpf functions. It reusues the reply union, so the bpf_sock_ops structures are not increased in size.
--- include/linux/filter.h | 1 + include/net/tcp.h | 64 ++++++++++++++++++++++++++++++++++++++++++++---- include/uapi/linux/bpf.h | 5 ++-- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_nv.c | 2 +- net/ipv4/tcp_output.c | 2 +- 6 files changed, 66 insertions(+), 10 deletions(-)
include/linux/filter.h +1 -0
@@ -1001,6 +1001,7 @@ struct bpf_sock_ops_kern {struct sock *sk;u32 op;union { +u32 args[4 ];u32 reply;u32 replylong[4 ]; };
include/net/tcp.h +59 -5
104 lines not on this page · raw message
include/uapi/linux/bpf.h +3 -2
@@ -942,8 +942,9 @@ struct bpf_map_info {struct bpf_sock_ops {__u32 op;union { -__u32 reply; -__u32 replylong[4 ]; +__u32 args[4 ];/* Optionally passed to bpf program */ +__u32 reply;/* Returned by bpf program */ +__u32 replylong[4 ];/* Optionally returned by bpf prog */ };__u32 family;__u32 remote_ip4;/* Stored in network byte order */
net/ipv4/tcp.c +1 -1
@@ -463,7 +463,7 @@ void tcp_init_transfer(struct sock *sk, int bpf_op)tcp_mtup_init (sk); icsk->icsk_af_ops->rebuild_header (sk);tcp_init_metrics (sk); -tcp_call_bpf (sk, bpf_op); +tcp_call_bpf (sk, bpf_op,0 ,NULL );tcp_init_congestion_control (sk);tcp_init_buffer_space (sk); }
net/ipv4/tcp_nv.c +1 -1
@@ -146,7 +146,7 @@ static void tcpnv_init(struct sock *sk)* within a datacenter, where we have reasonable estimates of * RTTs */ - base_rtt =tcp_call_bpf (sk,BPF_SOCK_OPS_BASE_RTT ); + base_rtt =tcp_call_bpf (sk,BPF_SOCK_OPS_BASE_RTT ,0 ,NULL );if (base_rtt >0 ) { ca->nv_base_rtt = base_rtt; ca->nv_lower_bound_rtt = (base_rtt *205 ) >>8 ;/* 80% */
net/ipv4/tcp_output.c +1 -1
@@ -3468,7 +3468,7 @@ int tcp_connect(struct sock *sk)struct sk_buff *buff;int err; -tcp_call_bpf (sk,BPF_SOCK_OPS_TCP_CONNECT_CB ); +tcp_call_bpf (sk,BPF_SOCK_OPS_TCP_CONNECT_CB ,0 ,NULL );if (inet_csk (sk)->icsk_af_ops->rebuild_header (sk))return -EHOSTUNREACH ;/* Routing failure or similar. */
Signature · 1 line
2.9.5
PATCH v3 5/11 bpf: Adds field bpf_sock_ops_flags to tcp_sock
In reply to Lawrence BrakmoAdds field bpf_sock_ops_flags to tcp_sock and bpf_sock_ops. Its primary use is to determine if there should be calls to sock_ops bpf program at various points in the TCP code. The field is initialized to zero, disabling the calls. A sock_ops BPF program can set, per connection and as necessary, when the connection is established.
It also adds support for reading and writting the field within a sock_ops BPF program.
Examples of where to call the bpf program:
1) When RTO fires
2) When a packet is retransmitted
3) When the connection terminates
4) When a packet is sent
5) When a packet is received
--- include/linux/tcp.h | 8 ++++++++ include/uapi/linux/bpf.h | 1 + net/core/filter.c | 7 +++++++ 3 files changed, 16 insertions(+)
include/linux/tcp.h +8 -0
@@ -373,6 +373,14 @@ struct tcp_sock {*/ struct request_sock *fastopen_rsk;u32 *saved_syn; + +/* Sock_ops bpf program related variables */ +#ifdef CONFIG_BPF +u32 bpf_sock_ops_flags;/* values defined in uapi/linux/tcp.h */ +#define BPF_SOCK_OPS_TEST_FLAG (TP ,ARG ) (TP->bpf_sock_ops_flags & ARG) +#else +#define BPF_SOCK_OPS_TEST_FLAG (TP ,ARG ) 0 +#endif };enum tsq_enum {
include/uapi/linux/bpf.h +1 -0
@@ -959,6 +959,7 @@ struct bpf_sock_ops {*/ __u32 snd_cwnd;__u32 srtt_us;/* Averaged RTT << 3 in usecs */ +__u32 bpf_sock_ops_flags;/* flags defined in uapi/linux/tcp.h */ };/* List of known BPF sock_ops operators.
net/core/filter.c +7 -0
@@ -3843,6 +3843,7 @@ static bool sock_ops_is_valid_access(int off, int size,switch (off) { case offsetof(struct bpf_sock_ops, op) ... offsetof(struct bpf_sock_ops, replylong[3]): +case offsetof(struct bpf_sock_ops , bpf_sock_ops_flags):break ;default :return false;
@@ -4525,6 +4526,12 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,case offsetof(struct bpf_sock_ops , srtt_us): SOCK_OPS_GET_FIELD(srtt_us, srtt_us, struct tcp_sock);break ; + +case offsetof(struct bpf_sock_ops , bpf_sock_ops_flags): +SOCK_OPS_GET_OR_SET_FIELD (bpf_sock_ops_flags, + bpf_sock_ops_flags, + struct tcp_sock, type); +break ; }return insn - insn_buf; }
Signature · 1 line
2.9.5
PATCH v3 6/11 bpf: Add sock_ops RTO callback
In reply to Lawrence BrakmoAdds an optional call to sock_ops BPF program based on whether the BPF_SOCK_OPS_RTO_CB_FLAG is set in bpf_sock_ops_flags.
The BPF program is passed 2 arguments: icsk_retransmits and whether the RTO has expired.
--- include/uapi/linux/bpf.h | 5 +++++ include/uapi/linux/tcp.h | 3 +++ net/ipv4/tcp_timer.c | 7 +++++++ 3 files changed, 15 insertions(+)
include/uapi/linux/bpf.h +5 -0
@@ -995,6 +995,11 @@ enum {* a congestion threshold. RTTs above * this indicate congestion */ + BPF_SOCK_OPS_RTO_CB, /* Called when an RTO has triggered. +* Arg1: value of icsk_retransmits +* Arg2: value of icsk_rto +* Arg3: whether RTO has expired +*/ };#define TCP_BPF_IW 1001/* Set TCP initial congestion window */
include/uapi/linux/tcp.h +3 -0
@@ -259,6 +259,9 @@ struct tcp_md5sig {__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN ];/* key (binary) */ }; +/* Definitions for bpf_sock_ops_flags */ +#define BPF_SOCK_OPS_RTO_CB_FLAG (1<<0) +/* INET_DIAG_MD5SIG */ struct tcp_diag_md5sig {__u8 tcpm_family;
net/ipv4/tcp_timer.c +7 -0
@@ -213,11 +213,18 @@ static int tcp_write_timeout(struct sock *sk) icsk->icsk_user_timeout); }tcp_fastopen_active_detect_blackhole (sk, expired); + +if (BPF_SOCK_OPS_TEST_FLAG (tp,BPF_SOCK_OPS_RTO_CB_FLAG )) +tcp_call_bpf_3arg (sk,BPF_SOCK_OPS_RTO_CB , + icsk->icsk_retransmits, + icsk->icsk_rto, (int )expired); +if (expired) {/* Has it gone just too far? */ tcp_write_err (sk);return 1 ; } +return 0 ; }
Signature · 1 line
2.9.5
PATCH v3 7/11 bpf: Add support for reading sk_state and more
In reply to Lawrence BrakmoAdd support for reading many more tcp_sock fields
state, same as sk->sk_state
rtt_min same as sk->rtt_min.s[0].v (current rtt_min)
snd_ssthresh
rcv_nxt
snd_nxt
snd_una
mss_cache
ecn_flags
rate_delivered
rate_interval_us
packets_out
retrans_out
total_retrans
segs_in
data_segs_in
segs_out
data_segs_out
bytes_received (__u64)
bytes_acked (__u64)
--- include/uapi/linux/bpf.h | 19 +++++++++ net/core/filter.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 1 deletion(-)
include/uapi/linux/bpf.h +19 -0
@@ -960,6 +960,25 @@ struct bpf_sock_ops {__u32 snd_cwnd;__u32 srtt_us;/* Averaged RTT << 3 in usecs */ __u32 bpf_sock_ops_flags;/* flags defined in uapi/linux/tcp.h */ +__u32 state; +__u32 rtt_min; +__u32 snd_ssthresh; +__u32 rcv_nxt; +__u32 snd_nxt; +__u32 snd_una; +__u32 mss_cache; +__u32 ecn_flags; +__u32 rate_delivered; +__u32 rate_interval_us; +__u32 packets_out; +__u32 retrans_out; +__u32 total_retrans; +__u32 segs_in; +__u32 data_segs_in; +__u32 segs_out; +__u32 data_segs_out; +__u64 bytes_received; +__u64 bytes_acked; };/* List of known BPF sock_ops operators.
net/core/filter.c +100 -1
119 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v3 8/11 bpf: Add sock_ops R/W access to tclass & sk_txhash
In reply to Lawrence BrakmoAdds direct R/W access to sk_txhash and access to tclass for ipv6 flows through getsockopt and setsockopt. Sample usage for tclass:
bpf_getsockopt(skops, SOL_IPV6, IPV6_TCLASS, &v, sizeof(v))
where skops is a pointer to the ctx (struct bpf_sock_ops).
--- include/uapi/linux/bpf.h | 1 + net/core/filter.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-)
include/uapi/linux/bpf.h +1 -0
@@ -979,6 +979,7 @@ struct bpf_sock_ops {__u32 data_segs_out;__u64 bytes_received;__u64 bytes_acked; +__u32 sk_txhash; };/* List of known BPF sock_ops operators.
net/core/filter.c +47 -1
78 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v3 9/11 bpf: Add BPF_SOCK_OPS_RETRANS_CB
In reply to Lawrence BrakmoAdds support for calling sock_ops BPF program when there is a retransmission. Two arguments are used; one for the sequence number and other for the number of segments retransmitted. Does not include syn-ack retransmissions.
New op: BPF_SOCK_OPS_RETRANS_CB.
--- include/uapi/linux/bpf.h | 4 ++++ include/uapi/linux/tcp.h | 1 + net/ipv4/tcp_output.c | 3 +++ 3 files changed, 8 insertions(+)
include/uapi/linux/bpf.h +4 -0
@@ -1020,6 +1020,10 @@ enum {* Arg2: value of icsk_rto * Arg3: whether RTO has expired */ + BPF_SOCK_OPS_RETRANS_CB, /* Called when skb is retransmitted. +* Arg1: sequence number of 1st byte +* Arg2: # segments +*/ };#define TCP_BPF_IW 1001/* Set TCP initial congestion window */
include/uapi/linux/tcp.h +1 -0
@@ -261,6 +261,7 @@ struct tcp_md5sig {/* Definitions for bpf_sock_ops_flags */ #define BPF_SOCK_OPS_RTO_CB_FLAG (1<<0) +#define BPF_SOCK_OPS_RETRANS_CB_FLAG (1<<1)/* INET_DIAG_MD5SIG */ struct tcp_diag_md5sig {
net/ipv4/tcp_output.c +3 -0
@@ -2907,6 +2907,9 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)if (likely (!err)) {TCP_SKB_CB (skb)->sacked |=TCPCB_EVER_RETRANS ;trace_tcp_retransmit_skb (sk, skb); +if (BPF_SOCK_OPS_TEST_FLAG (tp,BPF_SOCK_OPS_RETRANS_CB_FLAG )) +tcp_call_bpf_2arg (sk,BPF_SOCK_OPS_RETRANS_CB , +TCP_SKB_CB (skb)->seq, segs); }else if (err != -EBUSY ) {NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPRETRANSFAIL ); }
Signature · 1 line
2.9.5
PATCH v3 10/11 bpf: Add BPF_SOCK_OPS_STATE_CB
In reply to Lawrence BrakmoAdds support for calling sock_ops BPF program when there is a TCP state change. Two arguments are used; one for the old state and another for the new state.
There is a new enum in include/uapi/linux/bpf.h that exports the TCP states that prepends BPF_ to the current TCP state names. If it is ever necessary to change the internal TCP state values (other than adding more to the end), then it will become necessary to convert from the internal TCP state value to the BPF value before calling the BPF sock_ops function.
New op: BPF_SOCK_OPS_STATE_CB.
--- include/uapi/linux/bpf.h | 26 ++++++++++++++++++++++++++ include/uapi/linux/tcp.h | 1 + net/ipv4/tcp.c | 4 ++++ 3 files changed, 31 insertions(+)
include/uapi/linux/bpf.h +26 -0
@@ -1024,6 +1024,32 @@ enum {* Arg1: sequence number of 1st byte * Arg2: # segments */ + BPF_SOCK_OPS_STATE_CB, /* Called when TCP changes state. +* Arg1: old_state +* Arg2: new_state +*/ +}; + +/* List of TCP states. There is a build check in net/ipv4/tcp.c to detect +* changes between the TCP and BPF versions. Ideally this should never happen. +* If it does, we need to add code to convert them before calling +* the BPF sock_ops function. +*/ +enum { +BPF_TCP_ESTABLISHED =1 , +BPF_TCP_SYN_SENT , +BPF_TCP_SYN_RECV , +BPF_TCP_FIN_WAIT1 , +BPF_TCP_FIN_WAIT2 , +BPF_TCP_TIME_WAIT , +BPF_TCP_CLOSE , +BPF_TCP_CLOSE_WAIT , +BPF_TCP_LAST_ACK , +BPF_TCP_LISTEN , +BPF_TCP_CLOSING ,/* Now a valid state */ +BPF_TCP_NEW_SYN_RECV , + +BPF_TCP_MAX_STATES /* Leave at the end! */ };#define TCP_BPF_IW 1001/* Set TCP initial congestion window */
include/uapi/linux/tcp.h +1 -0
@@ -262,6 +262,7 @@ struct tcp_md5sig {/* Definitions for bpf_sock_ops_flags */ #define BPF_SOCK_OPS_RTO_CB_FLAG (1<<0)#define BPF_SOCK_OPS_RETRANS_CB_FLAG (1<<1) +#define BPF_SOCK_OPS_STATE_CB_FLAG (1<<2)/* INET_DIAG_MD5SIG */ struct tcp_diag_md5sig {
net/ipv4/tcp.c +4 -0
@@ -2044,6 +2044,10 @@ void tcp_set_state(struct sock *sk, int state) {int oldstate = sk->sk_state; +BUILD_BUG_ON (BPF_TCP_MAX_STATES !=TCP_MAX_STATES ); +if (BPF_SOCK_OPS_TEST_FLAG (tcp_sk (sk),BPF_SOCK_OPS_STATE_CB_FLAG )) +tcp_call_bpf_2arg (sk,BPF_SOCK_OPS_STATE_CB , oldstate, state); +switch (state) {case TCP_ESTABLISHED :if (oldstate !=TCP_ESTABLISHED )
Signature · 1 line
2.9.5
kbuild test robot
build botRe: [PATCH v3 bpf-next 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB
Thank you for the patch! Perhaps something to improve:
Hi Lawrence,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
[also build test WARNING on next-20171222]
[cannot apply to bpf-next/master linus/master net/master v4.15-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Lawrence-Brakmo/bpf-More-sock_ops-callbacks/20180102-111550
config: x86_64-randconfig-x007-201800 (attached as .config)
compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025 reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 All warnings (new ones prefixed by >>):
In file included from arch/x86/include/asm/atomic.h:5:0,
from include/linux/atomic.h:5,
from include/linux/crypto.h:20,
from include/crypto/hash.h:16,
from net//ipv4/tcp.c:250:
net//ipv4/tcp.c: In function 'tcp_set_state':
>> net//ipv4/tcp.c:2041:34: warning: comparison between 'enum <anonymous>' and 'enum <anonymous>' [-Wenum-compare]
BUILD_BUG_ON(BPF_TCP_MAX_STATES != TCP_MAX_STATES);
^
include/linux/compiler.h:301:19: note: in definition of macro '__compiletime_assert'
bool __cond = !(condition); \
^~~~~~~~~
include/linux/compiler.h:324:2: note: in expansion of macro '_compiletime_assert'
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:47:37: note: in expansion of macro 'compiletime_assert'
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
^~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:71:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
^~~~~~~~~~~~~~~~
>> net//ipv4/tcp.c:2041:2: note: in expansion of macro 'BUILD_BUG_ON'
BUILD_BUG_ON(BPF_TCP_MAX_STATES != TCP_MAX_STATES);
^~~~~~~~~~~~vim +/BUILD_BUG_ON +2041 net//ipv4/tcp.c
2036
2037 void tcp_set_state(struct sock *sk, int state)
2038 {
2039 int oldstate = sk->sk_state;
2040
> 2041 BUILD_BUG_ON(BPF_TCP_MAX_STATES != TCP_MAX_STATES);
2042 if (BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk), BPF_SOCK_OPS_STATE_CB_FLAG))
2043 tcp_call_bpf_2arg(sk, BPF_SOCK_OPS_STATE_CB, oldstate, state);
2044
2045 switch (state) {
2046 case TCP_ESTABLISHED:
2047 if (oldstate != TCP_ESTABLISHED)
2048 TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
2049 break;
2050
2051 case TCP_CLOSE:
2052 if (oldstate == TCP_CLOSE_WAIT || oldstate == TCP_ESTABLISHED)
2053 TCP_INC_STATS(sock_net(sk), TCP_MIB_ESTABRESETS);
2054
2055 sk->sk_prot->unhash(sk);
2056 if (inet_csk(sk)->icsk_bind_hash &&
2057 !(sk->sk_userlocks & SOCK_BINDPORT_LOCK))
2058 inet_put_port(sk);
2059 /* fall through */
2060 default:
2061 if (oldstate == TCP_ESTABLISHED)
2062 TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
2063 }
2064
2065 /* Change state AFTER socket is unhashed to avoid closed
2066 * socket sitting in hash tables.
2067 */
2068 inet_sk_state_store(sk, state);
2069
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH v3 bpf-next 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB
We created a new enum to allow different TCP state names between the kernel and BPF sock_ops programs. Since we want to catch changes in the original enum, we are comparing the values of the last entries of the enum types (which is triggering the warning).
On 1/1/18, 8:02 PM, "kbuild test robot" <[email protected]> wrote:
Hi Lawrence,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
[also build test WARNING on next-20171222]
[cannot apply to bpf-next/master linus/master net/master v4.15-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Lawrence-Brakmo/bpf-More-sock_ops-callbacks/20180102-111550
config: x86_64-randconfig-x007-201800 (attached as .config)
compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
In file included from arch/x86/include/asm/atomic.h:5:0,
from include/linux/atomic.h:5,
from include/linux/crypto.h:20,
from include/crypto/hash.h:16,
from net//ipv4/tcp.c:250:
net//ipv4/tcp.c: In function 'tcp_set_state':
>> net//ipv4/tcp.c:2041:34: warning: comparison between 'enum <anonymous>' and 'enum <anonymous>' [-Wenum-compare]
BUILD_BUG_ON(BPF_TCP_MAX_STATES != TCP_MAX_STATES);
^
include/linux/compiler.h:301:19: note: in definition of macro '__compiletime_assert'
bool __cond = !(condition); \
^~~~~~~~~
include/linux/compiler.h:324:2: note: in expansion of macro '_compiletime_assert'
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:47:37: note: in expansion of macro 'compiletime_assert'
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
^~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:71:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
^~~~~~~~~~~~~~~~
>> net//ipv4/tcp.c:2041:2: note: in expansion of macro 'BUILD_BUG_ON'
BUILD_BUG_ON(BPF_TCP_MAX_STATES != TCP_MAX_STATES);
^~~~~~~~~~~~
vim +/BUILD_BUG_ON +2041 net//ipv4/tcp.c
2036
2037 void tcp_set_state(struct sock *sk, int state)
2038 {
2039 int oldstate = sk->sk_state;
2040
> 2041 BUILD_BUG_ON(BPF_TCP_MAX_STATES != TCP_MAX_STATES);
2042 if (BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk), BPF_SOCK_OPS_STATE_CB_FLAG))
2043 tcp_call_bpf_2arg(sk, BPF_SOCK_OPS_STATE_CB, oldstate, state);
2044
2045 switch (state) {
2046 case TCP_ESTABLISHED:
2047 if (oldstate != TCP_ESTABLISHED)
2048 TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
2049 break;
2050
2051 case TCP_CLOSE:
2052 if (oldstate == TCP_CLOSE_WAIT || oldstate == TCP_ESTABLISHED)
2053 TCP_INC_STATS(sock_net(sk), TCP_MIB_ESTABRESETS);
2054
2055 sk->sk_prot->unhash(sk);
2056 if (inet_csk(sk)->icsk_bind_hash &&
2057 !(sk->sk_userlocks & SOCK_BINDPORT_LOCK))
2058 inet_put_port(sk);
2059 /* fall through */
2060 default:
2061 if (oldstate == TCP_ESTABLISHED)
2062 TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
2063 }
2064
2065 /* Change state AFTER socket is unhashed to avoid closed
2066 * socket sitting in hash tables.
2067 */
2068 inet_sk_state_store(sk, state);
2069
---
0-DAY kernel test infrastructure Open Source Technology Center
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.01.org_pipermail_kbuild-2Dall&d=DwIBAg&c=5VD0RTtNlTh3ycd41b3MUw&r=pq_Mqvzfy-C8ltkgyx1u_g&m=Q7DgPe3X_jy4GHXyZsGUWwNoAYwdvyKbdsSNwopo4LA&s=hDQMCMBEVY9MOxG2fIWSCTeKMAmXhkbFc6batWKJgBg&e= Intel CorporationPATCH v3 11/11 bpf: add selftest for tcpbpf
In reply to Lawrence BrakmoAdded a selftest for tcpbpf (sock_ops) that checks that the appropriate callbacks occured and that it can access tcp_sock fields and that their values are correct.
Run with command: ./test_tcpbpf_user
--- tools/include/uapi/linux/bpf.h | 70 +++++++++++++- tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/tcp_client.py | 52 ++++++++++ tools/testing/selftests/bpf/tcp_server.py | 79 ++++++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_kern.c | 125 +++++++++++++++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_user.c | 113 ++++++++++++++++++++++ 6 files changed, 438 insertions(+), 5 deletions(-) create mode 100755 tools/testing/selftests/bpf/tcp_client.py create mode 100755 tools/testing/selftests/bpf/tcp_server.py create mode 100644 tools/testing/selftests/bpf/test_tcpbpf_kern.c create mode 100644 tools/testing/selftests/bpf/test_tcpbpf_user.c
tools/include/uapi/linux/bpf.h +67 -3
@@ -942,8 +942,9 @@ struct bpf_map_info {struct bpf_sock_ops {__u32 op;union { -__u32 reply; -__u32 replylong[4 ]; +__u32 args[4 ];/* Optionally passed to bpf program */ +__u32 reply;/* Returned by bpf program */ +__u32 replylong[4 ];/* Optionally returned by bpf prog */ };__u32 family;__u32 remote_ip4;/* Stored in network byte order */
@@ -952,6 +953,33 @@ struct bpf_sock_ops {__u32 local_ip6[4 ];/* Stored in network byte order */ __u32 remote_port;/* Stored in network byte order */ __u32 local_port;/* stored in host byte order */ +__u32 is_fullsock;/* Some TCP fields are only valid if +* there is a full socket. If not, the +* fields read as zero. +*/ +__u32 snd_cwnd; +__u32 srtt_us;/* Averaged RTT << 3 in usecs */ +__u32 bpf_sock_ops_flags;/* flags defined in uapi/linux/tcp.h */ +__u32 state; +__u32 rtt_min; +__u32 snd_ssthresh; +__u32 rcv_nxt; +__u32 snd_nxt; +__u32 snd_una; +__u32 mss_cache; +__u32 ecn_flags; +__u32 rate_delivered; +__u32 rate_interval_us; +__u32 packets_out; +__u32 retrans_out; +__u32 total_retrans; +__u32 segs_in; +__u32 data_segs_in; +__u32 segs_out; +__u32 data_segs_out; +__u64 bytes_received; +__u64 bytes_acked; +__u32 sk_txhash; };/* List of known BPF sock_ops operators.
@@ -987,6 +1015,41 @@ enum {* a congestion threshold. RTTs above * this indicate congestion */ +BPF_SOCK_OPS_RTO_CB ,/* Called when an RTO has triggered. +* Arg1: value of icsk_retransmits +* Arg2: value of icsk_rto +* Arg3: whether RTO has expired +*/ +BPF_SOCK_OPS_RETRANS_CB ,/* Called when skb is retransmitted. +* Arg1: sequence number of 1st byte +* Arg2: # segments +*/ + BPF_SOCK_OPS_STATE_CB, /* Called when TCP changes state. + * Arg1: old_state + * Arg2: new_state + */ +}; + +/* List of TCP states. There is a build check in net/ipv4/tcp.c to detect +* changes between the TCP and BPF versions. Ideally this should never happen. +* If it does, we need to add code to convert them before calling +* the BPF sock_ops function. +*/ +enum { +BPF_TCP_ESTABLISHED =1 , +BPF_TCP_SYN_SENT , +BPF_TCP_SYN_RECV , +BPF_TCP_FIN_WAIT1 , +BPF_TCP_FIN_WAIT2 , +BPF_TCP_TIME_WAIT , +BPF_TCP_CLOSE , +BPF_TCP_CLOSE_WAIT , +BPF_TCP_LAST_ACK , +BPF_TCP_LISTEN , +BPF_TCP_CLOSING ,/* Now a valid state */ +BPF_TCP_NEW_SYN_RECV , + +BPF_TCP_MAX_STATES /* Leave at the end! */ };#define TCP_BPF_IW 1001/* Set TCP initial congestion window */
@@ -1006,7 +1069,8 @@ struct bpf_perf_event_value {#define BPF_DEVCG_DEV_CHAR (1ULL << 1)struct bpf_cgroup_dev_ctx { -__u32 access_type;/* (access << 16) | type */ +/* access_type encoded as (BPF_DEVCG_ACC_* << 16) | BPF_DEVCG_DEV_* */ +__u32 access_type;__u32 major;__u32 minor; };
tools/testing/selftests/bpf/Makefile +2 -2
@@ -14,12 +14,12 @@ CFLAGS += -Wall -O2 -I$(APIDIR) -I$(LIBDIR) -I$(GENDIR) $(GENFLAGS) -I../../../i LDLIBS += -lcap -lelf -lrt TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \ - test_align test_verifier_log test_dev_cgroup + test_align test_verifier_log test_dev_cgroup test_tcpbpf_user TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test_obj_id.o \ test_pkt_md_access.o test_xdp_redirect.o test_xdp_meta.o sockmap_parse_prog.o \ sockmap_verdict_prog.o dev_cgroup.o sample_ret0.o test_tracepoint.o \ - test_l4lb_noinline.o test_xdp_noinline.o + test_l4lb_noinline.o test_xdp_noinline.o test_tcpbpf_kern.o TEST_PROGS := test_kmod.sh test_xdp_redirect.sh test_xdp_meta.sh \ test_offload.py
tools/testing/selftests/bpf/tcp_client.py new file +52 -0
52 lines not on this page · raw message
tools/testing/selftests/bpf/tcp_server.py new file +79 -0
79 lines not on this page · raw message
tools/testing/selftests/bpf/test_tcpbpf_kern.c new file +125 -0
125 lines not on this page · raw message
tools/testing/selftests/bpf/test_tcpbpf_user.c new file +113 -0
113 lines not on this page · raw message
Signature · 1 line
2.9.5