From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp2361548pis; Fri, 29 Apr 2022 07:51:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtRT9VsoU8oYAxJaCaF0CTVO3GHbWZ7PY83UicImcKvOlOz/so5YpEtRNLvmAbHtIP6Wtg X-Received: by 2002:a17:90b:350e:b0:1d2:e1ad:5be6 with SMTP id ls14-20020a17090b350e00b001d2e1ad5be6mr4408486pjb.30.1651243913240; Fri, 29 Apr 2022 07:51:53 -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 n12-20020a170903110c00b0015d1ea26844si9107642plh.314.2022.04.29.07.51.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Apr 2022 07:51:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4963-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=YuXGarp4; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4963-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4963-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 3F420280BE4 for ; Fri, 29 Apr 2022 14:51:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 56E91139E; Fri, 29 Apr 2022 14:51:51 +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 D57AA1365 for ; Fri, 29 Apr 2022 14:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651243908; 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=0wu+45/HmTRPh+R+E+xyWGNFQ4skrL2h4+N49FjniBg=; b=YuXGarp4ovuC6AHcMeiZzHt/PhzAojbOCz/z4tWrsbt1ba3CepC5TBfVHldJSd5VGzvKTI 9NdiMJqc43tI9qHuWUoMYG3JSHVp5pWCuDUeTNg/qVQRTqJJBAB+ApnInlMUHiYuF73Nqb vlzKwPmJGdEUitV8rWhjShbbIth9Ld0= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2113.outbound.protection.outlook.com [104.47.18.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-RPi4IiFsM7-6fbXYIt7s6w-1; Fri, 29 Apr 2022 16:51:46 +0200 X-MC-Unique: RPi4IiFsM7-6fbXYIt7s6w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VnIhU5UjrGJs6T9sthYhioRuKOUYkgPgaOtx5Wxrr406qIASAt11exxC0AtTaEzeHDFiKmIiPlN/gEQjhtumKS2Lo3QXB0MZXNvpVE3gHtBD7jQpJUm8t9bXCFkN3tnNp91TUisvl0in03tfwCTHB+rjwPfdynfwEqi7IPuiUYaA/KSlCK1ajjd8PBLdznpFoY4RFu4o5ZocZRuJKowDjmVoIPgU1dZAzX6lG0WADC/GF9TT+zgz3kNgV2O0TK+1AnaSjBiZETkfvAEdzCfu0hDtnsPEhie0y5env05cwgX7raEkm+bhyk6LrE5Qm9WSTf0Y0lmkkvQ49HkCLQzr9g== 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=rWUTkrze5HnW2Xp278t0FXuaaA2GHEYLz3XRVww/Pj4=; b=VQaQh4qQMQb8mkkRPy5EYrwA5q23LEXM+799EYn1pdDw4AxSPNz+nf2CEsw3qJBaDx2MivGq2I7lrLQOUZwK5rkGi+Nt6Sdn2BiXOxOho8VcIVYBBDNyJ3KxPAlysRj8lSDnoRIHHfdaAj2qUdjr29q5q03grvqlyl1L1PPNshA0WtXp5FENwXBAERVBgvrmP4faKHHgHFzM3efuOaXmBlqtVy2itdu6P7yJFW8pxcaCO03S1WNkuLmAdiByrD1ccQEkEgQTQDQcSZl2gNFez5u+cMJNtIAWgs985swepgE6mkgKBnRR57vp/fGg432kc6tEImPCixj/g8LkPdCF9w== 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 DBAPR04MB7238.eurprd04.prod.outlook.com (2603:10a6:10:1aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 14:51:46 +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.025; Fri, 29 Apr 2022 14:51:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v9 1/3] mptcp: add subflows array in mptcp_sched_data Date: Fri, 29 Apr 2022 22:51:57 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0302CA0008.apcprd03.prod.outlook.com (2603:1096:202::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: f9d8028d-a7f3-4d82-6a8b-08da29efc823 X-MS-TrafficTypeDiagnostic: DBAPR04MB7238: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: 8QS1hVCqrjz+6YXN71cKjDORiaOhFKOfNj1NzYFDQkYeuyh+hvpLRC74mNHrnpam8oAuM7m4bQRShLvtqxCj04Ljvilf+DPIiW6DzbX9ayXV5hf/6n4K/M9eW9swB9OSn/iyqgZvgsR/2ItsQhlBbDSZ0M0tIpCVFcwWeWYKYJe1znbPQUsasf5aeftcZ+UImeHUGavds3RWEjDDzzjy1vO/T1gU908hRwMfPXwjIR9dHv/brngmW0Qx7HgOQl+5NAAmc7fgR2NCRpLecVnMLkkj5afNGmv31YdXVcUZui1BqQNVmjGkRdsr6TpoEmDc91s6f72VCeaVdXls1xfCaZS0RzapwhiPlELggwBqWH4TCF7ZurZDba6wXDyaEmp/kX9sXYlyO5xTphZGdmC+gpKXj0zjopAWycgONYFCzKM61RFrjbLhVS3ZHONsXVJgaqCf6UX+0N+CSRtx+e0GHZZHJCNMWWuPqn2pCmMlzzaSe7RrNqnvRXjMWVSgIScmx/3FSomGeDTiDxGqkOstTdPRPGk0IJSurzsbDci3anIM26YtMCpfv+Ex9aPAUhNnHCuedJ4U9sVVOejIYtms2W60qzlvoFuRs4gJBL4Zht2xCXws8RXO+oc6+H6T27JtjTGQiTEkG6sFwBI0H8Yhe9u5fQ7c6Ky0RZ0APQmvplRLaWs69GWICzlq7GAloNzLjUej6UWzzKlXg4jCeEXyUA== 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)(316002)(66556008)(66476007)(4326008)(2906002)(508600001)(8676002)(6916009)(38100700002)(66946007)(6486002)(86362001)(26005)(2616005)(6666004)(6512007)(8936002)(44832011)(6506007)(5660300002)(186003)(36756003)(107886003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZsEZEJ82Zi74QZyO/8Q8fV4sFsQPINHq5Uqnf0m3+z4v5JmVbivZi72oL6YO?= =?us-ascii?Q?X009SUfqXg+bOE540zq0SjCrOvtcBjtAtNyURZB6sCm89Pfy2HHH3nBEO4DQ?= =?us-ascii?Q?t9Wiy8y8uL4c4XjbLOicTCNX1YOo9GqRg5x1i1i//avakUB/UK3GYPsDTARJ?= =?us-ascii?Q?IXkAhiCsM2k98Ws1uuNRxS5f5u1RRf4pglTYPvS08xsEcE1uEsi6TTMk32Gt?= =?us-ascii?Q?c4Yd8zOPWoD/sYLZJnxEDjj0gTSWVmpFeo1kCBvmoVAzyC5D3IyW4/GlptZU?= =?us-ascii?Q?UYb32NfXpYeBNK9vU7v/cBybNwMNrYxtrYvLWH+VH9mZgzg5mG4CVIZPCDPc?= =?us-ascii?Q?MawJarjfNWNBLsEfgeiSVkiFScY+IyX1++rTdCPoOGWcGuEfSWhMDPgz95Gh?= =?us-ascii?Q?/tvBjgsvYYCc3C5yB4H76uCjd6fJHMZHgVFDZnt846dq89JqGWjmQO/laomC?= =?us-ascii?Q?MYbs/8iff4/Lt8q9I/r60k3naG4VAkn26gZATHZulg4pJhExLHLB/Fj9UZzw?= =?us-ascii?Q?/ytIInJ0MCLOmuhN6a9qNqg4QYlIMs8Ne522nxT9xzH40MG78zfcFgaFhXBz?= =?us-ascii?Q?quDgpA3SW1XOug9bamREybmSd5GKVSN9Tx7Ahwv3sHwzcPeiZLUrKUpParqC?= =?us-ascii?Q?KxPHTilWucbeGB1zjCGu93v4MQ5y7+2+U87ZEi1tpibydTxjYiqEDI5O5KC9?= =?us-ascii?Q?iC+XyaVtTBWoWo5VKViFeIy5egbehGrEijAgnWJeD8E94jK6L2GRjBCJT7dg?= =?us-ascii?Q?9mnhYjGLGEIbii4v9jv9MXNzQw3cvrqSbKy23i8jcuAu8GUhS+mCRKsLM3pN?= =?us-ascii?Q?GJymiD9byigK0qv5FX527C9fAOwNOFxop1Yc2+sQvSk2Xh9fFuk1xFcyWC9G?= =?us-ascii?Q?tBJrtH15gCHAYneEDSG/9CXAmxvFVM52cR92L2H4wAWgC4TgpwOXEAK5M2M2?= =?us-ascii?Q?dkg9ze3jl7L0VriUEZe4hcGwWu3fRGX+ZkdgqZT7bNePkIRDz5+k64ajZdT1?= =?us-ascii?Q?3lkFWDKotF6RXSA/z+8QsrNJhUq+SJWqP/AupTnmJ/88JkW3ukR+qXSYlInA?= =?us-ascii?Q?x1Ljnwb69ieQjUdupwqx0ZT4NM9R+RrtI0fyjRnbBq/h02ZCQxnMR0exblTE?= =?us-ascii?Q?MwamMKOvhES15FRCrKeCIjQR0fUdiCM6N6NCdLb+Q0o7AufHhMajy8D/KjGk?= =?us-ascii?Q?vuSAiJjX5e2IolCcxkOVgoY3bKiTm2+BjTW08G0ThderYfcDRzNDHYgRjLj/?= =?us-ascii?Q?mW/4PaMLbU49Nhw/aJz1Z+ezKjmskBsSH6w/wIPvd+TZ38rjS/OkJWxe2DXb?= =?us-ascii?Q?WsCn0ZojqhZXjJm2zX3g9zIhyD40SG6pj0aWZ7h0fmVKx6s9+1BBmTusiO30?= =?us-ascii?Q?QYRjnaedqyuAOcUS65kbq6baxBx1rWrWGg1Dhg0Tq+qPiu8LlbSsxbTr294L?= =?us-ascii?Q?k4YYQ1XAToRQuhvlPTWMCI4x0xVhGMLstmMQKKHMGuuo12rAOXhhtnueYtvg?= =?us-ascii?Q?spA1gWldtFN6s/VIdVhrgstYFNAg7rFJWuOqnnRW/AP/LlGgu8cutRq1eBeZ?= =?us-ascii?Q?xBqDNNJ2rnEvrb0uInjh1vAqM4HAo+VB/TsaTnM5soA8rDOKHXo5BR44iTkl?= =?us-ascii?Q?hH5sJmn+aEI7CdWc5yDLioq64vDRx/3KP/GdNZseY49EtsUl1l7Xt3ZIGAdm?= =?us-ascii?Q?LvabjedkV/AAMO3PPCacKO/hwZJe/IFHi06MgzJyeW0vDl0devE+DD3XeZPI?= =?us-ascii?Q?p9JqosJcWH/yWG3wqu583R3CczO7BKc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9d8028d-a7f3-4d82-6a8b-08da29efc823 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 14:51:46.1001 (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: 8IZRq9ji30aR3FzeWpq4/hX4RRxPbFHEh9/iRcjfcpCquJeyje2y45GGVx1kdH12QAJRmZ+hyl9+6LVmLMnWlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7238 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/protocol.h | 16 ++++++++++++++++ tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 3 +++ 3 files changed, 22 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/protocol.h b/net/mptcp/protocol.h index 0da2a91ad197..95a65582f1e8 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -993,7 +993,9 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_soc= k *msk); =20 static inline struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) { + struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; + int i =3D 0; =20 sock_owned_by_me((struct sock *)msk); =20 @@ -1007,14 +1009,22 @@ static inline struct sock *mptcp_sched_get_send(str= uct mptcp_sock *msk) if (!msk->sched) return mptcp_subflow_get_send(msk); =20 + mptcp_for_each_subflow(msk, subflow) + data.array[i++] =3D subflow; + data.subflows =3D i; msk->sched->get_subflow(msk, false, &data); + for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) + data.array[i++] =3D NULL; + data.subflows =3D 0; =20 return data.sock; } =20 static inline struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) { + struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; + int i =3D 0; =20 sock_owned_by_me((const struct sock *)msk); =20 @@ -1025,7 +1035,13 @@ static inline struct sock *mptcp_sched_get_retrans(s= truct mptcp_sock *msk) if (!msk->sched) return mptcp_subflow_get_retrans(msk); =20 + mptcp_for_each_subflow(msk, subflow) + data.array[i++] =3D subflow; + data.subflows =3D i; msk->sched->get_subflow(msk, true, &data); + for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) + data.array[i++] =3D NULL; + data.subflows =3D 0; =20 return data.sock; } diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index ee07caf978b3..1fe3d0a97429 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:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp2361628pis; Fri, 29 Apr 2022 07:52:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw27fYV99qfMot5SQ5Rlw+P8H5gIQIVKkWUrMLg3yhMg7Hkn21GFOanruuc2WHjrUl+Q/N9 X-Received: by 2002:a17:902:f54e:b0:15d:7b2:2ff3 with SMTP id h14-20020a170902f54e00b0015d07b22ff3mr28186734plf.95.1651243920999; Fri, 29 Apr 2022 07:52:00 -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 rm8-20020a17090b3ec800b001d96311063esi6789266pjb.107.2022.04.29.07.52.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Apr 2022 07:52:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4964-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=bHJPHVNs; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4964-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4964-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 4C65D280BD9 for ; Fri, 29 Apr 2022 14:52:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7087E139E; Fri, 29 Apr 2022 14:51:59 +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 BF5AD1365 for ; Fri, 29 Apr 2022 14:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651243916; 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=E7CKLpcNGxZqrshvpYp3iihWeuSQUakFE/T5ixnAswU=; b=bHJPHVNsBWFug869ux115Vtg704cW6eUczlGmA0x3C4KJu6URRd7y/ApwbakhpITaRB6Hh lIYN20e1KlQELDyS1iHPnOcAj+WFCd0cs0TFJTi1JczCdcn584m31z3P4048T8iN2iS3xC n8Jw7b2u+BUmrG5fDSA3wUDfouloEVc= Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2058.outbound.protection.outlook.com [104.47.8.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-u5DngwASOxCVSTo57A7XWA-1; Fri, 29 Apr 2022 16:51:55 +0200 X-MC-Unique: u5DngwASOxCVSTo57A7XWA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CzYXVudi2ZPla0TeMGBUyiWVs2r6Ceyo77TsAYlxvcF6vCOy8BBa/sBJiH3n+JK4MpZ/9dERmr8Q9btD44JtefD5yCzdCuO/nwsZmUTO54IvaXmSp+uAUchyH3R/rtJgoaWx4amtMSokwCWXIRxWLY7C7Rwg8jI/mWHNrrUW79BWOqo9pajFwCh/otPlSyylDChQmb18f0YHn3tCsS8ydJ2f2Vlquk5R8F6QhZs8tNpo2N+3KapNCullqvkMjoKozvNTTzzdPEhwgC6HXyoCAZkV9nEdn/saPz+3utQP37gLXybdokGzqXaCKdxoauH3dNkDmdB1jzNW1aPcxx5KiQ== 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=EhEgXaAaCVxk/YoPOHUxBUUR5mh4YSiaticfXEVWVJo=; b=RLIANQS10A6C80BsWcmPBN50TYjYs1VjoaLfuBi6r3kBW7ezCrr/rW40yS3IhSCS0LfKSJJmceRKNQAE2Vz7kjMw4dEbKJzkecByKju8Cw24E5MJwE+e8Dnbtr8XHnNJBQSYml+umvqXqbjnLqPmx/WM1PqViqFPk3NwoIeoYOGHR5nYqNbHpFO/MDOJsaaAjH4lrhMa1eaq8Khbi8xdfsMI4tak4dWDt621SleT22w1cYBF1YuAhP0UWHE+vBCTy3p1XVzHWT6MTSlQ+mIwJHgCdl2GkjGyKFUlolsby0yM7E1vB6F9h8zNdG0LG7VlVRK0tQH5LLdrdmM5LddAmg== 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 DBAPR04MB7238.eurprd04.prod.outlook.com (2603:10a6:10:1aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 14:51:54 +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.025; Fri, 29 Apr 2022 14:51:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v9 2/3] selftests: bpf: add bpf_rr scheduler Date: Fri, 29 Apr 2022 22:51:58 +0800 Message-ID: <1d2ecaada853df447dcfa6c8fabcf7bec5576278.1651243739.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0020.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::30) 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: d3685db0-5613-412f-f1ee-08da29efccf3 X-MS-TrafficTypeDiagnostic: DBAPR04MB7238: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: uROslth1grngLfoUKlH6/Y9IWPY5eobcWDCyxc0L5kz+vCKzxBeDNq+YjefBGZkxmH+s97a82nNiXnAA5r2K+guGiDSsiWzQ3VDA2xsTwr0kMck0a5YTyidGHFvXQvh7u9qy/QxcKM1Kbj1HuCiUP3GGl5zJMS2MInnVIvS1tIpZ3LgHNH7uNB0cq8yVhfg63aP+soo7SradkaGB37UtvBji4oVIlaIV/u3vNxl7nP/sCRGpgiUBcEHEJoNr0chb14fXsS+dCja5zwBc9byI5w4EJscXlnvd4lxXNBaVwqFkxSC0nhgVwB2+bjI2Gt5MFfZHkvozdOwilUdT4956ZGTWINHlSS//k5QzKZOJXGZIJ6iL2eC8kMhpHqgjKjudH8cr+HbF3BbsQOhcwieYFS70mLg6UP2sm1D8mWAlrVJ/3D9QjAlY9onVzEx+zmiJagZLfvo7DA82TaToK2Ph21dvxmtpQXYfAu7K3Czj7p9cK43RB1dyteSEsXNT4xv+UhEni62X/EoCQGgClLo7ad6Rb6f7/HGMfIKvQOmTye/vIZPDKyBsbahd8UtV3bIfWcAeSss/Al5ZMD++L0H5L7PYhKcjH08brxounTEzlAoi0gvQZM3qFMuTC2/coh5s4SfdzrWgGR8/nQclt1pWAfJtLwu+oDLfra6lQRpKW/nz+8A3+enCqWQHHPh2OsPDay7WjmjV6x/Uu04cmZyB9g== 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)(316002)(66556008)(66476007)(4326008)(2906002)(508600001)(8676002)(6916009)(38100700002)(66946007)(6486002)(86362001)(26005)(2616005)(6512007)(8936002)(44832011)(6506007)(5660300002)(83380400001)(186003)(36756003)(107886003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JDHuomImGfm9rlYTeuOdeA01NTFsHADIdnDfC3kupSTxS1ZOUbGvnWTyLoAw?= =?us-ascii?Q?lgUBzc7VS6J+4si3E3HjmfHMQiQnDfo72J/Uk6bZt48TjoGv2QTR92A2arAU?= =?us-ascii?Q?hEP8dXfn/CaLAd2+ven7Rg5jtt6XVSasrCTDbn7SfBsErQP7UDBu4NhUAJc8?= =?us-ascii?Q?Jh7sgUJesfIxvrbJ/mjQA9rYPb9P2orDMKbb4OpxrKDMpfWuDG6eRoq7o64a?= =?us-ascii?Q?SYDH2N7bnVAIHnhoTA1uTketV7ZSSMVOMZWcWiwM7fLhc9OikAw8aVHvZj0l?= =?us-ascii?Q?mKtYJ/yIGUkKddfzOrNtusHmhr8ezueslDblSRABl8jR8AA3ezrKlxk5KGQp?= =?us-ascii?Q?0JA9nD8DP9cO0azK1L0cWZGp8oiOfhtAftMp8xR/pkn2DFAxvXl4CLi7LMOP?= =?us-ascii?Q?0fkht/iX1JpBFlpukZQeT7+0YIVxj1eYrvLidz4rMBel5ExDw2PuditGE3DO?= =?us-ascii?Q?LUGJjoSE70dwOBiTJe/J2ZtBbBCabUxP1qV34wZ2N4WqK+VWoVAcX4ZC9mhy?= =?us-ascii?Q?qY7MkqgoKSK819DH/bVtPS4yY2GFO4oOfRycGRAkww7UP7OqyN7KC2/xuI3f?= =?us-ascii?Q?wxrnODIiaEbE5kSBc/YxtH8by72s20hNzFFnp+GzTVIXFbqziEvFmt0ESdyb?= =?us-ascii?Q?CPErmYbg7GxxXOzOjLA0qK+MwbQ9QLWTpLtBAt+dtfSjm/g8h7DiANRwKmV7?= =?us-ascii?Q?C3V7+q/+G3XooM7NQqCnve2gcMFoKtb1VKJ/1e4t4FhVpUdPrQA6U792XxDt?= =?us-ascii?Q?15Trrp7dYV6+DvQ8Ld5RnEcD3A0iUJWzMs9cRqDl29/jlQbvDZ21e6PbKTYd?= =?us-ascii?Q?y6NddmjgQ+V9HtGGklFoDAs3wrOrpj6yafKrsm+JFklqWMX0xrtHGu1HkQk4?= =?us-ascii?Q?FG6FJghW+W5MgKhNvLJPLEke0pNwuj4mWzUHFkeo/VEq9cKh5Bzsc1JJcFVr?= =?us-ascii?Q?A97DvTMolPmQW0hIv7fsjPm6Son06UYJh0gVjEwGV6lmA1O0kWoaiza40Eiy?= =?us-ascii?Q?KJRopB7LuswDegtxQPVadi/d8+tnDuJ3/on/cm6qWmgVFadOog8UDoLjQSR9?= =?us-ascii?Q?0/OBYaCjQtrHrQyAG2x0Pbw51cJ8MSz3FJhBxvdwzYy00wdJaagI4UlCPH6A?= =?us-ascii?Q?gx2keCTqSB5+yg3gBAHwEwaLSTF3o5vpkEvZyrOUcOIeZrOIAE0e5hy/i33z?= =?us-ascii?Q?lI9ePAjf9oO/TnUYOjxS+bmb/YM6E+Zp/H6b7EESsndiptYYPha6myXQ0hyO?= =?us-ascii?Q?VJdeXSt73W4/PxIpcUZBg03a4MbWrjtDCntlhechKvm/Aqi6q+krGO5rzC00?= =?us-ascii?Q?tR+HuJwAOLNK8PGGiJ3IpSjNHnBgT8Y6QbU7uW2PO0pQe0RYjEK48Vnsaft/?= =?us-ascii?Q?0AtuR+PlIHoOEZyhKYu5IQbXvLoDP28/7qn4pnSrlnlpXgNbJmFXIG2UA6s9?= =?us-ascii?Q?RiEuYSDcyqQuBoFR1SEXvshZkNVMVu5xBdpetn68OYA7sBhl9wXMmjdgG2qY?= =?us-ascii?Q?gLhWsBgu0Up9KtQvnIpjfEnKvTJ4NObZAJ4SlB68KkahbFE2NbvOrH/7cF2t?= =?us-ascii?Q?0Mi1dWx+YYrzRPTT+KbadriZ6yCW1cn7TWNXhrpB9AY9GOmb7g6aUaH0fR81?= =?us-ascii?Q?8zZatW2+2W0YwgI2CoNi/6Glha3JRuxjkUDkjyVTkCr9G0KXwxRKRjLRYJxc?= =?us-ascii?Q?I+APfbR0nPKie06bVcvjWbqynh7z88Ho46kdyJ2+in0uRdbIreHBCvzNhl4c?= =?us-ascii?Q?75v9pZfS++LHVzWoz23NR4sY0F2qrqs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3685db0-5613-412f-f1ee-08da29efccf3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 14:51:54.1933 (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: J7OryeSGP/bvbYdyItuNvmd0mXnOPI9s/GWDuC9nh1BwRK9qrsAultU1opA+TY1V65sk5OowfLiu0xXVNYHf9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7238 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 | 5 ++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 49 +++++++++++++++++++ 2 files changed, 54 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 1fe3d0a97429..8ce5b1603962 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -37,4 +37,9 @@ struct mptcp_sock { 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..2f31de4cfc84 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,49 @@ +// 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++) { + if (i >=3D data->subflows) + break; + + subflow =3D data->array[i]; + if (subflow->tcp_sock !=3D msk->last_snd) { + ssk =3D subflow->tcp_sock; + break; + } + } + + msk->last_snd =3D ssk; + 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:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp2361720pis; Fri, 29 Apr 2022 07:52:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuV9g70XfNibAypzKdFwnmjHnoHS45u7/rxubsXqFfqYETG7bN+3JCOKjMa/6Qz51/yA7B X-Received: by 2002:a17:902:7109:b0:15c:e11e:efd with SMTP id a9-20020a170902710900b0015ce11e0efdmr33375177pll.110.1651243931043; Fri, 29 Apr 2022 07:52:11 -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 k12-20020a170902c40c00b00153b2d164cbsi8575902plk.211.2022.04.29.07.52.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Apr 2022 07:52:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4965-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=VOn0q9Kd; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4965-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4965-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 4D2DB280BE4 for ; Fri, 29 Apr 2022 14:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 42A85139E; Fri, 29 Apr 2022 14:52:09 +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 326721365 for ; Fri, 29 Apr 2022 14:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651243925; 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=aYnPejULAiJ/mwgFCuj88hOWAX84m1E1GRIP00c2MS4=; b=VOn0q9KdNfzzWKbmLx4p+AQkUC6/lv0uYzc3ljlvIeL25pGm5vBIqs/VNPI+qw2O8aZUcx Vff91evHEcvUU0zpiBuNOgcGSmlQDPacRXBRYCNu5ybdrHAIKPQ35EFET+7AnPGoroWyla KLypk7WIgg3aJtrAbZNbkmmfWoYMlN8= Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2052.outbound.protection.outlook.com [104.47.8.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-89gG15H4NC2Re6eKw-bR7Q-1; Fri, 29 Apr 2022 16:52:04 +0200 X-MC-Unique: 89gG15H4NC2Re6eKw-bR7Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EHuPLjKXWmcQNLaTXeTR8AQiKkZ0MiojEQEzuX1h2W4/aen86fknlWH57dJd2grmmVsPpbzy1DepVvM2tvqmhV3bapZ8o2GjWloFI0F8rDSJm6Xslw6NBJBg0Ug7GaMdcBlJydiEc/3NHiZ3yiB5xd+cOt5zkoRTvEKdgZW+upZi0EXrL6EyYmaxJ4A46S0Lu0YFhlFz8I7yFOZngej2Iego4ERpUrrIzpVWBrlVAjUDhVjixbuLta1xvxVfWUg9U5mVBMTSylO+PasZT7a2o2kJ/xBo5J3VF/4I516jokWkUxaNt5OR2e28+vnR4OgpwZCJbsDwhQunezDMg9+OYg== 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=ENXOVXSoSQ9XskD9Mpeo9LPSWj4OjTv+jLXenfBqtxM=; b=ls72PmuaAbDIJ0vg32A9TMy8XKIY0l2RJIfRBEXtfOmpgRSp+Qpi+DjRvpvQpGNBvuJHWukFGkbSfp6o0OrB3AJAb3RPB7+fdZMbLEpw2UXxDkPRmGSUKdopTd0111FcSs5cmamu4FHIjK64j+bpnhb9PS+YapVWRDS94m99XItr86KLf4EyEiUwSpzowia0i9iDKxgZvp12xo/MJWZ/Ub/nfiyelyXoi6SEZYj7+asMNR/2+zVjxGeRE0wh6T+Zqxvxd3VTn+iWffHoXewMtROprV/XAx1D3M0iEs2Ma7fuEgqQ5F0FZ3ddZGFQvMYNXG9KW/mt8dDF4u6nI3FKBg== 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 DBAPR04MB7238.eurprd04.prod.outlook.com (2603:10a6:10:1aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 14:52:03 +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.025; Fri, 29 Apr 2022 14:52:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v9 3/3] selftests: bpf: add bpf_rr test Date: Fri, 29 Apr 2022 22:51:59 +0800 Message-ID: <8ca13c4d35f3b622a13b198203610d600c23518b.1651243739.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0196.apcprd02.prod.outlook.com (2603:1096:201:21::32) 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: 526eed59-f866-4321-baed-08da29efd28c X-MS-TrafficTypeDiagnostic: DBAPR04MB7238: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: OF2pUXSjVa4gYQC+Ptxt35wck+7/Owtk4UnY37Mr72ziY3ovs2X4FJgNcvy069UfS7Y/9Gk0mupfDxPemGXPqUb1kvQfPvoYgRaurP9frDLciFaYvyA3VryoN45r2bnw7sKL8HbqfPq0C6le6Jz8N2XQWzYnVIT97UJ7DVt8y79HbopbRUUP4kpw4cFKO08HAFFA29f9CfvkmW8T6SlECcKP/wKDvdmqGaSwbvPXKogbbR/vbkQf6rVmgGADfDG1wcgixJRfi7fCZSHGh/6/2xIPtflp8TsYDV+06G6Jewpav4kmmAxXLNuBMF1oAy+/TDhxdqJ1SbIrQhUGJGB3k1sJzYKUKXAfuHdJs1I95vetln/B5FjJx/uFeSHpPbceR7sBZAmT//l0YFs4SNcArbPUmx+m6Vgs+waGfSVP2I4TXJ8HMKgExvlKeLEjcJNDZAxUFGB0rT50vs+FqQGNPRrhsBrdVN4m5C2/HFcfIsX7D2bYpmyzxLQUrokJ4e3PeG6iMyaegQ6XxZgAYaPeedSt9QTKk5MIU0GGXjCJGoPDqURDZYdbNcLiWBx+xPuiUs3TJEJu4uScc2QsBMNeNKxdcPGjBr79ib5Npj5o+sXone2yUCK7XNXEE8ApHYnn9gNf0wiJGE7P+eZ58GJP5yS3dJkZkGK2TKT27pWHvuAoYnZzz2eVS7HX6GCcXXBA 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)(316002)(66556008)(66476007)(4326008)(2906002)(508600001)(8676002)(6916009)(38100700002)(66946007)(6486002)(86362001)(26005)(2616005)(6666004)(6512007)(8936002)(44832011)(6506007)(5660300002)(83380400001)(186003)(36756003)(107886003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9R6ZCbtGTvlpGhOqe6CfTYrrBgyituW2pjNTADAWRU1zPIMELfjTeo8YpLvp?= =?us-ascii?Q?PxC68JAeCkOlYQKMoo05wfipltXFxWWoSr3Qf+3L7OBqTK4+sTxngc7mtG1F?= =?us-ascii?Q?TOXvqUQrKnzRI8s6DvlpHx810kqZvD49lcke8COvp2ldSYwQy+XmcwU9xS5j?= =?us-ascii?Q?KYkoZVm/aFBOzWX6K9b4tv/JqAVLM9Y82AEtZUQSmebvW11+Z+tt9URUpHpn?= =?us-ascii?Q?7+MxeTxGacfQCns8wbVC/ItsVl1J+nSSsWHORaniuvlJXEPNu9Tnsd0UdIf/?= =?us-ascii?Q?7zlKhfiOFQOSZ7rjtAG2+6dbv18gGb5bAv/3LT7XSXhOxbjLwpFP0gkc3nPl?= =?us-ascii?Q?w7pQyOWRgwCg0WIddLpYsV6+Bwhq/XkFr010i+aGG3evrHGXw675f/EOX1ND?= =?us-ascii?Q?8ZZyrnG9QKwagUYubGuqzS9E7WSYovRHbGQNMAlEcPVMSlXSOHKrnFvMXTe2?= =?us-ascii?Q?yaQjOp1HuuIZSYoYtUbFFRCUl4HgBCBkcSfdKYmh+JTP8z92eYQCS2UbsWwt?= =?us-ascii?Q?xjyzpfoxTcaRW+x9EW/GEU3cbkNuT+oD4UOD35J2lcm87LvMBT3EdHbae2AR?= =?us-ascii?Q?fnMS/b4wyuDTL+cxdpltHHUV9YLaFVPh2pKQdOvqf4zQILM4W9+ol3R7fyl1?= =?us-ascii?Q?K21Els01FonzDIBlUr4gFBrxPt8V+TlSsv8XWA2P8TAWPXk0xvA1E1eHgE0G?= =?us-ascii?Q?X5DJuNdMUkuA+0XDmYp2YT7IQWevdnzQWTB1BWGTlaTAlmeiTKK6v7tDLIng?= =?us-ascii?Q?g8gRQa4KWWYxGM2a5pGa7UjSM2iNVPcM5ped/n/ckuCLZo+YDwWRDr9xFoC+?= =?us-ascii?Q?2hElEPyaXzqBzg6+wwjPB5Pt/I2M5tKltsswtGYLejcfId1S23sPHrU/L9J3?= =?us-ascii?Q?jmqiUzBbjBGq5w1dQsdMmhALT1XQo7CXweWzpHN8nYjTXSMU2M90KJK7hRaD?= =?us-ascii?Q?c8By8w0MzZ38LiFg6s+u2cx98FD5CFFVaw4V3Jr39skFBzdjOUG1plrfs/JR?= =?us-ascii?Q?uGViPqb+wsJ1KAu4PwJGCrJKlNaZ6eIwOHBamGjAKsd4IcjRdYUVyuayTOm7?= =?us-ascii?Q?FIPYS5oc7s2u7y8nIYi/GJs8UvboIgssZ7aQVXqfM9/I2PPTgxtRqTzaWEgU?= =?us-ascii?Q?JfodpGx46DDNOgtmpeY8lmkFw5GKJHYys9uFWvEUSZ3JCkWsvghPsMPpSstc?= =?us-ascii?Q?IewzTEkwRW/W4bQCKOOb1Nj1dF7SEWhlKonQOfCtdw3vSU56i5cDuDGHshiw?= =?us-ascii?Q?PD+aXL6TegvXuz0UAfrBmvh7DeKby4WcXwTfilmHUIcBNraFEfLY9Emmy9zb?= =?us-ascii?Q?BHoJmaM+qPZcBNZhoGiGl3/1RW2l8O4BGMhYXUEanNtZGPqJ+1FTE1NM2pIY?= =?us-ascii?Q?aMR/C5+m83ka40htndoD+/VOCpgeU6E+mrqZu4aDYPLsFUOVUTqh/ALj0CdP?= =?us-ascii?Q?behgxz5BoWIPriS0Pb3D+s6T8Dv27nX4uoO5bLvMfBbiuCYIF0CArYSmYrVR?= =?us-ascii?Q?NpJMwLiV8oleBc+lJt7JcekrSKmQwM3mAHW00B5pjd6cMHki+4WSTGwyDzQD?= =?us-ascii?Q?+vM3kVXoAgrV4rVUzZ4/pJZwS/lcKFmW34YyauA04ZDL5hVdu/YslmJS4mWb?= =?us-ascii?Q?O8uL+VGAtHghVzGxgrcyhPP1NZzr3a4pht3JsfeRWsPIYF8qse2K6Z5MG1Tj?= =?us-ascii?Q?Bt9iAkhveRP0iaJM26HilashuUd+Ds/a0gvi8IHZFg0VKRa2LBoxE/nYvaie?= =?us-ascii?Q?L25/M97X9Oh5ABnbqZDPI8UmYXdgbqo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 526eed59-f866-4321-baed-08da29efd28c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 14:52:03.5988 (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: 2ZRNvd3Blf7Rctf+2QcIp3O/yVTYNkXS1jfZCt/1mnlGYlDI9dHoPTfyLIw3ysR2+9QO3CORbgyVPsFI/DnUcw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7238 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 44484a63e62a..fb4a4b37e818 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 @@ -361,10 +362,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