From nobody Tue May 7 04:48:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4245537pis; Wed, 11 May 2022 05:09:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRCaRCca6VkK/tfcRG1+oebG8xVLMOW6wuBk5nbBS7A8htfEFAg8ZNCXWwLf8Z8GzsgG74 X-Received: by 2002:a50:ed16:0:b0:425:f420:e51a with SMTP id j22-20020a50ed16000000b00425f420e51amr28760333eds.23.1652270976590; Wed, 11 May 2022 05:09:36 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id sc13-20020a1709078a0d00b006e89c2d0609si2555558ejc.68.2022.05.11.05.09.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 May 2022 05:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5246-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=LJk4wGoq; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5246-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5246-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 da.mirrors.kernel.org (Postfix) with ESMTPS id F33D92E09E6 for ; Wed, 11 May 2022 12:09:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 88CC128F6; Wed, 11 May 2022 12:09:32 +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 8B39A28F3 for ; Wed, 11 May 2022 12:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652270968; 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=FvePz4sP6OgQZXv/Fqrzq+QjuVFjSTwhDtDRdjXpjec=; b=LJk4wGoqVz+gfQaM+RwZa40xpcei9K5BVieH6fEKSj7vlNCVHYdvVGnFYKpNHk3FuTcbMG cBYzqwh5i+6kSTodJw/wjddxMSHPTNtk0lyQpK6UpvalIhaSUsdiYLopaXpDx2P3trS0zH YHBH10DbHVMeFoTJAP0a178JaolkYCY= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2173.outbound.protection.outlook.com [104.47.17.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-14-_IB9GkG9P5y1Hpp89Tp9zQ-1; Wed, 11 May 2022 14:09:27 +0200 X-MC-Unique: _IB9GkG9P5y1Hpp89Tp9zQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A52+1I+Q9S4lUcfagbrGBKmGZrN7Spazrw697sCp81V6ZsxARWxTydDERbuGpXHgGm6FowhsRTPEpivcR4UNhxIw6LbNHTOaHeBy6JYIFU340tAh/mBVGdhEfmjk35cwvwLOHXcBlqJ4S+oLFSIeyDdk4GSkYHquwlsUmL30XTiwCiMRQIzKY7HhmylZ28R2e4H3sx0DWVefc5zAv4K8X8MHM82/f+ngTevgH+laAHLzWtGXUelwY3rO7YBybn7BVImZ+VG2dTSRgaKaZWiwfykymcserJCSaftsNKLoU2qe0n7Zv1UHrqGM/7Tp99F3nnKJeBPCKKFdjXPtbKB3WQ== 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=JaJpMJOawNcbX1Dh/jYRbr7xHUYID+jM6v1JJHF468o=; b=hKqm+oV5+6Tofzr+fDDhxlEwKlgbuYpNC0wLUqdU0Tta8wLeyVp6d5iqQd5scJC6RBVWn9n/7dVnXzn9Ty/zHv3LoY5cTZqDY5jidX40FwVvf62E6QS6ApFrt31CHyfr5DC26VSxt7NVv//EeNl1FN5XgmFBJagKGJOSAiDzL+7/JHSUo6s3XE5dOq1AFqE7weznY/D+njB4ivvqiPFX2d+aU3Xu7PWq46UXLeSiD8kLKzSqcft0Bx99m9h+FpaOaTGl5K13vtotFlPwSEjXvRHUd0vEsXQfMRNxHDt9QPpJtvge7MkP5yjZIQH1gMCfahVTiIBBWiBOyGgX7nE5Jw== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5716.eurprd04.prod.outlook.com (2603:10a6:208:128::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Wed, 11 May 2022 12:09:26 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b5c8:f15:91fb:33f7]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b5c8:f15:91fb:33f7%6]) with mapi id 15.20.5227.023; Wed, 11 May 2022 12:09:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v14 1/3] mptcp: add subflows array in sched data Date: Wed, 11 May 2022 20:09:07 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0228.apcprd06.prod.outlook.com (2603:1096:4:68::36) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 4af94686-0001-43a9-a0f3-08da33471787 X-MS-TrafficTypeDiagnostic: AM0PR04MB5716: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: diuHDCYUdj/LSRC/laZet8hq3DF3izY1kW3NWezgh3CF/Dib7cyOqFi9KjLeJEOCUHy0kZ0LSXb5pSRpjmnKI/YR5Lf1AcBLGW2a9KJlH6ftDn9sX9pFuNnGWeD4tnEcB59vWy3p1iCq72aqMeOnODHwV1qwznhLTfP2fM5tbFjBWJlmY6UmgmgzIrXxL/ff74uAO5LZF8yUQJZdSg6R9wxI4fb9BtKfSvJep2padVlt8Nhdl8m4u7oUpdOzSh7tdaqyg7XzguPc/ddhWUAkPij24DV8FqRy1vCJKA5b5pKGOryDUCJXfeQzl5jKYJbCpPLAqkARh4PeXVfKjOZxcLDif+D5P+HVgljxgRKbf4UO0Jsk63NgytNb9CFtrM4JOF/fPuK3t4LvG0hD36G1rBl7GcIOn/9HcUDbDvSPNQ4Mj9bayp5hu6fpQpY3QTZ1wxcQ9xNi5ASUnzxNg8mS4X9OguYHQJYtYg/laUG8+wfqUE9Hf/a3HstGPPygHFjjL+u30DQ+4yghqxggksCe6GyUeurdsuHteX7tVpu3fwd//dfow+uVJ/mgQWyiZp9oNHMY+KxYOQOP3skeD+yWVdqsJ2pwrxomKpwwXNIMv9J7HWGqhUszyIPacZnPHOsyTtO5giRmqYUSZRXkMbXA35AyvxItpdqDC31otXid29kGoPCRtzGtNP2U+H1/Mi7SHLNHm3O8KvEfvwNnv52nrQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66556008)(8676002)(6512007)(6916009)(316002)(66476007)(4326008)(38100700002)(66946007)(26005)(83380400001)(5660300002)(6666004)(186003)(6506007)(2906002)(508600001)(107886003)(2616005)(6486002)(44832011)(36756003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g4cBHQT7z3Vr7GOgNatBYdq+uWKJAVL2YHcu+uAWAPP1jMmwe+Wuak/85M5y?= =?us-ascii?Q?na6q7LCS/wco72/e4aahiHF7W2oUs7Te6syrViHNV9mtF98T293wvRd7kAce?= =?us-ascii?Q?WBjDE2kpCPeHiiZaU0qpdMdaq+h9teIvTJxR6ily4nWNk6ZZ5qHIUYuEND21?= =?us-ascii?Q?mlV8R2PUb777C1V26uqns/Tau70YbQZ7lQt71YakO3vzYjlSz38CGHMS1Dz2?= =?us-ascii?Q?hWVxOwGp83nhMW+pBjW/50gsEck8vPGkshGRUsFHLUqM61jnWqKvpSPvLoP5?= =?us-ascii?Q?Qmjxwx/pphFR5sJ/hIQBc5vaTkl2UwBhMWsetFdHrNQ+AQVg0mPeFRL152ED?= =?us-ascii?Q?Ckv5VQIsMR6Ge4spLuBgbblZL8X5kDnpGVOxwEKBeUd4rEL9qFubWc0Ke9Wm?= =?us-ascii?Q?S7oI5QgxXw26TVe28J41n1vlJY2I6MazT2H+sxw/0nvAIJz6d6JMp9XzxsbF?= =?us-ascii?Q?9K3llnMGrSX+dK4qYR65utVjHKXdl/RahxWjFwO1YrBX+q3iSafkLcS93xDk?= =?us-ascii?Q?+YggkvktO9l3aVPnZbN+ppsuQQaitetcnNNMyyM4CK2VknMA1EAgpc9gYIBV?= =?us-ascii?Q?qpG+4bIPv7T+qPM0wujVLDmbF3XaLcQMEZ9RrGt8mOfVGFLuQN6M8bY4FvL5?= =?us-ascii?Q?2lcT3ouT57rRIT8YPOQ2XxA1vGHYmcBpduv8jkcJYu2cTiiWP76KFAr8kxha?= =?us-ascii?Q?YQTP7C2xW33y/qgiNMYa+LWhwpbU8tH/igXui42DhZGon+EXY7vL164qRwMa?= =?us-ascii?Q?2NVwKFpmkE2yh2hnZ/6bqeFO24BC1xWh2IIArSnyEqNP1IaM5Axuz+dIfRWH?= =?us-ascii?Q?L5NLXuUUH0YYu0nzty3oRYjvrD62WnxDhLqg9hzHi5e2Hy/dpShU+hmvM4e0?= =?us-ascii?Q?jU7FSTNhg0w3QrYty5X5WWq4a0Amcs6CoVnXDtG9k7FaoFhzwtuIBwMiKbDg?= =?us-ascii?Q?MyhSc9vIOnecHyS8bjGkiX7YApYcPZjzlMmDV2Q8Y8iWrSlUSYpv4SslNRyi?= =?us-ascii?Q?ys/Y3AEzEn8XGaYP1YkIgAcKmOIMlc9BczgE05ogVP4iJ2nNDGI8oY1VEr/0?= =?us-ascii?Q?RsDmU2UddigTPJF2C4/oICaNgfOTBQ9IWxP7vXRygsHwAQnoeXcNXWcPOD8u?= =?us-ascii?Q?JjmCnqWkedmIKeNMJwd/hrVu7Kbv2QyRd/g/HRLQg3vzIybIGnfMc/m2g+xh?= =?us-ascii?Q?byR1M7FVYZG2ELiPurzCVMy5SOqWsu7bY+rfGHB/LHS2M6kyYI9u5f4kuGrP?= =?us-ascii?Q?vDnVJFbH1dZLtsKCF7dDAMgVl5A7U4leK1IIFPpg4fmV9KF5VX9Gt4lI7Hru?= =?us-ascii?Q?d9AxVTgO4SHVK3/sGp/xJzRpDJtUvUM/np34rljh7qStYdhBKy+KaUzQXfIQ?= =?us-ascii?Q?wHIaU/gF2Y3MxsZQAxyh3xk9S/K88W1cZDPxi+4M1DQBt6rPXqT6qzAWWdGY?= =?us-ascii?Q?aMT0/DElUyLc3xULBVywuZbc8h+8BPs+sBEwMIFu3Q+eB+hhh9ujVVi+AsxW?= =?us-ascii?Q?d/1e/iV8XtPx9060xhoOzyqXDJcf3KB6F0Cx1T1i53sx27m2mFHhpibjBs+c?= =?us-ascii?Q?8wvcmAupMLTGI6v40KYLFWywHuDEougOe/KWQJcf0jJnipM88GzncHhyQN3E?= =?us-ascii?Q?oZ5eSq40m5o87Mlw63pQtCY5fY05cuFvtKa/f7vJQM9xfu5Xt78VOkw5vq4l?= =?us-ascii?Q?wnbAMkBvj179AoKFIaYJNJKe/QM94RHKZttqIJVR6QF1FsLHrPuF1ArrRbcK?= =?us-ascii?Q?vHo6S/7UhNOBnz0NiuOrKu3jke3CXH8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4af94686-0001-43a9-a0f3-08da33471787 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2022 12:09:26.0086 (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: nKxMM+vM2H0HOeJ1AWtZXdldY2hcLD2Fzx2lg7g9hCWiSMCnZtQ5VB9rCCx2Owq4UD5WJu727qq6tSKwhDgY5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5716 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 | 15 +++++++++++++++ tools/testing/selftests/bpf/bpf_tcp_helpers.h | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index b596ba7a8494..d48c66de8466 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 *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 3ceb721e6489..f86b97292044 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -91,9 +91,24 @@ 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) { + if (i =3D=3D MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + data->contexts[i++] =3D subflow; + } + data->subflows =3D i; + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i++] =3D NULL; + return 0; } =20 diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index e17ce2b856bd..7fa96e3a8318 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -231,10 +231,18 @@ extern __u32 tcp_slow_start(struct tcp_sock *tp, __u3= 2 acked) __ksym; extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) _= _ksym; =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflow_context { + __u32 token; + struct sock *tcp_sock; /* tcp sk backpointer */ +} __attribute__((preserve_access_index)); =20 struct mptcp_sched_data { struct sock *sock; bool call_again; + __u8 subflows; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { --=20 2.34.1 From nobody Tue May 7 04:48:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4245578pis; Wed, 11 May 2022 05:09:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziwJaF56j4Z6UnmAt+dsU/+7Z6Ai+UShNkhzk0zqqs17YwUQe2P4EL8X0fgelofhjPXd9D X-Received: by 2002:a17:907:7ba2:b0:6f4:2918:566f with SMTP id ne34-20020a1709077ba200b006f42918566fmr23948077ejc.728.1652270982842; Wed, 11 May 2022 05:09:42 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id sc35-20020a1709078a2300b006f4a9fbfa5fsi2052564ejc.1008.2022.05.11.05.09.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 May 2022 05:09:42 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5247-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=c0c7jF7R; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5247-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5247-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 da.mirrors.kernel.org (Postfix) with ESMTPS id 428B02E09ED for ; Wed, 11 May 2022 12:09:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CC45E28F6; Wed, 11 May 2022 12:09:38 +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 2569C28F3 for ; Wed, 11 May 2022 12:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652270975; 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=ovcrUPXYT2NGf/lbGCZLF5moeulJhQwLtH52VysaY3k=; b=c0c7jF7RFOJ4J2W7zyUVJtTsonMMfnXQ6D9vHu8bpay1/JlzXVsslQae5PMcEY2NA2RvV2 h4h1pJ1QkNrCmfcsQbiSXIG2XOyJB6vUGoIWw/m6klhjP09Qk6npukVgeii9x++SMXsh5Q cjPtL6xfgCHgf82J641G++cAgUPQ2B8= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2170.outbound.protection.outlook.com [104.47.17.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-i3igQs9DP5eJn3i6_4Qkjw-1; Wed, 11 May 2022 14:09:34 +0200 X-MC-Unique: i3igQs9DP5eJn3i6_4Qkjw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ddC/W+Bbrmr1HkKy/BkS0EnEEnjzC1IQiDQH6Or7HrB2DFi0BlnnCZ0vbTUIrn/7U/xTINWSyR2uzMWQDia1c/Jp6YTQ6G679qaviTdqyHpD2ddTZGoE8dV5HT044sh6AMyGPHrKL1LPbpPch4jLVBBnrsbRZJ+mMyOXVbKsYSMSbL0kwyC2QxZ/CHfOTrBncjdasVyxXVRT/cn9nZ5XUr4s8yHYKE00OvIwYWT4yUdrGP5VkJdlzSKqJeDdZQ1TGqtb0R1fixJg+ZWdH3OBMM3BYGdp6K9bF2u8i3mWpwK3hsPiB03gkEVYeApveHu8j/+2H6I7MslxSGKthQCqOw== 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=ZQwsbPEKo9l6OAFWDHUq+2A3/mMBFUHCz9Am7r8frAg=; b=Ummbb2kvwq7wNRMTLbAi0oYkXrzOh72fbsZkYLonacxeKLa10jyhazH7t7lZgrN9kdReeaiQBm3FgybAgadXLzZKM1gfXIdRmY9ngyfZvMf8QH2dpQZRe+3PPX3rRSSj5iAFkzBI1jAy8veWHfB6Z1vsPzANrPQSVC8Qcg0TBasmb0oYz0M0IP9dUT+kU/O/aIMSqFtpjM+jMmxTXMfSWdyOmt0P4wgUZubZqNDaAizGP2ztGjIE3GXgUNodb67w3sSFiyOXHWNf82MJ4Qv2CL4bkmm3oo0icVMrtVgR+jx2nQLRzpODn49/lfG4pbThEpZrbdrkC3mvyYcFq46vXA== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5716.eurprd04.prod.outlook.com (2603:10a6:208:128::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Wed, 11 May 2022 12:09:33 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b5c8:f15:91fb:33f7]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b5c8:f15:91fb:33f7%6]) with mapi id 15.20.5227.023; Wed, 11 May 2022 12:09:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v14 2/3] selftests/bpf: add bpf_rr scheduler Date: Wed, 11 May 2022 20:09:08 +0800 Message-ID: <249c2026fda409a0ef42f5677a2eac55fdb8d6f3.1652270663.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0213.apcprd06.prod.outlook.com (2603:1096:4:68::21) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 071eb2c4-6b80-465b-e60d-08da33471bcd X-MS-TrafficTypeDiagnostic: AM0PR04MB5716: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: gF6GVnkUh79NKrNlOKyNBKOmS4v+4U1nH0PoBaNxiMW9QpNT8yH1iHnsNRclQTgWzTMVzgcJ62FlXOSS+IKMHLTnJMMBmmX/rSJKCm4naMPmEhq5V5+T48+UtarnJ591UfyD6INXJ+ml8so3x7sUxwSWLSsR4SJu8B9K8Wfkaydx2byIH0FkaxzjVzmYCmdHkupzgnVF+lwkWuHKtniGF3XYlEH3COwrmf+mg/MsVZHKsvwOt1T9WkaBbgWd5feA1kP/6kI20cp4h4q0TEMYIWkIN3iG25J2NZ3dSwF92yocaUicvhzn54PhdeLwAoUcU/3CSd6Ns0eWELky0xX+E/hyHCusNdHOKmSxuSJsb//ELi73Vx2+nFoU43m1VPMlbwQJWGo6gI6i2/OR6YqP83IeFPAgvC3urolSdQJtQWloV4Eozn1rKeNNuqCYExxbE67F9aVfgWAxlA+p/ByEcrtyb1Wm5gxsKvjuaWbLVBAFCUlGva2oLndqqNBT0kofGneKTBcY90gE3MXINv/pSEImMSOtAZdb8yzrDRJ9Zg3+ZBM1Q4y6bHL0bNqKO0uF76+XnZkuWRRWXXO6rBVanHyNQwlafWoHhC4CCQXDrQirx/zK08H6Iz4sbNOYOY9lM7h11Hb/krhFlX4UI6dPo/JdGsjC93Z17lXoVaonR4IHS5ijqgrUqSLAUT07+XT5JrFpH5y3j9h+G0F4CFbB2w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66556008)(8676002)(6512007)(6916009)(316002)(66476007)(4326008)(38100700002)(66946007)(26005)(5660300002)(6666004)(186003)(6506007)(2906002)(508600001)(107886003)(2616005)(6486002)(44832011)(36756003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tck7pkS2/qve6e/sjIX7jux8Iha9ms0tbwSxtKCjqpLFzAhHyEwe6az5XMSQ?= =?us-ascii?Q?0WbFHu8Sz+3YSyRiexhNJ1ZdsHMLL/wYVL9XuooGSjyz1hlw7s8NhyGOj4B/?= =?us-ascii?Q?gPb8QxXOa15gfli7VPbZuq/Mdi33hariajwEsFzL3JF9zJD0q+v3iXE9kYfc?= =?us-ascii?Q?4kIRi2JVpmNA3FltHQAOa7SJFgDnicrai9stemioZ/J/L7oh1cjCYk/ogbng?= =?us-ascii?Q?4QcXe9gsaQvKdaZ/ivcuOkAZdy41DK1IdSWe5DEEVbUPoEGJjM+EGSP5kxKo?= =?us-ascii?Q?lHaEJJs0j87fo5uSnmjBC3m6XOPce1gDHkoHdQsKbDmVfJSEPb3FBPBPa2xW?= =?us-ascii?Q?lEjW/23DqeUAhntpfUoFaMuHgC41TjzPwHbB0uZZxsUMeFqhbTlu6+19zJcx?= =?us-ascii?Q?FgvvLI1Sb6Dr6XBA7Rp9i4SWsyjwKjIiq/PQfATHmSVzTMJBUpFhOC/9zHrj?= =?us-ascii?Q?MU5HQtKLFkazM0DPuAnl2sQ8RwJWpHQJ/aH2Dy9W2mLNwQBE6r0ujs94WLJT?= =?us-ascii?Q?AcQ1jx66kVnkvk4XZCDn6NPF/AaVQlg+oXqBbbUqNGgfslfNMb3nsIGQj1AE?= =?us-ascii?Q?dlU6EtzdyhTH/NMbXUTUN81SlhYig7spDP+AIFp1gelYkFA6FDVluGmWJrkB?= =?us-ascii?Q?Dgw3aAYVho+DsgxURk2o/zNhlYQ3sJ21pkeRMuFOZCHFHluKA0b8qed/R9UH?= =?us-ascii?Q?njjEIfl/VQqHbJXrWag8MCmmIJYB+G7954F0u7bbKqTErDcO/8rfiRPG9lry?= =?us-ascii?Q?MpqwEQ5Epukpt2CmKVKgl592u3XMeMEHfyss7RrL0p6EehU8PodnkDYfn422?= =?us-ascii?Q?GOVvYa7PqZJ33flwMsiSkL5HrwJT0sJkwkckeV6VEN4q2kdadhbHRrVppGXD?= =?us-ascii?Q?sCHirazuQC9RCS4Xk+qEU0HJIdNnqQWxua60hSkxittYGlBic58Ygx7Gg4zw?= =?us-ascii?Q?DBKlBahRjg8cwUFwmYIvh9ZkK9lhh+cVpkLnFcWyQmp4xgXR7Ib3JE81IvqV?= =?us-ascii?Q?vDgiBhpt7JbYuENN7o4puSiaA4GF0l1NYVl4BLOrkcvOPI6jnJnGCR34GxCs?= =?us-ascii?Q?OEcxj51YW26A/ZOdBHVwAo7FVBD5BfzGwggdMgOOVC071pKhGhmci/YOfF1w?= =?us-ascii?Q?bkt9ShsPCd6/VJqqghQ9/QU6I0rfRa5TfKKv0V50Wp8Dv1NbhYtw/3ENplo2?= =?us-ascii?Q?211Wlq7JzTl3bgRqz6+xPB7aoYBLMe29PBXoL3sh42TyuHVTxsnw++R5eQhA?= =?us-ascii?Q?NTAVGEPi0onQsoSJ4qZOH8qk8lAGDA4kW9Cb/oe3fHdhBEBTnOYb27DpvEzJ?= =?us-ascii?Q?ilG63m6PxcHlDTaDoPS2jI6ubpOSiNSoyKF4NwWrcP1D8DIEI68cs7IdG2MB?= =?us-ascii?Q?/GKVv3ORm8Ca6LBgHVE8U2eWoUWLN6CcODoBdj3oPurSReDKXc60aPKxlDSd?= =?us-ascii?Q?Rez1VsCQ1Cr8JR2AI+GTl2XBf1PsMuW3YIoiKfTiCCtB+XBOQyXlNcDTY7xZ?= =?us-ascii?Q?5dC1szb4+7FsX6XfCVgVko8YzGMZzhaHk+esn8+1HJYybUlHPn4Ag4kqzPbA?= =?us-ascii?Q?Q0iV99G4wUxEdDJnzgrXKMZCDn6ixXGdm+KGohR29uSCWYovcsas2/qLbC3d?= =?us-ascii?Q?D3hlb1I4EVsZtQmxuMJMHM4DUMRCxGCP3P2qzzxIiGXmVcGJnZtF3UVF/4jh?= =?us-ascii?Q?jRGCeY1L+Du/KztKNVuLJqvpbVm0SLFrJBWCi8laxZ1FthDNRypq3EZ4piJd?= =?us-ascii?Q?9qU+iX9sarZleGiYu1kUCnPwf2idl0Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 071eb2c4-6b80-465b-e60d-08da33471bcd X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2022 12:09:33.0707 (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: hqhaOiCbk6dAsvpF72cGrUf7CgMNerk0gkHhenAepg5GHh3RCWQpU0ProQ7Z+XaMgjmhGlXUszAnP0LElSmHaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5716 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 --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 + .../selftests/bpf/progs/mptcp_bpf_rr.c | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 7fa96e3a8318..d08117f6fe64 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -259,6 +259,7 @@ 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; 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..d1a14f5dbfcb --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_rr_init") +void BPF_PROG(mptcp_sched_rr_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_rr_release") +void BPF_PROG(mptcp_sched_rr_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, + bool reinject, struct mptcp_sched_data *data) +{ + struct sock *ssk =3D data->contexts[0]->tcp_sock; + + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!msk->last_snd || !data->contexts[i]) + break; + + if (data->contexts[i]->tcp_sock =3D=3D msk->last_snd) { + if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) + break; + + ssk =3D data->contexts[i + 1]->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 Tue May 7 04:48:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4245743pis; Wed, 11 May 2022 05:10:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNF6NIt3Ho7mAZtcjNWwPA+nAcrnQ7s3aaOh9R8KyeOOOYiB1BySPq9P2aMGFwfbWwwmeY X-Received: by 2002:a05:6402:1d48:b0:427:e039:9262 with SMTP id dz8-20020a0564021d4800b00427e0399262mr29026818edb.148.1652271005272; Wed, 11 May 2022 05:10:05 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id q5-20020aa7cc05000000b004263a206f5fsi1921415edt.367.2022.05.11.05.10.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 May 2022 05:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5248-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=JaSQ2K0T; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5248-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5248-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 da.mirrors.kernel.org (Postfix) with ESMTPS id F257C2E09F2 for ; Wed, 11 May 2022 12:10:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 886EC28F6; Wed, 11 May 2022 12:10:00 +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 42DC028F3 for ; Wed, 11 May 2022 12:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652270996; 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=RXskkd6EmNPp2sPDlg+georMaMOfeE9PlXRANa/fCkA=; b=JaSQ2K0TCKFmAsLOYotOxqCeWQvoYOypEsuapirTd2kKSkXb112zJ8rwW0xlpEBAucvVVh HrfdYarpqmSOJE/4wdB2H/Ahagwfki7WjeyX4IVKm9S/F/b2Ca/TzgKQikPIcUFDbbcF3Q OZZMjSi3RDJKO2KS2iikgaSt5LN5ZIs= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2173.outbound.protection.outlook.com [104.47.17.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-ehjnSJ84OmWzVxevgojpFA-1; Wed, 11 May 2022 14:09:55 +0200 X-MC-Unique: ehjnSJ84OmWzVxevgojpFA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DqMXVREdGB5X1Gm514XF4aiyqmhAO+C0ELcI6kzhk2LUUOrR6caFAczbe96a8yPsD3Bh+Gbgqf1OEygf0VqP2HsM8KpSuv+SJk4pePNVYJqoD159wySOhV7MGDjOqS151R0ezNLE7dTYy4pPh4cMBfNT3Wm41rQMQYDBJpii07kEHraeNsXnWcJ/tOErX0X/dWtGE2KIzzrTYwQSUnBnhFeWSrd2mhYEHHcpLwf8QZc47Jjskt6Jt5atXWuZ439l7sxZL3XOdozHrtVygfQMbDED+KHUFerEp5NEKVcje31sjiThRU3V8AmnavrgKb4sNh1/D60kO/I2tsO8TlvyhQ== 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=0Y5AVj/dl0ZNDPR6FiTrg0YR0FybnCX9am+puDXpDIU=; b=PsXrf4Nr2lLIuZC1OBwVmqJJRNYE1V57m45mjI5zVCyVx7+dJoftfK4+rzJFSXO4v/CL5jwUeP92/h7atimBkdMrqpAms9SmAPXNl3zROuMo9rXMrWxu8nRoQvS7uLYORNnSF4gMzEWb49iQPboJ6Vod+Js6DkRUou/OQvN51EO4XpynkI5jicyWbBGvGE//QdaPlCGe9Ma7F4qNo1BLYplGwZFCtTrPqq8kDz0TCB4i4NwD3MUAPH3tf0Ad9x0h9HF118BaRT74Fyd67/znohXHcTx0Dx7QZlVzAYxJvkacmizZQtEWSd6Q/yvLI1tEO6sfC8mAS5pnrFGPFS/G3g== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5716.eurprd04.prod.outlook.com (2603:10a6:208:128::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Wed, 11 May 2022 12:09:41 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b5c8:f15:91fb:33f7]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b5c8:f15:91fb:33f7%6]) with mapi id 15.20.5227.023; Wed, 11 May 2022 12:09:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v14 3/3] selftests/bpf: add bpf_rr test Date: Wed, 11 May 2022 20:09:09 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0208.apcprd06.prod.outlook.com (2603:1096:4:68::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: f3500afb-2224-40f7-5eb0-08da3347208b X-MS-TrafficTypeDiagnostic: AM0PR04MB5716: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: QeBesuGHzEHdmtdAnIxAiPLjzPI351iX0DYvg9jl2M2ezdC/NMskx0tCH1JMxcLJeU0OW8MMJQjDTtPZZHn8S5oXpMLBS+GFUo72f2EhBlWy93MqRAEYvyoBmXKcYmwr1blM6InO8T7hvPW+Z4HTL2q3XaXFSZpvm0BCFKCH+qoiQZevri7QEN2kXl3u7rAzUTKwtUkYxMwRsI6nJbkDkSGMx2hXB968Hj3miZpxi/hxI/e2PWaFh7DejKLJCDp9xu0F/A7XQ5jJebcbVFjsBjapXdJ+pGyTJnbeziBuq22Xc1QstyNnrJKvykDIgd4U8aewa6DPiGWxtGjYYzYN64rNKU093YQQGMWJ14RFbin/SixwaGHzmiFoACQ/IN1rfJAdGjKb1pUNNZJKulCvIJMIsVKc/T8yiKcpIA+bNYquZdjuHweuVtMy7lfsRgzYWkt2bGPWamMErmjVFrMhAhfTL/hXACr5Tgi59m0AywGyNJzj7dqy7eIWRSFMEOo1+xRB/iaQ/ie+S+mb31OKj3zzU0L9ipym/ibve+bdX2ib3qGr5XeGQ0qBaL50YpfrujUhSD4rKMaYx012yAAHzYtLIQrtUe6nua1oOvqHXbXUj6v0dyHrBAxZ40gPzqUAamwHbQivy2AeXAsHvBP22ZHZT8XUtMCzfUCX0qubdXawI+jaV1qsCUNajGxTijvN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66556008)(8676002)(6512007)(6916009)(316002)(66476007)(4326008)(38100700002)(66946007)(26005)(83380400001)(5660300002)(6666004)(186003)(6506007)(2906002)(508600001)(107886003)(2616005)(6486002)(44832011)(36756003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PsDh0OhzrU73jFJaRFToIulJmkJ3/ST6wvHmV/5b381hm+QJB9LYM2QF2X/v?= =?us-ascii?Q?lwePEsGvV8MwRRnXS7d/F7MsbN5il9LdB1ffx0oqmfbfPC7+a/ABbGbEuW6O?= =?us-ascii?Q?7BTEDDzfzwokbzOaHzcYuMA8V1Ifkncl3ih0v7TqR58iLFeM8RSq8IE5GLw6?= =?us-ascii?Q?aW9DU2kxmfVoDk0oLhSYUprQhQ9YnxXSW4RL2x3IJ5TezQuIEdpRI9R2Hyif?= =?us-ascii?Q?ioNQTgYut5NXaTBJrXSKVtx23UsjrjItmdV2GGS7w8OgbGaCMn9fqJfrx5OO?= =?us-ascii?Q?fsYzTT1yFbE0LhTCzK58WgqXTVfuEJN+nXphTkuVeyIXHHUByNCuWuG1N9Ks?= =?us-ascii?Q?zYu36g0l1vTNlOU0ZH4bL5uW4iExg8YIL0DOp6MdDot8Ca2GZUBkpsmUAOIg?= =?us-ascii?Q?pVisd42FmZKbYUTtvCNYAwhS2w/bEsBZAUxp+7cYBcqhVLfieKIolLzcUtlk?= =?us-ascii?Q?UUaFDJ7PzBCiY6J8znvpUnIiFJnDzC7NHsBNGUAMW6xxnAy04zuN3sS80Jp7?= =?us-ascii?Q?ppibBmZkhz+sCImlgxz8QIE0oZ0D+kNRi1+VXH4clCIYxwsVe461/Q+8Cioj?= =?us-ascii?Q?+Mlw5jdfYIiHKME/06o2fyDt2fX1a/uIEW+FVph3IzzVxy39qXIYuxLZQpmW?= =?us-ascii?Q?jSGkwTFvdhd37Hy3LUamJQLMB0kZYUScHsRvUKIVc/xGgFe58WspPQNEBm6v?= =?us-ascii?Q?FmqEQdtHmZDVKCpcv6qjtaVSzxwdBYIwpRzvvjHC65wmdo9yVaKoh7sk8DQz?= =?us-ascii?Q?k3uIUs77A7ABfajnWF5w4BlEkwEf+2OgkYz4gXYr2xiXaTp0uyNwTBWLsEa1?= =?us-ascii?Q?Sm6/X91NseHTa1QdAbKa1oNoGY54oHeaDdN6ToySgLBs/WqUJ8VFrskXEzdq?= =?us-ascii?Q?Pj6ad1M3+ykSf42BhF1e6Zp6x9mQj6bIyKLtEWconFuKfIfbCUYh4bF3I2Q+?= =?us-ascii?Q?DvvPIGERjiOyEnrOkYyCtFHrA0k/+jC1mFUEE9TxMVL4XBEh+zv+LxFD5iPl?= =?us-ascii?Q?PMsVbSYOqcqzuEHn2fukKTz5n0mSBc5YBHMzUyIuJdPeXJUUkC2FmvgK8PJO?= =?us-ascii?Q?NXvbiW/lpB1GicjLfqUomlRwZfvpy8gQI19L4YuYsYCVAsBRIZ+lNAca6U1W?= =?us-ascii?Q?hMqujiIUVgtaNjDR5tVLIL4+Yegl40+HbAqRg5AAkQJngS7XabB10PDGipjy?= =?us-ascii?Q?8MCpZDMtcswvtl5dYGqqlcpRf8qd6dQxRoRknXnh+EG3CjsCOGZUU3QplLZO?= =?us-ascii?Q?9eNUmDYv1J70K+4aJQ2vsOF69vdp7PiBC7nLvG24jKrjF52/oi7Ii0DdPDt9?= =?us-ascii?Q?GkV9JtUGTyu+V+esxnpVnI62Q622EIBK8I5MwHJfhbgRDS2RUftvoh0R9/pS?= =?us-ascii?Q?pAvmUnVvkhKXkLoJ9iWx1aZUOmsFRCbpMnrXBoPEPV9nKfo/CNimWpw5h4s8?= =?us-ascii?Q?b1w8MqKZo/TVZFSArPwBupt2R0zSkH2d62a8tNOrF3lXCnWWlLLcFv+II2e2?= =?us-ascii?Q?lLyi77mHKSFwF+24hhQULqXM4t+do7UMNOBtLu6U7w8O5DET1u50fAjnxM15?= =?us-ascii?Q?sX+tcKvJDmQlMSN7fT8h1JBne8yuzsku9tcHJ0aYC2GU3agBcdsxU/KKZm0e?= =?us-ascii?Q?avn1L5o4AvtaZ/RzqT00dnJiOr1HxkV68Zhk8vaNtf1OtqXqikz9ENvevByD?= =?us-ascii?Q?d95uGubMNQraUs0Z6ZzQX0cKG2y2XJnR9KUPz3QQrIai/O/LECk8xDozOBQo?= =?us-ascii?Q?bTTabPsGuFJ+RkVbDNhK03y8/cPbS6Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3500afb-2224-40f7-5eb0-08da3347208b X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2022 12:09:41.0389 (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: 1eNMvatf68FQpbLoutFTa1mgzFgVDPK+pS/M/M97/OZOeERWYd4eC2NBopEAESrQjIR/OBxZc7SgzaWBbHpjDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5716 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 | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 93a5739712ce..6303eba67fab 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -6,6 +6,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 @@ -369,10 +370,47 @@ 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 (!ASSERT_OK_PTR(rr_skel, "bpf_rr__open_and_load")) + 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"); + system("ip addr add 10.0.1.1/24 dev veth1"); + system("ip link set veth1 up"); + system("ip mptcp endpoint add 10.0.1.1 subflow"); + system("sysctl -qw 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("sysctl -qw net.mptcp.scheduler=3Ddefault"); + 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