From nobody Tue Apr 30 02:40:50 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2083.outbound.protection.outlook.com [40.107.105.83]) (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 3800C4A24 for ; Tue, 18 Oct 2022 11:43:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AZfkpincRfzjDsF8SP6nwREjSGs3E386jNFP3+csf0abtkdgKs/NjrUOITVTauGZpccLhlmb/AK4h5z+yAWWBKMC7aRMjVZuMUwD8trflI7BMTUDazLFIiUIJsiEejcZ/s8OC1lJhNTfjZCn6KAL/rOYQ2iXNchpvdanAbiYoDsI/JVORS0L0z6uv98claUvvZuRMNJ8P8sRBECg81gr9epe4xYb4aMFVXHhnl0/cGaCOFNedMV2mcrlnhSo8yfuOqn0l/jeVg0bltrOepTzuGwmZGKhPSJDVmsBeA/KYCWcFhGP2NmLQzefVc+/ZQ+w4VMQuiA1EoNrIHbbh/4V7Q== 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=d6wlPHT3zTwyc61b5eZvsUdIwWJo1gUFF0IC18iZunk=; b=E6VhKKj3Za/pBMTzWuXPbuIF7PHYrVJiGZ+hYBlpST8WMJDfkGkm407jupQrX7bj6Gp8W9byP3KdjDcURItTDTeYzP5IoGuOPbiGxuZSXil4VvRGDLx6TcPMd7l7BmKlT1ylZSNjewQAV2lB9qk//YJIeTdT7bMaMLykoXbDrVA7b+MjdH7YSkCUIY151AwWJCud5x9J9kTMfJGG6s0RCa1Xx9ryItmC8duQh3dDmaaKO4vRDsvg9ur9L+2v7yx7eRPCIVqNHvW7XWQEIOFnFB1+pCVXnBr3kPFHksrCViArfiOGVza60iFdP1qmL5Bu1rsHnFbc+c4kdMaPGcclKA== 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=d6wlPHT3zTwyc61b5eZvsUdIwWJo1gUFF0IC18iZunk=; b=IGmuZulAJXJ/Zujva9Do5bT16out2/NWCNtC8JNMrLfBRRsX6MMuMlXx/RQAIG76ATiZ/2QW4KwVPJW1LYQvnqe6kKcbMLA1Ouwx+J54gTp4n/uS/jWsxCSn4XPTh8KsUC5mvRnrCQxfFTz5h0yCZwDgKKoZMIqe7liwrAuZLk0gTy5DpkwE5jKMN+n/E8hk3s/H0Z+CabZyD+IwhLd+GfkDp8W2NsPwf1R8aejFcRfhPzGmNcC/ugxuVMTzEOQbJEvZb5riMzrJtn6iqKTyofSkUS9KQuKMs/B36y776vaa7/8Oa/gEwVZwVpm3i5sS0J77w/2DzAVFcTnwCD2Ymw== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Tue, 18 Oct 2022 11:43:35 +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; Tue, 18 Oct 2022 11:43:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 1/6] mptcp: use get_send wrapper Date: Tue, 18 Oct 2022 19:43:13 +0800 Message-Id: <20221018114318.23627-2-geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018114318.23627-1-geliang.tang@suse.com> References: <20221018114318.23627-1-geliang.tang@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:404:56::30) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: c6a96879-c44c-4761-6321-08dab0fdfd3e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YpN8ccxN522A1zzEpKT9XNuv71PEbAG98vjsFizj80OVWPJrPHAaiGL2Qj02qHrjmFaTXpd4laINN08fXkir5AuIACzZNQDj6d+F0gLxfG/49R8lkXTjiyeG6zPdmF3IXL1c6+sgLTkJI/ZsmgpelBK9dhjDf37A5pNHeJGijmstRjufGcBhXM8msLbZW1XXKRvI4nP0R16Pg/jvNMzSg6OLyLiKyfeLg+/xz2/cijE9iDgjJIjav28Z+yR1BjKVaM5WV3TotesqsI2j2kobC95clpqp5dTF6sL90LWdNJPH4W/8boOKgnLC/vxuRXoYfiUOBCmkC/tbpKHSMcM2DBVc2n/jM1sNVO63k5uWnYbWhmYZ7UGEqpB1AkjcctPEGXoyELDvn5IktWVAzuNg/HrS57R5O5exdTHvfHDQQghFub/2xLArJHSy4YqbPoXWGeNB/et6qw+YDeS6GRgIWP+jnRtyxe74MMWIUczXmKy/pPNNsxlKnOGqqTtvHTLnymAzoERSnCcmHSHTKr5X1+hUA9LZYQ6otiv2iQCOeDR+nUvboFyCPGvQB8aricucCmcDkgf3lCn6XibsA7xgcbOukDFKNKsBkWdFVvvcS499xv+Df9BPtuN7C6B+5wyz48yzy02ZRITVdb3ssd1AVAlGNV4nXsq5IbvIemfyeEF3IR4as2xTwgnfkNqlpsfsYgWacriID/inlp9FEO38eYbiaqP0Q49QO8IZizkXNqm2WYOGql2fiAVzjJ1G2g1S 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)(136003)(376002)(346002)(39860400002)(366004)(396003)(451199015)(8936002)(5660300002)(44832011)(66476007)(4326008)(66946007)(38100700002)(8676002)(41300700001)(66556008)(86362001)(36756003)(186003)(2906002)(2616005)(1076003)(6666004)(478600001)(26005)(6512007)(107886003)(6506007)(6486002)(83380400001)(316002)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Zszwg3eM1mT/OLsHkqIBygxn2s4IvzdW30O68OcgK010HNRJvz+iTD5+S0qA?= =?us-ascii?Q?JUEjRBnPo5VPBR78z9WoqwUgpnkqWfkMmLOGtdqSFGAgw2b6Gp3AI1/6+TU4?= =?us-ascii?Q?JW9w/D2e/CcvmfE679p2Qmr+5A6arxG4v4T83ZKDik2AhX770T+BgVwJHzsA?= =?us-ascii?Q?+AFkFqgaIh1tj6nb5nBmRxQU4DUAw9d7RebFj5ChKT56//rVNJXErOXBeRUt?= =?us-ascii?Q?DUio3b0IGITOj9zonhHiz8Ifgd/IrRPxbzP32tBhnuF/VQ5AzbDAp3VOb8FP?= =?us-ascii?Q?15CitQ09mWhRvJapm8n0GL8S5C0cy3+bOnn1dBhrl98JV+lv3++w0lNmlBEF?= =?us-ascii?Q?FDl/eJu+O++NqF41Op/7ACuHZtxMb6h5GujzQO1cTnmYs/4REoHsTiOFim8P?= =?us-ascii?Q?vANI24O4mf1riX3YplpEXWM32f1iJNFwP7vwMzkAKrMR6P4KhpeFQKaLzcdj?= =?us-ascii?Q?HXAUiFXcs7XdLU2AmsI90Qjv2JAqzme7yHUBhLu8oW5KnSX/Awh8GorUDlJs?= =?us-ascii?Q?GQCGIbCADNl5expAeEN8tBV/avQx1wAgZT6wS+K+ZtqDopzwrhLTt/uu6Ryj?= =?us-ascii?Q?YbJB3HGew+x4pXRvZeGNaYIr1T4bBqvLdiUfbxH1g+JvkrQuEF8siqRYs8MU?= =?us-ascii?Q?dFAO+W7OOkTMe+GTd/k6QFm93Zj9K0+n/wcDUqTfbhPGD8MJD4qMg8e5lN8R?= =?us-ascii?Q?Iwy38PA5WMR5RicXfZXdjlw96d/iI2lFJQCnFtXFSMD76y0dzEke5N0xLrgY?= =?us-ascii?Q?/mBicDcR9qrsprL3S1EqNOb8cPSkUwOPrWn19YOzddxq3b9bQ4UBEUcQoNUz?= =?us-ascii?Q?Hq6CJbf0Xj4+NIxktaV/6fkurLUQ2dIxU9YkwhbbDLE6HtaBwW4FTI8HqU8d?= =?us-ascii?Q?VPnwOEpnOL5+FBUtnkjnIMhXjOfZpIc5QooBJf6tvKdYg9HAfhWYKWRIPW3Q?= =?us-ascii?Q?dJYwDvTtaelkdA6bMwO6RwIEtd8AkeitGmQOwYz36oJlALQQLZ/JvTNtNpXS?= =?us-ascii?Q?Jvb5t2xSETcBn4pViDZV8TnMHaPo8MY/nE6Mg1vu+hnHlKF2o+nt9XAlgvxe?= =?us-ascii?Q?dRJL85ZR+z7ChUAQ2lUKgWemoQoBK/gLe29t3f73sv6QtE11Mv2IU2T/ueRJ?= =?us-ascii?Q?6EPUQgIWffn7NZXen6Iwt7u57pOq3E7YvUdYWoabP6AOOel1agffYl6aADOt?= =?us-ascii?Q?CvK3DT1AhpgFIxlnogKDYXQ7BqxTBEzUXfEEs73srdSUc9s4oZvf14HOqkIw?= =?us-ascii?Q?JJYVLmQwalTiF+Z/Yp6QOOGBCLFXX1LPKBCvxpG3T9miQko+JPfT3fiUajfI?= =?us-ascii?Q?GScpizSVvIeU0ZoD5QswzWGIHksR0x1FCqb+4O+K8ugNAoCzLVvtkJAJko6o?= =?us-ascii?Q?KbheaImNqM1NbZDB+5VmwDekFtQnIO2mAFf/wldSTKzz1Ug/V30UCtTBLmx2?= =?us-ascii?Q?rlcLG3iBni9giqBhKNoFPKCVsq6V7w4Y1C1D98gYJw5nO96Og266WrmFjvH/?= =?us-ascii?Q?JaunhkZBermdjhwcrxtI8/VUMqQdaBIw9/jshGyY1bFJOXPm+eAwcW26u+eX?= =?us-ascii?Q?4HSo6OFqQ9vVRdVXw6BumGGMxtlE036uxTjXp9JotlM8wsgLQ7IbR9LfUVGF?= =?us-ascii?Q?ww=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6a96879-c44c-4761-6321-08dab0fdfd3e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:43:35.3284 (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: NWNC+xyzFyOsQ1Cabi3Q6SGQ2zb2MYXZaVI1xnUDaFuR+o7yvZJaGNASDF05EqFou56nzqCdp0HovI9FwrkOJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 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 | 78 +++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9b73297f6543..e3def2cd5660 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1564,22 +1564,30 @@ static int __subflow_push_pending(struct sock *sk, = struct sock *ssk, void __mptcp_push_pending(struct sock *sk, unsigned int flags) { struct mptcp_sock *msk =3D mptcp_sk(sk); - struct mptcp_sendmsg_info info =3D { - .flags =3D flags, - }; - struct sock *ssk; int ret =3D 0; =20 again: - while (mptcp_send_head(sk) && (ssk =3D mptcp_subflow_get_send(msk))) { - lock_sock(ssk); - ret =3D __subflow_push_pending(sk, ssk, &info); - release_sock(ssk); + while (mptcp_send_head(sk) && !mptcp_sched_get_send(msk)) { + struct mptcp_subflow_context *subflow; + struct mptcp_sendmsg_info info =3D { + .flags =3D flags, + }; =20 - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - goto again; - goto out; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + lock_sock(ssk); + ret =3D __subflow_push_pending(sk, ssk, &info); + release_sock(ssk); + + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + goto again; + goto out; + } + mptcp_subflow_set_scheduled(subflow, false); + } } } =20 @@ -1593,11 +1601,11 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) =20 static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk= , bool first) { + struct mptcp_subflow_context *subflow; struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; - struct sock *xmit_ssk; int ret =3D 0; =20 info.flags =3D 0; @@ -1606,21 +1614,39 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk, bool /* 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) - goto again; - 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 Tue Apr 30 02:40:50 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2042.outbound.protection.outlook.com [40.107.105.42]) (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 41D904A24 for ; Tue, 18 Oct 2022 11:43:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kPR/YXKEHnYnrH1BAcMcMihbI/bH1e0zAFLSV759mnB7Y9GFVyuNguiXbG0MMj/sifz3txaFVa8uFYJShLCJih9J3FT1pRtS9bCvF40bv7cHicCrXy5fr2SYEJJjpw4U3QwrE07rgwHr6TaOyrciOjVB5HTtkTo7wkIqy6YqCzfyHmaQKuP+vCF1411ivlKbus+RinDYUGXuOnGtCEJgDVdtV1tQT/s9hlaXfGySfFuLTDlIK7XV2ek6gtXAYxyqqckboC1GV9IDHyi+y9+saDPswJYGZziOZq9nadxA8LHu9OLFWKOJBLAvYqsOkzxBYCItI5vbwWGbAZWNsKfRwg== 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=D5WP6glZaWFpyTRZgS+hCbuGqLJwSnhIt9/sWozvMKk=; b=kMFYgJrsp1VwYNEfuiKY5M83k7xdFo8tOXlc4nzxqD4c3fMIXiScGVVlV6Ugqx6mumFQUMF2T7ww6SSEL29eYvsfh+njS27QEPtnbCNDjLkfMyFXheUpnW7EPKCveiFf8BubjKp+Xgndidh7ZeD2KGsdnqfvEuGNkggSCSPGKUCWXfVJgc6xgKxrKbLVVj7fpzBO1cpHDJjJXbUcJNuqsZ8JgleLzQvTuXqw0DgkDvrBRwRjeWqu2ROKs1fqwY/m08Ffb5UaEwKzmnzuAOh6tpXPp5rFRnABP4vC7B5W1OgofTbqTQa1gqqrfJU4I7HDGGi7NCRfSVBeV4+YC5e48g== 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=D5WP6glZaWFpyTRZgS+hCbuGqLJwSnhIt9/sWozvMKk=; b=IRN2kFpH8DRHdqZFZ8Xt6vltB07GSh06vVoqdE2TrjUpa07w+WqjB47r8rUhdQICtt4uJWQXBUA4TSGZmJObV+G97BSuwfmcnBNzldvGR1pFzTHqQ/kGEb9TS4T2QQjwfjPuqGYmQFGO+SjCAwcQmgD8c8sO2MPc8JWQE6hOLCU+wdh5msIjZ0/dD4vbO+vzxp1IPSCvgudBogNwV2e2S8xV7+q1b8/VzxO75bYU20b/I8IlPdp4uzGD8YKVhTFaSguBnOn2wZ2Zwz7gerGbm2cQURHcbbKYyjJmG3MC9UvMBjEexnJ+JukYcY7mP8r/GYAIx9UDYf2zFwEoLG0vJA== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Tue, 18 Oct 2022 11:43:43 +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; Tue, 18 Oct 2022 11:43:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 2/6] mptcp: use get_retrans wrapper Date: Tue, 18 Oct 2022 19:43:14 +0800 Message-Id: <20221018114318.23627-3-geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018114318.23627-1-geliang.tang@suse.com> References: <20221018114318.23627-1-geliang.tang@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0067.jpnprd01.prod.outlook.com (2603:1096:404:2b::31) 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_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: ad500789-73b2-4b6f-855e-08dab0fe022b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oLQWNxYT9y6PHtN7jR7Pq2rGFzhXHp8eLvgaQcQ/zokLDS7KP4WPVbuJzjxxP1s/PnDsraA/dWzHrEW7kJeZoB5VcYvEvk0nrPO7ga03zfJIq51gTpKu5Cmk/bYOysG481NiumlutEHR1PZ7zRnkZxCUQSbHvSx3Gkw/oV5Q7JpkbIdG7r37ZOPLKH2ppk59X61KDTuN85Ubds/tJmbeBn7q/rL7y/QV+xzKc9xhzS0e0GHK09IjkJlp0dX7Mj9CpO2p5WmqL+VSnVi2qYd1hikWifBpl3D+q4qwLvRIiBe68GMH0EUUCd+j8s/PtobIB9GNoEaXHnUXjuyU+pX5+zXuquNjKNdS8r2a8p+r2UTUjncOPZ+3GpPBrgdkL8nGtnnzLuEQHJkn0McZsVGgYDWc2QsfxbSI7sMwtqHnt0RmuosdTGD6eRRmhJZlp0gMhGMPIsgIFbtb+n2fMDqVfmDAYxsLy41t+7atsFRRXqz2rWZUJfiEGjzSlivUt6YnmT/2+P3pM059x1DCFms36R1NdSbOLwPp3DViT35qrIGYMumD1Cf6JMquFJ3wOH5kwXIyiQkF4Tq4VtJMJ7NW/KJd6mIIzYmY6BS3FdJ5ydwiZJeGtejqi0+6PK0wPPoM4r9gFm43jovKiZyAVinYKFQd0dDFtDOJ2RUwKWezCmXCy7kH0ztoFP03wRcqjOv2+gnftsS8+4pvRYJwJ0WKuAe1SODFpLP1mWPBgdG3ZvjKLQ+O+NRA7KjNupFh/OPe 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)(136003)(376002)(346002)(39860400002)(366004)(396003)(451199015)(8936002)(5660300002)(44832011)(66476007)(4326008)(66946007)(38100700002)(8676002)(41300700001)(66556008)(86362001)(36756003)(186003)(2906002)(2616005)(1076003)(6666004)(478600001)(26005)(6512007)(107886003)(6506007)(6486002)(83380400001)(316002)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eHACXBp8SUUHN6ENEE0wbAFKlIbyCDsUN6z6sSeieqMFuKKhzUPAOSfQR75R?= =?us-ascii?Q?SqkNajm7JWNm3FWG1goOdy4J8D+mjRFXew0DzlUraVOhDzevA5jr/AQ/3ZfZ?= =?us-ascii?Q?GfhhtJXl2i7Wn2JLTY+4ZSg1fDIgOMFE7zS7RUo+QWj8xM3m8Jsvu/Cn6+3G?= =?us-ascii?Q?ztBi8HY3W5kDpKY2Rrp/uDvFwqQflafB9+1F1SH/hI1kUMWvTmJfReVL9GP+?= =?us-ascii?Q?836xA1RDxhn5jV35ggsNCUbvTQHjkOXZuoH6nGv9g4PPJbCEG0wKJeOnu0Y3?= =?us-ascii?Q?svHjMS47Mc3igAUOxq1RabrJWxtaOY2Lp/wcW/xhHwUSFVlAOLXxMFHULMYv?= =?us-ascii?Q?rC3PiyxZBZY565K1uT/tZDrlmgwUhrReCeZFpQEjcH+lLHm/YfOvkgw+gXyo?= =?us-ascii?Q?jNwTqwkhp6zF/9bsFlFxP2eHtXhD6xMFSZbVhqqvgoo+emqwNsh+TWCBerex?= =?us-ascii?Q?KAuhpWCIZcAcIwQly0TF30MCWkFIe7216pVg8fG7JOqaHXWltDjgCWhQ8kud?= =?us-ascii?Q?4uc6hIzoOack5kZwd7NplkqiHGuJxyzRQ8xAx2auX+gnPgfq+7Wq33SDpfpg?= =?us-ascii?Q?wcqMzgp2FpEkR8PdIXDT0jdJxkNO/GI8Q6Cuc4QjUaI4FAQcMpIBlG7LEwGt?= =?us-ascii?Q?d4jMGFT5TdG0v8e42BO0H1zDzquBXwMPxXmQ5zGHxmVtKhS/YqYbaz0LNXRJ?= =?us-ascii?Q?Nsl8prA5N5nyH1xtmOoHT/2c9G8MbJYdnPS+4/iK7XeH418leCtDqzjDf5WC?= =?us-ascii?Q?pi4Nq/tmLK1hPMnMafWa8DG4wfYKsVL2QcI/w5FCJA4D4DaDG5GSodpOOZ9q?= =?us-ascii?Q?tAnPkGFm/M5TAKwmQ4TchByhvJhICv0Fs45ASrdfpPRgOWB349V4YpTJedpi?= =?us-ascii?Q?yqFmoff2SOoGTZpm7sTBXn4qLHDt2kxbDFbb+AP8370deoVlkhhiOPVt5TEU?= =?us-ascii?Q?LT/b91j8lzHxmI/QQhqGRhG+lWvqZ4nRrsA6xJOzXLv1XZoYBqrNI7gxbian?= =?us-ascii?Q?B7UPNEa0pu5VGoMEycDIgWXkxRGPp+IVoGmw7NMuo1H+uq81Rnt27qsFKBVY?= =?us-ascii?Q?jolUMMQHOC2B22Wc8Yv59BGbgpZPIeJwesst9nR77InSfbhatFSTbcJVlx/Z?= =?us-ascii?Q?ACoq5cQ/0MwbjgMxm80UbBQJVTx3vRix1S16FApWVJZM+5ewMXM6Ox4VCTlV?= =?us-ascii?Q?Av93QshenSnYXZaiInsOUrhFNTVEKlHhXQ+5Lj44t4VlbfdusUS2j9sQSdR0?= =?us-ascii?Q?CsaYpUEuWWFeuiIhJizdQGYiX8Mc6clj5OgSEBDwRVnYBGciG3NJh9kKl0SA?= =?us-ascii?Q?8pLpWERbt6yQ4CLB4HaQmg96Tb+BU1Kx3I3sj+CvIEI/mb4+TLFZ3lRTbPGO?= =?us-ascii?Q?7gwz81uv3noVc0PtMYvOHWgcBCn0g7l0tzgbCAxmtNDV3ZUbMfmeBr5SDYpY?= =?us-ascii?Q?adtOhkRw1RDlrzlOCnVEMHjtVJDOdW0ZyLV17MD+2J8G6+r7EZYiz919W8q0?= =?us-ascii?Q?70m05AMTxKR6UnRqVzLrLdrrWZQSRDmL8jaOm91+TAAYzlpUiDEn1ecA79QZ?= =?us-ascii?Q?7CP0S4WRcwBU3ZSCF+9xKhwDbjBj4HnjVWdT9ku3Djt2G8yfT8Ir2mnPSX6H?= =?us-ascii?Q?oQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad500789-73b2-4b6f-855e-08dab0fe022b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:43:43.5309 (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: iIJ5teZ9dq1Y0G0sri4pZQk3/6lc3AZj6vUTqAdv7bvcEOvUAMi3l9ThDP5h1gBU+rdfa8Kek6S3xl8O/rSm4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 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 e3def2cd5660..23184513489f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2500,16 +2500,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)) { @@ -2528,31 +2529,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 Tue Apr 30 02:40:50 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00083.outbound.protection.outlook.com [40.107.0.83]) (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 E00A34A24 for ; Tue, 18 Oct 2022 11:43:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgmFRkTQw3Y9LHdOXo/SddcDLRIZndz9yCEEetYioVCDrDPvajHaLLPz3Ku50hXGi+YuKADSFJx6j3wAFeAhBKBFtp7ut7XheuwNhGc9OE5A6olfkGIVY3edAROB+qCMNYIABzyMbR6C7mA57g9NL0+FCOBe8kq9U5jfeIu4K48orLhxUpj51Gj74wvXE/UM+qye4fWd4mDBbX5XVry1nqZbOSvIFreXEePqFdPgxPs05Y8AYwNjtFUwQjMtWYVwldcUSarsTxRmoOQMl2d1AzrUBAdMBJyrAYr4Zf9E9cIyHPKjujB+LQdTVef/oMbVcPZ1e/If844exrb3aY3iGA== 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=2L5XROpr2aTiw0L3E/rfk6ZA7n9H5J/dHBj+ifvV5xo=; b=iih9kMLqy6BJbZHu/Df26GpioMPSy0X8prIFSb6qgcBHsEIsBJuegioC9T2oZ01g/CcTIWAqnw9IvaZsYAEX4ym/Kelm2MAtMVtUmdpok1zV+XXmL6iJ3k68H9r5SAorzPnLFr/vpG4vRGvnMvy8FFtFTwRDnjM3W9WEf42624oAYWS5emdt4LS0RbOVoJuwRfLSoE11pmRvfwnX0L+QMtb9Gyb9AEXwvVv/gbIVyRVC27bk/k/U+kew/Y/jCQ8f2I3wrhgHQsnyvnCtQIui52yFyC19UjweZzCBAuMLTfkm5FUZvuB0TTwjhEJFwXZiDSgxrXNDyA671GDqKLQN4Q== 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=2L5XROpr2aTiw0L3E/rfk6ZA7n9H5J/dHBj+ifvV5xo=; b=xCu8J5FxYkediFXbITjSBkTuIYViKCzUdvAh3LT/N8kvn3JrM1kn+sUrtDNmQyTixkPYzVL94KAYrThyXN5QKsMyVe1WsIOrp80O1aV1s+oxNgzZKorA1keaRPH88vTtStA6ATbI4ajUpXePadlvaaIwrRyCZNSUU0WR0hfTkLDxBbYxH0Y1P4w/78R4DYBID5yNqGUqo54qlh/ViAOc1mPeVREvXwTYg/Kwy1OdOu3iQ+v0RVfzzhRhbYdBbANnAUcldFjD4S9LhJJY5WSlx8FwbtsGccf4Nwdtm818qLeewjy1CGWPUJ2yBbw3CN4K3UrJblZeKH9tK9C8gUNMHA== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Tue, 18 Oct 2022 11:43:55 +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; Tue, 18 Oct 2022 11:43:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 3/6] mptcp: delay updating first_pending Date: Tue, 18 Oct 2022 19:43:15 +0800 Message-Id: <20221018114318.23627-4-geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018114318.23627-1-geliang.tang@suse.com> References: <20221018114318.23627-1-geliang.tang@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0062.jpnprd01.prod.outlook.com (2603:1096:404:2b::26) 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_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: d93110ab-fe74-48a7-5dbd-08dab0fe0920 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8MqnNDT3cRsodLvhbRGoPXu0aEYXRGcCxlLy/RxJh9GrnuYGLiduN2q3IMcVCfxmTC95TOxSzO7rqqt+dXwVzTduKkbtmDOUu403INdWZwGGoGs30np0Yhuyk5Fds/2y1hQoFjM5KsOVpLNX/PjKrydgpcAPUDYzIw0vxyCWuj+fvEd2KfOhWOcYqzr7K8srkuQ4o+jkNP2GG1jhrhYJhQlvZeCbnUr0XIdii3CJFOmGl3I+uYWCwy1/73JFOTGWlurVC77ApvCf/9oEfdWuU82nArdGrDyALUF7ZZTdaKbCViDQmLu8nXNw65kEa5n/KTC0j1ViHEcLiUwCgolxpBpY+OBFr4okABSAaiEAdMVBj/vFBScobY+525bsJAwEJDgaVsSAdsKNhbAFiVMv51PG5kuhTRR5ZUCIePtHZ+iIJkk0e3iprJLrOu2V6bMbZuPplOXzWYKAmCT12hTTWA68SyDDum32KZQaEAwtkR1j9Z44UjinB1ARpqqoUTiPC7lysz/WZghZhqnswenNNr981IAaWVmi4ATFEEvGiAdnoOsmt0uwo/SePP9+Vgw/E0GRHfKBMJkUNVbmR1N6JMpijcCng4BjNDJfU/YO3usJqKclBAOpiKn0scjiseTL+0rqgNkXozAJGGpd7o/PrdpV3D1t7MOfEdN+naVVFrGaYt6a55rf924ZnaYBmslOUGbGAnr7+9FnXSq1FlLPKudDyDOmuZoMGiZkVwlcHYjMY7RvHewy/dZlSxIvBiR4 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)(136003)(376002)(346002)(39860400002)(366004)(396003)(451199015)(8936002)(5660300002)(44832011)(66476007)(4326008)(66946007)(38100700002)(8676002)(41300700001)(66556008)(86362001)(36756003)(186003)(2906002)(2616005)(1076003)(6666004)(478600001)(26005)(6512007)(107886003)(6506007)(6486002)(83380400001)(316002)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i+CW3Aqb64QPW0wOezJm1ZJt3kOEj4VPO5fh6TZhVu/Dkbt1FGN6VCFPMoIQ?= =?us-ascii?Q?/b9pn9M7YXvqrCI95N7IV1D6sSR93uTB4f3G00arJhMWPa/DDNOl/51ATI6E?= =?us-ascii?Q?/P1sV6YFUy5AcwU7TyqPRcGcY5Khfh1TBSqLVl4iQpqKikSAGisr9YRlQZ7W?= =?us-ascii?Q?FPnQfK8wJeLUgSQhyhv5rHyQhPpWb20g84XjC0d/CjtuWMzLDF4uvi5iuRnp?= =?us-ascii?Q?d0KsDlDENH+l1VoHgmXBJPxULHV72PwtdYlC3qVd9Yti/QLPniv5u3gnpbJ8?= =?us-ascii?Q?1r18BkpGKulS6+wDscz/lS+6GaPoSXt5CPDkspi2RFc+LiNOxll7glLhqWvt?= =?us-ascii?Q?BLL61cajZiHpRFoEF5LKpoWb04DqzFh8B76TOpwzAiZTsEjrmyB4ic+Xce/p?= =?us-ascii?Q?Ir/4ryWzXcrmEw/Juj5JNkKyGUzGbHcaJ2Bm+VjJfZgMysqrJut1dVa9u5Fq?= =?us-ascii?Q?DoSdm0qS8glisSoBg9OmaWeweGhvDTJeZMx72NiW1+4WBcputzmulm2vlp8a?= =?us-ascii?Q?lHhR7GyKRi5gqrkHQwJumuBn2CcK2PrpntfW2S5cO9ZmjoYoNdOKvLu7/VU8?= =?us-ascii?Q?wgtKfLfM+LIoj4JvGA4myON2h5W52qmKgX0hWJMcCKX85gSy6BppjwIQyHd2?= =?us-ascii?Q?3I7E9mpnIODiVCj/nuovWnDDBQI3xntKNdYDlpFukrRm6HnBBJ8BUNGrkPFg?= =?us-ascii?Q?9FYLdPaoFX4e9lUElhR8nKJYH9Hxcmr1Jnw0/UpYzd/B6nJEdZQIQMBMZVYC?= =?us-ascii?Q?gMdjdPiMCoh0LmahcEO3nOyIpunIyyw0YbQhPDyWlebACEqcCH6pswss9UAN?= =?us-ascii?Q?1wgy1B9k1xdTGFubbTmJbjdwj+SmFdd3yUm1smW1aFSr3ymuFQIahz6XjK3g?= =?us-ascii?Q?QoHaq3zuXseHnRRKfadNvjATU+ZY3pPG8BOMEZ0gKGbo29WndnLeqh44erB0?= =?us-ascii?Q?oQLkGBL40Ohybmvk3G3akz1gJP3kR67CDZxtEa9aHpKKRXv2LsBx2tQDjggJ?= =?us-ascii?Q?qotK/2Q4J5M9TmHJr4WLc1TKpgEgNaWFpvXScMCWQWu8qvPBDRCj/jZorxUZ?= =?us-ascii?Q?3OM8/0h56XZZfMJO9U3NkCGKMcI1BkYsm6I0afZbsyHYP7aHZ93shMwPmYs2?= =?us-ascii?Q?V3fW6EiFKeq701acojDmp7WUXP86aCeE43qycbjDA3e2F4IRqWnL2ab8H/x1?= =?us-ascii?Q?0quKEqEcCqRiwmJQEwUUpNlEJMMpDsiT/OblnFqt/hyKr3kuPKCpWp+q5IBK?= =?us-ascii?Q?uw5lbaMKhDZcCM9MUL1hYtJrqHn7N9H8BfUkO2QJlrYWbKSjRNKjuVtYUnLY?= =?us-ascii?Q?U+Eexf+SfNzY+FfaPsOXIQKK8scIcR+hVg6CCTCl/LJ1kLwsKk0jLXSaf2IW?= =?us-ascii?Q?UnBKlo04vEMuThXxC4tfjVcvMhPEK6sXu+1XZs7ChhEHhgpppmR6Ded/IpAd?= =?us-ascii?Q?RB8RPRJYsJL+i9mfiRDNbcveV7V205s0+QNHfnL4cQ54v1ktye5MO1yuFuPG?= =?us-ascii?Q?YPoQEHYbLtgI7zi2jUPdHhwZkAM5YSngc3dyOaU1m9ZpUkAKVlO33Yx03MyD?= =?us-ascii?Q?449PjKbXwuQbUBVZYl4T1vYZtPfF84yaXeAwXZk1/ymBZwgmCpvAz75XbVG5?= =?us-ascii?Q?hQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d93110ab-fe74-48a7-5dbd-08dab0fe0920 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:43:55.0612 (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: xHazItkXQpPyie1aCJplw5p4Ce2b/lTWRi6qW+SZMDWeFAXNU+ZRfHwyyzeG8bCRW7EJcPklp96dNqSkjU6XvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 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 | 30 +++++++++++++++++++++++++++--- net/mptcp/protocol.h | 10 ++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 23184513489f..76e8cbd1c23a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1121,6 +1121,8 @@ struct mptcp_sendmsg_info { u16 sent; unsigned int flags; bool data_lock_held; + struct mptcp_data_frag *first_pending; + bool update_first_pending; }; =20 static int mptcp_check_allowed_size(const struct mptcp_sock *msk, struct s= ock *ssk, @@ -1508,6 +1510,14 @@ static void mptcp_update_post_push(struct mptcp_sock= *msk, msk->snd_nxt =3D snd_nxt_new; } =20 +static void mptcp_update_dfrags(struct sock *sk, struct mptcp_sendmsg_info= *info) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + + if (info->update_first_pending) + WRITE_ONCE(msk->first_pending, info->first_pending); +} + void mptcp_check_and_set_pending(struct sock *sk) { if (mptcp_send_head(sk)) @@ -1521,7 +1531,14 @@ 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->first_pending =3D NULL; + info->update_first_pending =3D false; + + 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; @@ -1540,7 +1557,9 @@ 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)); + dfrag =3D mptcp_next_frag(sk, dfrag); + WRITE_ONCE(info->first_pending, dfrag); + info->update_first_pending =3D true; =20 if (msk->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || @@ -1549,7 +1568,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: @@ -1582,6 +1601,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) release_sock(ssk); =20 if (ret <=3D 0) { + mptcp_update_dfrags(sk, &info); if (ret =3D=3D -EAGAIN) goto again; goto out; @@ -1589,6 +1609,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_dfrags(sk, &info); } =20 out: @@ -1617,6 +1638,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool if (first) { ret =3D __subflow_push_pending(sk, ssk, &info); first =3D false; + mptcp_update_dfrags(sk, &info); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) goto again; @@ -1641,6 +1663,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_dfrags(sk, &info); if (ret =3D=3D -EAGAIN) goto again; goto out; @@ -1648,6 +1671,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_dfrags(sk, &info); } =20 out: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8f48f881adf8..4b11a5174e36 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -360,6 +360,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 Tue Apr 30 02:40:50 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00066.outbound.protection.outlook.com [40.107.0.66]) (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 111CB4A24 for ; Tue, 18 Oct 2022 11:44:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dFNv7V9ccGhBP8469fCxskxvEGSs6O4k0IFle4vEchVCCiqBBEoO5lh41xYEaavRVulqHPjMq3ziGPwb1PBMAqyRgI7O3Mav02SlMxe998zFkOtldJlF1tzup5+/A0287/9JjTAX5BFMzVxJd6QUUCBsMGV93Lnd+NiZHkbOGek2YVJppydNw5ufpKYFQaZDeirb2+xaRdRYv+/gZECuA2KQR4y7KxTzlh8Zza30IsNrn70xScIg6QFGeXxTI2/BAKE6ftvc+5XR0f+J1VXJkFjSfr67Y9rolPs2Gse6E4XCBx4HOnjitapkIWzMesxwhlpxAK5Z6JY2zYmqatD66A== 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=dS9/9noUGuQEd7epvYBtZxwIjC2TmplO2G+Ecyb6YRk=; b=FQkslVMXTFFiK5L77VKr4tQVhOXaX6NEJb5u7UPzKRo1/CijePax1NQY1missI6gvmAVgoYwcqs1sCH93cWxcC2ry2MwkQg9MbllLMvoch0oOkc4Hszx7zYH7gJjbUDBAWl9rHygI4aeyXjBobYJKyGnOqgANbpEPrXlQlUevLPjiG0cLaheOoiM5s7Ahw1znFUgSKAuHh+f/VV8xyf5kQaiqWONqiT3gaxRG3nKFQvfyFCNtTwURLJgOGjUoB3WRq8xojGhXBnL2m0w7qgewJszwJXwHMlnHxtyvlzCsv+ho+zsFZGDjOEFK0RIOwE7EjoA6XI0rKq4Qup1edKmRg== 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=dS9/9noUGuQEd7epvYBtZxwIjC2TmplO2G+Ecyb6YRk=; b=NNIn3InqJ+ZIPXhvmcUVlbF3Cw0OGbM6kReUP9tEEojy1Eg3sRmHaLz5L/3nyplrHUvbB4i1aN8SjHGbJoGo/13ioiidkdZWysMrq11SxO8THk785mx8VQ1TQSKj2K4yv0gJi3IzWqeGuz1fkQGV/ejvji6oHaGj1LI4T8VkLmKMFMKNy97wtwSPUWqRPZPSKzPVNvxxQw1n0Kmerq4UbKmaro4UTsBo/DOylc8YlTzhNGRh3H5KNgJ5AwRv47+/aYFoQWpce+Noi8bIUeW35RboVhuPYC000C+ymH02ABHKZIlCo5HgNZaZoWas/QWNnw2brfyFu7zV+BTnK07eZQ== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Tue, 18 Oct 2022 11:44:05 +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; Tue, 18 Oct 2022 11:44:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 4/6] mptcp: delay updating already_sent Date: Tue, 18 Oct 2022 19:43:16 +0800 Message-Id: <20221018114318.23627-5-geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018114318.23627-1-geliang.tang@suse.com> References: <20221018114318.23627-1-geliang.tang@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0010.jpnprd01.prod.outlook.com (2603:1096:400:a9::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_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c51b30d-da26-4cd4-81df-08dab0fe0f18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QcK5pkRfq3JEO+tG14AudpVEWNQ6P6Rr/fpmCLXbI21bMNNgM/63QbrGuJ7noZ+afubj+nh7xygzN8eNMJTFdmzOANCZGoxZb4jt2oK3U1C+yazpwFQ448rscV0OQKs2m47wzT3+GcV/lMaz7L+207T16NKxnyxw7VS1bcQGnl++RXKzxItkQLaTdIwAPV24jWaRF7Prsm/HLjZPszkObCRAaeBQ5q6posza/iUMR12PrpalwYlnavD6ByHBVaIFOD0+hT/lYy2p/wZz8I668HT0LTnss29HP018wNUeTTocSq06KtdNsk41VfTZHCQTrcMq53C+rcolxp8o4qZaEYjogma7KT+/+ITv3b/Gmu6ODtlcCREMP1b8jbksMf5OmJ8T7onJiGYLnSEKyBeAcEAoPcuNTLEWHpw425ek+qhQXFHHSS05voPXICUE/KIyg5qtGSaLdsarXe3BqmhQ5fZ/JPFVzMCIvcvON3DXoHZ3jUN2eh+Dzp6qVhmJqrhxqg1q0ySuoU+CxZdWyBAdO4Sc0h+z2Mg0lVffsaih0GWbF/N0NknB+jquSQ+S9UfvgWFV6h3b1zr5OJBINSUSeVbmIefk0KH4rWOcuQZtuXq1sugdGD76ueFZomItb40x9ztk+4NeVGe20hEHOn32gsr7+LhEb4Tvt/xF7kljISDGj5Q7OHEaAA5USe7rmFE0fNRrE2PS2dvFaE69xv8dME2dDcSDpoPiOGXqlEXwbKlweAcOD2fpIo8dImXUAbrN 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)(136003)(376002)(346002)(39860400002)(366004)(396003)(451199015)(8936002)(5660300002)(44832011)(66476007)(4326008)(66946007)(38100700002)(8676002)(41300700001)(66556008)(86362001)(36756003)(186003)(2906002)(2616005)(1076003)(6666004)(478600001)(26005)(6512007)(107886003)(6506007)(6486002)(83380400001)(316002)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QZf8gRQ9hWpqvAwxO6+QTaWMmvqp90UDT35VCVXPEff6Ta3IsbgTDFKZK5gQ?= =?us-ascii?Q?fL2ISLC8FSgXEzTDlUxg2bC5MDSnolSabvbG4+EwvBpL1RCRafwPAYqAKclk?= =?us-ascii?Q?jvOj729VPQ2owjl47exynUpJX0Sdoy0fUl3eRlDX5i3bEAD0nWgjU1s3/KsM?= =?us-ascii?Q?LyIKT9u7ZgGaPHS52LAFzKhY8QUSwKgwvfASKLK51TIBHfa67naTobE2o7qy?= =?us-ascii?Q?35no9pBrU257np8avNBx+pRLEoBlcUQmuSad+sOOWT4BWGF0j+5EhHmyiQo7?= =?us-ascii?Q?o3do2VocYRDVzDkixrHzoPIvutxYdwMfTg6+fnITguEEMm3KdFM/ocoCxArL?= =?us-ascii?Q?F+kEDa1kO75R2vTgQEk2eLdJqvx/lHpVkiMHMyboNv/Q2GaGdWLwcRq7SsBB?= =?us-ascii?Q?4TEpKYwQiQRsiyly2B3XeTqdgiVoG7kxzOmH6fM5fxOcqeWTzOBYuXsQ6N7+?= =?us-ascii?Q?NwKx2YEHdGVjuoDvcadO+9JABtkTpuBKFLVg7NdSa7y7W4sMyIz/UG2YqUSV?= =?us-ascii?Q?CVRp/QmH3Ryjb+svrE4IuJ9eYe0jWRzx11LdNxEaAAJ7TSHMITp0FjXbFut1?= =?us-ascii?Q?CBAtahWZT7xmT7hixSyu56e+YndiTscq8z3xZTl1jLRGiN8Te9dHm7n4LX9h?= =?us-ascii?Q?h/lJUWveQL7AeuY6zreF7HIdLxiolQiWWTywJMjXwPuPfl5Va9xxR0+2wsYJ?= =?us-ascii?Q?V/MYL/Mlv7IsfQjYVg9RvxEgx5LgApRtC6xR9gweIqbwo/zVSQ1eF6j3PGFx?= =?us-ascii?Q?Ko/QATLMyOFXG9f4CvG2sqgb6cxofLONLWFvxGKcKYi283qe91yFk+N5q/vW?= =?us-ascii?Q?21HQcWCW9aHKoq2E6Q+yPZpWpiJOlgaHN7UCkWef+g7xWMTOXSdZI8t18Dun?= =?us-ascii?Q?MP7QTSBnIIv0uLxvtlqbzF5GqZ5FseCIUJMJTWjkTNWu3cRVpeoXJ6pr0j4j?= =?us-ascii?Q?rDvFkO7jH0ugfXfQBmAz/akZ2JZFrQvTLimsgWzVs+ehLiFzmkCkhL56itvi?= =?us-ascii?Q?HnEAZaJkyZXT2BeUl3QghnHhrRoLUWFnc7SYYurPHKhoBKxqkqYyNjv1dko+?= =?us-ascii?Q?8oC0YU34yLeftbfEe7WGy0vwQNZJi0IRpAHz8w5fdE5YCfBDwrOmpSiigaKt?= =?us-ascii?Q?YkBx5965u9zpYjTMQhB3DKvolEsfClgEy4+/Z/dsB62I3Hw2DhcumP8ccqbK?= =?us-ascii?Q?j4G0lR1I+Od3uieeI8dBmEAxUZmvyT4w5XdEu0bLSjDysdBZsdg9wnT1NLjn?= =?us-ascii?Q?HS1niObkd/6/R3Yrlvyhw0Fksh9i0qLNEPHRJhGAzFwp0V2yvpgnR7RAFsiC?= =?us-ascii?Q?Fuba6o6wo/rVjgIbe1TJLnIWZ8zcd56JM+xtvuxcGA+iuY6C5F236dpqHpc3?= =?us-ascii?Q?UqOOFt9XZCYcCiNH3Wan3U5N42UK4P3nA/X0FmJ+xKlTh1tT6ccDYFSMxEo2?= =?us-ascii?Q?F8SsM+KkU2RqBNeRslq8YmnmjkAYLcn6PS6vZOTTl+7mTN6rrVYzsErcqdZ2?= =?us-ascii?Q?4ZnRTwAQjB6rOLL1m2KQeASlVK9cmAvZN0KJKjOOlJQf4DuRtUucQBPxuzED?= =?us-ascii?Q?qflTmL3en0qsewZwD9YhlFLqi7d7U0K6CAdzNjvQqGWy+rsoMq95BdwYsiWx?= =?us-ascii?Q?xA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c51b30d-da26-4cd4-81df-08dab0fe0f18 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:44:05.3417 (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: yx4alRbu2Uy6YhBAt+I8e5KPNz5aPB5945MeIS+Kod9BE9n42NDZnigtYPEmiR4UxbwW8AR9aAYm9JaehiMCFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 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 | 29 ++++++++++++++++++++++------- net/mptcp/protocol.h | 2 ++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 76e8cbd1c23a..5fa2ab374a3d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1109,6 +1109,8 @@ mptcp_carve_data_frag(const struct mptcp_sock *msk, s= truct page_frag *pfrag, dfrag->overhead =3D offset - orig_offset + sizeof(struct mptcp_data_frag); dfrag->offset =3D offset + sizeof(struct mptcp_data_frag); dfrag->already_sent =3D 0; + dfrag->info_sent =3D 0; + dfrag->update_already_sent =3D false; dfrag->page =3D pfrag->page; =20 return dfrag; @@ -1244,8 +1246,7 @@ 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))) @@ -1489,14 +1490,10 @@ static void mptcp_update_post_push(struct mptcp_soc= k *msk, 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. @@ -1512,8 +1509,19 @@ static void mptcp_update_post_push(struct mptcp_sock= *msk, =20 static void mptcp_update_dfrags(struct sock *sk, struct mptcp_sendmsg_info= *info) { + struct mptcp_data_frag *dfrag =3D mptcp_send_head(sk); struct mptcp_sock *msk =3D mptcp_sk(sk); =20 + if (!dfrag) + return; + + do { + if (dfrag->update_already_sent) { + dfrag->already_sent =3D max(dfrag->already_sent, dfrag->info_sent); + dfrag->update_already_sent =3D false; + } + } while ((dfrag =3D mptcp_next_frag(sk, dfrag))); + if (info->update_first_pending) WRITE_ONCE(msk->first_pending, info->first_pending); } @@ -1548,15 +1556,22 @@ static int __subflow_push_pending(struct sock *sk, = struct sock *ssk, ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, info); if (ret <=3D 0) { err =3D copied ? : ret; + if (copied) { + dfrag->info_sent =3D info->sent; + dfrag->update_already_sent =3D true; + } goto out; } =20 info->sent +=3D ret; + info->limit -=3D ret; copied +=3D ret; len -=3D ret; =20 mptcp_update_post_push(msk, dfrag, ret); } + dfrag->info_sent =3D info->sent; + dfrag->update_already_sent =3D true; dfrag =3D mptcp_next_frag(sk, dfrag); WRITE_ONCE(info->first_pending, dfrag); info->update_first_pending =3D true; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4b11a5174e36..5d3e100f03eb 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -243,6 +243,8 @@ struct mptcp_data_frag { u16 offset; u16 overhead; u16 already_sent; + u16 info_sent; + bool update_already_sent; struct page *page; }; =20 --=20 2.35.3 From nobody Tue Apr 30 02:40:50 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20046.outbound.protection.outlook.com [40.107.2.46]) (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 78A854A24 for ; Tue, 18 Oct 2022 11:44:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VwPCo4d643uAkSJ4+Wv0tZEfjCeVhLw9XxaY77Gq4+Wc3qvsLWgqQclnj6ibd8XXO/0DzDDA6ZIv/lP8ypHi2dlCRL+w/kzrM8YsL2O0CiHM2sADNqhHyOPc7T+rPL7mGX9VksnS+MOLieHRWxyEUq09QNZ5CZxNsji4vGVtgWuBPpRzgZjhSaMvvjcxa61TfjMHl37OrsIJejfHly84ZuANiRgGlvebMLZ83ZZSEzKJ3MZBcY7OryVBO2wEzgD5MqnUvLX28pPvoIEaSkwpG66Jvr5nbQv01lCoTzT8YR3CRgbg3D1u9XPa8nTEZQz3hclYqqKrPk1I6mju03jgkQ== 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=E0efhqYnXyJgytwburNsGk76ksArV8vvuBCEqUWA39EyodjBLjtTXaXPvHwAiILSwuvg5Zl4decZsF+qBB1zk4ruKMCBTDWEOFJde23VSynJ2SaP9eSZy5kxrafElJZ+lY1bvcMmAhjx07EKNjp/01oLQy5tzlqig0SMBAEJ/YweV0hNtkTHbM7II2jrOIBSeOG2oVDrPkuAoqMKIKNaex19WB4JBRugboozoZqR4erbmyIHqakSLx4GvEzWnoZVr5wzFtG6rWA4avqq+dxC/DL+4TkpTFuPd9/Upklk4sUdMJcAaOro//kmmTpnlgjdLRyPPQ5HWZUK/Rf6GBh/Ng== 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=TzEPGapXV5z9/c62lWdQtVDfovwZZztwZYN4Met42ri+3FJtEH+UVuPLfCCsDi/29FRG7adJS4XeVubOsU/HcT9zxhUP03k5QyqfBeS77/i3MLi1Ll6Qbk9Q9xgeuKcKkhVgcYa6gb/h6lbxMOAu7c+if1ZNbUY9a8kfWN9NwygtVQxzktUBNJEv2ysK0do8zkt/FQcx3NjLnSZL2WrwenCoB7QJphmU4cEG6yfmdwmOrwEbB6Z/Yj4nhWzLCi/j9fhUNn/fi0hKk/IMXIz5XINKPaE5D/IJ4XaN+fDjTeQNNwMlQPbKzZ1RqBKPxBS2FhdqI6wJWykqEH9SoRYPfA== 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 AM7PR04MB6919.eurprd04.prod.outlook.com (2603:10a6:20b:10e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 11:44:17 +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; Tue, 18 Oct 2022 11:44:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 5/6] selftests/bpf: Add bpf_red scheduler Date: Tue, 18 Oct 2022 19:43:17 +0800 Message-Id: <20221018114318.23627-6-geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018114318.23627-1-geliang.tang@suse.com> References: <20221018114318.23627-1-geliang.tang@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0072.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::20) 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_|AM7PR04MB6919:EE_ X-MS-Office365-Filtering-Correlation-Id: be7babac-a29b-4e47-f1bc-08dab0fe1667 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GEbXrELVQMMsT6bP0m3mQ6yj9igli3rDoUkBTM7f3V72UcQA7z5563+KheBEgkg6+otXV9Va3w4qAGLA4QYIkF2oMlGqaPqSuoWzix2CYOrCswxLKGuAzt8xWdX3CCwhOy1c0eYmOt31QI/Bs59TXxY074/rYKZbS1mMFverCfjnYFZFqToPqi6r+jEkKHx27IhneP+39Afor81Z+NDz16sF2j5+m31HyY2WIu7D4cLrXSaJzIxsYD2a35ZfZ23GfFwUDhChSZ01ZYPatVV/5AvELL1ajLztwXEF/n7slgqIfQJKXIv99XPvNPCHH/YOso4Y3k70KSHCMLR+oVuErO0PbZofHyUI41KcqZ4Z2ogMLhWkMXb/9zgE6Josotk7oWePdaD8c1MwhZ6CXkKunknnbUAIXMEApPRtid4QUwnuZ3cOYTJ19M00LIKLr9NdcpEq1tOPxr+4KjolThyYlu59mcewPPujMtOzQ8qJMdPBoa3ZpbCUHtBS9gww9MAMd4JVQ3zZJDLii0AQd3Jgdhf5gJ9MvwpnPD0XPz1r7xpvfj5gXEBAbFnluAD+8BY3cd8njsvuo7CgwoYAOEUtmoh8WKt90h5px/9CP0KyBRUHqGUcvmMD3xjD+NyQKjKYtmdSvkZSzH+jt8dIfo36pGZmc47jWLfIwQCdY3dfUIdqi4SZjrpQcEzj/353h4MZxD0H9WRnzHJyaGm5asvO4FJafmKYZ9yWiokZ3XEZrX09UQHu9yDF9PRUTA2yuFsq 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)(376002)(136003)(366004)(396003)(39860400002)(451199015)(6916009)(6486002)(2616005)(186003)(1076003)(86362001)(38100700002)(2906002)(5660300002)(44832011)(4326008)(41300700001)(107886003)(8676002)(8936002)(6512007)(478600001)(6506007)(26005)(316002)(66476007)(66946007)(66556008)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pGbJoRoQZjl3GG8sKjUkxyYXpLXatr9gZUpgDXszxtgLqPVRgGArlLLNmaFQ?= =?us-ascii?Q?6Nw2jXesRXVgmGkZKLc9VX//7IQ1VZ7ANmTjFB1TeP7DoorzqyGDuutgFLYS?= =?us-ascii?Q?SS40RIoRdsYAue8z1lp9wDiQhbL8iptxTythaJns4fD6jSPPwyE8ayNsQfmv?= =?us-ascii?Q?6w4do1Qn2NXqiq777N2lDcDnZqb2LjTKW/OmBlCjtCmCLVh5+3y9AAtNGqud?= =?us-ascii?Q?JQnuTZ5x5c9VA+KeHtCBfYKkOk6SOOLWHJmEvKwQkKOPvjVUqVsgZYDT3k1E?= =?us-ascii?Q?rOZGoWAqfNX3tavAq4pRJR8DFQhxQP2wjrGONvVEJnknChA1uvDHxMzt/27S?= =?us-ascii?Q?zUlgQnfej+cxGdxBb33rL6/fxs9Rnq2Ddu69kPE0y4QmX5i2tDduLG+qqF8J?= =?us-ascii?Q?1cRmB7iU4D4u2c1AF3irHG8VmKPWKxaS3AazQf42a/AMfFDoBWIU1kfLihRO?= =?us-ascii?Q?+JzdzyZhh+daQvz+n5a9M5SiOtUDIpqMvA734br1GtgUotXbnn+Xp+Q1TomS?= =?us-ascii?Q?04fPCDBfMiK8aXMiEd9f6//YFSpjV/LkCBzJmKxt6U1WjUuEvILhCRztJBWI?= =?us-ascii?Q?fnzuLGec7DgUs2vprO6pbBXtD4mbt6IjEgpoGKo6N0SvfqInzJIPLMT9pAxL?= =?us-ascii?Q?0gCfrduRLK9WeJQewS8nInHV2iEatz8mkyRUFP4RTs8a8nIXkjTffTrSOvQq?= =?us-ascii?Q?TYIyu8ffjp13qGbtYvxBCjwZpJnbef1Jo/8m69pBuVDEBXEAi4ynmjUMrJoS?= =?us-ascii?Q?kz3iIUOnywu2nXxyVtME5oVZX8GfQdQqKHK+H5UMlwEnugLGhpFXeSL5frgb?= =?us-ascii?Q?oKAVNaILRjNss7dc+gy+FumF7jTp7NOcTwZ0ZdT2HenMS4i8uPFKPJ//LMxw?= =?us-ascii?Q?WBHyWa+wlNNuD6G7N2oHqX82u+QnF/PMun0RvdzeXF+crBcX9Ci2BoKVP6We?= =?us-ascii?Q?sLpqDqxgz3j267/3ATG65ALo4WE3g2o2gyFPtbNlOsWAakgEFFMdhhFEvFft?= =?us-ascii?Q?Pa6CIpK/17mDrLyQrTMr46P2Bz2wmcaL99uF4cQBS+1Vr65Yde11pMYFzydB?= =?us-ascii?Q?SrGErQzfpLR1+GXf7C9ESBRYeVcK9Cythml/4yg/VXKLJawIRSDtW+eVtk3I?= =?us-ascii?Q?YNi5CWIJNUnPifuGja1YjqG2rInt0/CU4E6ctvM8wgQbWrPrFdMWYVMMrd45?= =?us-ascii?Q?BxY7afl8twp2ZOyHX9PARMs99jiyKHF7qJVsY521jaE49HqGmwjIJbTa+M/+?= =?us-ascii?Q?cLxGaKoXz7rTdiIceZsTuN0FpBT+rbYvtJwkGPY6+PPu9dxxvqCTHEsFzvbr?= =?us-ascii?Q?nnGk+goPhqh+fX34KHsdKrLXwvBlklJ2nqNAJDl4GuVHm5WbG7kABZkMMxTi?= =?us-ascii?Q?S0K3yV9UBXsuCE1jqxP63EFEUZkt52OQNJP8Hth9bDJvkV0ITRzFe7A/ZO2k?= =?us-ascii?Q?tKHvUMXLugu5sS1xInQeXXV6lM5rEqNlHh6Hx+Pe7kecyVj8wWtTxQILQEct?= =?us-ascii?Q?tmxmxeMmGx5BHTgnW/hUMvpMH65hWyj45tawryXDb7tOYJ7VcoIRI9xLMPD5?= =?us-ascii?Q?IWMXImc4me/YmAIozu3ZP8nS+0QjTJtZQpxfkSBqhQ0waQVX+0pNMzE1wQi7?= =?us-ascii?Q?Lg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: be7babac-a29b-4e47-f1bc-08dab0fe1667 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:44:17.4657 (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: JrSw/yOU4QI38gGHoQCSppXcRWdetAvVgmFcOLXJJeROFkQGLu7LfB3S4G3ewb92xxNPZKhXCw7a/Ixv9UhT0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6919 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 Tue Apr 30 02:40:50 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20076.outbound.protection.outlook.com [40.107.2.76]) (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 811D84A24 for ; Tue, 18 Oct 2022 11:44:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VDrrznvLoSTj8zJcLYhuJfiBgiyOc595rXHna+psODO6AA9ZNVD4jTGG3pLelkP9Dk6YxKm2EtYC8hBkmPrPoM+MVz2DI2fXbsRfUTyKfhzZksGSnF9TSo1Mqf7AMskhKNh0AAb9zNVx2rSR8T+y1M3VO9R+oDVyTZNW690TR9no7CthvUKLGZI6JMPV3Jeze8M6hd6ZRCq8h/yPJdnp/jury/t2u73KOnukJBFPv/darPr4VIfKl3xS9xCdJ6DGj/CFdoWVAGIQooMPZTmhmaDnfeiVuKFBj6hhNf3ranVHcGenJenguDp5eLEUJ25xAedYf7t9W75YJ1JV/Qg4/Q== 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=DwYYEFaCjdnoT+Qa83WWtyKe8OnLh6LzTt0wLSrmVExjdlc6dpfpNpcravwLt8T/M56MHCiX/qfAxE3O7NzoCGmr0nsXKZY5Z32+iBdGqw62jN5dUP858nC/ytLwV0O/deJAVzLOaP7Iu71+qGgyJgI8tU1H7HZ1HyhMwe7prAimOOjc0DvNY+KnQ9mR/fUAf0v1zNxXq+DiDqLlGBlbJYcCdWqcRF8L68Ur/UvEv7I/kPqwqCfPVwGNG9qT3GRheStE9nEiW9QgJ/9IUvVwExD2EARkvIfxzmY0DbEs1XeIw12Mj+pjyw4sYhLgo57RUqN99zmk4POSf/Fw0ALb9w== 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=zH/EXftm9ynMXQYcFpQvJODeS2cUvWqAZvCUIgI+Xjn53pB5PoUJS+q08xDbipT7ZB2Jq5UUZ8xpR6C/2nf498KhjJKIzk86K60FQMStql7QLLdnuolFDOeAB3hEaOhRr9S3Vn4PAk/CRByPNVSx1W9OiPnCMZgHvYIDvdhiGpGF+yOwRQuXlAsBgAYFdRZlkRXE8htLb8PwR9ilZM9BNzpCgGLwLB6a3nB8Kh1suNFeZSkHds5a6O6d++QR0aL4aStVl2DlgfKUn70xTx2VgzFJEoeSQmfijp1ZK4c/I49n5V3MxuAixwsD6cCf/FsnjVOGK4F2drm+PTqNEeuvKg== 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 AM7PR04MB6919.eurprd04.prod.outlook.com (2603:10a6:20b:10e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 11:44:26 +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; Tue, 18 Oct 2022 11:44:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 6/6] selftests/bpf: Add bpf_red test Date: Tue, 18 Oct 2022 19:43:18 +0800 Message-Id: <20221018114318.23627-7-geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221018114318.23627-1-geliang.tang@suse.com> References: <20221018114318.23627-1-geliang.tang@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0101.jpnprd01.prod.outlook.com (2603:1096:405:4::17) 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_|AM7PR04MB6919:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a67ec05-4399-49ed-a764-08dab0fe1bed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 74Zu+/CKBSH9uGKNc8dyxp00iPWkXoTjgyuovAH9U0n0bUxwNJTWlkgmtkX72MfKecF6J4R2spDH7KziwH+ELaehiMd4E8ihvyP/Xkjgk/W25orGdiaW1vL7yb0RE5VtJ8BDow6gvBKqAQGE9lV9eWZt8wTiwpWPJKROgMRG0L7diTTCweRFCo8g1GnzfHMNX36zjYWiICoZjERZw+oAY+xNxbAvtrTrW5eB+/jBoc2l6HPaKy3O13c7qHlXwhaPO+Fxd5xjiU7XTjMQrktQbs0mSPnKQlB4SIw3vqKy/6ty2eQPOcGzZwg4sYvwOPk6I4UyOfsVuajrn/n+ny3Nvlnc9lm22iGz+lsCPBCZM75XxFwEqOPa/AKWoyLPhFOdjfcz9CFz9X66fj1vuGSgc3hRYPBi8LdvGjxtLkxu8Empm+V+1YAYy6e4tPH5Tqn4ay07oTGkurSDn3eeytfSZurgeWwC0qRvEjwdR4QPERTPDcXWiawzc95ES3AvS9l1j1nKBGV1s5LvQwDxUok2nKIk2SIHYXRhUgis+UpZyktL4lFw8teTiIPwMeTCiw103jQy/Oe45A2T5gYKCAjxXRRmK8wTiUAD38g8vvj9ruOKhAM27pjqvBCWuQd3MhsDoYOvOp7xMeszZYRLt/sL1hI4st/4c0Iyp1zMfxE/9ZZ4MKM01fJ5KATwHs08Mpu3LpjYgtvAk6ohmy6fV+bHfce/6lZOB7LzXeoH8HLuJqNO+d8qsHv2d8aXTbfutxx8 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)(376002)(136003)(366004)(396003)(39860400002)(451199015)(6916009)(6486002)(83380400001)(2616005)(186003)(1076003)(86362001)(38100700002)(2906002)(5660300002)(44832011)(4326008)(41300700001)(107886003)(8676002)(8936002)(6666004)(6512007)(478600001)(6506007)(26005)(316002)(66476007)(66946007)(66556008)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8ADOVsjTnL+F13IzLCun/3dXwMMW09udrYT5TFULvVJzqXe1HV/UWicnC6R1?= =?us-ascii?Q?gRqnCrVetyauL/59LRtkQbtFnKWh1MocE6RaPsNQPfbd1UrM1pHBDe1xdtzE?= =?us-ascii?Q?EQsLocdSuHymCDeUzr6Fc+pXSquYTufjFE307pP7YHu0TSh77t+gyW1ah2Sv?= =?us-ascii?Q?QbtPXRjLC8MtA9hau7221ieQBkxYO8xR6q07s9RgMMrdOnd9xuEAY0zdw4rE?= =?us-ascii?Q?pAIwi/0UDWV0xOSwJEpyglbdiihI62rHA+7YMeWFyVpW38gy1MaLN0R0kP4A?= =?us-ascii?Q?5Z+bpZdzrOZfsy4yAsPMqqyb2fyveSH8PG4lmk6xHKL6CWhmhUPNhYu/U84/?= =?us-ascii?Q?s2jjI9Xmd5a7dvpYC7VYz/rP9saBiB+aPO6l0UWur48JLcvjMx75vRqAaiNd?= =?us-ascii?Q?+fCJ0uPtonWQiTR8x2sbBKFzM8fq/MBAkQ1JYiUrZXc/OYpu/qI/5sgCNE55?= =?us-ascii?Q?r9FJiK1Bur6a5QGmX7j/2o4E//IDj87aGpiObdVIrncsNNvIDjjRo0B0eXFA?= =?us-ascii?Q?oRm8ZxTIGa0z2LGMdjey9WX8lqhTtCJ96Gr2bFYIWLan9kEVERMz/4GwG6gP?= =?us-ascii?Q?jWS0gim2ZraAC6vJDx8WKhe0oFlTB5vTciQDvmM9Rmx7gP3QcfR7rUsib4W7?= =?us-ascii?Q?DzkBvIIKblKyrUutGuOCMNKApj6Bv6y2sqkb/pm1aGPseV6wXd6VdWtr7mQm?= =?us-ascii?Q?GxHa+t1ndnNlS/wbgof7x4Ih5jyAZE6N6AEfLMkMlwl+xCmdLA4QBEcHmCDH?= =?us-ascii?Q?DN655jCGvQJRmRQb9fifivpcAUswukIT0pAropCqBsBpeAM4W2UTYI6PZStw?= =?us-ascii?Q?4MOiMFPXcYP/8/yUk5OQwUevOmazp6nmxwY4+WXhCCJrunAngD/TGj/+OWe6?= =?us-ascii?Q?5peWWoB/ohFgxoU9cJIbLbxCJBZO1byH7SdziAxEeHLDgr6+2AYdKno9o0Ol?= =?us-ascii?Q?4/72hpgP+w4v5exy9Knbf2Us8Nm4lnXT4EYAY4YZ7Mjrb+FF03PRQjUn6Jvw?= =?us-ascii?Q?MTTRzRyFJasa2YRKcNxeqmqEw/t4hpQaIn1Kxe8/OG6S3qf49jaFOA6VkGng?= =?us-ascii?Q?KzhocJRmgDTRXwm2zMpLRPMKPba76rRqLu3zfP8RNwqZqFe4qAk/BcGU+1gG?= =?us-ascii?Q?CkNenoPxeoKMHkmz+F6F7d0ZvXwbLraO2qFrr6ACK2lUDFajVSJqLllGe6Ua?= =?us-ascii?Q?d+CQDP++2kZfmwlcfYTGoIJmG2ivMcW5ys9s9HaNzHeer+zBPk/qsPF6vCul?= =?us-ascii?Q?BjsomNrLa3wbEx+Zlh1ImCGMIJheLUMxMIMb7nBbv45Mp0HPGItFv7gBVfAv?= =?us-ascii?Q?2SSNg3DsyzVADVQVnFJHy6mMM/0lFE9HKycjJmdyM0ngVVnR7HOtLRYNTSeP?= =?us-ascii?Q?p+0768WBW6NL7CfCZSk0AfcNOEJgZdAvumgL5qPhNJc5l2t4gzMopEIZnLR2?= =?us-ascii?Q?DONKaVmu6uYOLaPzW7aHcSS7/KtT5VPoi2pLqRjaXoWTWrh+9QmMhnXBDGz1?= =?us-ascii?Q?142YYyKjWT+XNxU0Jbr77ms5/+G2VznZZD89IcRDOlR+3k8lO5z+N1tg3Rq+?= =?us-ascii?Q?xLKbmOzyzrTr7SWuJeIp/kcD1Fy1GRiON7Nkn7JzoOVK+GIQzAFVVJMpbUsK?= =?us-ascii?Q?0w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a67ec05-4399-49ed-a764-08dab0fe1bed X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:44:26.7150 (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: hdCHLP2A4N0L+qfg4AWPrrAUB84bHkEeG+6kGa+Z36zI5y6xWxoPJVjXXGeQp8JX9/0SbgLc5XB1xs6fgndggQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6919 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