Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1150267pxk; Fri, 18 Sep 2020 05:16:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjMQS8RcyjlnBp9/lwyof3eKDtiN0UhiV9UYfgRhF9IZmrypesbNO4B4L8f7d8b5j7WeMc X-Received: by 2002:a17:906:6b95:: with SMTP id l21mr34721926ejr.317.1600431402522; Fri, 18 Sep 2020 05:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600431402; cv=none; d=google.com; s=arc-20160816; b=Hk+GnNEAbduNU4rTQPgSHImxknb+Y0IK/ho7SfP2r4ZqALYW9mH3eK+XkHbRpsI5tR KZDfx6IYS1+pvnEqMmRDUYoBXaQzpmoA8OoSbafEbduAMLuOjs4wGApwyoORinwljU4t k9tKdCw/fbfKkSaEiw4My9KceQenXClji5erT+B6QhgxdTFjzAEqhvv62YX2fSBExv9x 1DTBuE2Vh65jpfCN5Yljbp/6rsnyrwLS8DUZ6O1uqEydvoyKzcFKIMZGSkPfY4oNuKml Ln60VI7vrkyVGkChHtFcsPiC3Yqnyp9p/vkMl9bpB5ARh+pEt9S++gR6/9nn6x+BZjzn k8EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=le+49qeMoYWRiEHhru6tG/8VGXjg9SNJqhqTvJk1qpk=; b=nyYjy7c8ZtiO6y8VbIfEt0X2vDg70OCvsG2eHwzvSb2326xqppKTv1LundmAnTIeXc CK/r1k6Ktf4mpksfbs8H9e8wx+8XCn6p7QiemSILGyw2VXgjTNtSslP91naiF2NJzb9k sO/wyLXc4cbOcq5z3Mm3NMFu2xQeqaiBz2aTcUV4H06/nNUuVd1cWbaNYI3eUio0ygG5 nCjrOU0vLwDtmOg+whrH7yWEEuU3BOjw4imYb2PvQKpy2hJuRTia6bMqmJ85ZudkyBl3 hxd1sgEoT6Rff9nF07ugiLFuIQjv8CWt7uWwt1S0fU5t2tqTlolR/TJ3e9K7B14mO2VI C96g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20150623.gappssmtp.com header.s=20150623 header.b=0BiUsPGS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q24si2250552edb.85.2020.09.18.05.16.18; Fri, 18 Sep 2020 05:16:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares-net.20150623.gappssmtp.com header.s=20150623 header.b=0BiUsPGS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726762AbgIRMNP (ORCPT + 99 others); Fri, 18 Sep 2020 08:13:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726746AbgIRMNI (ORCPT ); Fri, 18 Sep 2020 08:13:08 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22B72C061756 for ; Fri, 18 Sep 2020 05:13:08 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id g4so5917176edk.0 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=ByUzTCLT8XRrkhlReQ6hjNXUmBPo47KWGhd7OdfOpsP2zeJk4JTVvPnG9dzWT9iJ/z Z9d6uPbo/vuY1g/C2VO8p3o3B7b/gCqmNkCKgWG9F7HGEEtTyrMl1fUu7DGRvID3zOPZ AqRj5Qa3K9YnRSJ0W03ciC/ddXHLG2VdB6ZZ655yqq9+CTQbwXPa9CK74Q3pTLNJt6PA J7s6YY7ml6QHfPzuXki7ScQ+TuGkoQ/KWfWQjTYduX4nsENi0MmqClQcIPJLLL/Hezq2 vCcLR9nDdUJ8N7kWi6MI4Gow31/lg9PP726aZ+QSFzaEDjPvs4dKjHQJMBwUqS7W8cx7 ObeQ== X-Gm-Message-State: AOAM5325ILtQIN3C4OKZukDaoC+RyNoke9eY9LSpSa9Nvg40hVKyMi0U O50oUJqHjlpoK3WhwneejiiEKg== 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 -- 2.28.0