From nobody Thu Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3446634pis; Sun, 1 May 2022 06:57:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxer/VoK9zj/4RGbFhMQjauS2SmBLFqd2GMVmMqXNlTq2b2+xvQcFg9MFwUDtzTRyC9e22S X-Received: by 2002:a05:6a00:1514:b0:50d:9d1c:309 with SMTP id q20-20020a056a00151400b0050d9d1c0309mr7392632pfu.85.1651413461750; Sun, 01 May 2022 06:57:41 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id n128-20020a632786000000b003aa8cf89631si11246128pgn.407.2022.05.01.06.57.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 May 2022 06:57:41 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5005-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=Npah68JW; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5005-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5005-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4D7DF280A95 for ; Sun, 1 May 2022 13:57:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2BC6828F2; Sun, 1 May 2022 13:57:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CA1628EB for ; Sun, 1 May 2022 13:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651413456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D9Bad7WF2rpg51Ltsn/U9BnRpoaQ/rMmtcoefWcPw6U=; b=Npah68JWextzSOm0IcpdNI9o4t+YhSFtYOgPiMakmtyzXGEgLzRONMNObA0FfIsGzLhgPy YGlamafuEOkiF6Qy/0VZ1uYTdgk2lHaYM/PMp16F3FF36stKaun/9UANnurJtnTObPGlkg CGft7W2TlowV8wjO2uwninxFq28k/yc= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2059.outbound.protection.outlook.com [104.47.13.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-26-uQx05n3lPxKbEoxMUvnSCA-1; Sun, 01 May 2022 15:57:33 +0200 X-MC-Unique: uQx05n3lPxKbEoxMUvnSCA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=erU66Z0GeoqHI58bBSzfcxv9CCJJF5BVbJFJHWMkdhGK2NjIxmykWyTd10D01+ymrwKoVoANdVuwaQR/8jdipWL0KHExXhoP8fstLYR/SNU9r/3uZY4u06ma9rPS3IBpY4ZSPnqLfGw/EQYuHhCIHUhELyPGI72GFlAVojcu61lZnPeJJV7PtNsHJHsIKezmQ1VqgmiCOX5m7PUILJzU6RXsUnyZxY/yYXIezewMmUu7/fRkVWAuleh1Q9BpR9x07Sf22bC6n6Al/SiFwA2pWd88gv6EtqTijXtnInAcEG4F+5iOxrdf3VEoUDffwUuWwE3B8+s6PK5NKj36bfty7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ydplW64k1JeybmBNR0WaDyXv+VafYF79AY1tdQxYMko=; b=MsCUoYdAWc3XpVKcPStMbSDqxn7Erat7gbYxMRysCsxnVQh1iKPwLXOaPElPqEz2qNp4QmipSPgT/gvJ+LeLWIeZr+xpKQVeYT7seuMTh0JSmu7kv9kAZ93A14SNl+bLQJP4ZNFv1SvZBngFv0XN+5g08nIsiuzC0oIv+dIKjqqqLn7ko8ej0iaDYslGpyDvKp7Pzk6LWeIu0+uu+izZ6Ctp3xz4EhpYsGrWdIlX0rq7GlGsZy/svS0ESmo1P974R3S2wqQFFZ8VtDO0CWSa2wBy/fEMpSkMi4GbVBnDiwU7HeDfemynSVtwfrgD0fjbWD8duYxodzy/katT9ZUouA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VE1PR04MB6605.eurprd04.prod.outlook.com (2603:10a6:803:124::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Sun, 1 May 2022 13:57:31 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5186.028; Sun, 1 May 2022 13:57:31 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v10 1/3] mptcp: add subflows array in sched data Date: Sun, 1 May 2022 21:57:12 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0048.apcprd03.prod.outlook.com (2603:1096:202:17::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ce2c59fa-068d-44ac-a4bc-08da2b7a88c6 X-MS-TrafficTypeDiagnostic: VE1PR04MB6605:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wDYHDcQ1U9jIaiXQwLhcE7NuLorgg+UJ1q8BcLQ4RljHmYWf/zP1VN+1xBj2d/cUzM1695/nkdAm47jJOfrnsgysnqQbzF+zNY0pMTqJP11A9GCSe/J+fuuNSerc3ywZhqrzwTNOehQrjHG1peXzBOD8TEszZNoTwR2QbvEP1r20a5dOj5+9018OZ744s1MBP1l3ytCKEZP1WW65wxXvQlnufU2ZEy9f/ziaD8tznM94lmq4f/oAKi0VJQx7nVzkcyw0y/RwEI2R3l/M7SyA+at+/9sKaxICHFflLxtpAtcim7sxeeBEB77JfCTSrSkC9q5g8r2iuMDPW0g9oawkGKcr31Ky9/OfZrTFGHsZWqWpSliIPsUd7e27g2OVkeaQ6TvrSCwE+4GNOSmlvgVcb6rMr0+4O06rZ652lSRSDlo+ZgIkuy269pvi/sVkumEOaidI1mY/qsk0yzDy/t0FyMxtYpwebhT1QeKq92RMMuLbg4Gb0sV6B+/BXiwbNyg1aIQPRjz/IV1HNDZ93Yr16Ef03ZDVAEuDfa+Bs2dQVXUn/tK70tCgsV2Hhlk06fN28fMfRRNLf24WPlaUDz4oggukdp1QRCf/wb7vqfssvroKNOvPaKgyM8U/07zJ0NGui/4kcZgjQjtQVWfpkWrsDiSDiU7H15dmk2NTX74NjI7/EYLzswmcc0So9E3BEjE76TS4dTHmSBEWVU5d6YbiEQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6486002)(107886003)(508600001)(86362001)(2616005)(6506007)(6512007)(26005)(38100700002)(6666004)(66556008)(66946007)(186003)(66476007)(316002)(44832011)(2906002)(36756003)(5660300002)(8936002)(4326008)(6916009)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r+TKRBwaIHaflvrBslOTOe9C2/nhJCMFjtmnvqh362d4fl0IK4mnTIXJ9NYd?= =?us-ascii?Q?yeKnJprM9j9BZ3Cl0sOd6khSyxdqBBbH/B77cqtTYHYv8gK3VJJNqmQlJrZj?= =?us-ascii?Q?w5pkPvii+bNIyOIbCnDLEkhEt161nEUYJskLHsg8dGvx1GD7RK0n2/8YzBQE?= =?us-ascii?Q?BhOI59EXIwbxjL3Jv6KEB4X9R1HnG/3j1JvbaSTBYC3E5eq6z2WsQ97pocfo?= =?us-ascii?Q?Gfz8LcHV5+XFjvQkkgtexrW8n5PDd+Y0qmMZEeDPSDkKBKZFl57CwujB6jOV?= =?us-ascii?Q?v85Cpzp7ye9/SgzCqS1WmqW6Z92UPG4djojXrEvloLZzSb1IhxGxgT7AKSkU?= =?us-ascii?Q?to9hFFLSP42Y8d7miESG4YdhO3c2jNaULpSsvzsot3aFKaH/bregHj+WOJX8?= =?us-ascii?Q?HMqeEXUXNi2zqP6fNkT+N5KvITPmaC85PpK8x9Lb3w78+NONguWj2k9EsEv5?= =?us-ascii?Q?tUE1jCfQ8udqfWkhAgom9XoroVWI1kZGLWporoUafSmi8YnXSILpgLkJ9cfL?= =?us-ascii?Q?6HMpfqD2bdRfzw+kg5163xOF02zhaH2HoCKCOwBBQBS/6CfK3Qih6TQ7l6US?= =?us-ascii?Q?G9vjFdieFW0FwJAND5npE6HN2zFgIkcLdec9jjNEeCw46r9SNYxEXF6jWLKS?= =?us-ascii?Q?149vOLC2mhc/00gcAo+/jzSecaQ0xWvFoY1qebRYGn9q9hU6nfuPu5wqe/b+?= =?us-ascii?Q?wDTRWxViPwCuTXUuWZCy7HJ9ESM9VhUe6ldOeGXpCSClhApMVnqryLaSsj6H?= =?us-ascii?Q?9/p/n2i6Sjsq5SjluiVuXKpfZZrxITnrosDkLeADKm+PB09L5LQtDpVfrfvV?= =?us-ascii?Q?SgH20tx9bAnQgxns66akgaIs0Dmg9Xh1I+DnD/CUf45pOZevB9xD9Wx6/9+y?= =?us-ascii?Q?SxekyoDZhusIpWH8Ma3O4XHW6C9fitE1/rs74WEZF4IV12uvs2JmV+b6n1Fs?= =?us-ascii?Q?G4Jkm0DYZs8K4/+bt2C2HELFe43IcXV6OIPxyDf6oNQXZj5K/C0/VaA1pnmv?= =?us-ascii?Q?51rrjS/UbrS2oGoi6KDR/RnOI2nxYQaPZYXUuckCoOZWmIovQVurHWwYnpe9?= =?us-ascii?Q?GPDJ4OyyN1mkKmAjoSDb3t90Gpdz3u9OqFMkepO7qITnQm0YVFKx/0JjNy1s?= =?us-ascii?Q?ipYFvIzvJES2KH5nLjj/8dZCmw8ArQ53bcqi0C4DIbSxSDIo48z65iK453hh?= =?us-ascii?Q?KAh8cNI6mqAsSnbvdcQOgnxS+Tzr2p6YpvuPk9Q8ultEm1SAhOgxenvPpEz7?= =?us-ascii?Q?VYuOOUH6gCZvo7N90hYYTMQ0oc4VPz2OF8yzajyJvJXwpKlR1PPQfBzK/Qtt?= =?us-ascii?Q?80uKSN7vI41Qvkgz19mor9PLG27aJ/wDc+8VRbF/DAaMpfh8T64Wi82XmBd8?= =?us-ascii?Q?ldPhEQ6mPnObzkLNzk7PMNVxKxZvJy6Mw9vZ8BYvqVqU+4WRaxHFOl8YVQ8u?= =?us-ascii?Q?S9qgxjO4IwgzMazNyClQslwFNbS3brjz0N2knB3++/g2rs7sFRy3o+UhROEH?= =?us-ascii?Q?WuXGDNJXykzDwVtvYzSFRNtMNjsbA7okBbaDdgD8EyA/D8iQJbV68LkiYtrC?= =?us-ascii?Q?aLsDqgGOmGS/GSlnu9Rxe4SeTNHnpj+Ce1NRk78MCAUH430XuoXmxx2LwASX?= =?us-ascii?Q?2/vZI3t2WZZhRJw4RRcoIbaLPCGpp1n+Htr9W8e6gl81fVN8U3GLu36Nz3bl?= =?us-ascii?Q?j+V3+tMVotiGiElOYw8BmfEAdyrMXGWC3pHB88OTTQXsROS4vByRDqI+LRgT?= =?us-ascii?Q?Y8RvQ23999ry8DMaknNNAo8eWY740eQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce2c59fa-068d-44ac-a4bc-08da2b7a88c6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2022 13:57:31.0039 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: k/GFoMePgnJvHvwrxs6IpW7ueK8phDH274syFMISa8Hg4nOUFXLRmjTRKUsKw6xwGtHWa/oq9TlR0swDqWDl1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6605 Content-Type: text/plain; charset="utf-8" This patch adds a subflow pointers array in struct mptcp_sched_data. Set the array before invoking get_subflow(), then get it in get_subflow() in the BPF contexts. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 3 +++ net/mptcp/sched.c | 7 +++++++ tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index bea7608d72d3..1a48e31f3ac7 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -96,10 +96,13 @@ struct mptcp_out_options { }; =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_sched_data { struct sock *sock; bool call_again; + u8 subflows; + struct mptcp_subflow_context *array[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 7a5654132ed3..1efbcfe80fe7 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -93,9 +93,16 @@ void mptcp_release_sched(struct mptcp_sock *msk) static int mptcp_sched_data_init(struct mptcp_sock *msk, struct mptcp_sched_data *data) { + struct mptcp_subflow_context *subflow; + int i =3D 0; + data->sock =3D NULL; data->call_again =3D 0; =20 + mptcp_for_each_subflow(msk, subflow) + data->array[i++] =3D subflow; + data->subflows =3D i; + return 0; } =20 diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index e863954de701..1f991ff2e325 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -7,10 +7,13 @@ #include "bpf_tcp_helpers.h" =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_sched_data { struct sock *sock; bool call_again; + __u8 subflows; + struct mptcp_subflow_context *array[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { --=20 2.34.1 From nobody Thu Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3446666pis; Sun, 1 May 2022 06:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPnvmmjGRvG1/EwEB0aqyGdATUid7MdB6kk2Wmv9+luSI3DkjVisNrEnczHHmU9KKcsOuF X-Received: by 2002:a17:90b:1c8e:b0:1bf:364c:dd7a with SMTP id oo14-20020a17090b1c8e00b001bf364cdd7amr8339222pjb.103.1651413467044; Sun, 01 May 2022 06:57:47 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id m6-20020a6562c6000000b003ab7c9b8288si10908517pgv.228.2022.05.01.06.57.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 May 2022 06:57:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5006-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="Sl7iYK//"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5006-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5006-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 6B5A9280BD1 for ; Sun, 1 May 2022 13:57:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5CF7D28F2; Sun, 1 May 2022 13:57:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D33D328EB for ; Sun, 1 May 2022 13:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651413461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCS7/o0mFEd7aWCvAgyf4JzWsq9+Ec/zl5yXzfeCQRc=; b=Sl7iYK//tMd8eziH99EiZy2ReM6/gO6SAXlE4yOHTyGsYzYh3wEgsMTGD9pajREJ7l3/u0 WbtKCRNSS/rx36qUTFyUR/pN9kUzKoGmXTTL7LPTwvf40MG4SYPGrhov4i95NVQ5yOzOIt dERKr0cG55VvYtzTSiAT8/++cX2rzbk= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2054.outbound.protection.outlook.com [104.47.13.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-psTUDpMMN7y7A4y-ip0PXw-1; Sun, 01 May 2022 15:57:41 +0200 X-MC-Unique: psTUDpMMN7y7A4y-ip0PXw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jCdEoeGYTTHlwh/JvRydipLDL+E0tbmwJXpxhW1aYaHf69fkXumI0/+19ZEEEfwuflMvlEiyyB8bRKmiZGvqGX/sCZUXOZojAkCEkDaPAngy207Ewc/420vSXemUt1QbV0c03j66Vf0k10jooGKbjkFkrcGRBCemKx/WHtUeUM+02Stno1/XttaNp4CFe0hN4YU/EIj+E/LEyPavf21apy6RfXpI84BmK1l2xXMdc8ShOE5w1uTo7j4Xm3GzLGCDMgKK/VAeprmJMXKZdPoh72Cc/eSAnaoOocGpl8QIPUf+DWiELFVBpv9CxU6NPWouiS82CIpcvgRfuHZFC2nvvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QlIi8ZUX/4tAooxzno3A+twvvyk5QS7FS4c0RSTpZRE=; b=E+NuLmVzOqgu1bZdGmYkwendE2qPJLeKWV3PBEcprWgTTKfzHNPLAc2+RGBfHxEjGEuPU/0+Co522WXIpG4Fuon/6gKbwBeIfFmYxreuKyNJ5vPNmKcIEKm+ZEV4nJReUP4kPawGF5e5LClPVDm3xqJZzTOIy+Z71QJzIUDq91hS44hlMNBwlarowKiduWuzjIRox97kjR3rqJnNikWRefQ8MhDMY+MjGIFTw/7GeOCl9YPj+8vn0sdDuANzvsyGhBO/0gu59/+bo4fZhwLX7BIPskOX3fK/ndyHfKisaKsCGAtZ4Rn0WdecSFqVFlstcsktFdNsVQXAmZMT9/z99A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VE1PR04MB6605.eurprd04.prod.outlook.com (2603:10a6:803:124::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Sun, 1 May 2022 13:57:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5186.028; Sun, 1 May 2022 13:57:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v10 2/3] selftests: bpf: add bpf_rr scheduler Date: Sun, 1 May 2022 21:57:13 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0059.apcprd04.prod.outlook.com (2603:1096:202:14::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a061c2a-5fb6-42d0-232a-08da2b7a8e13 X-MS-TrafficTypeDiagnostic: VE1PR04MB6605:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jgi97kMlW6OVtsLEyE9OKQxq7tmPGm/n0FPh3v5W3tf4qFKVw63pRyLyYoNQHcSZV33GxFNBBdL30rF6mXsBl/tny3xVQOaBlBjjhPjNkCVheoGfALsyxa3hWm0aGQkzi9zK3/AgIR4Jw1A+TYHzqZZ1/Rwcrpg2A18CEbq9rJkz8PKYTQEUwaCkgZfNuKljcNZpS0AWsJ0Sqk9lLkclqxNHKQVUWDfpeRMQDdeZKpeuQms56nFgYlFXUOZqdDzICqbyCODtxezHJiRgDKY89/EFBlT9tbAWVYWcxdKI3bd5xRejbtT8RMIz/7M14h8xUi2bXGX6B3Yu8GCOF02u3y7qpJfS81jPYijmY/eyDrQiaWbieM+X15Gz5ZEG/mnC2jX86UVMXFihlWbXJ9o8UxWBaqls6W3sBTaZ86tGP6Qkv+YSixQ7hL85UkKH96qZdpzTk5HArY9uG4FUCGvMfyRpR5q/R5Nk0lYMHzAwN/PKFqdNd3zzZyKcVJqR2zeCOyoEFPYyF+Yygku93V2Sjz/kRs1vHEwAPYeSmmiT42q2p2XzDoY0VDOperbmC+qaoCQK6l7XVxEsvAwMNQdQ2JPy9Ky+JRJGP2Rm7gU+ZK9gf3BQadE/f+0VLg7sOe+TtwDW7pIojja0j6f5xP9XbmEWxKjqM0y9bEt4lIZjCcr0FfkLcNY4HSaaI78e70iQfOyAoHR8lDofnpH5afKfFw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6486002)(107886003)(508600001)(86362001)(2616005)(6506007)(6512007)(26005)(38100700002)(6666004)(66556008)(66946007)(186003)(66476007)(316002)(44832011)(2906002)(36756003)(5660300002)(8936002)(4326008)(6916009)(8676002)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2HCHfGt858WrJWlnAGh8ZXRh2uhFuF2D2ZlB3uvVzpZdJdu80EI/6JYna2Ph?= =?us-ascii?Q?MI5OpMNP+TlIMWdfAGEVp0KS3LzJ5T1Oy10LXkVBp1EuckQQj3y2dcQauhM6?= =?us-ascii?Q?eDigxM0vt4/MuoFEhC4jYx17p7FRW6DDkE+F1RSqiECEaM4OESil4tGCyaMY?= =?us-ascii?Q?Nu/4GcwzGANoFUzMfMMu1E9YvBkwHnzDyJOnRNsKThvU+zTrisyKK1sRYheQ?= =?us-ascii?Q?58U2x1sg56ptbr8pXJBLkN5w0vh1qEHeq9WWn/W0laNmPKhqGrWr5MTnx5Ns?= =?us-ascii?Q?IEW8YCqfM5eulvVzMzd8qsBy4VxBtiE2JfVuWj2OGCB+JTrrcYWdrq2LkrW5?= =?us-ascii?Q?SQE1heoq39ps7LUWlVL6rj4STkmHM9sRVbwICDpV/X0dLThYDOx7gJVDrD3l?= =?us-ascii?Q?boDPZuhuxxQSHmRuEAq0kOtTTgC86G1EG5JxqSLC0CPSa5jvRZCpHbx52hob?= =?us-ascii?Q?vbkIE0cOyDNYcq2UtbvSKiy9vTfkpmipdNEc2uvOXrD5AaDVGgA/1wZQnyG8?= =?us-ascii?Q?SmQ3DoDI9swQVnpguw6ud6tbK1x3ZjWVCSl14IrHhBo4vNoR/bEbMW16N34E?= =?us-ascii?Q?wg0s9eLPAwFxVB93qAf54/x75M0mzhIA71HBETIc7AaxB7qJ1vyjrF35n8Qa?= =?us-ascii?Q?uip+B/sQl0XqaVKJzCLOOZyXbSSEMK0onX/7rFaazNkQhtTbAd3qTesvv0ou?= =?us-ascii?Q?H0rPkiEHVpt4u5xkW17x1Zuu/xbDkmUaqp/0m/AVNK0/te3/iruAu5D7CpLq?= =?us-ascii?Q?EL92j4YLS/6Z6CJUvetcUehgCUp6VN/jQdObarsU2FLAgZ1vmhuLck8Xkgjx?= =?us-ascii?Q?1QVEorHKuDabeqSZd+exONA7qLeRbMaA/oEUZMlQvENoSlh6Tfh2tO+9KMLo?= =?us-ascii?Q?licpmSchpzfk6J+y2xpvskmPwSdFr4ufFJLnFh0eGG8wTDruOLc6iRtzhk9v?= =?us-ascii?Q?r+PqBr318Lpsh+P0omPddOajcmajbaRLlXTNSEoZAzwtyBc7hujGCyI+aK9h?= =?us-ascii?Q?Wcol2Ie4OM44lHQ/6Bryw8Um43wOjiZLRnIA1WiBSyKqeb8LUoMpU4xkZKO7?= =?us-ascii?Q?WZykEUjYT8dvuWV49YGrI2c1QY+vybkel9qBZnxMQ3TOX4J9BxE04AqDQOgM?= =?us-ascii?Q?mfB4mdqh4Sda6+xT+r6Kav5DtQcnF7dNQCIBP6a3EciXaL1eaaIeHVUJeq66?= =?us-ascii?Q?yEOk5r0GXZ0j3RsRE13fSjbAnTxCjfgazIOeBeNq1Ym/IPoodaJOsbV//si4?= =?us-ascii?Q?nCtBm9D4C1VqR6kt3/DRBf6SM6Gj3MzJdNMr+sgbm4Ca9OszxBviz74jvAHt?= =?us-ascii?Q?Rim4cQLc9wbgdn8BMqt15kXjMyf8qyob2Bvh9y4YPF3xipqBVj3pqsQFCZ+Z?= =?us-ascii?Q?Nw+Kyu0MUl9AaCbK22gGc5lrUCnR9UqilUC8LWl7IbqFZPqKqeDwm1xAi1rV?= =?us-ascii?Q?XDExYhqUVTuS1dT8pTjOVNfCjBsID4P4peKq6JNEH067sONkAc0xdVnn0ywU?= =?us-ascii?Q?+Lkd0fcPn0Q3K3ttULUVX6Af5uGafL0C1Wp7JlGHMutEJu0Vf5lVrx68QlbS?= =?us-ascii?Q?u4YgMTzhfL3jCziR9DQf6/wB9YL1LIA1cXww0cq4i9e5sY7zGnVZKjtn2U4W?= =?us-ascii?Q?S6cVasT5GOiB58pvLOOo5br9PcqoH2Fo8k9LtkmK7kvkiAJW9jtCKONpN5+w?= =?us-ascii?Q?SiBfh0iBox1X/X6+3It2SKHAtMegnwGqmmvyr5JN6/YXeIr6PCZrNevvpucG?= =?us-ascii?Q?VmXWJtuzziZNb/bJgQRDFjPLCkFXib8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a061c2a-5fb6-42d0-232a-08da2b7a8e13 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2022 13:57:39.8938 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: V0/c6n0a/wWJajItmWlqaM+qp4fogGurF3naRW6QOIMdq88ynxci8rKcUTJLgnplGkgt1w9a0QSa0rBFnBSN8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6605 Content-Type: text/plain; charset="utf-8" This patch implements the round-robin BPF MPTCP scheduler, named bpf_rr, which always picks the next available subflow to send data. If no such next subflow available, picks the first one. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/bpf_mptcp_helpers.h | 6 +++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 45 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 1f991ff2e325..8ce5b1603962 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -30,10 +30,16 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; =20 + struct sock *last_snd; __u32 token; struct sock *first; struct mptcp_sched_ops *sched; char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 +struct mptcp_subflow_context { + __u32 token; + struct sock *tcp_sock; /* tcp sk backpointer */ +} __attribute__((preserve_access_index)); + #endif diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c new file mode 100644 index 000000000000..3619bd622b94 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include +#include +#include "bpf_mptcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_rr_init") +void BPF_PROG(mptcp_sched_rr_init, struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_rr_release") +void BPF_PROG(mptcp_sched_rr_release, struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock *msk, + bool reinject, struct mptcp_sched_data *data) +{ + struct mptcp_subflow_context *subflow; + struct sock *ssk =3D msk->first; + + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX && i < data->subflows; i++) { + subflow =3D data->array[i]; + if (subflow->tcp_sock !=3D msk->last_snd) { + ssk =3D subflow->tcp_sock; + break; + } + } + + data->sock =3D ssk; + data->call_again =3D 0; +} + +SEC(".struct_ops") +struct mptcp_sched_ops rr =3D { + .init =3D (void *)mptcp_sched_rr_init, + .release =3D (void *)mptcp_sched_rr_release, + .get_subflow =3D (void *)bpf_rr_get_subflow, + .name =3D "bpf_rr", +}; --=20 2.34.1 From nobody Thu Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3446726pis; Sun, 1 May 2022 06:57:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHa7eANiPl7NdhHlvQEFayaFQU/CozvOtvcIaNzyjOhIcnP3PJZlip4cOkeffmJytbT0yb X-Received: by 2002:a63:350e:0:b0:3a9:fb92:85b8 with SMTP id c14-20020a63350e000000b003a9fb9285b8mr6105833pga.328.1651413475379; Sun, 01 May 2022 06:57:55 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id x4-20020a634844000000b00399345490cesi11031032pgk.419.2022.05.01.06.57.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 May 2022 06:57:55 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5007-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=aJxs7BEK; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5007-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5007-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id CA60E280B85 for ; Sun, 1 May 2022 13:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD2D628F2; Sun, 1 May 2022 13:57:53 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 671EB28EB for ; Sun, 1 May 2022 13:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651413470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QP/HhjyqP5e+YvH8PJ+d5E86H72GakFzEBOOq5Hu6Yg=; b=aJxs7BEKUxjawx2YcENqVbq2ObNIZ43MZocNClsSzKxq5OYoCCZUlGbgHvvgxgrPk7eLfh gGPmOdg4t4Yw8nncSrMJ5re0QpkssflbeTUIGdu0NgV4tI/tzwLrGC7N8eZYU/pOjOVq/d Y8HHgwqXR8dVYFJRPB5NoX/ZV7DPoPE= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2176.outbound.protection.outlook.com [104.47.17.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-BV9XgFGhNimN8JwmizjQLw-1; Sun, 01 May 2022 15:57:49 +0200 X-MC-Unique: BV9XgFGhNimN8JwmizjQLw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RogzVlAcmXOOa10K2RhX3WT7D+ertRpoWukxWTWAYPfdVO8+WxVmAgGqycUkONelKOIVlN5kuILVVaBuPo7Q77h7EkTzb4QfymPL6obJfYI1Oua7IhVsKJBI3FEeUHRy8uzJPIQGAcOSIZ8HCaOEec07p+/eIUQwwzNBDP2my49H5edAlPEQmMh71dYBa2ZvxuPSodmHVdtiJL0KV0WVzgCXRkjK3R2c4b3IYB4co1qJixOVG4lS8ef0y+bBKW127lvWuBMUOfT6SY0GFjtx27nDOvMpMjmfGQlPte2htqxFHaQXZ8gFmMgCZ98VRzjUrmGAFMggULmoPkEzCXDqeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ioI8YHiHz+f7fGNENfwLQdD9qu5mu22h56pvCDu9Sqg=; b=JsflYwAMCuczh1YHlcX8MqkpVFAQBS7nxK6M5iZoRoogbsqr6btHJRPDIrE+d/oo7QTe753PWfYcbHSVLj9dtxgWG3kHyjDxuyCt9HCUrBHmVkmfxiR0PbVYC+yWf1DXJX5qjNJfr5v2CdZc+cNoFxcWIbbCZFnJcBn3z3KJfhH7LIO/Y+OrnxwDp1Ow6kRXiOIIZhrljNiTXS+fbvv3DK4cMsxhRFD2H+zdZqJyzSvYSKzUNVoE44gbLMYj8GQglD8XOQRpDFwH0UgnEhBXOlA+5GN339HBKsFEASKDm0GT1QoJktAwY1D6hDlI0cDh3mQZF6yfsaUrHdNdBw2SjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VE1PR04MB6605.eurprd04.prod.outlook.com (2603:10a6:803:124::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Sun, 1 May 2022 13:57:48 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5186.028; Sun, 1 May 2022 13:57:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v10 3/3] selftests: bpf: add bpf_rr test Date: Sun, 1 May 2022 21:57:14 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0054.apcprd04.prod.outlook.com (2603:1096:202:14::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f450766-c37e-42c3-684c-08da2b7a9345 X-MS-TrafficTypeDiagnostic: VE1PR04MB6605:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZRbz8vdvD7wU0xjiOcHTFj8PxLjBJU3pZlG42Lm3Y+xCG9IvHlZ3im7l8255oQOYTwzFCJYym7CtNWl88TD0PtAjtUg4ajkh+HJLOA6VSCK+6cw/Np2KeYO5oVPbJsFpVXVrRnCgCPlwelADUKZ+bya7F1S58vkQnrUe9aNnj/Yx5tYyUcYMO5ousUFYCIVYy9FrOj/eTuZls5fGqMxJ0pPJBZNn7zSBmg+42odQGVmy8bP5Qg5TGzvH1xoJg2BaPN+ifwBhH4+6w+uXIMZpBfpXDqb+ayydcujZhYZcz94XzXJqgLAq8TwzabGZuk62fszrvbti1I1SXlNtwJ5w3vp1MvDCi+lpS0kaUg3DaAYzA7mlNv5fEoc4Wkx+0RstkhquLywev7mMcs+M/Z0ujW5h+J6Ist3qBhUnzaE2JS22MlYGJoBbduEGeDlthBRxZNyKVtNsbfTStLXanr4hV5kkuDy279ZpQHHMSJEszWXBCK1Cs1Hd094cEVMFaYzsMiBN+JV8YPICsJ9p5UwuAK2QUrSd8DpmeI1XFAxhqivrdwQN0vMSOycyPK5RT+rP8FjFwLhfPUBKqcdz1TP2OeMZVpAJ4uAnmAg+vS9sYCtmHArjrtTptQQgWowafe41hqW8nsYOQaQza0oVyXjTO5O9UbaDyrfyrnSRQzRCgb5Z0FizugXpMCHFE7ltuVP8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6486002)(107886003)(508600001)(86362001)(2616005)(6506007)(6512007)(26005)(38100700002)(6666004)(66556008)(66946007)(186003)(66476007)(316002)(44832011)(2906002)(36756003)(5660300002)(8936002)(4326008)(6916009)(8676002)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SaIbtl4VtbKIPADqECxh0x0g00JYdz/ckcFK/LhyirdoCdVDdBphix/h3Bkv?= =?us-ascii?Q?nBF+N2CSEjkaEGSSg0KoaJjfSz/DAOdjev08A1B0jYOVAiIt04cSvLBHu5EG?= =?us-ascii?Q?teFpWgglRpndCcqpgt8ttdOH/IIl1xNbSba95gyoMhNH3wXAePs0l7xztikF?= =?us-ascii?Q?HsEak8d/Il+OL1Vi/YV5175vbCdcO2d9+jh2MibwHTWtFFRS6zWBQpsI6Rz2?= =?us-ascii?Q?de4IKVkhpLabbWDvl9CM8C6PAvPqKgetcipzNiO//It0hYqb3o6RCFvMbDUJ?= =?us-ascii?Q?jpnjN7DZ6i0jdUX8BOuukNT15flsWJsKgTNPnemRK1+7ItsRuS160rr0fOOI?= =?us-ascii?Q?/Jl3ozUa8Ndre7sp5ATE9j3aXMjK2BDr5QB3c8mP3/iZ77AzcU8RZHB8EEjn?= =?us-ascii?Q?F7zYDVxPtVsU6btCCoJoL5449x8v7zIRlkJeQsjb+2Rxkb8Utwq1ypKNoZjF?= =?us-ascii?Q?EK24ZmY7MF03yLiiUEnINT+HIsgmLpnqZKW20VsQqXLLjVwDazyYLH0MAFzE?= =?us-ascii?Q?wDbLnJjlOAh10lWts+bGqB4oeN7nEjpfPBzZy5qGdMTD1HKSEf3m0jVtHoXw?= =?us-ascii?Q?O711SvFCH/YjeAYfcjrV2iMn44HupiraM/vKh+E+/0p30/q9/God5E/WFxq7?= =?us-ascii?Q?EN18BbLDr+NbdwtriSQDDBM24Z7YxWptMVCnEHZsqdfOLIMJyvF6C0F0TIFK?= =?us-ascii?Q?q6YlaZiOd7L78PfTsWFF1gV4dimAYxcc3ioo4nwDcTmI2BsXC8YVSSfNXceU?= =?us-ascii?Q?y/fDyrPegvnULUXaISKKzquGSEuPRFH6ZR9rPFkvNKQOlyYfFqM603V/K/jX?= =?us-ascii?Q?Z7Y/uCBRLztBSCb5o2WWimocltkO8MlYKuEOpxJOlZBYh7p6eQqPuonmyK0A?= =?us-ascii?Q?GSJsLaWE+PoKq3sftsVDd8cVlL7rCTLheL0/86TQUkmd+bMz3uYxFI8VOW9Q?= =?us-ascii?Q?OM1ROYERKn1JI3k9mYUTp1RE3DMNryn/c274Ju4bgVErl+Kx7OlqHWq4cKh1?= =?us-ascii?Q?YmXcLzFY/k7sEj6dShIYZ3YPO9Zqi0AGw/lA+zHKbJnQjtiucRU7dQzrCPxE?= =?us-ascii?Q?5o8fHXLZ/3kfKNc3vjsfYhBXiV0qGByccyVNl3JBMBTirrzqdb1q/xiMuIUu?= =?us-ascii?Q?FuwmlhOQZeStoA1UI2o3yoG+9nAYmUX6Fb5o4zzUsIiW1OXaGoEyFkKwuZOt?= =?us-ascii?Q?GQOEfhMfWxMztwRXHN8gh/iUTgu6BXWBB7BtxLGb6DN1YZFyrI256AeCjI9u?= =?us-ascii?Q?Bop7R5pLEYEjR1HhUiiR/ulnHdXFZ82nOWJ355VRYdbha8sb09qSRDvO+twE?= =?us-ascii?Q?wv75W6WGaaFe/l4gH31FIG1kngL4k7wFfmBkeQoJfCepYDUj+8X0US407CoD?= =?us-ascii?Q?P8qKvZD8PFN9Bzev2sKGtCxBUVvF193N17nzSRKEofwOEHLAkpj9l0y+C9WD?= =?us-ascii?Q?BZIaOgPZplXi/fptmGrH6O1yfwITKzwU2z3E9NG61a29trc1OMu6Th3Vq5b5?= =?us-ascii?Q?6m2TagPzSqCnRZUsVHQJvQUFfxN30iAbo5xGbrt64AViABrD/1zqiXZKz7vz?= =?us-ascii?Q?JT/ZbPrE9fNlSK3qJ4AqI7L8W2wNx+y2QFMQWFMLs/CfkBBv2msb3G62SGgR?= =?us-ascii?Q?im6pIcaB7DlsQ8Oa6hWZYTPUBr1aDWH4Vf+6HNYsnoBvGP3US409gVLHmbaK?= =?us-ascii?Q?WXh5YrkOWdC7BTEWoVmTv7ixuBXIk3VLECXCujm0oM4CP5Ppe7WErLWpAj/G?= =?us-ascii?Q?7mcbVg25S3sbnMV7muR1LiQnA1T5nec=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f450766-c37e-42c3-684c-08da2b7a9345 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2022 13:57:48.6431 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BeljjctHm0iCHt1O5ecJmvZJ/AIU/alnx5K07W1h3heRx28ZF+d9jMQziX+2RYJC0Qu5BS0kp4YVgBHfx2LPQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6605 Content-Type: text/plain; charset="utf-8" This patch adds the round-robin BPF MPTCP scheduler test. Use sysctl to set net.mptcp.scheduler to use this sched. Add a veth net device to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add this new endpoint to PM netlink. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 21462c29683c..c400be612f72 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -5,6 +5,7 @@ #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_bpf_first.skel.h" +#include "mptcp_bpf_rr.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -375,10 +376,46 @@ static void test_first(void) mptcp_bpf_first__destroy(first_skel); } =20 +static void test_rr(void) +{ + struct mptcp_bpf_rr *rr_skel; + int server_fd, client_fd; + struct bpf_link *link; + + rr_skel =3D mptcp_bpf_rr__open_and_load(); + if (CHECK(!rr_skel, "bpf_rr__open_and_load", "failed\n")) + return; + + link =3D bpf_map__attach_struct_ops(rr_skel->maps.rr); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_rr__destroy(rr_skel); + return; + } + + system("ip link add veth1 type veth; \ + ip addr add 10.0.1.1/24 dev veth1; \ + ip link set veth1 up"); + system("ip mptcp endpoint add 10.0.1.1 subflow"); + system("sysctl -q net.mptcp.scheduler=3Dbpf_rr"); + server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); + client_fd =3D connect_to_mptcp_fd(server_fd, 0); + + send_data(server_fd, client_fd); + + close(client_fd); + close(server_fd); + system("ip mptcp endpoint flush"); + system("ip link del veth1"); + bpf_link__destroy(link); + mptcp_bpf_rr__destroy(rr_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) test_base(); if (test__start_subtest("first")) test_first(); + if (test__start_subtest("rr")) + test_rr(); } --=20 2.34.1