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 10/12] bpf: Add BPF_SOCK_OPS_RETRANS_CB
Date: Tue, 23 Jan 2018 23:58:00 -0800 [thread overview]
Message-ID: <20180124075802.1522053-11-brakmo@fb.com> (raw)
In-Reply-To: <20180124075802.1522053-1-brakmo@fb.com>
Adds 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.
Signed-off-by: Lawrence Brakmo <brakmo@fb•com>
---
include/uapi/linux/bpf.h | 4 ++++
include/uapi/linux/tcp.h | 3 ++-
net/ipv4/tcp_output.c | 3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 6998032..eb26cdb 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1039,6 +1039,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 */
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 129032ca..ec03a2b 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -270,7 +270,8 @@ struct tcp_diag_md5sig {
/* Definitions for bpf_sock_ops_cb_flags */
#define BPF_SOCK_OPS_RTO_CB_FLAG (1<<0)
-#define BPF_SOCK_OPS_ALL_CB_FLAGS 0x1 /* Mask of all currently
+#define BPF_SOCK_OPS_RETRANS_CB_FLAG (1<<1)
+#define BPF_SOCK_OPS_ALL_CB_FLAGS 0x3 /* Mask of all currently
* supported cb flags
*/
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index d12f7f7..f7d34f01 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2908,6 +2908,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);
}
--
2.9.5
next prev parent 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 [PATCH bpf-next v8 00/12] bpf: More sock_ops callbacks Lawrence Brakmo
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 ` Lawrence Brakmo [this message]
2018-01-24 20:01 ` [PATCH bpf-next v8 10/12] bpf: Add BPF_SOCK_OPS_RETRANS_CB 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-11-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