From patchwork Fri Sep 18 12:10:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Rybowski X-Patchwork-Id: 255197 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 190A8C43463 for ; Fri, 18 Sep 2020 12:13:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD1EF22208 for ; Fri, 18 Sep 2020 12:13:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.b="0BiUsPGS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbgIRMNN (ORCPT ); Fri, 18 Sep 2020 08:13:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbgIRMNI (ORCPT ); Fri, 18 Sep 2020 08:13:08 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27433C06178A for ; Fri, 18 Sep 2020 05:13:08 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id b12so5795935edz.11 for ; Fri, 18 Sep 2020 05:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=le+49qeMoYWRiEHhru6tG/8VGXjg9SNJqhqTvJk1qpk=; b=0BiUsPGSnuJXW5JQTU39UHmRTLNDfi7jJOSkypi0tNCA15smhA9ME1h/R1UaO/4xbq kyo1f63q6EMOhHU00lzjtcfngDzP2/2W2TBdUkwY0mz5bvAG9SOvrNUeu1BACNTzJrDT LYnmlDWwtuMkhNeyW1iozuM+niWWT2PDQrWPQmxox3rJQ+cG51CIKreVGpj5qDDhmY7L saILPzlkN6DBgSea4r12W38ZqQk2tkFzGFUkzvdx2sMo3zZkIzaAXQKtcOQDVgdFfLKd UghQ+HS14l/6qlNkwu+x0nb5mNiKoIfQTf3IRhUrlJzGqAHRknR3FjdZ3DaVwZv8P4eH rvrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=le+49qeMoYWRiEHhru6tG/8VGXjg9SNJqhqTvJk1qpk=; b=qJq9qNU9MXgCqZq3S2lOA0x0MtdBt5n+aii8PceKq295o5LwOampbhSRdCy9XxLUjg lA2ZfPcnjhT3aF4fLtvNdihF68m8KkTTyhUrM7et4VYfBDxydT4rvjo450j0EAo4Oyn4 cs6cDGrYb2lTE2sewKhVy93J0/7N559iGtQEwL3rjvmk6SVvJ1+6UBHk8AoaHKDwCnRZ aQmiyzWCTc8AgMwyS3eNPR+uIQ0fm0ZR2324dO+Sqe0O8xpeiQ6VgkW1EtuNgoNrmFVV RMNw9U4YTP/+VzwKQ+nMTrOFv1/CQhFA0aJN/hpcVhd3mCfqm3IP+AxzwPdGQ4hpBOEO lK1A== X-Gm-Message-State: AOAM531XO+cIhpz26sdIB9k1V9MpOFe9WHtgFCbKu2fq4Mpm7tHoCKZB K+ouFJvUtFbYXzpx5YEhhhoPaQ== X-Google-Smtp-Source: ABdhPJyKjkptyqJsAy01GKrydbIkNu2sZeVapOZjiUlBmUdqZEUCrEEHBOKj+j5rztEhjWWwOnBb+g== X-Received: by 2002:a50:f687:: with SMTP id d7mr39719908edn.353.1600431186848; Fri, 18 Sep 2020 05:13:06 -0700 (PDT) Received: from localhost.localdomain ([87.66.33.240]) by smtp.gmail.com with ESMTPSA id h64sm2084555edd.50.2020.09.18.05.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 05:13:06 -0700 (PDT) From: Nicolas Rybowski To: "David S. Miller" , Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Jakub Kicinski , John Fastabend , KP Singh , Martin KaFai Lau , Mat Martineau , Matthieu Baerts , Shuah Khan , Song Liu , Yonghong Song Cc: Nicolas Rybowski , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, mptcp@lists.01.org, netdev@vger.kernel.org Subject: [PATCH bpf-next v3 0/5] bpf: add MPTCP subflow support Date: Fri, 18 Sep 2020 14:10:45 +0200 Message-Id: <20200918121046.190240-6-nicolas.rybowski@tessares.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200918121046.190240-1-nicolas.rybowski@tessares.net> References: <20200918121046.190240-1-nicolas.rybowski@tessares.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Previously it was not possible to make a distinction between plain TCP sockets and MPTCP subflow sockets on the BPF_PROG_TYPE_SOCK_OPS hook. This patch series now enables a fine control of subflow sockets. In its current state, it allows to put different sockopt on each subflow from a same MPTCP connection (socket mark, TCP congestion algorithm, ...) using BPF programs. It should also be the basis of exposing MPTCP-specific fields through BPF. v2 -> v3: - minor modifications in new MPTCP selftests (Song). More details in patch notes. - rebase on latest bpf-next - the new is_mptcp field in bpf_tcp_sock is left as an __u32 to keep cohesion with the is_fullsock field from bpf_sock_ops. Also it seems easier with a __u32 on the verifier side. v1 -> v2: - add basic mandatory selftests for the new helper and is_mptcp field (Alexei) - rebase on latest bpf-next Nicolas Rybowski (5): bpf: expose is_mptcp flag to bpf_tcp_sock mptcp: attach subflow socket to parent cgroup bpf: add 'bpf_mptcp_sock' structure and helper bpf: selftests: add MPTCP test base bpf: selftests: add bpf_mptcp_sock() verifier tests include/linux/bpf.h | 33 +++++ include/uapi/linux/bpf.h | 15 +++ kernel/bpf/verifier.c | 30 +++++ net/core/filter.c | 13 +- net/mptcp/Makefile | 2 + net/mptcp/bpf.c | 72 +++++++++++ net/mptcp/subflow.c | 27 ++++ scripts/bpf_helpers_doc.py | 2 + tools/include/uapi/linux/bpf.h | 15 +++ tools/testing/selftests/bpf/config | 1 + tools/testing/selftests/bpf/network_helpers.c | 37 +++++- tools/testing/selftests/bpf/network_helpers.h | 3 + .../testing/selftests/bpf/prog_tests/mptcp.c | 118 ++++++++++++++++++ tools/testing/selftests/bpf/progs/mptcp.c | 48 +++++++ tools/testing/selftests/bpf/verifier/sock.c | 63 ++++++++++ 15 files changed, 473 insertions(+), 6 deletions(-) create mode 100644 net/mptcp/bpf.c create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c create mode 100644 tools/testing/selftests/bpf/progs/mptcp.c