From nobody Sat May 4 18:08:26 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20085.outbound.protection.outlook.com [40.107.2.85]) (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 188372F47 for ; Wed, 19 Oct 2022 13:36:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nNAUMkCTdgGRCdm0Fy6GYBFIjQHi26cM6304LG71qnpqzyAXQhf9IT3ZakdCrz9HMZLK3+rLprj+zkbPqi2BCZKWs+jYjyUra76s9UbHUUT4iKLBwONfARI33EFTm3IMwFoTmy/EsBv2x+godWgDZJhi3N6OJ53IIEj1gGOlABCZ7P3OvxUj5qx3Lqh7hggqD18+Bd5fQd0sCT3IykuJlbB5gPpSa5udPsJqdJtKn/8DVk6ZrDcdCemeH6aJnGNg7P+GFYgDq2McufqNM/t4LcG++Veu2UdVx7MdMVcRQgogVvNmOlK+wFt1d96b94Km7Ckq7/8MEX0g+fauLDdJxg== 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=QDbMyeCK2ZQOKyR0tqRybhn+fDfbs6kIryQdQC9CumE=; b=dL1AdYNwgoyCjIeRYYpaz6GWvkAdIPAzgWKN9NsSWRRPDmzklN2jCTZlVG+iapxSVy7tpL9d+OH2oLHQITNCkq6yjCxzzRDaMZTcq14jQIFOMftVbn9LhbSAQMwRJSZ5ZHYATIItaaXYMCbVvPkP/gpcbTRNLyPVkUUGvKZ4l1gU3b2B0F6Ovc7yuVV/5ZPQ5IRWsQ95f0dcnuWAhAIBvJ3NEvm7LJrj3sc/o7uTfokAmRqmEvryeO53kzqOme/3OqtgggRIq4SgBwjpVU131E4IgF9qIGnqIucMwfA5Xjveyqo9RuOHAVUBgS5UTI7RQ7pRyV9RwE9ZmQ+SNbJ7Dw== 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=QDbMyeCK2ZQOKyR0tqRybhn+fDfbs6kIryQdQC9CumE=; b=4J2ntWHBg6gX4dPdYZqejCIDnaSyILXBTnm+1DFSDo0NWeilCmT05igiW1BK7d+CB8OLR5QPTGr40ynjg+DPygmq1WfNNegfAYYsCPzdlGyZGe8iIXc4fOFou2Ahspja10zIy/2JI5MNV5TUJUh7Jxx8iQa/nHte9RjqiG/Ov/DX7GGbZcxD1mq0hZebpf8CcmeUrS4qAqVpoUUizBPxlXeSKU0lhefzhAEq8CljxUQM0GuqF68fvqjBBHiAN9KdA/dmR48mExHU/LLmOnkPWC7gHYSXxRdy4KhNyqZXQ647o7mNch7xnksDrYZ8yWEM/Ic3Sgmbp+9SxbvnWMj6sA== 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 AM8PR04MB7251.eurprd04.prod.outlook.com (2603:10a6:20b:1d2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:36:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:36:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 1/7] mptcp: refactor push_pending logic Date: Wed, 19 Oct 2022 21:35:59 +0800 Message-Id: <1f31ba545d3585823aec4ea43686dd8d89237ebc.1666185947.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0041.apcprd02.prod.outlook.com (2603:1096:3:18::29) 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_|AM8PR04MB7251:EE_ X-MS-Office365-Filtering-Correlation-Id: a1a3a077-78a0-4e92-c09f-08dab1d6e890 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j9hBnSfGtAhzLKe9pmvJz7HECzor8MBIVBmLfNpHkEA0SG7lwfPvrGFFHLjb+ULlqSzowK3Rmwih3JojTcfJz51trzVulJ5g8c03d+QDnKUoGtf306JkJ8SOqMF6iM+Q8Zvg/w602en0VBPZkEJ3MUft983BvPrJ6Y3amw9uzX1PLvl/eyaV7WYMbfpZm0WT+OzJRQlFoyT/H1zAwPt0H+RuQiDZZMk81q3wO0QYekmxphzIsAAzhewnxCkI1ydu4Iyhu7HEmmAF8ZZzJHB0HndxJZ7E1A9cM8PeWn/uMTtT+S9BvsRidhJEQKWjpv9SbdXanJpxfBuKziccQkAcjpsj+imG1+oCOyL41me1yTdWKBGJTJWxFYg6y5SNeZodm0NGaAajo0410f8XyCo6VsRnom/Xk/8jI1y/oTl51jDK6TZT7HfZYhNOUEsk8rwOPL8mAcCvzjiWTGwO8r2iORjx9LBrnzffXxHW5Mtu2c2s5IHh2V1e5fibKGOsaMR7ET0owzEpF8aBaNy+hchw2t1qtktCoaPiE/0ARooQpVLYnq8zHXcDdvUce9wKgPkX3iK8K3JPxwW34JEIVL7X5F4LY6phiISl3YcfcW6HvfcIEbZpPcrk90x74hrZihpr4+rVd7SDMFEB5EhdPM5aStIxOQueqsVAMrVp6V4JupK6Ll0+taVf44wjuur/HvCC/XsXuQA5A+b3erdCmNhtKbbSVKq87dRUW1NtoXD7VE0vMP29hojtug2HaxXZj0kr 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199015)(86362001)(36756003)(38100700002)(2906002)(83380400001)(5660300002)(44832011)(6506007)(26005)(107886003)(6666004)(6512007)(2616005)(186003)(6486002)(316002)(478600001)(6916009)(66476007)(66946007)(66556008)(8676002)(4326008)(41300700001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pabIASRNx6Vxs2Kco84A3jPCe+sucAIQ1qAaKljZf7V90noqZKHq9sbLf1uP?= =?us-ascii?Q?Z/yR3DpoL/vB40tVpQNeXhLzmfUbEGjsbx5Gc9BWWy2JP53kgnMlmB5+x9DY?= =?us-ascii?Q?huLlXs2T40KnJKycu3CiUM7vpnHLiJ0eXyVMc0DtfMgSSkW/Tuv5bmcq13Qh?= =?us-ascii?Q?2crCoLc6kw1CYoXbtw6f3CUEgRPUWyCYWZvhKmVaCj2at290KnvWPaM6wLR+?= =?us-ascii?Q?tVLnEx41tvYCVH22qXfdXgI/swOYmQdN7/GeHSLmyQzti1pxRGgs0ym5xMPs?= =?us-ascii?Q?zyNae6XejGvddL3rtHgMmYCtfvaL/up2LOCaUQfVRCR3iaflqMVDSlbgNiq+?= =?us-ascii?Q?/9BJek/d5Dp1kv58T5Y4PJgPU7EkrFJfY0fuWyID0nTxpkcZSRVWqC7J4jv7?= =?us-ascii?Q?CnFQHLJPT62oqlRO6x9hePf+kogTu9IxroM2Isl+sluhi1WrHkEzwm6wo/sa?= =?us-ascii?Q?vlW0BKdQldwBrcHTaOslaR3FsBtYTIlLI9oM5uSHr+9viY5BWIfOLXHOFyR2?= =?us-ascii?Q?x6TG4iyRlQNN1Lo+GBuoW2Dlm3GKxB6x2hE7Ec/zkADNyCS6V4Bt/V3AVZYv?= =?us-ascii?Q?ElxwPX6M+Z2kbEP+DdUa/PeQeKZLVpefIiObiM04IruPhayDdpMpeJ4/2YPG?= =?us-ascii?Q?y1VpveqOJZBli4F7pCVoB0f7G/qJ/xsezyIb0yIVSjv9DqkHUqk7qKZ+ZZor?= =?us-ascii?Q?3L6rKvDzPHQ2v+Ayp77piDxgn0GnumzpXGbOOd3m5DGzu83FnBHpUykZMBZv?= =?us-ascii?Q?3pRK8Kamc+FXG0DxUDDO3gVblbQmxSGXy2LqCZJ2S8yB/c7AG7ZOR8wnwv6S?= =?us-ascii?Q?151fnJTqAaeBUbr+6UBwBh2o42Lshc+z/RfktOHx1U6LoKrB3mQBEKOXTKcM?= =?us-ascii?Q?Gf1XI4wyhRrUz5BOsAqRgkGPwlEBzaciM1VoqhVBj7DHDdeFA4obV/OmQP4N?= =?us-ascii?Q?i32ikxbfB6et8S2yg4KsLDVyuVjiPK6XOLaH4xYl1oocobKouYMpnEiFz4kO?= =?us-ascii?Q?79Sax33GMtfxHYKo+TRHXSfQicp/QKgCveu9FbrfFCZAu1VaO9JuIL/7S2EB?= =?us-ascii?Q?gAqtBF1ubcD/+TH/XVYc2QqHAcgQZgKvNaV1RxNuwPVqtniUOyvPcpXk4Dxs?= =?us-ascii?Q?zBi5qhzHyBJf5JAlEJ/kjM6/YQ4kBrZVLDgiNxXwLqDOih5tKhK4vogqupXI?= =?us-ascii?Q?6MhpsUrZH9+Y/dDz+VGO30EEYM/L9xL6VUBJxuEPmGoHjJUhH/tslHS5278m?= =?us-ascii?Q?yQLW/tlg9RkZld2nQxAYCYLq+0tLtBiNmdNenvaQ1e3oF7m7QUNLqpekN5Ar?= =?us-ascii?Q?1oimcKrn+MrFGLsXLcPkjyZAHZDVaDidZMBg6jxNYB3VzdChjr1oNQuKb+8/?= =?us-ascii?Q?eQGwKkFimeuiqVBHgCxc0Fr6v1wtZRPlpFxjhU2k2oGWqPGeczERoSFD7KBu?= =?us-ascii?Q?WNQh+OaZtENRofNhNouUXqRJfUlhZa4RSivk8BzI6SaKemzQ+ERZ0PsY6nrV?= =?us-ascii?Q?3jPXuvfqr/aH4MhLLDxKz+fQKzO/omjPKg2ZjGBp1/JbQtHE60cRwgZcQcY/?= =?us-ascii?Q?AvVdwlw7J0EbIcaa8Xm3D4frPoR3PFoahC37am5WL/IVYdETH7PdZzpXYWx5?= =?us-ascii?Q?Hg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1a3a077-78a0-4e92-c09f-08dab1d6e890 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:36:21.2077 (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: 19eu2dH+N9ush3zBF/1I1p6tA7Cav70ezj/Mk7sbiyx4xBxJ7whp++b4f/9PQjEJwQpZQj9xCkZfIYfoefdkaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7251 Content-Type: text/plain; charset="utf-8" To support redundant package schedulers more easily, this patch refactors __mptcp_push_pending() logic from: For each dfrag: While sends succeed: Call the scheduler (selects subflow and msk->snd_burst) Update subflow locks (push/release/acquire as needed) Send the dfrag data with mptcp_sendmsg_frag() Update already_sent, snd_nxt, snd_burst Update msk->first_pending Push/release on final subflow -> While first_pending isn't empty: Call the scheduler (selects subflow and msk->snd_burst) Update subflow locks (push/release/acquire as needed) For each pending dfrag: While sends succeed: Send the dfrag data with mptcp_sendmsg_frag() Update already_sent, snd_nxt, snd_burst Update msk->first_pending Break if required by msk->snd_burst / etc Push/release on final subflow Refactors __mptcp_subflow_push_pending logic from: For each dfrag: While sends succeed: Call the scheduler (selects subflow and msk->snd_burst) Send the dfrag data with mptcp_subflow_delegate(), break Send the dfrag data with mptcp_sendmsg_frag() Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst Update msk->first_pending -> While first_pending isn't empty: Call the scheduler (selects subflow and msk->snd_burst) Send the dfrag data with mptcp_subflow_delegate(), break Send the dfrag data with mptcp_sendmsg_frag() For each pending dfrag: While sends succeed: Send the dfrag data with mptcp_sendmsg_frag() Update already_sent, snd_nxt, snd_burst Update msk->first_pending Break if required by msk->snd_burst / etc Move the duplicate code from __mptcp_push_pending() and __mptcp_subflow_push_pending() into a new helper function, named __subflow_push_pending(). Simplify __mptcp_push_pending() and __mptcp_subflow_push_pending() by invoking this helper. Also move the burst check conditions out of the function mptcp_subflow_get_send(), check them in __subflow_push_pending() in the inner "for each pending dfrag" loop. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 154 ++++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 74 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ddeb8b36a677..67450378cb97 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1417,14 +1417,6 @@ struct sock *mptcp_subflow_get_send(struct mptcp_soc= k *msk) u64 linger_time; long tout =3D 0; =20 - /* re-use last subflow, if the burst allow that */ - if (msk->last_snd && msk->snd_burst > 0 && - sk_stream_memory_free(msk->last_snd) && - mptcp_subflow_active(mptcp_subflow_ctx(msk->last_snd))) { - mptcp_set_timeout(sk); - return msk->last_snd; - } - /* pick the subflow with the lower wmem/wspace ratio */ for (i =3D 0; i < SSK_MODE_MAX; ++i) { send_info[i].ssk =3D NULL; @@ -1528,57 +1520,83 @@ void mptcp_check_and_set_pending(struct sock *sk) mptcp_sk(sk)->push_pending |=3D BIT(MPTCP_PUSH_PENDING); } =20 -void __mptcp_push_pending(struct sock *sk, unsigned int flags) +static int __subflow_push_pending(struct sock *sk, struct sock *ssk, + struct mptcp_sendmsg_info *info) { - 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, - }; - bool do_check_data_fin =3D false; struct mptcp_data_frag *dfrag; - int len; + int len, copied =3D 0, err =3D 0; =20 while ((dfrag =3D mptcp_send_head(sk))) { - info.sent =3D dfrag->already_sent; - info.limit =3D dfrag->data_len; + 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; =20 - 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; - - /* 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); - - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, info); if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); + err =3D copied ? : ret; goto out; } =20 - do_check_data_fin =3D true; - info.sent +=3D ret; + info->sent +=3D ret; + copied +=3D ret; len -=3D ret; =20 mptcp_update_post_push(msk, dfrag, ret); } WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + + if (msk->snd_burst <=3D 0 || + !sk_stream_memory_free(ssk) || + !mptcp_subflow_active(mptcp_subflow_ctx(ssk))) { + err =3D copied ? : -EAGAIN; + goto out; + } + mptcp_set_timeout(sk); + } + err =3D copied; + +out: + return err; +} + +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, + }; + int ret =3D 0; + + while (mptcp_send_head(sk)) { + 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; + + /* 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); + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + continue; + mptcp_push_release(ssk, &info); + goto out; + } } =20 /* at this point we held the socket lock for the last subflow we used */ @@ -1589,7 +1607,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - if (do_check_data_fin) + if (ret > 0) __mptcp_check_send_data_fin(sk); } =20 @@ -1599,49 +1617,37 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk, bool struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; - struct mptcp_data_frag *dfrag; struct sock *xmit_ssk; - int len, copied =3D 0; + int ret =3D 0; =20 info.flags =3D 0; - 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; - - /* check for a different subflow usage only after - * spooling the first chunk of data - */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); - if (!xmit_ssk) - goto out; - if (xmit_ssk !=3D ssk) { - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), - MPTCP_DELEGATE_SEND); - goto out; - } - - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - goto out; - - info.sent +=3D ret; - copied +=3D ret; - len -=3D ret; - first =3D false; + while (mptcp_send_head(sk)) { + /* check for a different subflow usage only after + * spooling the first chunk of data + */ + xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); + if (!xmit_ssk) + goto out; + if (xmit_ssk !=3D ssk) { + mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), + MPTCP_DELEGATE_SEND); + goto out; + } =20 - mptcp_update_post_push(msk, dfrag, ret); + ret =3D __subflow_push_pending(sk, ssk, &info); + first =3D false; + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + continue; + break; } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); } =20 out: /* __mptcp_alloc_tx_skb could have released some wmem and we are * not going to flush it via release_sock() */ - if (copied) { + if (ret > 0) { tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, info.size_goal); if (!mptcp_timer_pending(sk)) --=20 2.35.3 From nobody Sat May 4 18:08:26 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70082.outbound.protection.outlook.com [40.107.7.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 6CD7D2F47 for ; Wed, 19 Oct 2022 13:36:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MiimmyhbETHdx8YZLz7kRwgfIr1Yi65u+9AZAtPhZ7/p+fZBx55ZjeG2o6NTTWfq7Yuz6As6ryA3EPPsbAXKr3tYKjzskJ4lHuyh2Ao3aPUu+EEKZEZZX/LxY81IwmX2wtFF2NJ9clrXNy4e5cN2zDxRCtQzRZRxhhO7ZDabm6eqvmKG9/AKdPEOi+Jmkteh2j9PUtIj3RdXjzHhoh5G32eiyOcHQgUGixITDN31iWVHFRJa5wVd2fSJtW8vFnNIAiLBGm234T5GwS2niDcHhOcTeZ/elPkT7He1auHJcsMMgZ20GDptiE6V9ql67AkONhXn133ruB4UvNtvLuh0PQ== 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=lwjlW6J69Yye0slij0JEGkLPmDlM9OilptOWmUlvGIM=; b=VQgxYmFAUP2zLFrtZcNA4AGW13wl2V2I5JacFl4JOe1dUc433BT4vD5dSnbwKf8GndftGyhvF9IFFWhYi43jKUoODhYSRvR96gRuULLrRcxTqC01sWru01HwAKLQWP0vPkHrO6Z07nEZ30aMVu8ee9+2xePDGezcIVg1Q0jr81NSXazp2BvW2w4IBpxmJ1dsw+oct8feXA7OtS5bECNZso4PKgZEDir7URSVx/yqbEpo/VhROjTWZ11rFAPFZjM3bK8wOAvTHad4ngA3GBmaXLeQXPH9OOFo4kwQoMU1vI8ed3kIKQFX2A95HIQ2Rq1OYQ947JVs7vtz0nzM7U67Qw== 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=lwjlW6J69Yye0slij0JEGkLPmDlM9OilptOWmUlvGIM=; b=Kl45/tGDySnzdwROWfTB3UsugkScDKK14ot13B2KbIWoL/uyAy+wmVIKo7shcbBCQ3c+hzh+kSeCfmuJBsyh3dosx7RmJMYRqFdb8DkKkS92sYxcNe7kvt7HDuSyTOVkVHYuzKkMW5Vf5MlmcwnX6W3vjk7+d14SjmpJTcqhNMrSnD7MulzDI3PvPTKMoy+nLXf2Et0oBhwxXRVFWLkZJSm7sYf218YM4utTp3Y7YyxBlUeW42CDVyEs7eQZIkonLPqy5qT7zGiRwt2CWjG0vsxVoJzeEkMFclFwWvOkZC+5+AonkRynGBnRxntzSQ1xCI/7IFMlZh0HtVf+LsCEew== 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 AS8PR04MB8261.eurprd04.prod.outlook.com (2603:10a6:20b:3b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:36:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:36:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 2/7] mptcp: use get_send wrapper Date: Wed, 19 Oct 2022 21:36:00 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0024.apcprd02.prod.outlook.com (2603:1096:3:17::36) 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_|AS8PR04MB8261:EE_ X-MS-Office365-Filtering-Correlation-Id: 5737b98a-58aa-43e3-ff7d-08dab1d6ee1f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /MMPbVuC9Sjn0xgZXHi5o0kccN4naQJeDuk34rjZZst2UdhkYfqdxZnIape0NiDC75C/4svfLVpoZpjXGmvcehjDUrLZO1CgxAw5r9kbreIt8/54/99me61wH7gQAOXIEnirwfxOhIz1QBgvmK2i8BhgO9G74wjIQIpfLkbY/tHstu1K3uyyALahCYy2t4APyMuX4Bd1cdyCGMmI/MlfGm+eom319koa/3CM4Z90yoAse9ixe7qXu/uq+/EYpkpPDSvLrjEFdN03Y+JN7Y4ogFHf8ErByXRwoC0lcsoWiIS6VRXO42vKX3+XCnuouJ6SZcOCXgYgYRSa0CITZGTFjoYAQUkUQaijpRN4MrS9taoBg75KAgkafc6ET5H0eXFIy25ey64oI6eycA2lHJTBMcjiJj6/KBtk9L+Yg1Oqbxk1/gMKsi9UPla3SwC/trjZdL9jKxhshUUhumiIXIqG1sCE0fa7cNomaJbmmuNVYf8uR0+tr34BgvSHScM8fQgJJbn5K/quXTfOV2FnZlIa8+IdqTVK8PiCipygdJj2Acdrr0Fxsdvk5/YhelFcc2r73u7CF1IvN2JF3CqY1wizdcSvgV44UdXB7SU06Iryvdi4qYQnm6039IM/Mhd64q3DTvNTtUYmh3A4HIBCNZYzjNfJ04M4+5A6VZCwSvdk3W5Bligtsd3LNTc1UthWsdZhJ7V8ZKIhq8xoNhzz03Sa64QSPMLoUCM1TwRij85YpezsrfG2wXwmqmUyxbZw1S37 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)(396003)(346002)(39860400002)(376002)(136003)(451199015)(83380400001)(36756003)(86362001)(38100700002)(6666004)(107886003)(66556008)(316002)(6916009)(5660300002)(44832011)(8936002)(186003)(66476007)(2906002)(6506007)(2616005)(478600001)(66946007)(6512007)(26005)(41300700001)(6486002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D0txH1k3/xG7XarH4Tw+lUVQnc+DR2mHgSkvw8NmPCsWbzwjSiV4GvfGMPK7?= =?us-ascii?Q?53x/YdmCMMTMQNw78oSIv1fQFWEVfIzoh82ZPU47wPXq/90uRJO2UlBbIN6s?= =?us-ascii?Q?H12jGCRIO62lsg1n9IDUhGus7v//kFcZLog8OHnmZUaZZ1DDh7/Fwb0etL27?= =?us-ascii?Q?3SKffvYdQWoUKvoRkBARJlgOVuj/2ab6Xt7qrVuNLxWn3xU2vy1O1Ai2NvyQ?= =?us-ascii?Q?GG+sEuCSHjAl6pkSIxS3W/VCxVnpp+eE5k6pxq5oWyqhjR47LK6v3SFUNBqp?= =?us-ascii?Q?cxclyOuL6TBQyV7M7RtfQoC6Gf3BTjzZCCFb7p5njQk/SdzDByVtREu16JHD?= =?us-ascii?Q?r8nN9HPzb3wQhv2nRJP5G/6Te3xHdNHpcJ75qvYfkHINX86BkmfvQaiFdU3t?= =?us-ascii?Q?reUfc108ZicZ3YAUVWqRSZ6PweQKhriyaJafovz6Nh9EHBQa/T0ZoWnXRfb5?= =?us-ascii?Q?lFBo2NKTwtEmtJ8Oi20szkiYADwY3fbZ61ia3/0nVwqMGW2J1lURjVR84gKm?= =?us-ascii?Q?f1mbU2TjLqVxUl4IgIQ6sRGxr0uMVe6wQnsVtXrEdxafgliI4R69fQnhbtFQ?= =?us-ascii?Q?e4k2B4gtKrpWB7S9vm1DmyeJJlMPM3iPd82upxAglw9o6Sr7EdjnYKeUmvC/?= =?us-ascii?Q?DwLXIcHnpMmBXEiXTmWNkMAkcxJXmwaP6h2DLR4Eha+k9cMtEtcXxteLUXxQ?= =?us-ascii?Q?KMXZH0jLHz08rGacL/xAWh7G8e8L8TtSjQ7m6/FDOQQygYkr4MsLGe/RJ4l2?= =?us-ascii?Q?wqgjG3QucUJYp7Mhn0jPD1cDE8xIL3u4R9BpePyI/0ctgXkNkEiKRXEkZJFd?= =?us-ascii?Q?XjpIbNEZ5Vy7tiprkTYc+ymLGMOibV+rHNhjFgS6Bxqfl4+hgUtO7W1jAj37?= =?us-ascii?Q?Eb42mGjO3OGC8okwl906flfdB5+Ff2RdUQwHEnoOG+xDW+VGzyFjwh9EqJZv?= =?us-ascii?Q?XT3ZR/gzBH0wtsS2/EwLg++cpJavacDWYcuDHF+bJbOIxwsJY1iCsc/JH4Fy?= =?us-ascii?Q?lQQG68NMdw23rLrfJRylXjuAs9Pp2ztuesAL9ztMMMSuWDr3tUidqaSDBo6y?= =?us-ascii?Q?qtBvul3/UFG1E+pUco9RqUqSisEFBy1RuPdamHeYt65NaM/5jSLOKRJKEnry?= =?us-ascii?Q?1yjNs8/9qsHRqkF4mc42k+A2kZlSNvhxMwySWn2g9yN3cCsip1hKaaakrl65?= =?us-ascii?Q?AVVe4Sqqgvvv1o5vY6wW5qNld3yINdERkQsHCxsKGzzA8THTbzzPRh/BuVyB?= =?us-ascii?Q?Kbo1MlI7Z7DZo7YrOv+Jd3mgR+vPwZco0ZsXih5pamK+G6XCdJo7pF9y5Ej2?= =?us-ascii?Q?+z8BVhpBDofIf+qxLo0yb46WApz3qrU2xL5WdtfPFbniSZaeo8DMehBBBgoS?= =?us-ascii?Q?7qoV2vczUevxlDwc4F573/nDDFoBZSwtDhoR3zQe7JgJ/x8FD4ti8NL98ks+?= =?us-ascii?Q?BYKC4dR+wKUE79jG6pZDDMhaaMkllJIxNqhUZURjtn10lfzkSI2c8CLgUSBq?= =?us-ascii?Q?hLqUhSSCf5ALMaExwz0DTLsidfpgNzzv2WaSQ4tRmeAOcaYNQRoEYpd9Bit7?= =?us-ascii?Q?6/o11FwHjklLhJzC4/1ObtqIoZqsE/3Ck+bSC28GCYBY/s6W0Eai0RGG64li?= =?us-ascii?Q?xQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5737b98a-58aa-43e3-ff7d-08dab1d6ee1f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:36:30.5975 (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: B6z6KTTkSjOHrflLL0EwNI5qawQeXetiLfi535Y16R6RNctBgM6LGdVlYeGWfy4WrB2lxbPsS2h5rWMrUPY2Sw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8261 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_push_pending() and __mptcp_subflow_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in them. 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 | 98 +++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 37 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 67450378cb97..05238a0313f6 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1566,36 +1566,41 @@ 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_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .flags =3D flags, }; int ret =3D 0; =20 - while (mptcp_send_head(sk)) { - 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; +again: + while (mptcp_send_head(sk) && !mptcp_sched_get_send(msk)) { + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); =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); + /* 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); =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); - goto out; + /* 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); + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + goto again; + mptcp_push_release(ssk, &info); + goto out; + } + mptcp_subflow_set_scheduled(subflow, false); + } } } =20 @@ -1614,32 +1619,51 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk= , bool first) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; - struct sock *xmit_ssk; int ret =3D 0; =20 info.flags =3D 0; +again: while (mptcp_send_head(sk)) { /* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); - if (!xmit_ssk) - goto out; - if (xmit_ssk !=3D ssk) { - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), - MPTCP_DELEGATE_SEND); - goto out; + if (first) { + ret =3D __subflow_push_pending(sk, ssk, &info); + first =3D false; + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + goto again; + break; + } + continue; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - first =3D false; - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - break; + if (mptcp_sched_get_send(msk)) + goto out; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + struct sock *xmit_ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (xmit_ssk !=3D ssk) { + mptcp_subflow_delegate(subflow, + MPTCP_DELEGATE_SEND); + mptcp_subflow_set_scheduled(subflow, false); + goto out; + } + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + goto again; + goto out; + } + mptcp_subflow_set_scheduled(subflow, false); + } } } =20 --=20 2.35.3 From nobody Sat May 4 18:08:26 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20073.outbound.protection.outlook.com [40.107.2.73]) (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 04F6F2F47 for ; Wed, 19 Oct 2022 13:36:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=azmqajEthFcMB1JixtRyCesnXg8oVPE+7CP385TsfGcVIDbRPo7/AZymnspyAG0cTkr0qFEP1iVVXkeg9VAOylW/Ojfkdkd9PaHL/tdOMMvzX2cq6UoPXuW9RCiYPy48Zdp2RRScX17m5rtWp4I5qF5BEsiune7pm2lBNDlI+OMDBYdoCTtFeQ+PQPE9Kss/y/Cqsy0/NDFEZdZf9lsB5GJlVS9FSD+OYHqAmowlqEFZ/aOBVU2VujuxqoFHK6oWmO0+Ir3HS1Cb0rT0Aw7xrscJJx1AeJOEifWEeVD7k1LNAelRexeiuwrVO8FXDq/WcvIo6SH2LFuLw+aNGG9cOQ== 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=fJRlzZnmLsIvLtv5Wy7MR6eh6z/SYPVfKcxNWF4uDAw=; b=QPar1X+WCXqu6PzpRxi7aByk5iUkL5DuaJ51mqICacpoGaGlvYV7j/SUXvWa4BJcKu4vtBo+Ll1MyYLqUQKsXKQvi/JX/Jy89LQoDLZdOgddUFK51XYfNvyADVuqUr6gVjYqe3xwU87ut9z/tIWMHh6AkthLNq0gq+97X1zGk+r1Og4XsEyfJp/rrHvcuYyE8Mnd+uOmVRMcDbkp7VTWcD8/0bLDNiczTaDjSC3EAqN+GLj7fcJtT2gFXivvisPZyKO3AM7LMbVtG8smBkgDn9Wc0ZEcci6ZCh4t9AbFrzpK5WhOVX5AnFeLOhQIwiZdd2CQ1hUxwEqOCG8k2SEmug== 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=fJRlzZnmLsIvLtv5Wy7MR6eh6z/SYPVfKcxNWF4uDAw=; b=cBV6/r9v3zzvcLsBUZ6GU++5d7xCThJq4vvpRobxaGlZrnWQsVWVWtEIzkSxSXwjtk4/gxZWNhaKH/joOhCU1/exn8/MVn32q44dTLSznII457+g5nhBWotiw/D3iyyrH/72zBt2DhgzGC9WVDElv7zHvJyA8/4vi6cEauSG0OM5vGlgiGpCYPOxpZ/rwF0+6qi80K1yfGOUYGsZqRLg9owLG/N/w+ucQTZQ/U03zp0WCeHwLQFbpPzECLNn8NW3oGud6aRKcihO71SkLISaz42YJEewyKL5vgJuW82McC3eym2hACWxmhGaqIwr1phSRiv643J1rMEuuk4E5dzQQQ== 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 AM8PR04MB7251.eurprd04.prod.outlook.com (2603:10a6:20b:1d2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:36:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:36:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 3/7] mptcp: use get_retrans wrapper Date: Wed, 19 Oct 2022 21:36:01 +0800 Message-Id: <877611411d7973c2b7bebe36ccc2b9c23e7c32fc.1666185947.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:3:17::23) 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_|AM8PR04MB7251:EE_ X-MS-Office365-Filtering-Correlation-Id: c03be5c6-2875-4d82-8a2b-08dab1d6f3dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0frJUso1PTQcKPTtbejMXOlOxR+GiMapZPcbS6J4FRQ/7jyH91XGtSDZglP9MT2c23pUdSiHDvhiJyQIYOzDmJVJoVt56jmAF0K8jWVwhI54xjTr8Gp2qq+mduNfFU58Thxz6Mtv5ORHiHmQWBn5rxKibihdPYc9LU9WJkLV8H1aseKvVehZ0zJViZeB4cBqSfot1GXalutuGjZM0NGcLCbG+9T2BaV1rLRIFlrdhRhm3djuwEAc9liibsF3gXcwaKzJttQkDpNNpkdakpFt06Tct/N9YRiPTCaxSa9qlKTEBoDdKp8i3fYG/W70T+K2yhpP+r22bwetSQHiw85cJxef3z5R5gtXaZ3i1l5hpI0wqqrsaAPC7bVgrfYNP+z3l+36Np4nGW3HLloXDEHOQ8sua6zEQYWG6Fpvd//TgCmlfOexolhedLVwn0vUmOQcGMC4+7tiUO6BWWDP/pjl5i/fIEaZNn8ENhpyHFWHXY98Z2gUATLmcgUDvnFEXREIo8YKSF1RG1JxAdJQIwKaGLCjRES9KcFvBB7vkSHJ7xsiMSzfhqMJLDr1xPllgPJrPLVJ6USbEJ4V5+Qzp91E/9cwNMjrXItiEDOIgqOqlt7mBrJV+nNBFic/hDnZxH/Fqkb306i6fjxNlSSPNHPLbB4bBlHseB/bV6LCFvphSjTNpWmdr9IsDLY1WZIabU5hNCY8EE5eMx1Fs4q9Hc3OyOBN/uuvXGXtMrwbDcDKnq0vUPJ7xa+JPdbKD92Qzj1g 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199015)(86362001)(36756003)(38100700002)(2906002)(83380400001)(5660300002)(44832011)(6506007)(26005)(107886003)(6666004)(6512007)(2616005)(186003)(6486002)(316002)(478600001)(6916009)(66476007)(66946007)(66556008)(8676002)(4326008)(41300700001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iNBuRnSxWgWIVbIRxTQ9aDSPxJSt6WZ8HkS608WXARZmFzMHrmTwoOvmgW4L?= =?us-ascii?Q?kRcDIASLK2oNcdGbasofpQQCUNyUZ6k3cyAmKmhm617jHCiDlWEuAwt1T7TY?= =?us-ascii?Q?pRPf0nfuEHFu63P3/xxefGiD/MH4OPfLXLAUbNQK1l7RZ5DmJtBgtV7lolq8?= =?us-ascii?Q?09xFtzXGOTcuFrF9hKwoc278rJYOmuHU/VNQcISgdpfgRde/don3NukEQ3ie?= =?us-ascii?Q?PaHU0iuFmxPbHdaDrI3I7tEJYh5evWUl/51rZAaZL+PMpDIeZyy+Fz0y0NlY?= =?us-ascii?Q?UBIaTWk+KGuMmfTav3Moi4ajFQ9XY4QYFiOtbbJeYoMgiVI9iyZtKFpcA1Xb?= =?us-ascii?Q?ctyHd9yeLo/jnFYPGKw0hdeRFMzbtCtktc1t94niBOOge2aDT1enw7Xz6LG0?= =?us-ascii?Q?m3hMjLM1QrelpFXiimTIssT40OS4y0/Ki11Gk/8kR1fxI1D/sVbTaWo7NnhF?= =?us-ascii?Q?zduK00WGFUSYP9FwD9slN+YrjT8hn2bxGzqiBkImllltBSW+8k/SX2L2JnhT?= =?us-ascii?Q?ha6fhLv1Z6zyK2IQAEkn1Ydk7UZQwvt1BfLZkHGSlkprH8uNG8jmx8e3yPpa?= =?us-ascii?Q?PkyMp+3UZx+VcEtiASblJBd5fdkBMV09mSghAcltGktLuIaVvfsn2QAglHOP?= =?us-ascii?Q?QwfGjj6LJWvuL1BW1E5DinkjS6uHmKhToX3yVhDAJyPm0suI0M3lt22UbuMv?= =?us-ascii?Q?d7mVDrCsqyV7AtQUqZyTsYhUdFj0hwraxfE6Fg8GP4yUkxDR5aHa2JLV8lsq?= =?us-ascii?Q?9fEskZZ5q0ujVQSWGEhHFL447Y3Z7m6TDEmo8aQvEEyao/7r61xygxbTEGio?= =?us-ascii?Q?IaawU2CcXJM5mjHp7rEmGMUV+iUpD83E2w2ulWRuyKm8eerYjRjjKh+bY8KT?= =?us-ascii?Q?RJ1IRjb9k3x4D6cSkO9pQwNuJvwBSszq9HErjl4BjwPapkDDJjRkh4WVt/sb?= =?us-ascii?Q?VPG+l7IBdiOl/sfFHQAHnKyag5BkiXM5rFwEWl687Hc14th1crIr/0KDJwEq?= =?us-ascii?Q?eRpCPBJ4Yqwdj0wxomkuPkck4xV9noVKt1PHOTjzuNnY1NlbiASGcynhpnXo?= =?us-ascii?Q?lKI7m1xC/9ij+baAgl8GzME/jsgs3FFj5RMzB7+6Sj2w99eYYqxcRfkQXacv?= =?us-ascii?Q?NupSI/WF1o9sPbojhWy8xQsgElSRCpfxKfRtB2UfAEr2D2JK2kD7+kv1k4Fi?= =?us-ascii?Q?vx0SQp8PLQVilqwWQCEN1TERF8ttnnBijlNCYtMrdnig+wawpVh98sfWRrBf?= =?us-ascii?Q?LWMvdxcxnDPoA7T1mUUtxVueFjS/Ux82oWaAO8OfFzMGnbszgbEGZTLyTwZ+?= =?us-ascii?Q?5G299s0CQXKcpur4shh7AoNSmPH+8FPhUsghtwDwJbJoZg0uJI4EG3Ng3/+u?= =?us-ascii?Q?04EgK4VU3Ebu/G2eITfo+o9JlfMJZUc+ivZoEZvPjNZx23qfoU1ZIf9MfwgT?= =?us-ascii?Q?1oOYXMEuAUP+L9gj9OchmS6sB4zOFxthSyww0ouCqrWQjObfnXdxlT9ZDxsh?= =?us-ascii?Q?cER5AlrD0UhoRx1b+u9hKPWcdU8CyQYPDEkk2lEhSSmrtv8cmZq6XGrZk3fa?= =?us-ascii?Q?/FkGvANFNTc5B+2fHtF+o74GmPRzLyoP5CnGbv2tJUuNg47cLRSn7M5AEMD6?= =?us-ascii?Q?NA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c03be5c6-2875-4d82-8a2b-08dab1d6f3dc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:36:40.2999 (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: VeQ4KHW95dY021A6DWu8hXm5BHIUzrCsuwZtDz/0NCKici2lVDWssodFxfpymgSc/SHVcZjYnVfKTWBqEEWbLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7251 Content-Type: text/plain; charset="utf-8" This patch adds the multiple 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 retrans data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 61 +++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 05238a0313f6..7c0d81c6dfe8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2519,16 +2519,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)) { @@ -2547,31 +2548,45 @@ 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; + + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; + + lock_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); + } =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; + release_sock(ssk); =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); + mptcp_subflow_set_scheduled(subflow, false); + } } - - release_sock(ssk); + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); --=20 2.35.3 From nobody Sat May 4 18:08:26 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70079.outbound.protection.outlook.com [40.107.7.79]) (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 5D2802F47 for ; Wed, 19 Oct 2022 13:36:53 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e4o7QdMZ+bvPBEJNmAaVcKDU4PDFR0d9iURpnB3a91ttQZf6AeyG3XQMnuSTAGR6xXqk+bLnr53w7nqjxT9sSjOHRtqo3OygUmXYp4xkFZ877P0uF1Sc69AN6DJwP4xb9po66KgSBcYHMBPBM6WS2J/vtdfKMoDRsIeO93W5u1ea6B1iG+fA8r0Pqt/PjjEXyE7TN6pwj0X8/fMIanfrvly2UEgtNmf6J2LoF/p5Jztyva3fPaqsdkYYmq7Yp6UnrcoEdXrh2zWIXLf+bD4DoWovBBnBE+TE70R+/IOUWhXV7LejsYrHD7Se4e5YRr064AEkGUup8+VfDREzC5Fd1Q== 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=FRfrELYvOcYqwmiB7zae4Uw8lIBHVDM9ygpGvnBlsaI=; b=XoiuXcp7gIxAgNDKKSdtPsjok/u9T6lF8aYxBoTaPtBlb1W8ASisRUXE8bE5cDAL3R6O+j95kZR4FGiacsUt4QM1r0eN61YQLxFOWYIBQ5lSUf33g2s3Rw+IwgKdlNMbkxLjDEOBts3HHPxkkau3zSa8bc72GYedGpIl+hhzygR12s+3+I5VP2KpY4VMUwZxlH9kQOXDiRtA2WyJnrPLTWD6VSSzcdWcsK8cjo98cSg83eiqkpQXy5VeldMVf48JOEu5xs1E7dzpFmLIiKqrjvBZn9EzXOnfMEJpiYHPmlsD5MrjsAP9cmLTBk+k6EuwL6Yr+48Wju3vvHfyRPbZfg== 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=FRfrELYvOcYqwmiB7zae4Uw8lIBHVDM9ygpGvnBlsaI=; b=wpZJM0RUBh22yCukR1zBIxLb+Ot6moY2ru0EzN5KsnZO1om/Ws8gnORI729n4r/dzt3dbuMozG6LKBgb8qGbmqKo4bIac/AJypZScSgVZ6fcIJDINtwfAxvNXWX0xbeXxL1tXbckpaPnJhOH/4C1zGDagJ4w17TnPHQw1fiKxlHdB4Odqd4STGTFpIIUx8x74DPBBy1L5k7WGBnKGJhVL979OujWS+5XCD0agOeFXMKX19NWfSy4emN5KggB3JPTNJGAwzpynJZQPiPmtiBq1jTjsIhCAgHnTNf2siqEoIYMeBZ/SB6v+VPeurz0VZEBWG2I0aa/kP5cDHk91HXKVA== 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 AS8PR04MB8261.eurprd04.prod.outlook.com (2603:10a6:20b:3b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:36:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:36:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 4/7] mptcp: delay updating first_pending Date: Wed, 19 Oct 2022 21:36:02 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0078.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::15) 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_|AS8PR04MB8261:EE_ X-MS-Office365-Filtering-Correlation-Id: f258dae7-62fe-4126-fa45-08dab1d6f8d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6L8HFKLxVWVP3yFvT+x0qQoxrjtgSxavaF8eh7jQEKekSbs+blymn8GHhSjXOQMdKKqwi9xjJctszM0r4DOXCGcnoQVjLyLR41nA8Y89Rr+5p3PmTGZ08Z6pU8q7gKUpl4cmrv8T1ECSoNzlOr5Zc/Ui05w1LNFNZ4Q2o2u2AeMOLjEcCc+YEjNppVk2GR8wgnRNmy4yCoYyrUJg0XD/zRA7YWz3iCEcfD3UWEJ4fSy1jwEEZuwQXdxTPL2SMxiDQ7K3An3roRt6I+qZzbIjXg1q8RlLQcaK9uw65Lfs6BQI47vjLeFJ7Tyd5X7sdMpOIIdJSpzOJsW+JmKMtnO9XY6iq9DNDJTUE1W9MJcSY4fW4r1fy4CIE7wokWj1mt/9iCXFQMWjJ5wVS52J7Dfxr9l0g6t/6/zFap6CVaxtr0fiKrAch7G1emGzCtEnxSRE7MUFoPB6XC0lbEDr/f/Njv1hoBnFcKd+jIgZWoCtN+gOQ423a6sGpVuN62tL6uVklr7eGcYZJVItAQrJZld+kQh4s1tLCXKSsuDotTyIEOhIRXk2QVXRsccUNZLc7vTu7CZMC9goCywoi8Y7TBVCxB0zEd8tBDElxfuiwH99v+UQNWe35zCq2vCJYTBzrkk+LLHhZN8cx3iGRER1jtPsf88B5fsxmWbBPvuufOGtloepESa60NXkHXi1Xxf0vbngGQolR+hdGEoSz6gAv+UNi+XKJdPW4QowdES5XZwAY4y1b5By5iqFA47+VpYJtQA+ 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)(396003)(346002)(39860400002)(376002)(136003)(451199015)(83380400001)(36756003)(86362001)(38100700002)(6666004)(107886003)(66556008)(316002)(6916009)(5660300002)(44832011)(8936002)(186003)(66476007)(2906002)(6506007)(2616005)(478600001)(66946007)(6512007)(26005)(41300700001)(6486002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/5D9bwZJ077HisnXF18dIlvQN78GWeQOM0AShkeKBvdJuE8Edlxu4VGyAOtT?= =?us-ascii?Q?AvL6Vbx9o9AUAu2cylXINfBjfyIXt48eYGX512gT6M+PDcrrWa2z+AjPsX/9?= =?us-ascii?Q?9LkrS5feTZi8SsluBq4TujmBpKurqqKBPBX4dh65eVNe5zgFMl389Qrf8+NG?= =?us-ascii?Q?/Is6b+23/rn1S44QKzhUPryxeJTQvxi0dnm+N7asKLXr1rtjH9buKmFAdozq?= =?us-ascii?Q?CAlsVTbaGf70Gf7fp5etGjJr34j6A1ksEVsHt3KRDqmp/rtmy5FBtM/cn4yL?= =?us-ascii?Q?z6aqhlTt2qnwyp0D8Z/iNJX+jOfhSc7jhYX+te7s+oX72DQU5kUFcsuBdAl1?= =?us-ascii?Q?4+da2YPuHuN5CVVn+yvVB8nbVpRXfM3geOvmXAGBwjVwSvjwiNPM1fYE6d2K?= =?us-ascii?Q?tUh6V2AjjMXZ7dnTttuTKFkKbNZuJo7OJcKczhyKksv3vZH5BsGD324WZeqc?= =?us-ascii?Q?9bU3x5/SSpxYRtulXoiBz+iKmnajTjqZ9lfsR7f3s1Rg3vEwDLt5rqhBN8Bb?= =?us-ascii?Q?erFgR6SVtjyiUOAVFYa5jkbMQ9ftVEPMVe0nT5dCz+WfpmNVOJOFUUuHNtN9?= =?us-ascii?Q?dFUaEXe/uI/mx61HYtBwauHg0Xqqohc1sfqJACxTmo8jWgIbSTmSXRZGvsmC?= =?us-ascii?Q?1daipkq3UtaxdLdUJ+F/1n1Z7i1c2ZGVCmAGQh0oZ1zK2nNETn/oXNuaZFnD?= =?us-ascii?Q?BPKsyFDX0fE+FUYKFoxCSVREB+QUMYEpmuX7t3dj5pq53+Y5yG+qqztpRjON?= =?us-ascii?Q?z35tVlPn68ZACqcVZPMNfny42ump1PtkRzZTKusZjasWt8iw2cyPns2/7MEF?= =?us-ascii?Q?RmC8ofiS20Ciz+DHYF6wT89vMmLWgWn1c8x0xu4sAjyLYum6YCMK3RpBYxcw?= =?us-ascii?Q?WMKmnsw2B07kUboBwkQZ8VRSWjent4+Z33LEG9CcThMmcU0ZvWqns8R+5b8E?= =?us-ascii?Q?HKi/T7sK7XiYCKcXRa6MZ/03WaF2mx1lnstm5c2+XOI/byneg5y0+KVO4Vy7?= =?us-ascii?Q?fVfUR0NXe199VdrvtMrAJ11n9L6v6w+MY7eIWXrtg3R48Vg7FIbg9T+cXsKs?= =?us-ascii?Q?TCVTrj4jbsBYVVBrAxt+ebPzBy4TyBUUBeJpT6YZQbVjBjGUI5zlrtnUO/fz?= =?us-ascii?Q?gGOeF+RhLiNHtV1U8psplYKBT5RvOhMx4RNLGFd2KELk8DaRKwDU4XOAAF3w?= =?us-ascii?Q?EFt/59POr/wm9J+cpFxiMHvKCkOhT7NFDQb1BHuMBhyxX4Ao3YqSdzYg/UR3?= =?us-ascii?Q?JpD3RwWsqNpydwnTuioBX/dFSp707fIbHVxOHedpiC9Yin5/rYZZOhd9ACdL?= =?us-ascii?Q?Emjmckd4oC1Z2ayKLJW5OrszrOEC+PhCIIe5Ajh5WB+727Z4kYFNys2vv0ZP?= =?us-ascii?Q?Ok3iu3XMTb0lqA5av379UaXBS+Cv7qDW04rguyAEQeGhbeCAsz59M714Pn9e?= =?us-ascii?Q?UT2/Fe57QKIOXj3bUKzpveDqAJ/hlaAwnaNb+asF6KuXfmNXhlQzk90HapK4?= =?us-ascii?Q?fgmHSI7wIyFeZF22MtK50OU1Ipb2UsDmwyYIHklng7dIRBccTiiecKRacwoi?= =?us-ascii?Q?8V+KbgqdZTM5lyPiT80pfZKWtjS5WHP3+z33b7RbxaOVTdKWZmcNzQq40ysx?= =?us-ascii?Q?yg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f258dae7-62fe-4126-fa45-08dab1d6f8d7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:36:48.7211 (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: BQ5FsXiMkJM05z18uHrDabp812kGuNESd6HOvdK2JB/GrzK0FnpUcAxPNR9AHax0zVmMrqe/Jgbm9fGqqCMDdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8261 Content-Type: text/plain; charset="utf-8" To support redundant package schedulers more easily, this patch refactors the data sending loop in __subflow_push_pending(), to delay updating first_pending until all data are sent. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 28 +++++++++++++++++++++++++--- net/mptcp/protocol.h | 15 ++++++++++----- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 7c0d81c6dfe8..b1fef2b0c968 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1121,6 +1121,7 @@ struct mptcp_sendmsg_info { u16 sent; unsigned int flags; bool data_lock_held; + struct mptcp_data_frag *last_frag; }; =20 static int mptcp_check_allowed_size(const struct mptcp_sock *msk, struct s= ock *ssk, @@ -1514,6 +1515,14 @@ static void mptcp_update_post_push(struct mptcp_sock= *msk, msk->snd_nxt =3D snd_nxt_new; } =20 +static void mptcp_update_first_pending(struct sock *sk, struct mptcp_sendm= sg_info *info) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + + if (info->last_frag) + WRITE_ONCE(msk->first_pending, mptcp_next_frag(sk, info->last_frag)); +} + void mptcp_check_and_set_pending(struct sock *sk) { if (mptcp_send_head(sk)) @@ -1527,7 +1536,13 @@ static int __subflow_push_pending(struct sock *sk, s= truct sock *ssk, struct mptcp_data_frag *dfrag; int len, copied =3D 0, err =3D 0; =20 - while ((dfrag =3D mptcp_send_head(sk))) { + info->last_frag =3D NULL; + + dfrag =3D mptcp_send_head(sk); + if (!dfrag) + goto out; + + do { info->sent =3D dfrag->already_sent; info->limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; @@ -1546,7 +1561,8 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, =20 mptcp_update_post_push(msk, dfrag, ret); } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + info->last_frag =3D dfrag; + dfrag =3D mptcp_next_frag(sk, dfrag); =20 if (msk->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || @@ -1555,7 +1571,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, goto out; } mptcp_set_timeout(sk); - } + } while (dfrag); err =3D copied; =20 out: @@ -1594,6 +1610,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) =20 ret =3D __subflow_push_pending(sk, ssk, &info); if (ret <=3D 0) { + mptcp_update_first_pending(sk, &info); if (ret =3D=3D -EAGAIN) goto again; mptcp_push_release(ssk, &info); @@ -1602,6 +1619,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_first_pending(sk, &info); } =20 /* at this point we held the socket lock for the last subflow we used */ @@ -1635,10 +1653,12 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk, bool ret =3D __subflow_push_pending(sk, ssk, &info); first =3D false; if (ret <=3D 0) { + mptcp_update_first_pending(sk, &info); if (ret =3D=3D -EAGAIN) goto again; break; } + mptcp_update_first_pending(sk, &info); continue; } =20 @@ -1658,6 +1678,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool =20 ret =3D __subflow_push_pending(sk, ssk, &info); if (ret <=3D 0) { + mptcp_update_first_pending(sk, &info); if (ret =3D=3D -EAGAIN) goto again; goto out; @@ -1665,6 +1686,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_first_pending(sk, &info); } =20 out: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8f48f881adf8..118fe5a2745c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -350,16 +350,21 @@ static inline struct mptcp_data_frag *mptcp_send_head= (const struct sock *sk) return READ_ONCE(msk->first_pending); } =20 -static inline struct mptcp_data_frag *mptcp_send_next(struct sock *sk) +static inline struct mptcp_data_frag *mptcp_next_frag(const struct sock *s= k, + struct mptcp_data_frag *cur) { - struct mptcp_sock *msk =3D mptcp_sk(sk); - struct mptcp_data_frag *cur; + if (!cur) + return NULL; =20 - cur =3D msk->first_pending; - return list_is_last(&cur->list, &msk->rtx_queue) ? NULL : + return list_is_last(&cur->list, &mptcp_sk(sk)->rtx_queue) ? NULL : list_next_entry(cur, list); } =20 +static inline struct mptcp_data_frag *mptcp_send_next(const struct sock *s= k) +{ + return mptcp_next_frag(sk, mptcp_send_head(sk)); +} + 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 Sat May 4 18:08:26 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70072.outbound.protection.outlook.com [40.107.7.72]) (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 EB8CC2F47 for ; Wed, 19 Oct 2022 13:37:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RKRFSBqXIXqBc0vcTs2TU2vX2GTuP6eynTfEoywRh1Rpg3ozK1ayXkVQ6P6KcXi0Vq4r75UUW13vxt6M3FeizO0G3Vy14DWN0F2QMlVrC+aqaDX80zvPP3A2gsB6vSVInm2m9BExJdGkMB/nBgOfC2vm7fvV9Vy8I1f8fgJitYT3UG84mWL0i1GS+j9hewx6rQQmuh2ot0Fks/qkeSaOMsjUuoZ4aIdSuYnFDI/WGDO7bf0zDeHr6UPUCHd4dt0SZeVaNO/2vcRSVSXxXl2mNjCibzDdKmK8htKDEFcmYaKVxuDRPSX2k4cCg11+Psv+tP5krO+fpt+JJRGRrf5fKQ== 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=0iszZLFfbkflw+3GUV/kZdKhKPStHpkJpqhTc5iCuoc=; b=k48/eHZtq0DbOhJ2DLYlOkXOhgiTQZeUknN3TCzb864QbjlrPj87yubh7pamciX0okB9b0xDS/x/UWwEPplJyiSnrSJUZ8luiMLt8UCApQXDdcFCQcpGI2nr7KVCuwzTlwq1FEdCe6k7Qqx2mijV//QIT5uhqz5zyead179rqqegN3BVHLkMvmTMO2TAl+JsVw7KvJfd8ITID10qllKLtv/mKP0ytzqTAGwSRdRUgmiZOAw8qxVcWaUSnnkCxLufV8TohvduTZnMbqpgmYheFBbsegEywIClJyVSHb7S3Cstbqm+eVNB+2nOyOKyx3CLOrubORyMgAowjwaCKeQLwA== 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=0iszZLFfbkflw+3GUV/kZdKhKPStHpkJpqhTc5iCuoc=; b=HQIX450VsocIRJnWlLqrH1ANQFrvSa1uhdLgBVe+bFYneLZo9/rvVLEEE5S0mEdyUFtpuCvxtPXwa7aPHBcMsd2lEMGhaF6k7ywXYgSRAHPwKsbMSj9nDDwqE5miZ1SY7LGu1jj9E5hYfeCUOtnY9yeO+A8Yk9fTfg+1VeiJe3xFcHPrQkvxolFA/7mVAb4f8NmOcArH8qHMjLdmFHV1DCEbDGhdiDWQ52U4kOIL7iutHGo/bX3KUgsCIjxUi2qNh48Ow+O6/zrwAGmQoYbZve00hDTLQmXBCrZt6HKJDyKu7c15cBVBs1YPCremT7csyOC2cAJxMgPHAAbV0dOJ4w== 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 AS8PR04MB8261.eurprd04.prod.outlook.com (2603:10a6:20b:3b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:36:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:36:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 5/7] mptcp: delay updating already_sent Date: Wed, 19 Oct 2022 21:36:03 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0090.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::19) 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_|AS8PR04MB8261:EE_ X-MS-Office365-Filtering-Correlation-Id: cc7b3ef5-50ac-4d8c-7067-08dab1d6fea0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QEYXgV6VmWbgJEQnVQ4DUQg7g/kviahyQh4cboIvnhHtFWFQL4ktD/ZEximV7Zd2Kh0vVgaVhC1H1NQFmc9q7VJcGmuWY0TMrg+Hxd7qeN5K/Vf7bgPzleQxnQPT+R7KQ3rYvu9DCN85oco42/XVE9uFkgdRvj+vtx8IupVsSN9VGTJ6p90ljvC9e8rqV36yn6R64NFf+iJwxIXJ3qPxP0wG3dsYGJIyJUkHKTNOggY8yM99Wat9LrAa20nVLXFK4r4k+nk268Pee21vb6vIBR2GhIVY3txBQuiOj00HYQf+sltqUToclJj0d6GzxLMLICH5nMLYFXlf6lh7A3ow1Fo8aCZv2tzYMYI0KvenWvYPHqfOs7NHyhTtcfd2syN/yXWkA4nufnv2JYGXMhwV3vlzjdT+wLfmbbw2gco4+l1SY3tsgpE2rensJo6PD9CoqUrct4ypiJA0TGebmIUmGdScJ8wdjoNEAMp8JaGYnzADgzz9T9x8L37pNbVpXDQO5FPxeZf0YGOmboLJfl4DsMCBm5A/9xDnGEQ7s+hEMKyK+G+3Yw+z9hhNkhRNgYGHKlBxpEPlMdqvHMGpINX+ZYE8tziASpQhHr6RyKQP/R/C1ToL/lh1PFyvEEkbGvpRy9kjUVRjTxVZvnwmOYkKw73vu4RLrB2vnt+uTcZcDPqG28sxeHaY1dJgyVb8gpy5JNchT4XWPfZWdP4ikhSBDxHo28rlNdyLtcw2ENmn/KFU7MXhAyl9xAJSeBX4wwl2 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)(396003)(346002)(39860400002)(376002)(136003)(451199015)(83380400001)(36756003)(86362001)(38100700002)(6666004)(107886003)(66556008)(316002)(6916009)(5660300002)(44832011)(8936002)(186003)(66476007)(2906002)(6506007)(2616005)(478600001)(66946007)(6512007)(26005)(41300700001)(6486002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ah1T1h83iHg/gMwElOafjDPzj7KY6snPKQjMRy5/iVb8dZFe+RXkKH8xuwh1?= =?us-ascii?Q?1uhunRz7JhfeORwAaZCZevGRrF4U1tJi5vQQG13/xmXFlPP4Saw3ppO5GLar?= =?us-ascii?Q?70pdYTljkbN/7kABimBgI3GfjO5+CBw7Ue1UnAS0JtwRx2blkJjb3SJfilre?= =?us-ascii?Q?eDl6l/Lh3SUVlCKof8dAkMZxzBJG8wwUcYAul69Om/SFNF9NW99yFlnzMo0J?= =?us-ascii?Q?4DBCA03ZLtL5+qLUr5EDqKpmMGNtrYwrsiHFXsiKlTFi7qUlqiXHOuTk2beD?= =?us-ascii?Q?gWcJ2qHxroQbzwOsN6t/AlTN3Ike1nf80vG0ICgovkjZnK+zafPqy9CZjw7p?= =?us-ascii?Q?5zgCn8aKYirzGifw/aC3s2PtBFsc7kX6WLPHRanip/SLQnQMAw8gg03e0ZUd?= =?us-ascii?Q?4qErNa7iYwtnyglAnsiyHpkJZi+bN5CXAidu3MjwgKofzv7hANCy9ANJUNtt?= =?us-ascii?Q?GFOjQsCsjw0cl1JstoV/koaFWEUQGrfuOOOkX368KmS5F2saRYX0IXjNv/bW?= =?us-ascii?Q?fvpn+C9ZL7pvNLcZziH2eNvpNrwIX07MPcF8NtdbSay8r7FvykMmWqrmEasb?= =?us-ascii?Q?NSJPZqdMNfMw2KPbnenzQyMWfnZoBIkZlHzA+iylG9XCDArrK0ECG6hrV/CY?= =?us-ascii?Q?xyQudJLgQ+BjSDesu3kJNkaYcpUcZuECivj9q3ir2ojMEKbaoUeNCcKY4JwQ?= =?us-ascii?Q?UxOdFa6fqpu1Q0Riw7O6GRZPIIVCqX+4gCF510e/cera56Gvrp5lHDykbJJi?= =?us-ascii?Q?1Prir5djyIjn5q4cHH2Pet241SFa0jRYSBF0JM0LJ00syz5fjOWkc567exSn?= =?us-ascii?Q?BA5tsh1FSZw5uw0cjgWqFkKqa//8sM/yg3lIKmsqpisfoy6Sqr2LFwjmM4kt?= =?us-ascii?Q?vJ6+ziOgCphhCvyE33uKWD5qj7jPuIQpxifzAMopHG+SRVZ+Idn13K07lxty?= =?us-ascii?Q?VxiGCmNQAbqm8CFEaiap5yFSXoonByLVEcJY73A/CAwk+rYlTIYvay8pJz3B?= =?us-ascii?Q?f8jCDZuLaz62rnShLJ7xtD9SJqmgZd5w28/bnkNNT37tA3zPtaIyzNC0Wink?= =?us-ascii?Q?XFhoZFP0LHMB8il0sQbW2IxK1vq4WwZH0h6599oS/JfeOJi0nQFT6Y8LE0ha?= =?us-ascii?Q?497Gw5VTfmQQ3NS2+BUrztsfKSwOPAO5nRhRvWrEMQKQ/bzPAxSF5TyUrDik?= =?us-ascii?Q?CV2yyuck8ap/vdJTZ1RtS4DtTPdb/X5Yo1roeSua2mhRAnOi0kpmjr1bYVcZ?= =?us-ascii?Q?HCA0UQljVSVmGls36VpR0KzrjsZsAnZMsCguGwpSY5un90+CZ2tdfNCbGZ9a?= =?us-ascii?Q?eI35AYsK3HkT39E3o8ZUfXjGWHwU9b9GNl1k+gJNIUdOAg56dV3iVKE81iB7?= =?us-ascii?Q?cFDKhZIhlluu8hocYetBf8KwAtpZRp6H8DdyVu9kHCXrkBNsS/ALWNvTSbAa?= =?us-ascii?Q?xG8jER+coTXpC5M5+yFfHgqXnr1LMWzib2VZyVJLKlRSPVtvM4gsloGd/pfa?= =?us-ascii?Q?nx5bGHTIuZwJUeJmgVOAkGxPfYrrT09b6JkjqGydpTOEpriySG33GpTGduXY?= =?us-ascii?Q?jDr2//5UKD2SoTWDY6EMWV0Btc28Z6Fg0U5hdUNVvMGY7UgriUOi4/22gdAw?= =?us-ascii?Q?PQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc7b3ef5-50ac-4d8c-7067-08dab1d6fea0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:36:58.2203 (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: miJ2Nj1YAssaxn7y7mqKuFuSOk0l3uWT5dQJJY8uBqLVvCr5ERPrUf8/laF5qWQrHfNz8Z5abRZcM0zJiC/qiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8261 Content-Type: text/plain; charset="utf-8" This patch adds a new member info_sent in struct mptcp_data_frag, save info->sent in it, to support delay updating already_sent of dfrag until all data are sent. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 34 +++++++++++++++++++++++++++------- net/mptcp/protocol.h | 1 + 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b1fef2b0c968..8ae8be76a09e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1108,6 +1108,7 @@ mptcp_carve_data_frag(const struct mptcp_sock *msk, s= truct page_frag *pfrag, dfrag->data_seq =3D msk->write_seq; dfrag->overhead =3D offset - orig_offset + sizeof(struct mptcp_data_frag); dfrag->offset =3D offset + sizeof(struct mptcp_data_frag); + dfrag->sent =3D 0; dfrag->already_sent =3D 0; dfrag->page =3D pfrag->page; =20 @@ -1243,8 +1244,8 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct= sock *ssk, pr_debug("msk=3D%p ssk=3D%p sending dfrag at seq=3D%llu len=3D%u already = sent=3D%u", msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent); =20 - if (WARN_ON_ONCE(info->sent > info->limit || - info->limit > dfrag->data_len)) + if (info->sent > info->limit || + info->limit > dfrag->data_len) return 0; =20 if (unlikely(!__tcp_can_send(ssk))) @@ -1496,11 +1497,11 @@ static void mptcp_update_post_push(struct mptcp_soc= k *msk, { u64 snd_nxt_new =3D dfrag->data_seq; =20 - dfrag->already_sent +=3D sent; + dfrag->sent +=3D sent; =20 msk->snd_burst -=3D sent; =20 - snd_nxt_new +=3D dfrag->already_sent; + snd_nxt_new +=3D dfrag->sent; =20 /* snd_nxt_new can be smaller than snd_nxt in case mptcp * is recovering after a failover. In that event, this re-sends @@ -1523,6 +1524,23 @@ static void mptcp_update_first_pending(struct sock *= sk, struct mptcp_sendmsg_inf WRITE_ONCE(msk->first_pending, mptcp_next_frag(sk, info->last_frag)); } =20 +static void mptcp_update_dfrags(struct sock *sk, struct mptcp_sendmsg_info= *info) +{ + struct mptcp_data_frag *dfrag =3D mptcp_send_head(sk); + + if (!dfrag) + return; + + do { + if (dfrag->sent) { + dfrag->already_sent =3D max(dfrag->already_sent, dfrag->sent); + dfrag->sent =3D 0; + } + } while ((dfrag =3D mptcp_next_frag(sk, dfrag))); + + mptcp_update_first_pending(sk, info); +} + void mptcp_check_and_set_pending(struct sock *sk) { if (mptcp_send_head(sk)) @@ -1546,6 +1564,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, info->sent =3D dfrag->already_sent; info->limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; + dfrag->sent =3D info->sent; while (len > 0) { int ret =3D 0; =20 @@ -1556,6 +1575,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, } =20 info->sent +=3D ret; + info->limit -=3D ret; copied +=3D ret; len -=3D ret; =20 @@ -1619,7 +1639,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) mptcp_subflow_set_scheduled(subflow, false); } } - mptcp_update_first_pending(sk, &info); + mptcp_update_dfrags(sk, &info); } =20 /* at this point we held the socket lock for the last subflow we used */ @@ -1658,7 +1678,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool goto again; break; } - mptcp_update_first_pending(sk, &info); + mptcp_update_dfrags(sk, &info); continue; } =20 @@ -1686,7 +1706,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool mptcp_subflow_set_scheduled(subflow, false); } } - mptcp_update_first_pending(sk, &info); + mptcp_update_dfrags(sk, &info); } =20 out: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 118fe5a2745c..f60520bfdb7d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -242,6 +242,7 @@ struct mptcp_data_frag { u16 data_len; u16 offset; u16 overhead; + u16 sent; u16 already_sent; struct page *page; }; --=20 2.35.3 From nobody Sat May 4 18:08:26 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70081.outbound.protection.outlook.com [40.107.7.81]) (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 633892F47 for ; Wed, 19 Oct 2022 13:37:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QcXjvsMygdLtv4rnqF8snV4ZsNDVHCCfrXHodJSQMlstNsBFj0iBECfjGcjDl5gMeroG31vs8RfD/pBX8RK8hyUB9Rl1aUoN9OSk1KjAzoXmA1xLEDRu3Y1PqoapoJPdyuLbW2TgJOUAAStf3ZLWFlAFJrQNyOX+zylUxJ9lRhuf5ZxVDxvQN04g3qHgmBJaERfChacIOd710ZIGTdtOtfRHVT04FHiqCGFBPjg1DaxG6x3NEGDg8OWObwL5Kvh0piAm0jJaj3yz1jVJwaKCC6ocKK6qF3roRkDQq/tV2OKdNmZRTJqVZWfy9FTqPPMILtHyptf3a7GpmM4OUwadtA== 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=N1wOkWwfSWqD441BoPgl1bbwBkTnvH9YLbUx5Hqk5aY=; b=DB+gagiNFH6fLkIOtWDcqYoiF/nsuYY1sGJge1ejjXz2Isu2XLFm98VkNT+Asq4vKU3aPIreQU3dWMHkDV2BPs4AVOZSztDZ/bvr/baHerXgJ+TDz/w05XBsytj/VYhnweq0gjdYOvhbm1gzlCYqzANg5exfPA45w/18H8nSbyBJeM4sdQvSJoASHtvVGFb/ZZoOU8jG6GvgvfWq8m9YYqrBnH2HRzQelnQ+qf5jMHZA68oJn9SeKnyI+Za6Sny34h3vmztVaAWp4ZiDVUPUVWJzeOnh8blllCOo9fFgqbZA/8fVpdFTvOM3yHoTRBCX9DNXH0DIX1nHZm3i4ao4ww== 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=N1wOkWwfSWqD441BoPgl1bbwBkTnvH9YLbUx5Hqk5aY=; b=ILwmS0XjH/PlSt2+EYKcZPr+4l0ftWI/HKhZtUwWpyaFSDzJov2Pl1o7PfRc862Yi1zrjOFA589jAbCNDUTBV4b4+YIjPmQuTsX8TNE4+3uADUC9EMsP1WBHv+yqrsF23OLH9PiISvtI2GxUENKOg8Z7LRteZ7ZgKByrpqXtpLtGNpsInmlu4odC2SGNkyMqAp6mJRYO0jchbBmRnE50dTOgst4pD/OebGU21cOxESt+Fp1460a5ukuGsyGrokAe+ihYVsNN5iw2PbO1blVMbePL2L1of+qtQ8th5duTPRjN+abPZwWYQ093cAMhIguh/KvMO8j3Q2kbl5ctw7BwXw== 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 AS8PR04MB8261.eurprd04.prod.outlook.com (2603:10a6:20b:3b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:37:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:37:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 6/7] selftests/bpf: Add bpf_red scheduler Date: Wed, 19 Oct 2022 21:36:04 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0048.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::11) 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_|AS8PR04MB8261:EE_ X-MS-Office365-Filtering-Correlation-Id: 411e8f03-ad4d-4b73-3e90-08dab1d70506 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aKxNjWBKEjr7NwQmIEcQvpQr0qs6fcRzhwiXY2in9QLu2frnw4futDOOpmlE+pnu0QTe8S003UKjsF6A+4tWZ6wuACIVONzIS8wk+QhPHzAqJ58UgmsTj/a3LteRw9vlzALM49O3OXM7JVKaV/63te+GHdz7c/2FqyGhnRA1aailgwf7MXVoWBnXsalCuOhoZGEAQc8wG+0h86FL9A5WG17MQtEltuSCedEtFmaDZ7fOpEWzv4fHjhSsm1rpm+QxJx3qEwkouPkAEfrRQqmJHlbjLwv4jvAhqLT+D53inXD+OezWOX+dQV/kT99Mk5PyUUjTBQRUwObN/ZknYR6Kp/Knk7c3YA6FX4bH1GxmrsbSRaloW8a56XnEQf4IwQPaLpS/1IQD8ElER5oMK2UOObLQVLn1pRBx+bI8fWyov62wr+UAMDW1RbAL8EvyI7+n0mKAqjbQN/GK50hTtx4WhEDxoRvevxOHpZBOMIgFT6YeEXF8CzAtRhOVS7l62PtzrVXYnZ9Xmp2x+HQm5ePWjSouy3gbq9dDfH1Vvg91lVgR1VVPzEMsrhKFbPD6edyqO2f8FyGACGdsGcK8Ekk7nNJAqUzfEbyXUNKiyDVQwf0y2ir9uRUrUArb5aRu0u35qPTcBctOLAchaxJsLMga2/tgVCx6ulRZDgiMfSH7DFar/gx2c8/ESEqaY+Jcu0sD0uue1o4d6/cjQQBBdrirco03DHsEH6YDlg/tIjrVkmhR+281aPfKsj+jzZuQ7koa 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)(396003)(346002)(39860400002)(376002)(136003)(451199015)(36756003)(86362001)(38100700002)(6666004)(107886003)(66556008)(316002)(6916009)(5660300002)(44832011)(8936002)(186003)(66476007)(2906002)(6506007)(2616005)(478600001)(66946007)(6512007)(26005)(41300700001)(6486002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XHgkgRsJ15zm0FXk8vhKHxviGeVFCJZIKq9YVxDC5Pfk7Cd9AGgUhdY6rx5W?= =?us-ascii?Q?MLmC3UOpoj9FOU3h8Mom5MnSAkl+D9RT/n0gyY1f8Sjz4EuniK6fUPxrTR78?= =?us-ascii?Q?Dcg2V7la3wPK/orktS/qpmAQxDLiCikZcihjYTQUYfjT8GduiVqklL+Lh/0J?= =?us-ascii?Q?3Y0ys6YuePqsGAdBc9NPiqYlnMqNDDPMLH13wjhGTHEhR/kPMOfS+dKaQjF1?= =?us-ascii?Q?5MZSjtK+zqZz05oHg3JRNJxiegZIuaH4A5DSneJNalcdX79ee0/wCdi6VB23?= =?us-ascii?Q?YtppbWJdNrvEAUCSZSY8n9N08N5N6//bke8VoL2fMS+BGLnkAZJY/yidrM8M?= =?us-ascii?Q?XPEQyTBZ9v2gq2+E2Oc5B4fKvly3LOfYAu393l4seR6+efMC2DmBkdIw/ysg?= =?us-ascii?Q?zgkz/GYTDugs0fmqTYqy5Q1gC1MSPS1eAJR/gSVz3/qPWgDNQzqj4/c7c6bD?= =?us-ascii?Q?HrHtXn64/+Vob3jiJ4Q1CmVBSz0qHCPeWHThQdGzw9PIOvcFX5jk9yQuIIgF?= =?us-ascii?Q?mo4TyEIdPaXt5Dpw/FH1ugoIjdox10s1jPJAjNypCaB40oLVGvnRBO9jdC8N?= =?us-ascii?Q?5kEbWG8KwINXSkrY6CEHHErbD8yMZGJ8/jaf5e6h7juUCvN3a7hNwPg42Vz1?= =?us-ascii?Q?5L8VeoL2Olfpvjxur9aDgDjipEQchxJPpoDqcGeTOdJrxRD36Ie2nKi24ERr?= =?us-ascii?Q?bnpkVWuT2W/A7VnbsGhlg6dYEz0K/spKaFj582z36pl9uvD6PNFmvtY2xRHj?= =?us-ascii?Q?cuZV+Y0jU65vB/u+10QTpp9g6Z6gdjn/cDj9YL/4Q15dgHHMRfuYjWYeQjq8?= =?us-ascii?Q?azj4cOyYQXK/YmFnjPnmR76E0h4Vb/qBKUscEh5n7A9ufEimr24PtArBKWIc?= =?us-ascii?Q?cCW/mUqd8YcmKU39fc2FStgAFLjJXnC0YNDaqZMLlYcekBPU830H7K1w2vBt?= =?us-ascii?Q?F+GM3grzFJh60YKoz80wNoxSp+mDwrrA/Mi2JzUUTMY7fVF4Cfy3KndjOOYy?= =?us-ascii?Q?WLCCyXBbmhN7T/592dSt5qygTf30sQy/+vPsevWreGXv2W4HQXCsjeOZfZ8f?= =?us-ascii?Q?S8Hh547OnOwM+4js39QTCmD97aDvslLjAK2wY3Ppv6JXi4yMFrISVj5Hry1C?= =?us-ascii?Q?8qFV8nwbO2Oac7ad4DB5YMebeL6UneIqxjGs7qafiDDFiM0En5MqVb657Rkr?= =?us-ascii?Q?3ZPHaabEZ4cEz/l7Eab+kqYqig2FHS7npuRRr+HpetOeEUuG7spGuDkGLMBp?= =?us-ascii?Q?r6DYCnt0130pWiImV5iq8I9ZyFtptlrmQtwYpA3w1ZI0vENiMLZ2w40DxGWy?= =?us-ascii?Q?RerUi51IoaG7rzFgqDjZ1t+QgWQC1BjosHrQzSL0BHS28QtBz/dFQlkn0RxC?= =?us-ascii?Q?WNVJuhf29om5HjvpFUySiAUjjP+3zG1hduO7QcOE7LUOqurzbHU8gQafEw/O?= =?us-ascii?Q?gN+55zGM8kMxE9ztNZPgYxT0CKY0PW6Hrf2z7TXPq0+xOjSoLXmv3zaV+4M3?= =?us-ascii?Q?r99elwtDr852K3Br+zIrifS9BB74XKS8Bi4/AWdyKpJy+GwmFf7TdCKDbYo/?= =?us-ascii?Q?FlzvLJRCahZbiqZAN8BUQ1373yZ7KMsEPx3fttz2MAPXKWF1zJ3gfWRfTJQm?= =?us-ascii?Q?fA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 411e8f03-ad4d-4b73-3e90-08dab1d70506 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:37:08.8132 (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: eRUEsd8E5YfY/Yk0jZpvTPV1/iiWwid/lZGHHLpSyKHRhZaxG7QJC9vTz6eEglGAU0Vqk1WSrw7gHi09nc7vog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8261 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 | 37 +++++++++++++++++++ 1 file changed, 37 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..f8a9b4d1630d --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,37 @@ +// 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, + .data_init =3D (void *)bpf_red_data_init, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Sat May 4 18:08:26 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70081.outbound.protection.outlook.com [40.107.7.81]) (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 D0CBB2F47 for ; Wed, 19 Oct 2022 13:37:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qa/VaYoPxdre5Xd7JFWCQO5BU98+WaR/qmUVa9hzJH5T02NK7qGuFUmG2t8vnXot/mOyh/jJ9PKDc/gNL1J0NCTw6MOryF3ZJmpXSIJikMPxDwUO75yA1iiqqi5nGOCLCK2CKD5ruR0sRVbnEQtscWo7fqioNQ2LTmSJ2QsjB4yhpvqHNmpVxaaqCSmGgFI/XTAXNsQaUhTBDUOJFta8ASx/okJfNhACdw6uK0a9jGhAat6zaSWbI0gqIsXOo9/r2BH1DqymFvxGJuYjw45q4EXwgDH1CHOJ+TD7yP011+a/rPjrjke8AT6BG5e/XZDofpDM5BErGnEKLXme3/oiaQ== 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=RWDylEpY3wSwSWvgf0CmaqiEhDBn3Hd5QfEc5pKt0YyfHKJug7jT5Oszqddi3VCnUkrXTHnt3eZ48tY9X8GdmyYrwtdF9Ks9EkBFabgB9H0f1zOiSFSNWhmLiadU0j9a5PRDgMou1nWb+9CmNeVmxpSkjBBqqmaTQl1e3ySSui8U/L7GwLdmCFEr5EnUstSiye8cMM3gEB9mOkKbNYzIvlDwH6QPmaknF0k14xzfUwszCc7PFdRK+KbpAN+aRul0ZpmspapgFZt3ARzdXzqwvy5bXYu3sXV7/8ALCga1C5nR/Kf/BiIBbSZLbnFdF/UZ8J7XWmIoQ0tJjafOWUyAQA== 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=xrlbDDKJzdekRndTGZxi6KKJYTAN/dcXkV3klEOCnyvOHpWBVEdjuxjI9yraoX+7DaVaq3SCinQ2Fn7RH8elh9hA2duaPtCWqIERTsc9R+KFlH0wi1Bg/3viqeQFlacFaZGgrl/IphMGhA6xVa01JJsuo/+QntW/O1Y2ckPXM4aTp3LFgsY8HNQGnMk8Ae+0lKVa0gTB6fWoo0e+hzthszCLtuQAvhTpftiwwjm9Oxfvv+bUmOVj1c3+2+cAeRC3GrfYnGplO+DMaH5rp3/LMVwya9BXWLf8ooo59aJKMw0l8v3U5Kg3jMULeyDLPryjdiBhLwmtsd/OTVYDbB9WsA== 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 AS8PR04MB8261.eurprd04.prod.outlook.com (2603:10a6:20b:3b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 13:37:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::645c:cc06:a616:fe45%7]) with mapi id 15.20.5723.032; Wed, 19 Oct 2022 13:37:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 7/7] selftests/bpf: Add bpf_red test Date: Wed, 19 Oct 2022 21:36:05 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0154.jpnprd01.prod.outlook.com (2603:1096:404:7e::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8261:EE_ X-MS-Office365-Filtering-Correlation-Id: 807737a5-0231-418b-89ad-08dab1d70b05 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0VB9M7L8EVRZdHKUFsWIrTJkVcIGY1+mv2jSH4fSlYv4qkljihSawyRRX28GfRXib6Z8N6KuL/qBwMeNcL7S4uikRqspLtPMuG6GULrZelR6Y/Xkw1Asn8VtfSRDWEyBpJ/inCSXwqzWzX5TtisUn4HPqNqVY36DjFuxm/8pOX8G1xo7TrdIaIOGu9WmzAGcTU5ejuaXZ/zfFX4VuS/JmdXOE1Y9QDRhjpPQDllEA/XoxJr6gi96ic094TJ27bAArZJY0rMlUxAj01H5VJauLBWEBDjy2xOxxjrpAxtxoiiEfJFKbsDyHvNpHs7hgBMk9dkTAK670dS0kugdi2uGomEqFPJHBIWRnZOJMUXiojlyADQm+1FnGsv1QAnSewgXdD+OfoIgs1QU9YRpBpAAPK44j6ysC7EL161tZgA1XN9tLsT+yvcR+iOt+eP0QAgd5vS192MQp03P2mCLUTKH5j8PMTQFV2wBxJ8paicR7GRai7iuGS2RkQ8t5XEFkQDeZJmwWAJyehrCRqRURLDyd2LnJ3kgI7jUZYfpM09myIjm2iXz5VX9h/j+ZA2UP0NNN3isi11JZiYwMbb43ywKQvgelKUGU6Q3lq6o/IK7wQaPO0oV+k+JkMNBHzVGh6bQaGAUkBc/85LntrisGxG2+P8BGCpaedVUCwOkDfrRa7eXLnQSBdiD9mZFX6nWfbf5WIMLMyovIAC+Dc+dcE8httgnX8OLKQnHeQkx1uQpsriw9mr4TtKxE6d/unCIoWGC 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)(396003)(346002)(39860400002)(376002)(136003)(451199015)(83380400001)(36756003)(86362001)(38100700002)(6666004)(107886003)(66556008)(316002)(6916009)(5660300002)(44832011)(8936002)(186003)(66476007)(2906002)(6506007)(2616005)(478600001)(66946007)(6512007)(26005)(41300700001)(6486002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fNLPEnYQDLNO5H2nkqS0FvsikT84vBiXwCygxCsauQcZT9PNgFUmrTg0vlpZ?= =?us-ascii?Q?tNKb6/nbEF39rdYkg/MfNCCI5Q1Wyr0gasAM+kQP7YL5HDmnpDQI2URLxyku?= =?us-ascii?Q?N5Ca2fIW8b/JG0xsNlfg9GILYZwNP5UYPTItqlzsWJSBgcLUCPWZcS783o1y?= =?us-ascii?Q?OekpftEna0GdLEEzxhy8jh6M8cVxIKTx8N/0Mu7xVfxpHxEBupLLKVqR7QOd?= =?us-ascii?Q?Fqb9B+oFGmfxZo6NViNcmXozma1rrBwikCsHnM+It+IeWmkleVbn6dVHclMf?= =?us-ascii?Q?RRJrOQ3Sd5lsqFl7vnfilRLIiiVBjhbBq0rNjOautZXdkWeyRKJ1iKqmao+R?= =?us-ascii?Q?6d+6GqCyxOi0fM9U1rfiQXjqoA3r5rX7oUg8NEqmb95LTydirD64prOdvReV?= =?us-ascii?Q?6SkLQj3cb2ijTkmaMNLgHWPkVXUtphKcESzgTFn36OsWckoNGioJoo0Ybwc8?= =?us-ascii?Q?4UXWfWf4YJh6JGXzANPsZ7CX0vTxZbHVupK+S5EF3dsZmnvp7GjeoaFH+ht5?= =?us-ascii?Q?BWdRsg1cMol3ydeIYElNPyebUWeIpdaKhrowLM+kyEhtcfZfit5g7KI94voI?= =?us-ascii?Q?rC704t7KqBv9FNifMIEQGx3AQkmjObeQGtnETc6uTE1x6tuBEg2TdbyXkNhA?= =?us-ascii?Q?nGzCU1t9WmZKr8rFq8+9QmEj8cgjoomzEBhhEaIWDdhpgaBxeTZWA2/sHYPD?= =?us-ascii?Q?OL7fJFTo1vG3RjyOyzWh2hbguoSe0DWSmVaNpkz13HF0hI29brqygmVnQWEx?= =?us-ascii?Q?MY+dpcH1gUfNQUBqEI4mrESbWZ87yrM2Ul4/pO0D/32qmZLjoBE53SLp+8Ye?= =?us-ascii?Q?TWIgXbbfOXjPDgDc/1ceCXribm69A6Tx7Tg/9vpb8pJvHt0X/pLdkcdLI1k4?= =?us-ascii?Q?SCYB3EDkTAnGIaROrg6DCn7cj0IUlHe9HmRqN42XAw555YRstPyUS6Rh+ei+?= =?us-ascii?Q?FTEX1lnLS30COqDlSLMpJnUo0I06fFPmhezEPdEe8r/HmDhZvWW8B7Q/S+gn?= =?us-ascii?Q?mHm+GVdLiPL+LXvpiDDMf7Q0RQxY85N8i+bmiV4RNlueApoBIcV7SKQ0ZDsd?= =?us-ascii?Q?YERdiuhwf8lHxcv+V8RbknCseAoQF/Wmi8IW/BIUg/28fWciK2ixztGNl8WM?= =?us-ascii?Q?UxEnXm+hG0i9raLZjKFGCsjGa1Z9pSmeeXp9x8R+TzNOZWLPIljp9X/+xuss?= =?us-ascii?Q?5dLytWhdoDF7gDh0IXfL3BICbzsZYCeVH3oCxOQBSWI/JnGvyVE/ZyyTbRon?= =?us-ascii?Q?gc0RnWtb898bNlP5X4h8Y0HOzy9I+uy/UtEL4CK7K1rkmADVejTKnW639/dw?= =?us-ascii?Q?ESDfMmOJQ+SyKEA8y8C0BKVk8i+FWui2npRtHovXAmiZWxzIpm0y8wGHs7l+?= =?us-ascii?Q?PZcYUa6JVU1EVi+YJEsASdrjNL8ZHHcRqLSUkVO9Ps8QZ+1axP7znrcCLCry?= =?us-ascii?Q?11JL6MqIxxB+Rz/cOibZx5Jhhm7JBVXhbnYHPJkOUXo3TrlhvmHaac/595S7?= =?us-ascii?Q?Z4oZO68RH+M9L0jqwRfFimLNlefZLMaLmcK+WWpRDrCeiXNJ/um1n8WeQE4U?= =?us-ascii?Q?65V60f8osbC78Va66toqekiG5FWea1OmMp5nnbDsKVOW2AN2J3e9jM+HOMZR?= =?us-ascii?Q?iQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 807737a5-0231-418b-89ad-08dab1d70b05 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 13:37:18.8593 (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: DcsnoNHkR6fFGN7VXuPlRnx+85a0O3mWqTsY7p8frBfeiweZIJsvsCorDcEELUrfNozsG9a5IicmKViF4Ate7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8261 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