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 06/11] bpf: Add sock_ops RTO callback
Date: Fri, 19 Jan 2018 17:45:43 -0800 [thread overview]
Message-ID: <20180120014548.2941040-7-brakmo@fb.com> (raw)
In-Reply-To: <20180120014548.2941040-1-brakmo@fb.com>
Adds 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.
Signed-off-by: Lawrence Brakmo <brakmo@fb•com>
---
include/uapi/linux/bpf.h | 5 +++++
include/uapi/linux/tcp.h | 3 ++-
net/ipv4/tcp_timer.c | 7 +++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 7573f5b..2a8c40a 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1014,6 +1014,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 */
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index d1df2f6..129032ca 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -269,7 +269,8 @@ struct tcp_diag_md5sig {
};
/* Definitions for bpf_sock_ops_cb_flags */
-#define BPF_SOCK_OPS_ALL_CB_FLAGS 0 /* Mask of all currently
+#define BPF_SOCK_OPS_RTO_CB_FLAG (1<<0)
+#define BPF_SOCK_OPS_ALL_CB_FLAGS 0x1 /* Mask of all currently
* supported cb flags
*/
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 6db3124..257abdd 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -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;
}
--
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 ` Lawrence Brakmo [this message]
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 ` [PATCH bpf-next v6 09/11] bpf: Add BPF_SOCK_OPS_RETRANS_CB Lawrence Brakmo
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-7-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