From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lawrence Brakmo Subject: [PATCH bpf-next v6 00/11] bpf: More sock_ops callbacks Date: Fri, 19 Jan 2018 17:45:37 -0800 Message-ID: <20180120014548.2941040-1-brakmo@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Kernel Team , Blake Matheny , Alexei Starovoitov , Daniel Borkmann , Eric Dumazet , Neal Cardwell , Yuchung Cheng To: netdev Return-path: Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:40470 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756420AbeATBpz (ORCPT ); Fri, 19 Jan 2018 20:45:55 -0500 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0K1h5P9007220 for ; Fri, 19 Jan 2018 17:45:54 -0800 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2fkv0vr19n-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 19 Jan 2018 17:45:54 -0800 Sender: netdev-owner@vger.kernel.org List-ID: This patchset adds support for: - direct R or R/W access to many tcp_sock fields - passing up to 4 arguments to sock_ops BPF functions - tcp_sock field bpf_sock_ops_cb_flags for controlling callbacks - optionally calling sock_ops BPF program when RTO fires - optionally calling sock_ops BPF program when packet is retransmitted - optionally calling sock_ops BPF program when TCP state changes - access to tclass and sk_txhash - new selftest v2: Fixed commit message 0/11. The commit is to "bpf-next" but the patch below used "bpf" and Patchwork didn't work correctly. v3: Cleaned RTO callback as per Yuchung's comment Added BPF enum for TCP states as per Alexei's comment v4: Fixed compile warnings related to detecting changes between TCP internal states and the BPF defined states. v5: Fixed comment issues in some selftest files Fixed accesss issue with u64 fields in bpf_sock_ops struct v6: Made fixes based on comments form Eric Dumazet: The field bpf_sock_ops_cb_flags was addded in a hole on 64bit kernels Field bpf_sock_ops_cb_flags is now set through a helper function which returns an error when a BPF program tries to set bits for callbacks that are not supported in the current kernel. Added a comment indicating that when adding fields to bpf_sock_ops_kern they should be added before the field named "temp" if they need to be cleared before calling the BPF function. Signed-off-by: Lawrence Brakmo Consists of the following patches: [PATCH bpf-next v6 01/11] bpf: Make SOCK_OPS_GET_TCP size independent [PATCH bpf-next v6 02/11] bpf: Make SOCK_OPS_GET_TCP struct [PATCH bpf-next v6 03/11] bpf: Add write access to tcp_sock and sock [PATCH bpf-next v6 04/11] bpf: Support passing args to sock_ops bpf [PATCH bpf-next v6 05/11] bpf: Adds field bpf_sock_ops_cb_flags to [PATCH bpf-next v6 06/11] bpf: Add sock_ops RTO callback [PATCH bpf-next v6 07/11] bpf: Add support for reading sk_state and [PATCH bpf-next v6 08/11] bpf: Add sock_ops R/W access to tclass & [PATCH bpf-next v6 09/11] bpf: Add BPF_SOCK_OPS_RETRANS_CB [PATCH bpf-next v6 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB [PATCH bpf-next v6 11/11] bpf: add selftest for tcpbpf include/linux/filter.h | 10 ++ include/linux/tcp.h | 11 ++ include/net/tcp.h | 66 +++++++- include/uapi/linux/bpf.h | 72 +++++++- include/uapi/linux/tcp.h | 8 + net/core/filter.c | 281 +++++++++++++++++++++++++++++--- net/ipv4/tcp.c | 26 ++- net/ipv4/tcp_nv.c | 2 +- net/ipv4/tcp_output.c | 5 +- net/ipv4/tcp_timer.c | 7 + tools/include/uapi/linux/bpf.h | 74 ++++++++- tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/bpf_helpers.h | 2 + tools/testing/selftests/bpf/tcp_client.py | 52 ++++++ tools/testing/selftests/bpf/tcp_server.py | 79 +++++++++ tools/testing/selftests/bpf/test_tcpbpf.h | 16 ++ tools/testing/selftests/bpf/test_tcpbpf_kern.c | 131 +++++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_user.c | 126 ++++++++++++++ 18 files changed, 933 insertions(+), 39 deletions(-)