From nobody Sun Apr 28 19:39:18 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60082.outbound.protection.outlook.com [40.107.6.82]) (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 353F733EC for ; Tue, 27 Sep 2022 15:26:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X6kZGkjzgbxNtuxXUQGrzcAFGitMKg27J8YHWHpCmbpIDm766UCH7PHxEdNs7JYC5us48JgU/mYdGXZj6BSHvpU9HgzktbPRz0kvRGNnphkaLT+oHh7Vl4wenYujA7JOY0ZSsnenQEyRqz3ke3kABErZuXNv6Ldy+CAJYxMNBaV3x4Ll15J++AJehW4XbEZQZVWrArtlKPtoELQt4nXvZj0OQ/RdV9JU/V+BVvymdVPjBMN+hMImA1Z4sERdQ4BnhsiqmQk++XBOBgitnGJhxbp8TAamnMyx8CrPP/g5VGQMRSWdqQnJ3KJkaEP9zDrha1spSdp5Z3nqqUw3u/xyqQ== 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=Hu+ct6f4/9o/sk77C/yzy2NsMVwXXv6K1BgmuvJNYng=; b=aBNIImIaYJa4fS8CXhVuLnBKNdM0IJeyaUHnh7LCxpiKkbgMNOaMxMnwotiTkrj0zqsNnMR2KykEWkABwOD6C4dI0ora0wE6QxO9nLhxo4XQYCH0xqdNgprWSQTueM4m2oK4b1yxwV89i6gW/62KJ9FQoKlEbXg72Xv2UeeJtPA0mT7vjtlTKq7973IwMJbp2BaaTxSfmQzoGjoyCG4n+e7uYxzQRMGUNFE7opUhigWR4kSj3lnseA7uBMHmcPloFOuE6p1BLOkTlQ3OWatES8m3nNzWvXCw0zXRYwj6fOfZ/9XF/9Vo/cCclzI102+VRdIAwppBZ15JPpyXa9QfBw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hu+ct6f4/9o/sk77C/yzy2NsMVwXXv6K1BgmuvJNYng=; b=ZLB2S/ZZGYIG+MhZJRg42J+dGOio8C1wRtobVJhLZKTBOlRuBoKLZAjuSgfah2vRJlbjE/w391fa3JCMp7kW6VJvbva5joYL5k7PwBdRm+IPDC69gcrFmgnldpp6QfHI2CMXi33JQkZkgmp0C8Rx+lyKyuC5JDggqNpoF/aYhvtBq4m/U1ld5amP0uDYUc6Rfs5GhX8UpmKbUubGKoEtCJcv57d2VfrLiOmtkooeaMKkT+VAh4tPKzfswIfquvWTVD0YhtgdNBEdSnRzdCWKivuAeMWvWMw5RAxmgEeRoNArwMDAOEJyOpywH8r2PfoKy4MxERQOtSWD8nvudjVmhA== 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 VI1PR04MB7087.eurprd04.prod.outlook.com (2603:10a6:800:12a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Tue, 27 Sep 2022 15:26:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5654.019; Tue, 27 Sep 2022 15:26:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 1/5] Squash to "mptcp: add get_subflow wrappers" Date: Tue, 27 Sep 2022 23:27:00 +0800 Message-Id: <7d93daa96520afbc4181daea2385af64d4d69bb1.1664291273.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0003.apcprd01.prod.exchangelabs.com (2603:1096:4:191::16) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB7087:EE_ X-MS-Office365-Filtering-Correlation-Id: aac87786-f330-4ecb-2374-08daa09ca5d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MKqtzf2QR5mGL5ftrCdhddGvB4rewounLRr/vLI0WYDgtFll4Z5xi6ozXcouLahBvHYhqedyn41S4f7QEpODioF7kpDuEcHwa1r2peSpeJ5METRNr0AxKIGx99zSvqy/7FFNyDsS4d8+8zvgO6YCp4t93Pv2nPdbB8KuU90dGBkO1PN55/VzE/Q6Pj+pTCAqnTqasa8FivKxd0OP5XbqaacA2x6ORqlOL6N81RyECFyOQSnWG+CSvMhwfwivnTzIRXxkOTwkAyax//EwuGIgn5+/dSt2yOwQ53v2hxiAuOS2w2BkVP7+mXooI9i93t9tLQP5uoEoJ8hyYK+SrVWHWhq4MuuXHkimrVWk2PwKIjyXsGO/Q5lc2b5w/Gzf32IToGPxU6C+l5s342rIGj3F4TgCDXUagtN7BJXqia5ucK+JCxJKQEXagtvJxyNs55xb6atVdh/X0Ay/mkMWoLhLs9j/v7aN47G5kx4s0a0Auq5mfIa30hZVf0aXNBiEEvSZTSp+qARwP6a93zkROGDHK212xkaQoZPu4FazxXL+A7I+j7MrHcjJY/3xNBx4evfSX0jvM8zDBzGBmEUpO4YJWH7+je0QzfEpGPIzXJzk89ucHXxADYZVik88Qs3krDY3v/Y3qeEwEfay9sRxtiFVo9HcLHRKD3Nyb5zp7DWUeIzz6YQCBx8Uo19K1mC2MToonXnJgmSkkABogYf8xbZnw2ZNFJ7mLETRGkF+6u0CZhVOLqdJyESUVAm/Ux2rxt7a 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:(13230022)(366004)(346002)(136003)(376002)(39860400002)(396003)(451199015)(38100700002)(6486002)(6666004)(107886003)(6506007)(316002)(66946007)(66476007)(66556008)(83380400001)(4326008)(8676002)(86362001)(26005)(2906002)(6512007)(44832011)(478600001)(41300700001)(36756003)(186003)(6916009)(2616005)(5660300002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?giXj0bXy/e80EKbqF4tjs9LcO+ifvI/2CWVikLoo4naC7Uuy6ss4HFlEB8Am?= =?us-ascii?Q?Z6CLiRPHX1i+SBxYw+N1pPwrM4TyWaR110DzBc30NZywaVE5381fWQv6ffvl?= =?us-ascii?Q?0l27yUQZNmMH011BCogngW2TLAxUT5OYTFTX33QrBDfPtShYpY8yNQiGaUXG?= =?us-ascii?Q?t4I5Q+Be8HGnDjJYjfaPKzcyfn+YCALe1LNUM+nMiqRYC2MKwbd7C87K1aFd?= =?us-ascii?Q?AAIj2tOKwHI5UMZOuSuv8Gv0CoqVcTaepaV9baFdYRBsZwponsAJJExlItjp?= =?us-ascii?Q?vNJwPbD46R7Kv3qfItd4oSXte3Di6j5g0gHShdijbF3e7O/Z+ouKbIMWBcgH?= =?us-ascii?Q?KAMKBjaDJcEpdX8mb8MCuc3RPgxxuc8BBxkiLPXzQFsaW1D7h3z2BQ9OKDO6?= =?us-ascii?Q?oKez0bCx4MNCeeUCYvRVsA+PDTp6EQ+/HwRUkyA0Or8vBVyBj1fGbjd3H7rp?= =?us-ascii?Q?smRWI3Uz+LRW1QkFQVaMiABNQNO9UcRwAa+Y7B0QD5JlwScG+yzE2jsqMwqy?= =?us-ascii?Q?tZ7269UeiU0yrVuy6QOELPaXL7+hfS4kw1BPj2/ZXh5Vyk3UfCAOYqcZJWVt?= =?us-ascii?Q?ykDtOIDORHxI6PmYSBymPBvRWURL/pRRuBsNl7rBUbzkLb7YjuwEht3Z0UPn?= =?us-ascii?Q?aSFWjCFOF/qe+gVZFAYHnf5fdZiFYIcVgIdI83GYuprI1On+ttHJOCuiqOQA?= =?us-ascii?Q?RG+RIKZ3mgssbTyJoCzPOR7Vm9VwyXZ0eU3zD7V77pM+sRU1w/pKBnGLNMU6?= =?us-ascii?Q?x1jaGIbccLzxaOadZ6W0+/AHl0KopdIKq7H33XBia92l06trf+aG1/5x4J1c?= =?us-ascii?Q?I1cWRaNTnH+/DBc8jsI+deZu5XTDFPXvunjs64uvFhU4aeMRvbOHnPRzPiFd?= =?us-ascii?Q?yvDFjYE9pwJeZxUnbuHFfui7B6Aba8S3l/L2djGUHGYBL5PzIO6MfKCC/IP9?= =?us-ascii?Q?QQdOWsvLbG5sxFZLlGxwx1iGGkXhGJpf7ujkdm3un0kJ8RsQmziqMh+rHl+m?= =?us-ascii?Q?3cLSSVQTGr4dC10zyvn1uTFwpy7ydKGETrOWWOl+ptHC0F7y8fiJiOOtMk2r?= =?us-ascii?Q?hdWe+yjoQDCs9U8vMgeP+vmeyQUbGV6pfc6MFDwOfWQhJCVuPEFg543rwqLr?= =?us-ascii?Q?RMuA+o295D6vRyM7n6wI9Zhq7wq7jnpGERduVeZVz8QBEgISfsO1gPVSjzp8?= =?us-ascii?Q?bsNcq+VaW284hdF74+BsTV1ZSMuh/vBadnLcMaarZjvZsf51Uyea+me4QHlE?= =?us-ascii?Q?M6t0gWkCRZ4r5JhPWma4Vkp9bX6nWGbeRsxsddny9nP296Uc9m4VCspYmH04?= =?us-ascii?Q?E0mWecGiFaE5LB3F4nzWPxd+9NxWhkD18Ye0Ly71KWdbSWramqZpfkMA7nfr?= =?us-ascii?Q?5enGv7RlnHcWurF3zQmBrHhzA912nEvAOF6JBIaK0hWqYXzkbjKBf72T2+lh?= =?us-ascii?Q?UbmRdwtmUhLs4iPXBbk2jH7QuWQT4hA1oLUk9aAF71ukZ+ootkorBi0QkVSP?= =?us-ascii?Q?2eSHNkoiH4AYyapnFoCj4tN7ZSZJREt/quOf0Uj4JYQt4Kv3t3k7sKsClcLw?= =?us-ascii?Q?CuPPRTgB7qgNzr58zIeRqBP4H8KtimOfjfzP7nNz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aac87786-f330-4ecb-2374-08daa09ca5d6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 15:26:28.6775 (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: fhx7Cq5FsGpA9Hcg6rRrVzgEF6OyAMDO5cHRjroxXsxx6PA1tqhAQ72QyIkAk/dr3XvKDl6cyLbonmjOBqZBmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7087 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch defines two new wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in them. Use them instead of using mptcp_subflow_get_send() or mptcp_subflow_get_retrans() directly. Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler. Move sock_owned_by_me() and the fallback check code from mptcp_subflow_get_send/retrans() into the wrappers. Redundant subflows are not supported in __mptcp_subflow_push_pending() yet. This patch adds a placeholder in mptcp_sched_get_send() to pick the first subflow for the redundant subflows case. ''' Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 4 +-- net/mptcp/protocol.h | 2 +- net/mptcp/sched.c | 59 +++++++++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 8feb684408f7..e5c5173108e4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1547,7 +1547,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) int ret =3D 0; =20 prev_ssk =3D ssk; - ssk =3D mptcp_sched_get_send(msk); + ssk =3D mptcp_subflow_get_send(msk); =20 /* First check. If the ssk has changed since * the last round, release prev_ssk @@ -2478,7 +2478,7 @@ static void __mptcp_retrans(struct sock *sk) mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_sched_get_retrans(msk); + ssk =3D mptcp_subflow_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 93c535440a5c..79313476ac59 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -641,7 +641,7 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk); +int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 044c5ec8bbfb..cff538a9e187 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -114,35 +114,48 @@ static int mptcp_sched_data_init(struct mptcp_sock *m= sk, bool reinject, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; =20 + msk->snd_burst =3D 0; + return 0; } =20 struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) { + struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 sock_owned_by_me((struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return __tcp_can_send(msk->first) && - sk_stream_memory_free(msk->first) ? msk->first : NULL; + if (msk->first && + __tcp_can_send(msk->first) && + sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + return msk->first; + } + return NULL; } =20 - if (!msk->sched) - return mptcp_subflow_get_send(msk); + if (!msk->sched) { + ssk =3D mptcp_subflow_get_send(msk); + if (ssk) + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return ssk; + } =20 mptcp_sched_data_init(msk, false, &data); msk->sched->get_subflow(msk, &data); =20 - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + /* TODO: Redundant subflows are not supported in + * __mptcp_subflow_push_pending() yet. Here's a + * placeholder to pick the first subflow for the + * redundant subflows case. + */ + ssk =3D subflow->tcp_sock; break; } } @@ -150,31 +163,27 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *= msk) return ssk; } =20 -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) +int mptcp_sched_get_retrans(struct mptcp_sock *msk) { struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 sock_owned_by_me((const struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_retrans */ if (__mptcp_check_fallback(msk)) - return NULL; + return -EINVAL; =20 - if (!msk->sched) - return mptcp_subflow_get_retrans(msk); + if (!msk->sched) { + ssk =3D mptcp_subflow_get_retrans(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } =20 mptcp_sched_data_init(msk, true, &data); msk->sched->get_subflow(msk, &data); =20 - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; - break; - } - } - - return ssk; + return 0; } --=20 2.35.3 From nobody Sun Apr 28 19:39:18 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60086.outbound.protection.outlook.com [40.107.6.86]) (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 D472933EC for ; Tue, 27 Sep 2022 15:26:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AhRZ6C3Tu2UQXsoNCRjWyw0j0TIEhCRVjw/RnFPsJNUWH4JUV2Le7kHA5FWcPDYQXfmuJhWnvHg2RuV/o6pxHcu3Yf5mfi9WbCSXS/63kid5/K7+N3LZeTsz6gopT7XO1zRg5FG3lq+wMOE6UHRx9FHDIqP8XTuvO1cNsRwmiJGeCd6QrbbfbmyW/8Hbs8MgQakPrccvH2MhPeeWC8mNiwI5h1ajsAMw91twRFAWldXLNzlx8G8NpyVbSHKyorW8d4tRPwtKPj/5Th0SD7reuxJOmoRkBOk0fIv/IYJb6RsYYGb7YXIoWiZcZcSgRrlus3ryl/+gwSQiWw9W0ic28A== 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=hpqtCF/NWVruJpxOaX/+kgQIA6n6GCji4Bt/iusnCI4=; b=cpUx6V8K/wrPngyzFmwLHA4tgnzofB+2zIq5ovo1sHGUnKX5WqX4RSWrF49IbSc0qVVYHmufzaz61BeWldgGHb0uHiwuLmH5WQA7jS8Mxr/mwvbgsu9wFni+LJFU2u9rzfCPTLTEghA6iYdGkzIk0IMlor6LW5LO1V8VXgwZQ2Cg3wLfpckF+FczDQRb3+cbtBXqKtLAsiS7PJCBM5uUnnucDqtWzJp0TUVribrq7NJCLrYEdVZw55DHIUYqEm8PMyV//FCYJ0Azw69pzZOFwRfTwOd0Kl9J/NtcD60+3SuOFvSJ2IQkW7qd5Lv259ugAVoBIwEWLY0yN2rCDDXJMg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hpqtCF/NWVruJpxOaX/+kgQIA6n6GCji4Bt/iusnCI4=; b=KDkTdPhqrVW8FUMa4myOXKlFOVnRuPm9yYjk39mVsM0m/hKrs8fiGrT3OOOs8Z4oSqJpXPTMyOGax1RA3GJbpeoG8ABqFdFPKB3XuNuePt1qe+nqV/6cKDdNK0sVVZ2d0gsfcTxiA7bVD/m1UMr3jjhoCuS2sHR/FMNjiT1BVtiIpGe3Mn+0dJ9562hOoiJk16r0WUmOpCh/2uFGZmO1ReWw2xTnjg8OPXIRH81OYChnINRb4WiHa9yas/eqEL00QwxbwbovyaPjPgX/2OEnRkuTKK+CkwwU8mYaZF3WCjls7vWPJ40nd84d9Chh9+kO5UFFmRQx3mUi58h/kgEwZg== 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 VI1PR04MB7087.eurprd04.prod.outlook.com (2603:10a6:800:12a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Tue, 27 Sep 2022 15:26:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5654.019; Tue, 27 Sep 2022 15:26:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 2/5] mptcp: redundant subflows push pending Date: Tue, 27 Sep 2022 23:27:01 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0013.apcprd01.prod.exchangelabs.com (2603:1096:4:191::9) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB7087:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a26fcd3-8e13-4c30-68be-08daa09ca9de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w91R39ESI/tTPfJ3q0Bp0vmLZ/4j6m46Ejm0DdjeKt6jDf4s9yyp/oSe0sdTw5j78TcTvy4ONP0+T8rAOC81b6Ec/BrYY98qrsdY2iUxmjX6g9G2qlQ0fE+ga/Hd7jYrwqr0jS5AGbAgCibax7cBLdWMl37fVIeUXPBsw/PrJOh+d3SWWDcZ7OynUi61MDEGSmCKyY5EyNNCYUfobVWUpjO47Y6E3U4EfxZTl7g/BoRkSHHSqTeQYZ1svr8+K0JzTph60pgN72u74cP79uMR36pbf9aJCpjkMA1e89761Kc0l9Xb9QtFNTDy7hS5DAb+eQJQ2PXdBaFQ26SB+vEZ3uhIdrl4rfGl40kDbqmuVGITn6WDA4KsY9jnBEEz8fZ4XQOhrYDrDPXuLPalwNNsSSd72Zhda84L9xHCRtfi0XqZqVMH0UI9Gu69zuNDNuPr6ENd8e+UV7MoBOoXRCXGR1K8U0OA0M3LCmEaPPkQtM5uU/Z7kDENAtnj/pXn+MgN1hi6/oLJCxYjaCAin5B9KwblXwGnwyx4VSY5+fJ/+zH00oRcKaHKEsXFW/s/PQJW8IzctD0KWd+ZMItzjtuW6yDvu2kGF490mmlSoHE1bFvaOfh47q+40LJue6I8YpSrtRA+JWEVXmEQVeTEiZFiwgo3u7w1ms8nNJ1bp7ZE8k4JQRFW9ms7ex9HsoNRj5eK5eAsPH8ZvkOBQfchY29ohTnLHa2VaXuiOWqsaNazjvQoRQlgSsbiZT/iMHD9xJg3 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:(13230022)(366004)(346002)(136003)(376002)(39860400002)(396003)(451199015)(38100700002)(6486002)(6666004)(107886003)(6506007)(316002)(66946007)(66476007)(66556008)(83380400001)(4326008)(8676002)(86362001)(26005)(2906002)(6512007)(44832011)(478600001)(41300700001)(36756003)(186003)(6916009)(2616005)(5660300002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rYERH7TXvVXSZB+F5IJI14rkFmDpw5FWe+be+YW47VzgDS4vnfRwT1O3Js1o?= =?us-ascii?Q?fET/+S0xPG2OkIUhWnLU4BZJurmXL6qUm6jTVu+eL7JS4uGSxZJBdCTgm3Vl?= =?us-ascii?Q?lftD60do+heGjN+RieIfHh0QdVTwuVTJpBCYj0pJiB1SyYyXK6efq0cxQsi+?= =?us-ascii?Q?xCdPwMQKlHGxKn7Q/6gczL1ZqMyoLhabpy0kFrDM9Mg7HwBursbjOPlEL0W5?= =?us-ascii?Q?lj8PGxP/v5hEML2T6eFzJzOIXOMQ0SayXf5OZKT5ewEgUFalHBCEkCNvmkEQ?= =?us-ascii?Q?2rI2EBLaEbOOCXXBPyQ8kWjrJVavjfn2oiQ/aqlmawsMdkzcovEug0ax8Cpf?= =?us-ascii?Q?cn44xXJ4wxkf1clqYRL7QDca4uEgBrww6M/Mzm+X4TmbAzmZC/Zsf0pSovij?= =?us-ascii?Q?/MUp5bxqfev58y65baoKIwvS5e2Mhu7NM+fR+W2sT1e9n6ettMriGj7haT1O?= =?us-ascii?Q?rQMhtajpLdv47pcZX3Tci8p28B/UebMsUC6VEYHe1jlQUWaTAxzaQqqvilJK?= =?us-ascii?Q?Fm7u9XnodRin+jITM6z8vMaeakDh/bj8ii87OEUCcfpWs663R3AqE4lnjPCa?= =?us-ascii?Q?0Dy3PYVVW/b1+jef9x/XC3hl8PYxsMCRnTfm1K0Eb0X4MEyh4Nbf7uFOyLJm?= =?us-ascii?Q?6M+LVS+x7KVLFpFPgDTVC0eDylLPQ93zB92BrgNL1iOAStbn2rkMG+0/W23M?= =?us-ascii?Q?JvospZHwp1ykJ6Pqf0/xdhI4saz59/LsaDuXc5fdpDsToNGYmDpnBdV9NPyi?= =?us-ascii?Q?HMoCTNdnkBIPQoUCDMV8VdzBh/aj3TBk7lqwtLHaOrNo1YPvwmqPFgDZob0h?= =?us-ascii?Q?4fHPoDMH5Z8zDxaUVfWkTFZgPwHqVWJT5KAkvC/IywFMSh89PdW44/qcJOr9?= =?us-ascii?Q?dQiU8H1JEHEmaC9+t47FjGCtYQyAkd+ZM8uiT2nhRZLIA5Fn5vR+c8tBBFRB?= =?us-ascii?Q?yzDSCZ78Fpa6CQn+YT9W9sHIL1Pk1TIi/g7rvP3E9xJO54yw0oyOeymniIPe?= =?us-ascii?Q?Q8tAKTdj4ki62R2VlvDKxK6IU3iR/w+lh5NAK+Vp6eCqh6W95ld/1dDNVVO+?= =?us-ascii?Q?gP0Ie44wt3PTjZJK8kvdtL+/iqH3gvB0saXCnpUapcmA2uGwWRKWLyUc6GEr?= =?us-ascii?Q?nzn8Ck0eUtjNg7R8Gy1FGsDXaRlwzF0Sb2lgysVJGF12dR9icLdCgd+ykTva?= =?us-ascii?Q?YbFrxQffzhJKXt6cQhFcXFg03ERHOX7tl38uWVEFd0/NqU9+P/EnOZWWM7UK?= =?us-ascii?Q?82LBSwtNsfOgOHcuvLC4VxDjrXi7bFB+YtpSFsug/lVGAWxngBaXNOc4o9Yv?= =?us-ascii?Q?L4LX7EAjnkDZU8wk02q4+6KAHaHcv0aYOUi7ywtwE0PmDPf8Pj5FCnkjP6wA?= =?us-ascii?Q?aocirzcCL3nOEYKVyuD0y1P0uBkjcKtaSUmRRbdZ5PfDZKNr8nUeivzzY+BE?= =?us-ascii?Q?jwFuUwlR5yZ7mWkeR3cO/ul/Pg7G2fW9RfkcYRjXPoeyM0QCy67N79OFRz0e?= =?us-ascii?Q?nvn/O9t2+2tDAWUrmeREWSAIiSfzX8QQbTEOPED3HljCgWQy8lCR/lo4vNMu?= =?us-ascii?Q?cUGyyRdrDrLGv3rcShdHPXACcHZeShBUzBJhqiaI?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a26fcd3-8e13-4c30-68be-08daa09ca9de X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 15:26:35.3176 (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: 1g3DBRdOzKKpvSR00ucG76wuwjPmiddwjy3zotL60c/7ridCcejDN4rs1BvF3WYFMbcyeObnz96A1SV2sUWM1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7087 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support for __mptcp_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 128 +++++++++++++++++++++++++------------------ net/mptcp/protocol.h | 11 ++++ 2 files changed, 87 insertions(+), 52 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e5c5173108e4..a85243be4d29 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1005,6 +1005,9 @@ static void __mptcp_clean_una(struct sock *sk) if (after64(dfrag->data_seq + dfrag->data_len, snd_una)) break; =20 + if (msk->first_pending) + break; + if (unlikely(dfrag =3D=3D msk->first_pending)) { /* in recovery mode can see ack after the current snd head */ if (WARN_ON_ONCE(!msk->recovery)) @@ -1020,6 +1023,9 @@ static void __mptcp_clean_una(struct sock *sk) if (dfrag && after64(snd_una, dfrag->data_seq)) { u64 delta =3D snd_una - dfrag->data_seq; =20 + if (msk->first_pending) + goto out; + /* prevent wrap around in recovery mode */ if (unlikely(delta > dfrag->already_sent)) { if (WARN_ON_ONCE(!msk->recovery)) @@ -1497,18 +1503,14 @@ static void mptcp_push_release(struct sock *ssk, st= ruct mptcp_sendmsg_info *info release_sock(ssk); } =20 -static void mptcp_update_post_push(struct mptcp_sock *msk, - struct mptcp_data_frag *dfrag, - u32 sent) +static void __mptcp_update_post_push(struct mptcp_sock *msk, + const struct mptcp_data_frag *dfrag, + u32 sent) { - u64 snd_nxt_new =3D dfrag->data_seq; - - dfrag->already_sent +=3D sent; + u64 snd_nxt_new =3D dfrag->data_seq + dfrag->already_sent + sent; =20 msk->snd_burst -=3D sent; =20 - snd_nxt_new +=3D dfrag->already_sent; - /* snd_nxt_new can be smaller than snd_nxt in case mptcp * is recovering after a failover. In that event, this re-sends * old segments. @@ -1522,6 +1524,26 @@ static void mptcp_update_post_push(struct mptcp_sock= *msk, msk->snd_nxt =3D snd_nxt_new; } =20 +static void mptcp_update_post_push(struct mptcp_sock *msk, + struct mptcp_data_frag *dfrag, + u32 sent) +{ + __mptcp_update_post_push(msk, dfrag, sent); + dfrag->already_sent +=3D sent; +} + +static void mptcp_update_dfrags(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_data_frag *dfrag; + + while ((dfrag =3D mptcp_send_head(sk))) { + if (dfrag->info_sent > dfrag->already_sent) + dfrag->already_sent =3D dfrag->info_sent; + WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + } +} + void mptcp_check_and_set_pending(struct sock *sk) { if (mptcp_send_head(sk)) @@ -1530,60 +1552,62 @@ void mptcp_check_and_set_pending(struct sock *sk) =20 void __mptcp_push_pending(struct sock *sk, unsigned int flags) { - struct sock *prev_ssk =3D NULL, *ssk =3D NULL; struct mptcp_sock *msk =3D mptcp_sk(sk); - struct mptcp_sendmsg_info info =3D { - .flags =3D flags, - }; + struct mptcp_subflow_context *subflow; bool do_check_data_fin =3D false; - struct mptcp_data_frag *dfrag; int len; =20 - while ((dfrag =3D mptcp_send_head(sk))) { - info.sent =3D dfrag->already_sent; - info.limit =3D dfrag->data_len; - len =3D dfrag->data_len - dfrag->already_sent; - while (len > 0) { - int ret =3D 0; - - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); - - /* First check. If the ssk has changed since - * the last round, release prev_ssk - */ - if (ssk !=3D prev_ssk && prev_ssk) - mptcp_push_release(prev_ssk, &info); - if (!ssk) - goto out; + if (!mptcp_sched_get_send(msk)) + goto out; =20 - /* Need to lock the new subflow only if different - * from the previous one, otherwise we are still - * helding the relevant lock - */ - if (ssk !=3D prev_ssk) - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + struct mptcp_sendmsg_info info =3D { + .flags =3D flags, + }; + struct mptcp_data_frag *dfrag; =20 - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); + dfrag =3D mptcp_send_head(sk); + if (!dfrag) goto out; - } =20 - do_check_data_fin =3D true; - info.sent +=3D ret; - len -=3D ret; - - mptcp_update_post_push(msk, dfrag, ret); + lock_sock(ssk); + + do { + info.sent =3D dfrag->already_sent; + info.limit =3D dfrag->data_len; + len =3D dfrag->data_len - dfrag->already_sent; + while (len > 0) { + int ret =3D 0; + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + continue; + if (info.sent > dfrag->already_sent) { + dfrag->info_sent =3D info.sent; + dfrag->already_sent =3D dfrag->info_sent; + } + mptcp_push_release(ssk, &info); + goto out; + } + + do_check_data_fin =3D true; + info.sent +=3D ret; + len -=3D ret; + + __mptcp_update_post_push(msk, dfrag, ret); + } + dfrag->info_sent =3D info.sent; + } while ((dfrag =3D mptcp_next_frag(sk, dfrag))); + + mptcp_push_release(ssk, &info); + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); } - - /* at this point we held the socket lock for the last subflow we used */ - if (ssk) - mptcp_push_release(ssk, &info); + mptcp_update_dfrags(sk); =20 out: /* ensure the rtx timer is running */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 79313476ac59..e84d2cd42ff5 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -243,6 +243,7 @@ struct mptcp_data_frag { u16 offset; u16 overhead; u16 already_sent; + u16 info_sent; struct page *page; }; =20 @@ -358,6 +359,16 @@ static inline struct mptcp_data_frag *mptcp_send_next(= struct sock *sk) list_next_entry(cur, list); } =20 +static inline struct mptcp_data_frag *mptcp_next_frag(struct sock *sk, + struct mptcp_data_frag *cur) +{ + if (!cur) + return NULL; + + return list_is_last(&cur->list, &mptcp_sk(sk)->rtx_queue) ? NULL : + list_next_entry(cur, list); +} + static inline struct mptcp_data_frag *mptcp_pending_tail(const struct sock= *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); --=20 2.35.3 From nobody Sun Apr 28 19:39:18 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60044.outbound.protection.outlook.com [40.107.6.44]) (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 58CD533EC for ; Tue, 27 Sep 2022 15:26:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eR5kaoe6uqTMPEycUWq4atBPP1wdMDYXlfGZyTBTBC5l3NZpgpexwtKorGCkeT8RzVcJmvAzgP3TvKSZ4xkjTst1snwLA2xNoQ6m3pQHe/EVVf6h2Aedne2hEDa84/RvejFpHZ3JqlE2AwS8uj4zO9Uanz6bCg62BIIBbqG0XmfsepijJsUQQQNU5GxwzgMljNdOe1xm3EdFUSdHYCWa+wNYXhyjn/lO9aefNIVm6homK3m9PpbMq3wnfIt+DlJA/dta5aZ1xkVhYcbUCFScVRGjJRSNR06LhaNXOnO807oa7tQvQKFHbbfBD1Yu3wM5XuompGKTD9IIxI1vrokHqA== 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=mvI6CAVafa8dpbnbLK6RcfJzOLEvzPtg1xIP+2xFxCs=; b=fWuAq9QCnO3+YHeTIn0vVL2EIuJWnaXpys7CWwbkv3NEwayImk8M4qd7m/KbotwbRdBcla3Gr46EldjUFMOaUDwZ5pdUxagmyMifBh158MgEwtm0slIpocPDmn5LTxZB3kM7mSKc8dZzBWqdndFCbUsObrHOQytbq/irYt+2jmlnUznI/9EjhCwDAPGpL9wEVWu4B0//Wj8DoSYMfnt95qSX/1Amdy/g+s8v8H95Qucy0BwdmSwJqDia/YyA7S/F9Eyko58LzCX4LdPhPbil/P/0px+2sdNpyG/9170BbUAnZedHi/Ebe11tyqeir5ur4YWNFK4n5GW51vAWdRYzfQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mvI6CAVafa8dpbnbLK6RcfJzOLEvzPtg1xIP+2xFxCs=; b=aazFgsYkSZcpUK4s91vMujI6PJGswAOChisEeTlW8q5u033azYl1pxLqTMdaQ5Jc0GFxczyQ/FF7Y82S9w//tiP1r+apl04U3avrm/JfI79KHxYkXChNi5flslKTnqtczmIi39GPnIdxXyAUFf6kzTTfJ7cfsHC7GkNQOLDRaOftDU3+6HJwf/BiVpIGMZKBoZEBAKOMc7Z7/k2mBdsNbjkMeDybSy8cnbLsgNPPV0wWrsOBiy1Z5TPCXVmKHK+Lo71DJdH/0NLWMWMeEPeOW0ySFFAJojXWMnUcxSk3JfB0rDw/e2jd6S9r47icds/HJkmtj9x0qppBXJEynKwd5g== 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 VI1PR04MB7087.eurprd04.prod.outlook.com (2603:10a6:800:12a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Tue, 27 Sep 2022 15:26:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5654.019; Tue, 27 Sep 2022 15:26:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 3/5] mptcp: redundant subflows retrans support Date: Tue, 27 Sep 2022 23:27:02 +0800 Message-Id: <9093837dd67627e304f39b136615a162159934a5.1664291273.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::21) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB7087:EE_ X-MS-Office365-Filtering-Correlation-Id: 8233b35d-a038-4a05-57e3-08daa09cae54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wHB6PZKTTHM3wVdR3NxW4uOkzLbZI3d/W9FGmr69+tmsOnaO6XtWk4BJYnymuWpyT+Aerq4kWAW/q15Vx86dw8JMaUq1OP40y0VCd1XBmcRGOTYYIr90Iq7Toh/ZZlKTyMI74IT19WccZ5NO/e6vX48jIxll3vhhhjSAMdSvxLunFCEL6RonGZhCkUECIUQFFjptT0HGsgvzsiRWfMMi8Dp8Yx8N232xiSN9qQqxERNPpPBkrm4bsmmOg8RZbbtx5DSR6Z3P2X6r3JEZ2ICTefYMPQWRzbLg7tPxoTc/n6ezxmvKgZU030hblwYklfSi1OnxRMrVlUZIastDZ7QyMbBvC44DqzBMMgwAPPljdUqdH4hEYWgrYes4Gy7ZVYDBl05PL60tiaAFgM5aSLXCrmtOy+2mFJIcHRpEXqkDUFUxpWpi7I+9/gIiFuhn+rsrCI5RPOkiBFbX8pFy6ntioEYmpVjtY/mFX6iezr9ej+OAGndAooIRu3FitrAHY4+g6dlKrK6rFeTrZFaJ+I6IgntFd9C3EmBZyaeke5d/JkKoL+kjZpZ5Hd6YM4Lm+bxyLO4Uw/gjMwmf9KiZd/epkOONO1vpXTVzH/m3zktKIZByzLA+IzZERMI+IYX2eZE9TBXHaHkJRdL/PySkPKKvG48b0SgUvL2odeudH+C69HuKNZIpuSyFIBw8b/0gYUsD73e+wLlzQpsmv0VFTuN8NVQhQx2fjippRcaMsF77Q2Rkxz+goqPlgT/iHHDGB1af 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:(13230022)(366004)(346002)(136003)(376002)(39860400002)(396003)(451199015)(38100700002)(6486002)(6666004)(107886003)(6506007)(316002)(66946007)(66476007)(66556008)(83380400001)(4326008)(8676002)(86362001)(26005)(2906002)(6512007)(44832011)(478600001)(41300700001)(36756003)(186003)(6916009)(2616005)(5660300002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Xe7sZZ0Onk4ukglnFpWXOxusdvZcU2UmZ2MjB4uOK32htjnPHt0BvQs2hdW5?= =?us-ascii?Q?auj6B2iJW4fFRpG9ehMgHBtvvujtwSIFQiaelYZtioJamENc+sH3ey6JuHVf?= =?us-ascii?Q?ePIy1VawE2dcK2C0ukE01eW8LguqbrprNFPzVm3wcYDXO/ZUj6MH+sZOccZl?= =?us-ascii?Q?H3fWwtffZSwknJMy98sxCFTuZFpVcA8T1UmCcT9QMOQ+eqdF7xZ/iKa5k+/m?= =?us-ascii?Q?5Kdwbm2Ln4xHhivyn00LBQJEXtjEm7GAKtQiMbxwZD90ypWswBOVuZMjNAbu?= =?us-ascii?Q?8o3LrpebyP3YS0zgLz9+Vh1deqTIsMQLfDZyDExJLBw7usfIBGaJjKDrxpFq?= =?us-ascii?Q?ntLE2JE7p8C1ZHNRreIgoOKF+Rxq5FVjaF1K5B8boFGFEa7lHUaqrQBoCju7?= =?us-ascii?Q?iJp8aVHKjm8on9OzOezsSKCdkPVX4IMW8JTk1RFdKJJvOtc0KRVnljkjJtRV?= =?us-ascii?Q?nXiblmG+RvSYj022hL37MxIL9bd8CLZK8EqSXj1ukLQF4f56CyCxuLvkuK+T?= =?us-ascii?Q?2xylJ8/2TozgXrhlKHhHd+P6ss6/gcRYUN07mEbLtDHYGSgyio5w7+Z1JIBU?= =?us-ascii?Q?WKlNmbY+tvZUxCmc5VYZ+7LrjETLACJgG3sNYyULaQyTzkEZrYqqyq14Phlp?= =?us-ascii?Q?GRnrOoTZS6N8tpf80bXYTYEWiFNSC34IVvR3iqWcOCastdHp3rBb1yHDnB7/?= =?us-ascii?Q?Xa3aOeedc6kV/qkk1zz5i1jhj5QSjN63W0Fmf9svJx4tc3P7ibgtQErK76MM?= =?us-ascii?Q?EKNbUqoJL+E46zAMwj2qZh8EYJzfmjM0JoW/FoZOPmquYpHINga3ylcNPcTL?= =?us-ascii?Q?O4JGXvvTl785cjSZeljn6T54pm5M2PzDZjZkaNfSQuRC0JlCvZkF8UI79R4S?= =?us-ascii?Q?QhvCFoUHgmPstvWLh9oAzwR2iC6P3EnqnOovlgv2MO6QiA8ynoCa8VNOfCYs?= =?us-ascii?Q?uy0s/i+Abc56AEKzswJ1B+CHjbG4W1BZBvr+TnsdRqUrI9oh48ABIamzNq56?= =?us-ascii?Q?OvmL9zVF0zQD1pg0vpSqXMA9yQ8sTsPor2lGeq/LFuaWm4ubI87FgZ1ayRwb?= =?us-ascii?Q?QOMSyfZf2Z7AqvTIbQuPFjAYxnH/4Wzt+7MktB4QwsM0a4KJcKZvjG4mWspk?= =?us-ascii?Q?UstaeCsmtzcnh78GPEZjjKtUqq6V3+mFnfHzhqZ6uVdrsiHVUClJ+Zob4COr?= =?us-ascii?Q?I7EuXhyd/zY2J/1mJ7HmhmtRBKLCmFJ1WwxBOfjd8+G4bDVfLRXYL8YC9jTO?= =?us-ascii?Q?90k1sxvSt/mLfGNuUECdTdDMS6YI7tE6JtlwDZOPcPCUiKYZOwb3Lbev0Snb?= =?us-ascii?Q?ZHNhU+RdFiD6GgrqKNvV6vwqJUyBgCqlS7ILRPGQws+V+OSP1vG4eyqo2uXa?= =?us-ascii?Q?t/igOzwh5zFPD4tFH4koX6wFO6RHQ8ItCkUyfIJuzw5NIDSTTe1jrXJtkmuh?= =?us-ascii?Q?NhD+glmYghh2ddxmPa1vCzEVxhJ3vNet3QldzqiDWOSdPIOSv34G+9ld2oSN?= =?us-ascii?Q?BIBjKzISaR5IgqVIyr+9wC+C2X0ZT+iCF7m5aagelHkkMvAqfj+pVnebJZoZ?= =?us-ascii?Q?QAYIgt1BHZ8Upj87VS1M0YnYw19+ThNbiUdSc/Dj?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8233b35d-a038-4a05-57e3-08daa09cae54 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 15:26:42.9108 (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: 3EO+uZ69bOszBrfRAS+TuDAaoGc57x69pZXGoKNT+bTt9kvins9iWSFESV8sPsOrYj9yFssHsyniEd6I8r8D5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7087 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support for __mptcp_retrans(). In it, use sched_get_retrans() wrapper instead of mptcp_subflow_get_retrans(). Iterate each subflow of msk, check the scheduled flag to test if it is picked by the scheduler. If so, use it to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 62 ++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index a85243be4d29..021123d3ebee 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2493,16 +2493,17 @@ static void mptcp_check_fastclose(struct mptcp_sock= *msk) static void __mptcp_retrans(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D {}; struct mptcp_data_frag *dfrag; - size_t copied =3D 0; struct sock *ssk; - int ret; + int ret, err; + u16 len =3D 0; =20 mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_subflow_get_retrans(msk); + err =3D mptcp_sched_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -2521,31 +2522,46 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + u16 copied =3D 0; =20 - /* limit retransmission to the bytes already sent on some subflows */ - info.sent =3D 0; - info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->al= ready_sent; - while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; =20 - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; - } - if (copied) { - dfrag->already_sent =3D max(dfrag->already_sent, info.sent); - tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, - info.size_goal); - WRITE_ONCE(msk->allow_infinite_fallback, false); - } + lock_sock(ssk); =20 - release_sock(ssk); + /* limit retransmission to the bytes already sent on some subflows */ + info.sent =3D 0; + info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : + dfrag->already_sent; + while (info.sent < info.limit) { + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); + copied +=3D ret; + info.sent +=3D ret; + } + if (copied) { + len =3D max(copied, len); + tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, + info.size_goal); + WRITE_ONCE(msk->allow_infinite_fallback, false); + } + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); --=20 2.35.3 From nobody Sun Apr 28 19:39:18 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60067.outbound.protection.outlook.com [40.107.6.67]) (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 7A99E33EC for ; Tue, 27 Sep 2022 15:26:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fm1r721nxfCF8+afqXZ2ArDVyQ23zSMd+A8In4W7HzBchMviYSk3rbThURZAR/XtG/bqjYWJZvLpGapEGNZ0Og0EcZMh/4QGSIlV0PNsevS++N2owuD7xAWFJh43pP3kdwIw3hKjdBN9R1cihrRl+jRD9xYBrsqe/PApkwxFyb+cuqJT/JMzfqAizPCv8/lQ2qFuIPOBj2woEPUCm3v67KtmOKiLAiH7cfjcUZOR51+9P7Rze62PPPH1XsK9Cntogq4JPjZ8k1P1O8egkM7QmdaOc2wUF9BZ/8e1p7h2juCIO1sv7vgV+WBf6HwHbUmjF4Ua7IM7kWNluK2/2O92+A== 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=4SpylYRiXp0P4k3XioNA01AuM9ZHejqqclsSfyCQrL0=; b=RK22zwD6//ALvvosmrdkO44Lpu8xgAGtf/IAc3Ml99uJM8+h16duBfs+iNSkoPb5ftaLULVW9KZBm9ZiD2fk3z6BA5t1GfscoHhSe8OXaVvo+j4N26peb6BbnD3m0+TBnZ73L7ORFfG6Q7Iz0YwZGv0xwInJ9xHmlwcFlPu3vOO2nIxxKjod1fGLpg48gcFmUREOhpw48JWxFbWGRCh3ECpMfvtKvCubsuHylaUK2rXqm1aiLKBvZgoMgi76EdgbUFTqmReG9XM+S9ByOlG/bMUqssFXn/ZJu5MlkG78bQ4DcDHIRPGPqfSNxqNmjwB/OGOHWQLtstHDX8jKgJFAgw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4SpylYRiXp0P4k3XioNA01AuM9ZHejqqclsSfyCQrL0=; b=hvQeuNZZ5VbADSVWdd6Bmc3AU25cViSHptlV0Bz8SMs4vADtGbfOpWeYYNzBR2/pHuERbNTJSi6wMYm4cMVI7Ho16dpJER36q+bN/8k9ggewzOkKwD+/uHRxTXI7QCuON/AJI8Hhv9XpQ086bJ+G0NiKQXnbcvyNkRCNZtNA8ydDUCg6EqA5ECaskVXpZmvsQbQ9fCz6xT31RVfzHNdjZKmu8/+/KCo/UucF9Qe5382XUejrDfuFq5t8+Ipna/TJRRrLR55yk8huAzYmLZ3J+Y5xlpQC3dhz56ov4FCbikRh3QUYIjr3nx+j04919+b8rYD3NrrL8Z5WwUnxND8p5Q== 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 VI1PR04MB7087.eurprd04.prod.outlook.com (2603:10a6:800:12a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Tue, 27 Sep 2022 15:26:49 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5654.019; Tue, 27 Sep 2022 15:26:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 4/5] selftests/bpf: Add bpf_red scheduler Date: Tue, 27 Sep 2022 23:27:03 +0800 Message-Id: <0a3ea8773690abc47189588b3f638aa0f32ad7c4.1664291273.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0013.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::25) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB7087:EE_ X-MS-Office365-Filtering-Correlation-Id: 81515893-4ace-4334-da9d-08daa09cb238 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DikIE+83VR7paOUfZnA/Uf+yvzna+NOr2N5GZGx8RtijudyAulsRSkUGO44Tawi3nVl3BV6wHOnmfRWT16KFuX5sNKWUQTPjh7ViiTsBBMFr51Rn9LQQREmOEeJwcPB//ZH7t61r0zDtIPrCYbADVhAajO0rn9qwIW3w4l9y79DuYCHb/FOTDxJY0tRm8rtlMRHZ+Bkfh0QbbEXKWua+6f7ayFNWxMITnZo4WbPuIXROWGW/5+ANO2cNznW8O6WZEppU1CNo48l43NfbV3crzWVtlTgERdGgjRZoXh/hVtQ9ZuX2UjuAKJV0Mz8vxjIXt0TOGPNDAdMJl809LI0Z4pTqCRnDCQveic8KNcfXFLdUDR7eVqkk4mVMUa8F7MMNiOM3XdPkm9JOUufpv/5OQaB1pNuOly0XldF6pBi9FAUfISFqnXwgPQrBJKBSbzsNyBGf+mfKUCd2GX9+ucAvUhIxhQIKOFfw0eO09Boqe6fcwn3SG7loFMuJtbIE96oTP7cp9fTpfii5yyhQjY1hLSLRdD6WBR2swx6FFxSKJYoOdC1fQPpJ5bluOKEuANp2aE8K8Kf0KyS461vmuauQ1PWVALhuvQarJpzmkRYactRYbv5QYb4Q3EDdbkYsYNz2abBzu428UDbDh/1h/o+Ehk+knyz0g5McdArB4piqlAM1pbjvF29mXJ07Pa/HIB9cIGFn3K3UBUaGCos4myfTZKlOtuYwN9f+BvWaoMhZeSjvDCaU5NUeqaX4nRdu9E/l 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:(13230022)(366004)(346002)(136003)(376002)(39860400002)(396003)(451199015)(38100700002)(6486002)(6666004)(107886003)(6506007)(316002)(66946007)(66476007)(66556008)(4326008)(8676002)(86362001)(26005)(2906002)(6512007)(44832011)(478600001)(41300700001)(36756003)(186003)(6916009)(2616005)(5660300002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TKihG4Y/F6eWsEIlU7UfuKvytZHmyVXYsSee0J2BscJ9SS6skBx+137ao1az?= =?us-ascii?Q?VCcn2qbo7zVWLM5PzZZjNu9z8HeFeIIIjOAm35pBUMrvqTeJ/KsH8cE/URVf?= =?us-ascii?Q?+r45xG7JlKXLiSEiY8X2IYOswAJkIym4fHgW1qVMoc/4TWfUgCFQHvARFHFp?= =?us-ascii?Q?YGTRq/bnQRi2br1k0mDigRatacqiygsVWTgOvI8UyPapxybvxQfpjiMZe4Nh?= =?us-ascii?Q?WSQ1s8MG11nDu4tbXoavVmNgk4lZD4uezQpB8WJ6Xyo1Gv2a2Yqrt0p9+Iyt?= =?us-ascii?Q?5BEqmdErC8NPnHxxPnGHvTJJrzcNLMotUSKNK+v9anXDAvndWyMv1xX8w3hK?= =?us-ascii?Q?w8ivyNMjBmPgRo1zn/yb90W1tgn+04gCAL7zofs2azPUjUjPN/EnjlFL7sjZ?= =?us-ascii?Q?GXCelXmKj/Ixl2HlZrOTuoK/AK1r9ACZV3WvmiKuiazTOBlZzwwkV91ojHTT?= =?us-ascii?Q?0t/L/9oaoVxiiCN4GtuZZCjwVRcKtUdwYI0EPHyKF+YrHhe92Lia1awvXDKj?= =?us-ascii?Q?6bxGvQnYxKpEezetmKCHrBqdVLdNQW1BbDUiFgL/gkpTZyMKQWOv9u48MG3S?= =?us-ascii?Q?Bf8NFQGLnKqptwQAxHfTMTBCA3TjWnSv5ZmFkDOZ1ODWVIg/0YdII3PsHmyL?= =?us-ascii?Q?Fzr6wTedj0f2klwHe8bc16qo+JmCmMG7lKy/+DGL1wP98eil1xl2MbtnLUOF?= =?us-ascii?Q?SvjbP009gHkY8ZIcdpF6D6lcQAsBTijL8rs12fsx4Tq5BC+PJrEGnkDpWqK5?= =?us-ascii?Q?M7MhEMTt2qZ2/mfKVgZ44XRFub8lJEEQbNNkIh3MksceRJvizJn7kjl3uwz6?= =?us-ascii?Q?15TQxceAusjI0W7cdrjZgfWRx3qHNEi/axFpbXalnjw4RyyRFHXV5ix6uemU?= =?us-ascii?Q?WFpRu4EkyzYvMWlHo7bYNxhlzv6NeyJJ5D/uGdZlVDoociAbOWPWqH+t6Or1?= =?us-ascii?Q?l4xm/Q1kWJX0EpHn/oCf3CLoRYB4FyvHUZvdUDTdiF1ubBbNeiaPR3YAiA2S?= =?us-ascii?Q?5Y4n1Yz0dvEal7Y4ZcqChwf+1Djv/hrSn+tFj2FhFqEiXQqNSeH1R9UpRUQW?= =?us-ascii?Q?mfvgInmVA4nGAqit/4FP9/6Iv0GhhrfiUoxspnCNwNyVkp8IgZ2gCh6Awm2i?= =?us-ascii?Q?bvnZwDgjS3uxlQ4h874KDyF9OvKUIky9rfJG4zC8/mbpykeaxVoyzdMF/0Y+?= =?us-ascii?Q?k9oJDci0rkNQa0PyZyvFJCw8kV/Jd08XETQH63JnknfN01wKKsWWk6UavcXn?= =?us-ascii?Q?X4/uU+Db7mZ2juf+bxaaAGUZ12o0WHkmPJ49VvqfZX//GhFMsQfvAqa05Jmn?= =?us-ascii?Q?v4cyQYC3vMSqcCs4NiDDQufNLg2u+X8T9zEFpXXguCxEtvMX9Z3wvMjCbgo5?= =?us-ascii?Q?r4E6O2k+Cai7oyOno9zMfT57bM6ps1/m3M+oEuMG/MbnEtSAwKAbpMhkYCSX?= =?us-ascii?Q?ygTfrZoyrpeFhjHe7LqoM0woCdWYcJXAzrFcIaav4MQjKGBpPYeT38egmJZQ?= =?us-ascii?Q?803XyaAmAeW8A73YZ+y9eaexd2pUUM7OYnAKilnFkCn09I5ORT5BoC7zrhHc?= =?us-ascii?Q?WvlvprspSh/kpjN2M5B7G7SXorS8yKWpeMJrnA2H?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81515893-4ace-4334-da9d-08daa09cb238 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 15:26:49.2696 (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: 6G0wsCwwk7Ykvci1TdQLQh+4SAB/dYM6DYSI2jrBMq6FkB2QqEpV+pmSEOrkS2AhJFneR6SNaOQxBOZy404ktQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7087 Content-Type: text/plain; charset="utf-8" This patch implements the redundant BPF MPTCP scheduler, named bpf_red, which sends all packets redundantly on all available subflows. Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_bpf_red.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/test= ing/selftests/bpf/progs/mptcp_bpf_red.c new file mode 100644 index 000000000000..58f90473e495 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,36 @@ +// 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_red_init") +void BPF_PROG(mptcp_sched_red_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG(mptcp_sched_red_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_red_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + mptcp_subflow_set_scheduled(data->contexts[i], true); + } +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Sun Apr 28 19:39:18 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2049.outbound.protection.outlook.com [40.107.105.49]) (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 46F6F33EC for ; Tue, 27 Sep 2022 15:26:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AkbWRXk6v/7tJ3+aijsR+6az6OXVhWYlogzxbwDmGKqx3HacKlYC+2RRP66ZGi9aoADQwg8ZvyXaGligpTu7gjmrjV6ipUOB4p1hILTFnAzIufs3NwRnFVZb3ZokNw1W98/m0CagIXxD/YMyPCJtMSihBph91HgR0WUruLwxkhLYnYalwtlpWMdY7oLPNWbYFC2XWDQ+hRZiFPNiPtCbM+ww9LTMtAc/wW3SPpIwJwxFDOmz3dykubzKNAm9SLmfhnGphX6VVsepJOMTLREuoSLuVy1LvTEoclyTKobmNbfpwHLooMkqW1wbXIIUcW4dIMnVLahH6Icstc+3NIqkQA== 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=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=h/BJ2XfduN1XmLMzs9kosqL/N+faAywh2w5IgJZgmJVVRBBU2cJtc3RohzBvWwE2CRW3/KII0NNJeEQJH43YwVwhVp52QiTrycN/YnRIkGBhcEwxj3wosoExeRgiqPm2qLzD+LW1SFWrkA5ij2XVO6+P03u8ZVggnGoyOhO7rEdIZhiOT1GUXsp6pWzgwm0a4dfXt1Xv+dmdhhJiNKUNL+/n0zDC8ZkntXhkkqGnUZP0uJacGftWmusaHl7857qyOFLLUGguSCdrsyxVEDjiQAMaF6dlRi/oaRutZrMyyiWxXLhiXJOhQrQ89Iy3+NiqhUACI4ee+ezVsATAa2C9Hw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=P8B1MDLlfwm7C90fCBUi3UvU3iWaZdOVuhT3Fix8fgo6oabkEABQEwct+TffvRNqMN9Sb8TAbkyGVYzx7NhUtv9yfQ//W90knLBi3w1GbFk+z9StvVjVf25gTPEBZ1eXGSkcPDYB5Qw3j5rrsZliN0AhNo2MZnzgbKagjX87dyQgYRedXlwmtOkce/D5lYPqF38i0jrJJxjA4aqHCJYnlwRT9r0qXGjxOB3BwOW7mvgQyNQKAIADLQYnWecQCnq1Gndy7dcOQzrtgUuJSEav1FJGfp0HhSUGSJfyZCndHmb3ueIVNmIVlUflUGwWoaABS/DPqVtsElh5kKwF8eNL3Q== 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 PAXPR04MB9092.eurprd04.prod.outlook.com (2603:10a6:102:22a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.15; Tue, 27 Sep 2022 15:26:56 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5654.019; Tue, 27 Sep 2022 15:26:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 5/5] selftests/bpf: Add bpf_red test Date: Tue, 27 Sep 2022 23:27:04 +0800 Message-Id: <9c104d9eebb5c7f2f6b5e0e0079cd0efb90c788c.1664291273.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0013.apcprd04.prod.outlook.com (2603:1096:4:197::6) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9092:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c1c9dcb-2599-4564-bb79-08daa09cb65d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dT1DFLfRt/GjcRlSZPG6W/CPjgzP1HiLfipGRQ0OMYLFGQgOHmi6OMxFG7bfCoYtYweNbyG4OnVlj/aQS1A0/gSdJxqpx7Y9ILogp/ikgTtTZE8iEe0a1VzgGB61UxGCxEA1dowuZHjjn2yuqXR70dtQ+slUtmSy4NoLLKL2gxDPZX7a2PJEmWAIY+ZlPftnTMFYFMH++VbLpKjAJKo0/YluSrOHbsrjobG1VzGNuO5dzcVgVpg3YQHFr5i0ss79/effLUo1SPIeFjSJFPg9s2uTZZPXSBoWV0ZVFrZXTVeDtpxW6H5FeLeeQ9Th6MR4a2f7yqHE87imna8nJUxbGSL3NpDwCs+uQyi5rJhuC6BMtozNKWe3Ao4dX/LHyiZDpTnkC2G+QruOg0LPkNVV26ceCKuBQZ8IdaL6TdivsZQtEXWyUBma7PeKdYoVjFra78PYEmBhUjfbW4yW97hPtNw0Rpll7cXgALwQCqDUquXwtBNH/honkB+FpvzLkIBDcS2/i5qZy/I3EFwtye1m8TnWAPyitX3aMASzlyZwcEao7p+/5iS16FVkammR8iEHJFEgO4xtqhjen6AVeGBMFbbAvOv+teXzJxgdMDIeXp4Tz+S5xtIZ/Ryzq2pY/wpojuVF76a3vIDb+IztdYZuqfpJ0GKFnM3jGASRGL3+EsuXky7TicUFoDzweJRM3FcNI49vffEI7dDKaH6KsIoMQIpCxTKhL3pfl//02Jz7gD7sVX4bg7r/JG3hTtpN8znF 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:(13230022)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(6916009)(478600001)(6486002)(8936002)(2906002)(5660300002)(6666004)(36756003)(316002)(38100700002)(2616005)(41300700001)(86362001)(107886003)(186003)(8676002)(66556008)(4326008)(66946007)(26005)(6506007)(6512007)(66476007)(44832011)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P2oUOVkTpdw3+jTT2WdFLOb/Z4W6Xz+tN4Wvg5F19ZjVkP9KHs2TN8L+B/x+?= =?us-ascii?Q?+TejN4mdssvgVInPw+VQNg9CiD0wn7PPsXnzgeBO8BFRQO9HMoO+Vnqim9tb?= =?us-ascii?Q?wMsjTlb+4Wje2j6I5yGQxaD8DbyhG9tLH7A1ED4SYPex4rtlE7rINre+ovRu?= =?us-ascii?Q?v5PE5MgD/wXC5Emp0f/W/j3UoOqUPjrNDoRT/CaGj0luEq92Gc0TaQPy95d4?= =?us-ascii?Q?lVV357ZoaqYVVcVkynbkKGKkijhprrLXdU9buviRmJWZyK/N+Yn83g7WMqnA?= =?us-ascii?Q?eqVTgIzfPZ5t+UNe45xylnCPVlgaKrZ+dJzievJjM/11UseK6qWBfvwFTTV3?= =?us-ascii?Q?iVQsSutZLq0P1hy/VxaKpa5Iufd0gOB5YVBep7HqCNRFLPxsE/N7wTarr1Wv?= =?us-ascii?Q?NwmqWYC8b7NrGrCUqJ73V+NRyEnjTajmvY5M99C8SxFE5zibajuIo/STboSc?= =?us-ascii?Q?d1/f6hWLkaK15NLqiENOxClB/ro8UN6uVi+3ofggeO4H/+YcpYycRpVAKE5J?= =?us-ascii?Q?Y5EKrWvGyCPqjcEHV00CwTUObkvltVMhjsYWyQYbcadQqA4Gg6QBo/0un7QL?= =?us-ascii?Q?mwoE3zCOBHd87SvP+EmVpP1tVm6p5qfzVqsaGOYUo1RA6Dc5Jj4STZ/6+LEz?= =?us-ascii?Q?iC1OGcbow9++zXueaU87GBUplE6legXtmFzVyl4DdgS2yUo9oKh9VcAlz6+z?= =?us-ascii?Q?9mPEo1qZmcQUaI+7urHcrZtpBMw44OqQG0Dn+Ir7A57alMJpdkam+8WLH2Jw?= =?us-ascii?Q?D8EoOHwpXtG11eFMr3LLoQMOjlE7AVXn7bkRG34NLU8ui19USMnNHysDpfbj?= =?us-ascii?Q?jTo6+mjhsz1WcyukC70htXLBEJ50vG7txo9a8ONvhblkli+Z3lbuviJQqfa8?= =?us-ascii?Q?cBVrarkVopMYiPq2dTlwOY56g24kCXsbX3oBetOiVSju2m/0CHVKUeMxMi6k?= =?us-ascii?Q?uSaVz964Igb6hdwEyUKTxbxXAAnXrwuNpJjsTS1fPNdGMwSCtqWNmviXGdYS?= =?us-ascii?Q?rYtAFRAqYwpF4WW/mJPEuDBdzaQ7DsTVXFgAEXDPc9H9U3Tmww6Vk18C9PPD?= =?us-ascii?Q?8XgeM6AiM7npBtHJbYqpuS6KNLpdPvCk9MPHJiZ3r6aWOJzCJgCsv9m3bVzC?= =?us-ascii?Q?Psuz5FrVzenYwgCnM+cZKt/OAkh9o+eLpzxiCpHFJyTml6ZW58JcJKoq6fiY?= =?us-ascii?Q?mRUI91kgRTWgTfjlyWVDaidh7L+JQSRkqIdpYT8FvcrXzXYJv/SyeKf/CRS+?= =?us-ascii?Q?gOasVVMA0xEJoCGr1LCpBqwYsaEt46mgwwFhY607oeSAWl2asWWrlrVUhScm?= =?us-ascii?Q?XPoww2sFP70p3H0+w8Tj6UW1Z7fPAyY3L63yy1CaQONW3htOm3hFxE2+SAHc?= =?us-ascii?Q?6OXYQfCDsTdgrWF4VmDnUJ+tzJ4wK6lD+rH9Hzbd8kfPrDt3gCGUPiKOA1+1?= =?us-ascii?Q?IB5omZRlcRw/cfwOQKSm0ZbGgpxMdi23wM8uL1Cng3Evd+uroH/3da8uB+CO?= =?us-ascii?Q?4Fi0kI1vB5eI9VeM4QTNoivYY8W6m1nwH1aahp796+XWEfFYo+fLtMiaNTaG?= =?us-ascii?Q?NXSLKZxaST8A59k7sZnwOIK0Nuzp4OibL2fS2vgH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c1c9dcb-2599-4564-bb79-08daa09cb65d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 15:26:56.2066 (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: K8oS0J63T7ujUINe77/OxIuviXfJqxmaREWcF2LmsP9slz+cM0lIU/Eo9qUnSNum4TaFY5u4k34KOoCbCKKxCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9092 Content-Type: text/plain; charset="utf-8" This patch adds the redundant BPF MPTCP scheduler test: test_red(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been redundantly sent on both net devices. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 647d313475bc..8426a5aba721 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -9,6 +9,7 @@ #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" +#include "mptcp_bpf_red.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -381,6 +382,37 @@ static void test_rr(void) mptcp_bpf_rr__destroy(rr_skel); } =20 +static void test_red(void) +{ + struct mptcp_bpf_red *red_skel; + int server_fd, client_fd; + struct bpf_link *link; + + red_skel =3D mptcp_bpf_red__open_and_load(); + if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(red_skel->maps.red); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_red__destroy(red_skel); + return; + } + + sched_init("subflow", "bpf_red"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); + + close(client_fd); + close(server_fd); + sched_cleanup(); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -391,4 +423,6 @@ void test_mptcp(void) test_bkup(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.35.3