From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lawrence Brakmo Subject: [PATCH bpf-next v4 00/11] bpf: More sock_ops callbacks Date: Thu, 4 Jan 2018 15:55:22 -0800 Message-ID: <20180104235533.3672006-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 mx0b-00082601.pphosted.com ([67.231.153.30]:41432 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751142AbeADXzi (ORCPT ); Thu, 4 Jan 2018 18:55:38 -0500 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w04NqOIt001123 for ; Thu, 4 Jan 2018 15:55:37 -0800 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 2f9umdge2r-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 04 Jan 2018 15:55:37 -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_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. Signed-off-by: Lawrence Brakmo Consists of the following patches: [PATCH bpf-next v4 01/11] bpf: Make SOCK_OPS_GET_TCP size independent [PATCH bpf-next v4 02/11] bpf: Make SOCK_OPS_GET_TCP struct [PATCH bpf-next v4 03/11] bpf: Add write access to tcp_sock and sock [PATCH bpf-next v4 04/11] bpf: Support passing args to sock_ops bpf [PATCH bpf-next v4 05/11] bpf: Adds field bpf_sock_ops_flags to [PATCH bpf-next v4 06/11] bpf: Add sock_ops RTO callback [PATCH bpf-next v4 07/11] bpf: Add support for reading sk_state and [PATCH bpf-next v4 08/11] bpf: Add sock_ops R/W access to tclass & [PATCH bpf-next v4 09/11] bpf: Add BPF_SOCK_OPS_RETRANS_CB [PATCH bpf-next v4 10/11] bpf: Add BPF_SOCK_OPS_STATE_CB [PATCH bpf-next v4 11/11] bpf: add selftest for tcpbpf include/linux/filter.h | 4 + include/linux/tcp.h | 8 ++ include/net/tcp.h | 66 +++++++++- include/uapi/linux/bpf.h | 61 ++++++++- include/uapi/linux/tcp.h | 5 + net/core/filter.c | 221 ++++++++++++++++++++++++++++++-- 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 | 70 +++++++++- tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/tcp_client.py | 52 ++++++++ tools/testing/selftests/bpf/tcp_server.py | 79 ++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_kern.c | 125 ++++++++++++++++++ tools/testing/selftests/bpf/test_tcpbpf_user.c | 113 ++++++++++++++++ 16 files changed, 823 insertions(+), 25 deletions(-)