bpf: TCP RTT sock_ops bpf callback
Subsystems (7)
v2 cover bpf: TCP RTT sock_ops bpf callback
Congestion control team would like to have a periodic callback to track some TCP statistics. Let's add a sock_ops callback that can be selectively enabled on a socket by socket basis and is executed for every RTT. BPF program frequency can be further controlled by calling bpf_ktime_get_ns and bailing out early.
I run neper tcp_stream and tcp_rr tests with the sample program from the last patch and didn't observe any noticeable performance difference.
v2:
* add a comment about second accept() in selftest (Yonghong Song)
* refer to tcp_bpf.readme in sample program (Yonghong Song)
Stanislav Fomichev (8):
bpf: add BPF_CGROUP_SOCK_OPS callback that is executed on every RTT
bpf: split shared bpf_tcp_sock and bpf_sock_ops implementation
bpf: add dsack_dups/delivered{,_ce} to bpf_tcp_sock
bpf: add icsk_retransmits to bpf_tcp_sock
bpf/tools: sync bpf.h
selftests/bpf: test BPF_SOCK_OPS_RTT_CB
samples/bpf: add sample program that periodically dumps TCP stats samples/bpf: fix tcp_bpf.readme detach command
include/net/tcp.h | 8 + include/uapi/linux/bpf.h | 12 +- net/core/filter.c | 207 +++++++++++----- net/ipv4/tcp_input.c | 4 + samples/bpf/Makefile | 1 + samples/bpf/tcp_bpf.readme | 2 +- samples/bpf/tcp_dumpstats_kern.c | 68 ++++++ tools/include/uapi/linux/bpf.h | 12 +- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 11 files changed, 574 insertions(+), 58 deletions(-) create mode 100644 samples/bpf/tcp_dumpstats_kern.c create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 1/8 bpf: add BPF_CGROUP_SOCK_OPS callback that is executed on every RTT
Performance impact should be minimal because it's under a new BPF_SOCK_OPS_RTT_CB_FLAG flag that has to be explicitly enabled.
--- include/net/tcp.h | 8 ++++++++ include/uapi/linux/bpf.h | 6 +++++- net/ipv4/tcp_input.c | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-)
include/net/tcp.h +8 -0
@@ -2221,6 +2221,14 @@ static inline bool tcp_bpf_ca_needs_ecn(struct sock *sk)return (tcp_call_bpf (sk,BPF_SOCK_OPS_NEEDS_ECN ,0 ,NULL ) ==1 ); } +static inline void tcp_bpf_rtt (struct sock *sk) +{ +struct tcp_sock *tp =tcp_sk (sk); + +if (BPF_SOCK_OPS_TEST_FLAG (tp,BPF_SOCK_OPS_RTT_CB_FLAG )) +tcp_call_bpf (sk,BPF_SOCK_OPS_RTT_CB ,0 ,NULL ); +} +#if IS_ENABLED (CONFIG_SMC )extern struct static_key_false tcp_have_smc;#endif
include/uapi/linux/bpf.h +5 -1
@@ -1770,6 +1770,7 @@ union bpf_attr {* * **BPF_SOCK_OPS_RTO_CB_FLAG** (retransmission time out) * * **BPF_SOCK_OPS_RETRANS_CB_FLAG** (retransmission) * * **BPF_SOCK_OPS_STATE_CB_FLAG** (TCP state change) +* * **BPF_SOCK_OPS_RTT_CB_FLAG** (every RTT) * * Therefore, this function can be used to clear a callback flag by * setting the appropriate bit to zero. e.g. to disable the RTO
@@ -3314,7 +3315,8 @@ struct bpf_sock_ops {#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) -#define BPF_SOCK_OPS_ALL_CB_FLAGS 0x7/* Mask of all currently +#define BPF_SOCK_OPS_RTT_CB_FLAG (1<<3) +#define BPF_SOCK_OPS_ALL_CB_FLAGS 0xF/* Mask of all currently * supported cb flags */
@@ -3369,6 +3371,8 @@ enum {BPF_SOCK_OPS_TCP_LISTEN_CB ,/* Called on listen(2), right after * socket transition to LISTEN state. */ + BPF_SOCK_OPS_RTT_CB, /* Called on every RTT. + */ };/* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
net/ipv4/tcp_input.c +4 -0
@@ -778,6 +778,8 @@ static void tcp_rtt_estimator(struct sock *sk, long mrtt_us) tp->rttvar_us -= (tp->rttvar_us - tp->mdev_max_us) >>2 ; tp->rtt_seq = tp->snd_nxt; tp->mdev_max_us =tcp_rto_min_us (sk); + +tcp_bpf_rtt (sk); } }else {/* no previous measure. */
@@ -786,6 +788,8 @@ static void tcp_rtt_estimator(struct sock *sk, long mrtt_us) tp->rttvar_us =max (tp->mdev_us,tcp_rto_min_us (sk)); tp->mdev_max_us = tp->rttvar_us; tp->rtt_seq = tp->snd_nxt; + +tcp_bpf_rtt (sk); } tp->srtt_us =max (1U , srtt); }
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 2/8 bpf: split shared bpf_tcp_sock and bpf_sock_ops implementation
In reply to Stanislav FomichevWe've added bpf_tcp_sock member to bpf_sock_ops and don't expect any new tcp_sock fields in bpf_sock_ops. Let's remove CONVERT_COMMON_TCP_SOCK_FIELDS so bpf_tcp_sock can be independently extended.
--- net/core/filter.c | 180 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 126 insertions(+), 54 deletions(-)
net/core/filter.c +126 -54
@@ -5194,54 +5194,6 @@ static const struct bpf_func_proto bpf_lwt_seg6_adjust_srh_proto = { };#endif /* CONFIG_IPV6_SEG6_BPF */ -#define CONVERT_COMMON_TCP_SOCK_FIELDS (md_type,CONVERT ) \ -do { \ - switch (si->off) { \ - case offsetof(md_type, snd_cwnd): \ - CONVERT(snd_cwnd); break; \ - case offsetof(md_type, srtt_us): \ - CONVERT(srtt_us); break; \ - case offsetof(md_type, snd_ssthresh): \ - CONVERT(snd_ssthresh); break; \ - case offsetof(md_type, rcv_nxt): \ - CONVERT(rcv_nxt); break; \ - case offsetof(md_type, snd_nxt): \ - CONVERT(snd_nxt); break; \ - case offsetof(md_type, snd_una): \ - CONVERT(snd_una); break; \ - case offsetof(md_type, mss_cache): \ - CONVERT(mss_cache); break; \ - case offsetof(md_type, ecn_flags): \ - CONVERT(ecn_flags); break; \ - case offsetof(md_type, rate_delivered): \ - CONVERT(rate_delivered); break; \ - case offsetof(md_type, rate_interval_us): \ - CONVERT(rate_interval_us); break; \ - case offsetof(md_type, packets_out): \ - CONVERT(packets_out); break; \ - case offsetof(md_type, retrans_out): \ - CONVERT(retrans_out); break; \ - case offsetof(md_type, total_retrans): \ - CONVERT(total_retrans); break; \ - case offsetof(md_type, segs_in): \ - CONVERT(segs_in); break; \ - case offsetof(md_type, data_segs_in): \ - CONVERT(data_segs_in); break; \ - case offsetof(md_type, segs_out): \ - CONVERT(segs_out); break; \ - case offsetof(md_type, data_segs_out): \ - CONVERT(data_segs_out); break; \ - case offsetof(md_type, lost_out): \ - CONVERT(lost_out); break; \ - case offsetof(md_type, sacked_out): \ - CONVERT(sacked_out); break; \ - case offsetof(md_type, bytes_received): \ - CONVERT(bytes_received); break; \ - case offsetof(md_type, bytes_acked): \ - CONVERT(bytes_acked); break; \ - } \ -} while (0) -#ifdef CONFIG_INET static struct sock *sk_lookup (struct net *net,struct bpf_sock_tuple *tuple,int dif,int sdif,u8 family,u8 proto)
@@ -5623,9 +5575,6 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, offsetof(struct tcp_sock, FIELD)); \ }while (0 ) - CONVERT_COMMON_TCP_SOCK_FIELDS(struct bpf_tcp_sock, -BPF_TCP_SOCK_GET_COMMON ); -if (insn > insn_buf)return insn - insn_buf;
@@ -5640,6 +5589,69 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, offsetof(struct tcp_sock , rtt_min) + offsetof(struct minmax_sample, v));break ; +case offsetof(struct bpf_tcp_sock , snd_cwnd): +BPF_TCP_SOCK_GET_COMMON (snd_cwnd); +break ; +case offsetof(struct bpf_tcp_sock , srtt_us): +BPF_TCP_SOCK_GET_COMMON (srtt_us); +break ; +case offsetof(struct bpf_tcp_sock , snd_ssthresh): +BPF_TCP_SOCK_GET_COMMON (snd_ssthresh); +break ; +case offsetof(struct bpf_tcp_sock , rcv_nxt): +BPF_TCP_SOCK_GET_COMMON (rcv_nxt); +break ; +case offsetof(struct bpf_tcp_sock , snd_nxt): +BPF_TCP_SOCK_GET_COMMON (snd_nxt); +break ; +case offsetof(struct bpf_tcp_sock , snd_una): +BPF_TCP_SOCK_GET_COMMON (snd_una); +break ; +case offsetof(struct bpf_tcp_sock , mss_cache): +BPF_TCP_SOCK_GET_COMMON (mss_cache); +break ; +case offsetof(struct bpf_tcp_sock , ecn_flags): +BPF_TCP_SOCK_GET_COMMON (ecn_flags); +break ; +case offsetof(struct bpf_tcp_sock , rate_delivered): +BPF_TCP_SOCK_GET_COMMON (rate_delivered); +break ; +case offsetof(struct bpf_tcp_sock , rate_interval_us): +BPF_TCP_SOCK_GET_COMMON (rate_interval_us); +break ; +case offsetof(struct bpf_tcp_sock , packets_out): +BPF_TCP_SOCK_GET_COMMON (packets_out); +break ; +case offsetof(struct bpf_tcp_sock , retrans_out): +BPF_TCP_SOCK_GET_COMMON (retrans_out); +break ; +case offsetof(struct bpf_tcp_sock , total_retrans): +BPF_TCP_SOCK_GET_COMMON (total_retrans); +break ; +case offsetof(struct bpf_tcp_sock , segs_in): +BPF_TCP_SOCK_GET_COMMON (segs_in); +break ; +case offsetof(struct bpf_tcp_sock , data_segs_in): +BPF_TCP_SOCK_GET_COMMON (data_segs_in); +break ; +case offsetof(struct bpf_tcp_sock , segs_out): +BPF_TCP_SOCK_GET_COMMON (segs_out); +break ; +case offsetof(struct bpf_tcp_sock , data_segs_out): +BPF_TCP_SOCK_GET_COMMON (data_segs_out); +break ; +case offsetof(struct bpf_tcp_sock , lost_out): +BPF_TCP_SOCK_GET_COMMON (lost_out); +break ; +case offsetof(struct bpf_tcp_sock , sacked_out): +BPF_TCP_SOCK_GET_COMMON (sacked_out); +break ; +case offsetof(struct bpf_tcp_sock , bytes_received): +BPF_TCP_SOCK_GET_COMMON (bytes_received); +break ; +case offsetof(struct bpf_tcp_sock , bytes_acked): +BPF_TCP_SOCK_GET_COMMON (bytes_acked); +break ; }return insn - insn_buf;
@@ -7913,9 +7925,6 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,SOCK_OPS_GET_FIELD (BPF_FIELD ,OBJ_FIELD ,OBJ ); \ }while (0 ) - CONVERT_COMMON_TCP_SOCK_FIELDS(struct bpf_sock_ops, -SOCK_OPS_GET_TCP_SOCK_FIELD ); -if (insn > insn_buf)return insn - insn_buf;
@@ -8085,6 +8094,69 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,SOCK_OPS_GET_OR_SET_FIELD (sk_txhash, sk_txhash, struct sock, type);break ; +case offsetof(struct bpf_sock_ops , snd_cwnd): +SOCK_OPS_GET_TCP_SOCK_FIELD (snd_cwnd); +break ; +case offsetof(struct bpf_sock_ops , srtt_us): +SOCK_OPS_GET_TCP_SOCK_FIELD (srtt_us); +break ; +case offsetof(struct bpf_sock_ops , snd_ssthresh): +SOCK_OPS_GET_TCP_SOCK_FIELD (snd_ssthresh); +break ; +case offsetof(struct bpf_sock_ops , rcv_nxt): +SOCK_OPS_GET_TCP_SOCK_FIELD (rcv_nxt); +break ; +case offsetof(struct bpf_sock_ops , snd_nxt): +SOCK_OPS_GET_TCP_SOCK_FIELD (snd_nxt); +break ; +case offsetof(struct bpf_sock_ops , snd_una): +SOCK_OPS_GET_TCP_SOCK_FIELD (snd_una); +break ; +case offsetof(struct bpf_sock_ops , mss_cache): +SOCK_OPS_GET_TCP_SOCK_FIELD (mss_cache); +break ; +case offsetof(struct bpf_sock_ops , ecn_flags): +SOCK_OPS_GET_TCP_SOCK_FIELD (ecn_flags); +break ; +case offsetof(struct bpf_sock_ops , rate_delivered): +SOCK_OPS_GET_TCP_SOCK_FIELD (rate_delivered); +break ; +case offsetof(struct bpf_sock_ops , rate_interval_us): +SOCK_OPS_GET_TCP_SOCK_FIELD (rate_interval_us); +break ; +case offsetof(struct bpf_sock_ops , packets_out): +SOCK_OPS_GET_TCP_SOCK_FIELD (packets_out); +break ; +case offsetof(struct bpf_sock_ops , retrans_out): +SOCK_OPS_GET_TCP_SOCK_FIELD (retrans_out); +break ; +case offsetof(struct bpf_sock_ops , total_retrans): +SOCK_OPS_GET_TCP_SOCK_FIELD (total_retrans); +break ; +case offsetof(struct bpf_sock_ops , segs_in): +SOCK_OPS_GET_TCP_SOCK_FIELD (segs_in); +break ; +case offsetof(struct bpf_sock_ops , data_segs_in): +SOCK_OPS_GET_TCP_SOCK_FIELD (data_segs_in); +break ; +case offsetof(struct bpf_sock_ops , segs_out): +SOCK_OPS_GET_TCP_SOCK_FIELD (segs_out); +break ; +case offsetof(struct bpf_sock_ops , data_segs_out): +SOCK_OPS_GET_TCP_SOCK_FIELD (data_segs_out); +break ; +case offsetof(struct bpf_sock_ops , lost_out): +SOCK_OPS_GET_TCP_SOCK_FIELD (lost_out); +break ; +case offsetof(struct bpf_sock_ops , sacked_out): +SOCK_OPS_GET_TCP_SOCK_FIELD (sacked_out); +break ; +case offsetof(struct bpf_sock_ops , bytes_received): +SOCK_OPS_GET_TCP_SOCK_FIELD (bytes_received); +break ; +case offsetof(struct bpf_sock_ops , bytes_acked): +SOCK_OPS_GET_TCP_SOCK_FIELD (bytes_acked); +break ;case offsetof(struct bpf_sock_ops , sk): *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( struct bpf_sock_ops_kern,
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 3/8 bpf: add dsack_dups/delivered{,_ce} to bpf_tcp_sock
In reply to Stanislav FomichevAdd more fields to bpf_tcp_sock that might be useful for debugging congestion control issues.
--- include/uapi/linux/bpf.h | 5 +++++ net/core/filter.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
include/uapi/linux/bpf.h +5 -0
@@ -3073,6 +3073,11 @@ struct bpf_tcp_sock {* sum(delta(snd_una)), or how many bytes * were acked. */ +__u32 dsack_dups;/* RFC4898 tcpEStatsStackDSACKDups +* total number of DSACK blocks received +*/ +__u32 delivered;/* Total data packets delivered incl. rexmits */ +__u32 delivered_ce;/* Like the above but only ECE marked packets */ };struct bpf_sock_tuple {
net/core/filter.c +10 -1
@@ -5544,7 +5544,7 @@ static const struct bpf_func_proto bpf_sock_addr_sk_lookup_udp_proto = {bool bpf_tcp_sock_is_valid_access (int off,int size,enum bpf_access_type type,struct bpf_insn_access_aux *info) { - if (off < 0 || off >= offsetofend(struct bpf_tcp_sock, bytes_acked)) + if (off < 0 || off >= offsetofend(struct bpf_tcp_sock, delivered_ce))return false;if (off % size !=0 )
@@ -5652,6 +5652,15 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type,case offsetof(struct bpf_tcp_sock , bytes_acked):BPF_TCP_SOCK_GET_COMMON (bytes_acked);break ; +case offsetof(struct bpf_tcp_sock , dsack_dups): +BPF_TCP_SOCK_GET_COMMON (dsack_dups); +break ; +case offsetof(struct bpf_tcp_sock , delivered): +BPF_TCP_SOCK_GET_COMMON (delivered); +break ; +case offsetof(struct bpf_tcp_sock , delivered_ce): +BPF_TCP_SOCK_GET_COMMON (delivered_ce); +break ; }return insn - insn_buf;
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 4/8 bpf: add icsk_retransmits to bpf_tcp_sock
In reply to Stanislav FomichevAdd some inet_connection_sock fields to bpf_tcp_sock that might be useful for debugging congestion control issues.
--- include/uapi/linux/bpf.h | 1 + net/core/filter.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
include/uapi/linux/bpf.h +1 -0
@@ -3078,6 +3078,7 @@ struct bpf_tcp_sock {*/ __u32 delivered;/* Total data packets delivered incl. rexmits */ __u32 delivered_ce;/* Like the above but only ECE marked packets */ +__u32 icsk_retransmits;/* Number of unrecovered [RTO] timeouts */ };struct bpf_sock_tuple {
net/core/filter.c +19 -1
@@ -5544,7 +5544,8 @@ static const struct bpf_func_proto bpf_sock_addr_sk_lookup_udp_proto = {bool bpf_tcp_sock_is_valid_access (int off,int size,enum bpf_access_type type,struct bpf_insn_access_aux *info) { - if (off < 0 || off >= offsetofend(struct bpf_tcp_sock, delivered_ce)) + if (off < 0 || off >= offsetofend(struct bpf_tcp_sock, + icsk_retransmits))return false;if (off % size !=0 )
@@ -5575,6 +5576,20 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, offsetof(struct tcp_sock, FIELD)); \ } while (0) +#define BPF_INET_SOCK_GET_COMMON (FIELD ) \ + do { \ + BUILD_BUG_ON(FIELD_SIZEOF(struct inet_connection_sock, \ + FIELD) > \ + FIELD_SIZEOF(struct bpf_tcp_sock, FIELD)); \ + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ + struct inet_connection_sock, \ + FIELD), \ + si->dst_reg, si->src_reg, \ + offsetof( \ + struct inet_connection_sock, \ + FIELD)); \ + } while (0) +if (insn > insn_buf)return insn - insn_buf;
@@ -5661,6 +5676,9 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type,case offsetof(struct bpf_tcp_sock , delivered_ce):BPF_TCP_SOCK_GET_COMMON (delivered_ce);break ; +case offsetof(struct bpf_tcp_sock , icsk_retransmits): +BPF_INET_SOCK_GET_COMMON (icsk_retransmits); +break ; }return insn - insn_buf;
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 5/8 bpf/tools: sync bpf.h
In reply to Stanislav FomichevSync new bpf_tcp_sock fields and new BPF_PROG_TYPE_SOCK_OPS RTT callback.
--- tools/include/uapi/linux/bpf.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
tools/include/uapi/linux/bpf.h +11 -1
@@ -1767,6 +1767,7 @@ union bpf_attr {* * **BPF_SOCK_OPS_RTO_CB_FLAG** (retransmission time out) * * **BPF_SOCK_OPS_RETRANS_CB_FLAG** (retransmission) * * **BPF_SOCK_OPS_STATE_CB_FLAG** (TCP state change) +* * **BPF_SOCK_OPS_RTT_CB_FLAG** (every RTT) * * Therefore, this function can be used to clear a callback flag by * setting the appropriate bit to zero. e.g. to disable the RTO
@@ -3069,6 +3070,12 @@ struct bpf_tcp_sock {* sum(delta(snd_una)), or how many bytes * were acked. */ +__u32 dsack_dups;/* RFC4898 tcpEStatsStackDSACKDups +* total number of DSACK blocks received +*/ +__u32 delivered;/* Total data packets delivered incl. rexmits */ +__u32 delivered_ce;/* Like the above but only ECE marked packets */ +__u32 icsk_retransmits;/* Number of unrecovered [RTO] timeouts */ };struct bpf_sock_tuple {
@@ -3311,7 +3318,8 @@ struct bpf_sock_ops {#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) -#define BPF_SOCK_OPS_ALL_CB_FLAGS 0x7/* Mask of all currently +#define BPF_SOCK_OPS_RTT_CB_FLAG (1<<3) +#define BPF_SOCK_OPS_ALL_CB_FLAGS 0xF/* Mask of all currently * supported cb flags */
@@ -3366,6 +3374,8 @@ enum {BPF_SOCK_OPS_TCP_LISTEN_CB ,/* Called on listen(2), right after * socket transition to LISTEN state. */ + BPF_SOCK_OPS_RTT_CB, /* Called on every RTT. + */ };/* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 6/8 selftests/bpf: test BPF_SOCK_OPS_RTT_CB
In reply to Stanislav FomichevMake sure the callback is invoked for syn-ack and data packet.
--- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 3 files changed, 317 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c
tools/testing/selftests/bpf/Makefile +2 -1
@@ -27,7 +27,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi + test_sockopt_multi test_tcp_rtt BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)
@@ -107,6 +107,7 @@ $(OUTPUT)/test_cgroup_attach: cgroup_helpers.c $(OUTPUT)/test_sockopt: cgroup_helpers.c $(OUTPUT)/test_sockopt_sk: cgroup_helpers.c $(OUTPUT)/test_sockopt_multi: cgroup_helpers.c +$(OUTPUT)/test_tcp_rtt: cgroup_helpers.c .PHONY: force
tools/testing/selftests/bpf/progs/tcp_rtt.c new file +61 -0
61 lines not on this page · raw message
tools/testing/selftests/bpf/test_tcp_rtt.c new file +254 -0
254 lines not on this page · raw message
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Re: [PATCH bpf-next v2 6/8] selftests/bpf: test BPF_SOCK_OPS_RTT_CB
Quoted 10 lines · Stanislav Fomichev
Make sure the callback is invoked for syn-ack and data packet.
Cc Eric Dumazet <[email protected]>Cc Priyaranjan Jha <[email protected]>Cc Yuchung Cheng <[email protected]>Cc Soheil Hassas Yeganeh <[email protected]>Acked-by Yuchung Cheng <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>
Quoted 7 lines
--- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 3 files changed, 317 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c
Can you please post a follow-up patch to add test_tcp_rtt to .gitignore?
Stanislav Fomichev
reviewerRe: [PATCH bpf-next v2 6/8] selftests/bpf: test BPF_SOCK_OPS_RTT_CB
Quoted 19 lines · Andrii Nakryiko
Quoted 10 lines · Stanislav Fomichev
Make sure the callback is invoked for syn-ack and data packet.
Cc Eric Dumazet <[email protected]>Cc Priyaranjan Jha <[email protected]>Cc Yuchung Cheng <[email protected]>Cc Soheil Hassas Yeganeh <[email protected]>Acked-by Yuchung Cheng <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>Quoted 7 lines
--- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 3 files changed, 317 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c
Quoted 1 line
Can you please post a follow-up patch to add
test_tcp_rttto .gitignore?
Sure, will do, thanks for a report!
PATCH v2 7/8 samples/bpf: add sample program that periodically dumps TCP stats
In reply to Stanislav FomichevUses new RTT callback to dump stats every second.
$ mkdir -p /tmp/cgroupv2 $ mount -t cgroup2 none /tmp/cgroupv2 $ mkdir -p /tmp/cgroupv2/foo $ echo $$ >> /tmp/cgroupv2/foo/cgroup.procs $ bpftool prog load ./tcp_dumpstats_kern.o /sys/fs/bpf/tcp_prog $ bpftool cgroup attach /tmp/cgroupv2/foo sock_ops pinned /sys/fs/bpf/tcp_prog $ bpftool prog tracelog $ # run neper/netperf/etc
Used neper to compare performance with and without this program attached and didn't see any noticeable performance impact.
Sample output:
<idle>-0 [015] ..s. 2074.128800: 0: dsack_dups=0 delivered=242526 <idle>-0 [015] ..s. 2074.128808: 0: delivered_ce=0 icsk_retransmits=0 <idle>-0 [015] ..s. 2075.130133: 0: dsack_dups=0 delivered=323599 <idle>-0 [015] ..s. 2075.130138: 0: delivered_ce=0 icsk_retransmits=0 <idle>-0 [005] .Ns. 2076.131440: 0: dsack_dups=0 delivered=404648 <idle>-0 [005] .Ns. 2076.131447: 0: delivered_ce=0 icsk_retransmits=0
--- samples/bpf/Makefile | 1 + samples/bpf/tcp_dumpstats_kern.c | 68 ++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 samples/bpf/tcp_dumpstats_kern.c
samples/bpf/Makefile +1 -0
@@ -154,6 +154,7 @@ always += tcp_iw_kern.o always += tcp_clamp_kern.o always += tcp_basertt_kern.o always += tcp_tos_reflect_kern.o +always += tcp_dumpstats_kern.o always += xdp_redirect_kern.o always += xdp_redirect_map_kern.o always += xdp_redirect_cpu_kern.o
samples/bpf/tcp_dumpstats_kern.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 8/8 samples/bpf: fix tcp_bpf.readme detach command
In reply to Stanislav FomichevCopy-paste, should be detach, not attach.
--- samples/bpf/tcp_bpf.readme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/tcp_bpf.readme +1 -1
@@ -25,4 +25,4 @@ attached to the cgroupv2). To remove (unattach) a socket_ops BPF program from a cgroupv2: - bpftool cgroup attach /tmp/cgroupv2/foo sock_ops pinned /sys/fs/bpf/tcp_prog + bpftool cgroup detach /tmp/cgroupv2/foo sock_ops pinned /sys/fs/bpf/tcp_prog
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Quoted 15 lines · Stanislav Fomichev
Congestion control team would like to have a periodic callback to track some TCP statistics. Let's add a
sock_opscallback that can be selectively enabled on a socket by socket basis and is executed for every RTT. BPF program frequency can be further controlled by callingbpf_ktime_get_nsand bailing out early.I run neper
tcp_streamandtcp_rrtests with the sample program from the last patch and didn't observe any noticeable performance difference.v2:
* add a comment about secondaccept()in selftest (Yonghong Song)
* refer to tcp_bpf.readme in sample program (Yonghong Song)
Quoted 7 lines
Suggested-by Eric Dumazet <[email protected]>Cc Eric Dumazet <[email protected]>Cc Priyaranjan Jha <[email protected]>Cc Yuchung Cheng <[email protected]>Cc Soheil Hassas Yeganeh <[email protected]>Acked-by Yuchung Cheng <[email protected]>
Ack for the whole series.
Quoted 29 lines
Stanislav Fomichev (8):
bpf: addBPF_CGROUP_SOCK_OPScallback that is executed on every RTT
bpf: split sharedbpf_tcp_sockandbpf_sock_opsimplementation
bpf: add dsack_dups/delivered{,_ce} tobpf_tcp_sock
bpf: addicsk_retransmitstobpf_tcp_sock
bpf/tools: syncbpf.h
selftests/bpf: testBPF_SOCK_OPS_RTT_CB
samples/bpf: add sample program that periodically dumps TCP statssamples/bpf: fix tcp_bpf.readme detach commandinclude/net/tcp.h | 8 + include/uapi/linux/bpf.h | 12 +- net/core/filter.c | 207 +++++++++++----- net/ipv4/tcp_input.c | 4 + samples/bpf/Makefile | 1 + samples/bpf/tcp_bpf.readme | 2 +- samples/bpf/tcp_dumpstats_kern.c | 68 ++++++ tools/include/uapi/linux/bpf.h | 12 +- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 11 files changed, 574 insertions(+), 58 deletions(-) create mode 100644 samples/bpf/tcp_dumpstats_kern.c create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c--
2.22.0.410.gd8fdbe21b5-goog
On 7/2/19, 10:55 AM, "[email protected] on behalf of Y Song" <[email protected] on behalf of [email protected]> wrote:
On Tue, Jul 2, 2019 at 9:14 AM Stanislav Fomichev <[email protected]> wrote:
>
> Congestion control team would like to have a periodic callback to > track some TCP statistics. Let's add a sock_ops callback that can be > selectively enabled on a socket by socket basis and is executed for > every RTT. BPF program frequency can be further controlled by calling > bpf_ktime_get_ns and bailing out early.
>
> I run neper tcp_stream and tcp_rr tests with the sample program > from the last patch and didn't observe any noticeable performance > difference.
>
> v2:
> * add a comment about second accept() in selftest (Yonghong Song) > * refer to tcp_bpf.readme in sample program (Yonghong Song) >
> Suggested-by: Eric Dumazet <[email protected]>
> Cc: Eric Dumazet <[email protected]>
> Cc: Priyaranjan Jha <[email protected]>
> Cc: Yuchung Cheng <[email protected]>
> Cc: Soheil Hassas Yeganeh <[email protected]>
> Acked-by: Soheil Hassas Yeganeh <[email protected]>
> Acked-by: Yuchung Cheng <[email protected]>
Ack for the whole series.
Thanks, this is a very nice feature!
Ack for the whole series.
Quoted 29 lines
Stanislav Fomichev (8):
bpf: addBPF_CGROUP_SOCK_OPScallback that is executed on every RTT
bpf: split sharedbpf_tcp_sockandbpf_sock_opsimplementation
bpf: add dsack_dups/delivered{,_ce} tobpf_tcp_sock
bpf: addicsk_retransmitstobpf_tcp_sock
bpf/tools: syncbpf.h
selftests/bpf: testBPF_SOCK_OPS_RTT_CB
samples/bpf: add sample program that periodically dumps TCP statssamples/bpf: fix tcp_bpf.readme detach commandinclude/net/tcp.h | 8 + include/uapi/linux/bpf.h | 12 +- net/core/filter.c | 207 +++++++++++----- net/ipv4/tcp_input.c | 4 + samples/bpf/Makefile | 1 + samples/bpf/tcp_bpf.readme | 2 +- samples/bpf/tcp_dumpstats_kern.c | 68 ++++++ tools/include/uapi/linux/bpf.h | 12 +- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 11 files changed, 574 insertions(+), 58 deletions(-) create mode 100644 samples/bpf/tcp_dumpstats_kern.c create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c--
2.22.0.410.gd8fdbe21b5-goog
Quoted 32 lines · Stanislav Fomichev
Congestion control team would like to have a periodic callback to track some TCP statistics. Let's add a
sock_opscallback that can be selectively enabled on a socket by socket basis and is executed for every RTT. BPF program frequency can be further controlled by callingbpf_ktime_get_nsand bailing out early.I run neper
tcp_streamandtcp_rrtests with the sample program from the last patch and didn't observe any noticeable performance difference.v2:
* add a comment about secondaccept()in selftest (Yonghong Song)
* refer to tcp_bpf.readme in sample program (Yonghong Song)Suggested-by Eric Dumazet <[email protected]>Cc Eric Dumazet <[email protected]>Cc Priyaranjan Jha <[email protected]>Cc Yuchung Cheng <[email protected]>Cc Soheil Hassas Yeganeh <[email protected]>Acked-by Yuchung Cheng <[email protected]>Stanislav Fomichev (8):
bpf: addBPF_CGROUP_SOCK_OPScallback that is executed on every RTT
bpf: split sharedbpf_tcp_sockandbpf_sock_opsimplementation
bpf: add dsack_dups/delivered{,_ce} tobpf_tcp_sock
bpf: addicsk_retransmitstobpf_tcp_sock
bpf/tools: syncbpf.h
selftests/bpf: testBPF_SOCK_OPS_RTT_CB
samples/bpf: add sample program that periodically dumps TCP statssamples/bpf: fix tcp_bpf.readme detach command
Quoted 16 lines
include/net/tcp.h | 8 + include/uapi/linux/bpf.h | 12 +- net/core/filter.c | 207 +++++++++++----- net/ipv4/tcp_input.c | 4 + samples/bpf/Makefile | 1 + samples/bpf/tcp_bpf.readme | 2 +- samples/bpf/tcp_dumpstats_kern.c | 68 ++++++ tools/include/uapi/linux/bpf.h | 12 +- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/progs/tcp_rtt.c | 61 +++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 254 ++++++++++++++++++++ 11 files changed, 574 insertions(+), 58 deletions(-) create mode 100644 samples/bpf/tcp_dumpstats_kern.c create mode 100644 tools/testing/selftests/bpf/progs/tcp_rtt.c create mode 100644 tools/testing/selftests/bpf/test_tcp_rtt.c
Applied, thanks!