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 v6 09/11] bpf: Add BPF_SOCK_OPS_RETRANS_CB
Date: Fri, 19 Jan 2018 17:45:46 -0800 [thread overview]
Message-ID: <20180120014548.2941040-10-brakmo@fb.com> (raw)
In-Reply-To: <20180120014548.2941040-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 1c80ff4..2f752f3 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-20 1:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-20 1:45 [PATCH bpf-next v6 00/11] bpf: More sock_ops callbacks Lawrence Brakmo
2018-01-20 1:45 ` [PATCH bpf-next v6 01/11] bpf: Make SOCK_OPS_GET_TCP size independent Lawrence Brakmo
2018-01-20 1:45 ` [PATCH bpf-next v6 02/11] bpf: Make SOCK_OPS_GET_TCP struct independent Lawrence Brakmo
2018-01-20 1:45 ` [PATCH bpf-next v6 03/11] bpf: Add write access to tcp_sock and sock fields Lawrence Brakmo
2018-01-20 3:54 ` Alexei Starovoitov
2018-01-20 1:45 ` [PATCH bpf-next v6 04/11] bpf: Support passing args to sock_ops bpf function Lawrence Brakmo
2018-01-24 1:11 ` Daniel Borkmann
2018-01-24 1:30 ` Lawrence Brakmo
2018-01-24 1:34 ` Daniel Borkmann
2018-01-20 1:45 ` [PATCH bpf-next v6 05/11] bpf: Adds field bpf_sock_ops_cb_flags to tcp_sock Lawrence Brakmo
2018-01-20 3:52 ` Alexei Starovoitov
2018-01-20 7:50 ` Lawrence Brakmo
2018-01-23 17:29 ` Eric Dumazet
2018-01-20 1:45 ` [PATCH bpf-next v6 06/11] bpf: Add sock_ops RTO callback Lawrence Brakmo
2018-01-20 1:45 ` [PATCH bpf-next v6 07/11] bpf: Add support for reading sk_state and more Lawrence Brakmo
2018-01-24 1:05 ` Daniel Borkmann
2018-01-24 1:27 ` Lawrence Brakmo
2018-01-20 1:45 ` [PATCH bpf-next v6 08/11] bpf: Add sock_ops R/W access to tclass & sk_txhash Lawrence Brakmo
2018-01-20 1:45 ` Lawrence Brakmo [this message]
2018-01-20 1:45 ` [PATCH bpf-next v6 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB Lawrence Brakmo
2018-01-20 1:45 ` [PATCH bpf-next v6 11/11] bpf: add selftest for tcpbpf Lawrence Brakmo
2018-01-20 3:59 ` Alexei Starovoitov
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=20180120014548.2941040-10-brakmo@fb.com \
--to=brakmo@fb.com \
--cc=ast@fb.com \
--cc=bmatheny@fb.com \
--cc=daniel@iogearbox.net \
--cc=eric.dumazet@gmail.com \
--cc=kernel-team@fb.com \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=ycheng@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.