From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lawrence Brakmo Subject: [PATCH bpf 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB Date: Mon, 18 Dec 2017 22:21:59 -0800 Message-ID: <20171219062200.372711-11-brakmo@fb.com> References: <20171219062200.372711-1-brakmo@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Kernel Team , Blake Matheny , Alexei Starovoitov , Daniel Borkmann To: netdev Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:39524 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761367AbdLSGWI (ORCPT ); Tue, 19 Dec 2017 01:22:08 -0500 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vBJ6IraJ021288 for ; Mon, 18 Dec 2017 22:22:08 -0800 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2exqrvgnne-6 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 18 Dec 2017 22:22:08 -0800 In-Reply-To: <20171219062200.372711-1-brakmo@fb.com> Sender: netdev-owner@vger.kernel.org List-ID: Adds 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. New op: BPF_SOCK_OPS_STATE_CB. Signed-off-by: Lawrence Brakmo --- include/uapi/linux/bpf.h | 4 ++++ include/uapi/linux/tcp.h | 1 + net/ipv4/tcp.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 7165619..b018d6f 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1018,6 +1018,10 @@ 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 + */ }; #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 dc36d3c..211322c 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -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 { diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 817df3f..e70dd2f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2041,6 +2041,8 @@ void tcp_set_state(struct sock *sk, int state) int oldstate = sk->sk_state; trace_tcp_set_state(sk, oldstate, state); + 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: -- 2.9.5