From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00087.outbound.protection.outlook.com [40.107.0.87]) (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 44D6917F5 for ; Fri, 21 Oct 2022 11:00:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D4JyTzVOQDByS8JrIwwJxsaB4FVLoqm6W67ADIFIferQqTDnWr/rdRfR6htrpw/uv+UiQ0gC8G4AKytIzto14tUEk4cPaGoDwj9iI+tx1esaWbesNqtnvFZbKIK44KNZEroUWMuLXmakttTNuVOhHnSYP7b+jS5l+biSUCJ+RronP32Yph4Npz2hchg4intTvKkBBD7VmYYAVMmFPsRM5640JN4uci6IJMO0B14SpNyZKJeuUTNAPd3tdLuG4qkFW+YVo+3MjZz+YeHWqvnjXQu4bchADGyRusNrtmTl9WHnPt5lyTbqpWhtozQkOw/RtL1GbI0x03gE15PAyf34Fg== 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=70O2qjoJES6OmFCgG6l4fRRtfTmbGOU401JYhm7eRGI=; b=CA2H51wsLtyRPwNQTuLa2EnOKTylkA6qY/1xG0gPUXRY+DvyHP9t1Jo8fldLfk6l+z8eBomt4XLJzEp6wSfezVgtFE6SpxJhyiSoNBF4WyEgOYyHVFkyxevzV/Zo/cCXP0n4SIEm4M10l1YOctYBjBQPH6L49aM5XRj0Rh/TbsbfFHuZ7Shh9CBdvXd/Suhf9wd4A93uqBWeCAhEmas4jGBzbtzS6ZB6jLLBd4EtoIBRzRpZPjP8+O5Rc0iiqpyqx8owwV6hIetSzgv2uafiCMw9nN8iq1B++Zz9420VDv619hsbSKrdR2JTBMwvHKUff3bUDBRb8kRMrmppUCSFNQ== 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=70O2qjoJES6OmFCgG6l4fRRtfTmbGOU401JYhm7eRGI=; b=e0pxT6/GRZ7/pojbsgNIcHFHhF9qZc6LaFSPeRjBP54XJYw6DkmeeUCbOhy5A8xP1ukMn9VoIlr8IT3wdylxuBpbEy7V5gz/3su8UhmzyW8Va96tASqWGa36FYeUaeAdY39taTalmBGPM4IF1AANGa32Kimx71jz7rwi0/iBGY3s8uKyirDgyngyjRNV3ZEXkkNwwLOmTd47VcccBewL1dAXvIkdHIGWiYWD5OwRz1zs/1w5d4kEfurBJlAaOkBvSfkhwcDNMSaRwBAnUnCUVxK1ekblr0f3UDNUhPatAkLj0yEGrwFA4iID/jsYsBC7X27N3PNOKNIUJQKheE912w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:00:49 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:00:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 01/19] mptcp: refactor push_pending logic Date: Fri, 21 Oct 2022 18:59:53 +0800 Message-Id: <07c2012e7f8688c9a6977555e906fc691f37bc30.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR03CA0008.apcprd03.prod.outlook.com (2603:1096:404:14::20) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: b3d8c80c-02de-4b96-c6e2-08dab3538372 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p4ooOkKJ06i5s90fVKqeBbETcG3Tne8juHyJC/SVoExPkiobAVPc/fUR+uxG0UngfSAca9gq4C+egdGpNsKrDZOdnLUcP0GZfKoqxvJIOWFdk/l9RQg/w0tt7pHJF1gDvGYzvLqoUbggTY68g3iAxJIb02WAV6axeslqXMYdLIPTWFOl6sdD0FSClp2ralF87smibcuoTNVs/jSg0Us0fdTf1pxibUrBcWTnSvrJ1WyojjkMLqCWhpQF+VYiKyN3ntUAxbL9O2Dp6AE2MwxHwH5NlssBMBKIJ+vszyH4LpGeUW+237v5PwWu6AaBiXOuJpBqdpP2L1vH7MN9q3uGOTSlAOdCCvkJ8dvI8R/1M2fdWycPBtpE9fnJb9O53OQxJYwmXyVuuUztzouRyexUhRjg0gV8J0vl0JhgkAw/mugmibKCylP67IUyWkUUeJgrcIHFM4SnGXW9sR/pSHRWNnIz7jHN1SRnU6n3oazVLT/dZaoiIUsYBcfvwoSK5r0OofUzl1s2+gKA4D56TgI8yIh1OHAz7U3ETOOPO2qxd2wcwjBriU7l2+meVg11UMxaKLvBxvqJSB+8NiJq5TZcbhv3qgCohDsJXWZJmL8hn9wpxukRd1pQFIB8LI+acCxvUEhScAgvKP1I7gEfcc+DWp5DBc7N6yQ0HSm2P2dk3XZkybj65j0fqq31FVljw5s4k0nb3ZmhrTOwnlhbVbmB1xMXK939iYKFjyzD8Kv0vsrmRZnI/DxQMOPyOzHii/3q X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(83380400001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?U08LndD27gbmu/ZrEvcqcjO+QPzI6/x9k5WENA8pBtF7pOQ7Cjx/O92ffFbZ?= =?us-ascii?Q?JJ3335M+sfOovx/gnPCd7q+a2lw5rCj2/9lPjQA9hVDSa9YKOB2F/1SJIZmd?= =?us-ascii?Q?EAzES3VDcMDhUItF1aZgPfEHiiMdVgMKt3hst57NYx6M12JiswTwrpw5uP5N?= =?us-ascii?Q?VNnxZj98tpbMb5eSp6D7T6Lytp0lCtt0SZkNPSenG0ddPOVoyufqmyOGRScJ?= =?us-ascii?Q?gVAK36T34Zhv/GSLAmlNAlZFsSOGdWg3FmwscXYvOZFzmXNKlnlx31946h3m?= =?us-ascii?Q?Ab594fUL9M8ScT3cx+0Q7IgdFcvznEomQX2x2Aqo3oeIUPsiuloBkDlV3k0Z?= =?us-ascii?Q?lTTD/hxCwpK3xIlMJBcWtVGj1Z+gEfTAW9w44KF+Ug2NxLq5REPIdvrLgmCX?= =?us-ascii?Q?jLy+PGpAvdcUV847xIUU2udkb8Jw7Ud1bdTbrwWzJD8qKFptRuwaIvWGIxZS?= =?us-ascii?Q?WSM+msltAeTIdJVyCXloESJnDARSmoVl5Zrn32OHrbbvTjPLA8nLaBFxVFiJ?= =?us-ascii?Q?nIAfSizL1DRCUJrRGvlmn5WBZ2+kegKSEtQBr9jEY5zf0CiCL6pVHx9Op1Ly?= =?us-ascii?Q?i3EcvQmDyGHHuRg8wsEGzPXCtXAPpRLtLszO0Yx/2w3c9LLZW9ZkTjqcoLz0?= =?us-ascii?Q?pOcCsBCeaV+uv+HYP4pk/vngsPx+yrciJ9RpvtDRHJghPaP6GPzj6ucf9BDt?= =?us-ascii?Q?loDgfb8V4PtXC5c3hjcDT8T2udT8PJyygMRl60Y6xguVcyVHjAWbWQKTvm4j?= =?us-ascii?Q?NU46/zmwiZuFqlFj3Lhiyqr13iRR0aDABl5HwKO1G8EoKcDWpnFCuTLXij/b?= =?us-ascii?Q?EDuG5g1o1jkmOty7ouEWN4U4uxfus211oa/FnK5g8WmTvEnV9A3/zbt2V19e?= =?us-ascii?Q?P1DGlVbCl2Zp6ZyrC8thj4FjvKoPYZxSepNX2jPfuqMTAEsUKbkDrqYM0EHj?= =?us-ascii?Q?DzGI2dwRH3XgKatlFAGePD8/O5i5YQ/lVTfehwaHW4ppRqa1hMx/bBzSthFf?= =?us-ascii?Q?tapXHRXC1eEkp+0sP9GBdjkVi5lwZJGpNBdcpWfgi7wlzm2gXaezzP+s11cZ?= =?us-ascii?Q?faHHd9YFC/oDLr8W34hSfJmHR44vCfzsDF9w9oqJYR27QH2beIWtLgGd8J4q?= =?us-ascii?Q?LGBfLv+kWNxBDO/g66H64bE+g+I2QlGbjQAoX1ALBHSfZn6Rr6dHVt69qaR9?= =?us-ascii?Q?ii4tC2BdEJ32Eu4G4FQe6QjUxgL8g4B4yQ6K2EbadZVPMTZoA3kD58E81IoH?= =?us-ascii?Q?Ro3TEKIbTz2uw24DH8/6gQNEo1G3NaJPnzgb1hpDcHCE3QbB4bGBaisRXFke?= =?us-ascii?Q?Jx2X2y5Fs9nrtsx4lRZgdzHTIU6qi67POiKjMAba+aJ9RvKAV9vuG9bGOPFd?= =?us-ascii?Q?uB6vDtpuXXobI1wnbqCb91ydChA0dcFsk7jUo4Lhosm50qS63MCGIS+PL+Yo?= =?us-ascii?Q?rylyT0quWJQjGipqO9ut3atTl09uLkef938/ctv4TVnOOKJVgPf0n6YXHnnu?= =?us-ascii?Q?MLDC9gLl6tBLzy4RdH1Lme87b5oUozTTJw/AD6wK+BdAYpIF2zB8i0dAxW4v?= =?us-ascii?Q?xGfuaq4AFECq2crtWPqWjZaRGSCbn/2d4cIAzEL/wr3yHXmG1kiWlGGbDWxI?= =?us-ascii?Q?zg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3d8c80c-02de-4b96-c6e2-08dab3538372 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:00:49.8309 (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: iTMtzQaGH0GUrx7OL/VJRWK3YJ8swvo9Ob+oa79iyxYmXbsTR12tgDQ4QUi6lwXi4mXA5qjLdpi/11nyBk9rdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 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 dc46c7ec8950..03312e762606 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 Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00071.outbound.protection.outlook.com [40.107.0.71]) (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 46F317B for ; Fri, 21 Oct 2022 11:01:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dsnc36QfztaamngA41/uu1q3+Q2cdzlwdyUhsbpxKylTbJI25tyHzl50XuHtnboTVmIy8726FMOGcD1CRz5SAnrf53ALPjuuSWHKGjUvA86sgGnQISEa3U5oxFPkC2JFLOT5FuL2dS55tCofa6xFX8vs19byNtLe99MWx0HZ6cJcc0YEwvmSSgRMyDl8xdkCtdmbrgCISEQBiwJvOBrMKHGIfAEFAh1S1Muqs0M4EcIjwSxYdu5pSXEwxtCdpgqKc1bJHvn1FCCVRZekDK0BMzP4iSqjrBXpL2CJ4PRlUyMrXjYdo8iUDKZCknpme7yHFT3WNXSms5MXOrhkC+6E0Q== 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=wuRdzJcF64kacxCMa++KrXFRVFU7wrRXkDEToLE5QjA=; b=Umb2y0FCf3ECwskyj6bDDzraNPU2DRM7/6bE78RK+mB7M5I0EzOblMRnEthkX2Hri5iIRwNsHXdMq/8N5MXlSi24g2Gsmie5bEN4T7v4JNMfB85iOFM8I/9aKG5uNmP/tvBNitQ/F0AlVE6TpzSUMSHAPzWNk+xggJC8JGb60NtDES/zT5GxytBHsFzNWNlLAdhdreSg4aqAh/46kgnzQl+Xqt4BxOLPmNjLLgbgBArLrnczXBU3EhfkuYdCDCcFpHlYlrl0SApWdh8cDaXGsk7MuAfocSncVI5iS725auB9Sfx8tWgbJ70XVWnr/y14qV+k+Mkv6bMEaAivYV3Nlg== 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=wuRdzJcF64kacxCMa++KrXFRVFU7wrRXkDEToLE5QjA=; b=DUbZSJRdvIUHmtCBIgW5voP4KWPN8x5//GX7gdDyLLuOpRsAY59UkjLbqBumy88MbmSng3Pdpltgy9kmHytEPgj7aqvaugZrIbwqAMo1wdISW9sUdVarv0kRZg+eIprdImyCL+zg8gMBEBXgV3+dTX/L1di4Tx+VemrVgySHdRoLEnNUsNdpc9EtwP5f3Q6Y1Choa59fdDIuWpX0JFoqHmv4Qn/oRh4DhVyJOo9Rjh71PowbLT1LMBO0br+nBHXdZkfDxEDRERaEhD1b3FUlRdZiBM7x1T3HpPOg7sRjcdf4LBiyCN/XPGGQmNbUeOuvZWi3Sme3cPpth9lBA3HerQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:00:57 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:00:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 02/19] Squash to "mptcp: add struct mptcp_sched_ops" Date: Fri, 21 Oct 2022 18:59:54 +0800 Message-Id: <0c76170deffaef27e7f13ab23db61dab3c040355.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR03CA0014.apcprd03.prod.outlook.com (2603:1096:404:14::26) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c6532d1-ff6a-4954-ee77-08dab353885f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BfsuQtNGVZYHwP6X7uSIBXky75nbrtB/PI6KX1/1tBvVmfvMh/E3Rmm5JDBCNxKJn6i3tB5bOlbvanJXkEtZqVxspMIR7dOPtzqeUTCLsHBiCldEEJZshRRo7L/HcvqB2LdizLjxyUrihL4iUggOGAIeD5SXQ8FGH/p0idM7ENgEey2x7+df7zaRTSEoGw/Y/lTBhCIUbGsRh2DdHu17rtTzDddjKl2GHQIQHRZDHKTn/cEMqSXu+EMuYlCPCHbXIgnYzo80K6cjxjYtS6cOrQkCvKJ5UqVEOEJ+kWl61mJKZkRUVQNCfKWgMtxtUkUAe3mXBgxi6hJIA1wL88CRuWJs/x6l9O+CxfRHjupftLfBMB3Qv5PR6UcHrYi9D5+pI2e1ni2roX2Tzn/k6ZAAOFc2h0pXmpPdxtQhfekNaWOgp+8yoRmp1oEFAMavcleXyv+TBrxVWem9jhV1e29XwKO8NCVZ3cdVWntq3bOnWRIJzs/lSUcAF68puPPi9IzEXQcMop4EKkPNSrzpI9wOqCfQi9VW3P5nc2dxOLRRmEBFkix5g4YIucHtQ1P7pA1oySZfRmkUsnHxGYpenP1NixdqCoReoP12zPk0SFqzJT/AZiY/bS08k3UV3OLnx7blaPRENPEvQBXGeAE3ufWTuo7coAFBe19no3DT3WJzSBY1U8wh7v4X6m7RLd5zH+LbJr0Z9pyzZ9XtTVKzBLnZOsXK4LfZ4KDBL/sm5w2M0Jv/zGk1sU/xmS/Mnb3001u8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(83380400001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0x2WF/U/2kryEJjaL3UHA3xfph4KQ/rSusZnY7U8d0OpfCmpJqDZ0DvtznDo?= =?us-ascii?Q?InAe0ddokEnuz9VlcJzSU08Uc0mXVr/TtEuH04gv8rkPTVtp02MG8heSDdJF?= =?us-ascii?Q?A3ZodhFYsUWWJoKjiApJItd4thU0tSjAVJLTtqGbLg57mpG3Tr7Qdh7gIw+9?= =?us-ascii?Q?KihHzvlS5iSkusME3/FzS+4cU/609JFz+ubk4AGdeaIdGF22gIwHDNnF0WC4?= =?us-ascii?Q?p8iR41so6nOeLkrWQ+DVWUfH3y1cVV6F0CYz2viMshjslY1+z7yJrtAYPHxd?= =?us-ascii?Q?Qr01+OuYG+Oc5nwIkNBpgynSF9y0UMjsAxNcp+NFt2aNTuR4rHQolH+psmm8?= =?us-ascii?Q?UPHbXftxIhpPU3jjrE0H5eWtdINBP7hBO4j75d0QRGoWeSQROlySEeE83D6w?= =?us-ascii?Q?RmASpSwLAy/mQfWS9GkB+fJ98YP9GNXgsPyQ+4RAV7pxQlsI6rhLTNNs1bDy?= =?us-ascii?Q?Dr4RuOcRTAIxDtUvdE+1RJD9aRGbK/8QKS+3yjVgOMK29dNenCBnBAzL+v1/?= =?us-ascii?Q?Xr9+7aw3ZqFdhopMUWjXRYkpL5VM3+F4D/AM1NRwPv6h4GLoc0dr6KBLOkFK?= =?us-ascii?Q?DaT2hXf5LbTw4KW5L38ZNolPtoKsrhAzes/SJH99Or/tRFDSTMDVt+bxNeT5?= =?us-ascii?Q?PkrB/8Sej/sHaytMBenS3eoV62+kUAcTYIdVO7WM5UclRcNDGUoSMqjeSx+C?= =?us-ascii?Q?K26H/+HIdKvikQ3LhcPCloXykCY2pr+iKWR+hyYQtZEi5PtE+Dt6G+OSdM0g?= =?us-ascii?Q?9OMMcPN+4snjHyoOarrHs9sxSIK7iSFlZwzPVADY2GBB60l/pEUcEjZUDtBJ?= =?us-ascii?Q?33F5Nw2R09luTprDMVbu/aOn4NdUx8AiV1dGmKp1XAXAnHRqYNLLHRywjpGs?= =?us-ascii?Q?hciDOzPNbEjZfRQ6R/jr9Ci8n35QhQOHqUo8h8oyFOwkfadz3ux6nPL/Ypej?= =?us-ascii?Q?yOX+nD89D7U0hCRhwJG3k8OOSXTpbaQxqjGumzpjvbLAGxwKRwqr9DeVdjGA?= =?us-ascii?Q?ZGY4eI63Yfx5XyV4kl8jMk6YTcDCUwfPGmPhcbxuXmnUbDcDdj/QHTURyJ46?= =?us-ascii?Q?Tu5STt/TmnB/Jthv5yu4ebUIHmsWhRxdOINjT+SvHWs8XPa+QVrutV/W6KJO?= =?us-ascii?Q?YGwNye/Y4WSLXyWJDCNbLe8k9wxtN4frq4HvaahC23Dx8pE47xeUPo+BzJd4?= =?us-ascii?Q?Rnik20jInV+Mfn5FBmkCXyGQkKiW7e/rYyyfFiz+eA1icgJhZCjTZZkMLtXV?= =?us-ascii?Q?R6kfQKik3eWKJ3ULVVkyikVAdALYuztVB0wQAHD3C6imepNhMPdh3vzAKGhN?= =?us-ascii?Q?QdlsmxXljRpJlnMpEXUJVNDavPAzIrUIbJNyyJ06s4II5E+CJ3YqoyzidyJJ?= =?us-ascii?Q?6LKXBw1yU4Z6WYEeiXUce5aBMIat/zE2SvOF2HHo3y5Koo1VsfoC7gYfJwam?= =?us-ascii?Q?nl7LWozKJvl9h05zJzR0VQIfIoo06wLhYYBzYI4AbcqpR1VMPfl4xom0Dpkp?= =?us-ascii?Q?KR8B8XR14hN1OtjaIOnADjHMmTnkGECqyBHdWJF8ovNZmizt6VHPNWzkZ1jP?= =?us-ascii?Q?UAFYf1fvq4HG24EkIFgnInWTPpSP2lvu/oFp+0iuCbh2DQVJLxx0I3huRzdQ?= =?us-ascii?Q?dg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c6532d1-ff6a-4954-ee77-08dab353885f X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:00:57.8617 (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: LoPdWW4rK80ju4zc5aq92tX1MVYLEq1b8NzzNTF2psWsYglEelwbZiEoSC89M6GJzewRmeybSf6MPvPA/V2zGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" New api: - add new data_init - add an int return value for get_subflow Signed-off-by: Geliang Tang --- include/net/mptcp.h | 6 ++++-- net/mptcp/sched.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index c25939b2af68..0f386d805957 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -105,8 +105,10 @@ struct mptcp_sched_data { }; =20 struct mptcp_sched_ops { - void (*get_subflow)(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); + void (*data_init)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); + int (*get_subflow)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); =20 char name[MPTCP_SCHED_NAME_MAX]; struct module *owner; diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 9b128714055a..6324a8a76382 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -33,7 +33,7 @@ struct mptcp_sched_ops *mptcp_sched_find(const char *name) =20 int mptcp_register_scheduler(struct mptcp_sched_ops *sched) { - if (!sched->get_subflow) + if (!sched->data_init || !sched->get_subflow) return -EINVAL; =20 spin_lock(&mptcp_sched_list_lock); --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00081.outbound.protection.outlook.com [40.107.0.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 413CE7B for ; Fri, 21 Oct 2022 11:01:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A1BmI+2UQfpwmZBYCQ5HJRkh8+Fc51tZXGGwxshcBxDUFVrDtYEAI69rBBeGn/S5JVkhvgEHUo3szyH24rEIjZ1XYz1gZSQj1yfg7ycpfe5flpXsieD1EB68SLTPUDeZ9fLtNeuSg6y28AEy9OGze1OHlJ5x/ifGIRkblSFq6KtNqZXkLkzRn1EofWK3VLJgaxeX7BfGzGIEoWvwn831vcT7HiUQ60c/JwPlY2psCFhbt8H+Z97eDSozr+Ratqcb+p8pF9vO9vsGPjYdUaeb+dIwvDArIymmPuUaAjVbwSGyR3v0he7I+p8x8GRus5SQJmNHXDYIVLltrJkPdgZ9BA== 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=ZQeH3ImbzrYpv0878OqP8I7EW8lXturQl8QJE9rbHhg=; b=NRP/dyyBFD2fXXEiuPSMLJXtwrGWr4EbvxIWx7EcoFek7GI/CugEv8yNarwFoUGJ1g+QA8OZtNWXUaI3cHI5Gw+By08KXj7grKJ0ZkC4HbLvmSXKnhypCaFma5CNxvABfvdU6GgLBNR2Lm/y3qA25at3pQ2v0OHBMIenLkPe04Tz9OwO1yyVO0kZ1IJhQoPBcDer/JPDMoT5rCIrAz8nV8RvdJCAnrevRTKdSRFrj5kMiQl3osnLn/5mPgK7lLRo5wR+5gtKnrtTYm9xhTNorilPtCBgJkWvlfBSH84icBjWwM8mTTZ9FYmT78UGmnw7RNbwYax2B+XfU5iWgCT9nQ== 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=ZQeH3ImbzrYpv0878OqP8I7EW8lXturQl8QJE9rbHhg=; b=b9CpFVOLE72gjoQYH96qmK7J7LcqTzE/RyogY7gnrr7SqDffxJQFJnmUXXcZ/825aiwKgZTjEISQ2sIKWatf4TUcsxh1WjrQ1iorkQLOmhrtuUWagdAzFkMnAsMxgwtDj3AVLQ06zicOHj64pjb4/uXBm+jK8vPcFKcWZ93xyMs1uUslqFa9g0j8lWcXHs16ckTdiMtnYB0GFUSpdkr00MzDH9X/6CZGqOLfPrkpT7QsVEkFZrlml8y2HaxSZ3qEUIR0M4Y2b/V+8kLZwEOUAizjyvl9svYmpSfY7buJJ6zahn4oEZ3bVmmthWk++N2PcS5y+baxGj5cpCVzzrUVQQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:01:06 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:01:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 03/19] mptcp: move last_snd into mptcp_sched_ops Date: Fri, 21 Oct 2022 18:59:55 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0162.jpnprd01.prod.outlook.com (2603:1096:404:7e::30) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: 37964bd8-2a51-438e-eb33-08dab3538d83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ixbyFIbaCx4GJXj554W4KvTyUMW7sjr/RmR/GXDtSv9eIzA0qWdfM8cewTLxhGNLGld7t9Yu1nCBr4z4mOiZgBDNUDZg67IayInQ6JWWVIrn5+136fepu/x05BDEDGAkieQN3mozTFuiE5Wujm3RxJEt+fUN4S5rKRwQQTbdslFRJoFQwEP8s1JQO7jkU3NcjEW8OY92aHHRuFgTWgI1tvmvMg1aDyBEeyBtLpGQAC+xcexeRCHc0tfCKghc9Fo02w2TuBo7Zyf6CMS1FY9SVkV3acAb+Jw69m8n2yoAiuZYQD/Yp8OwNdCjTKVzZujxnHEq7bsgc827fg3f+sdxJzvJSI1aUASna1T2vpeKLOKtskVVU9mBYXoxYFLX2rQE55gYNv3BmJwVKKD1YpvGeXXZwL1YzWApfEEscoW6esBkQeZbXAskSfSRLEb05+FQYQzVyjD2KZqjST124NSyy+8S4iDpoOVTFGV3Njf+Hsh6vELTO8SXYru+Sf8t5B0x7I5S9juL7QIokhTfhUTZHHBAS18TMJ05H7t/PGCXH+oMTGxa0kef64ML5ykrWE2plTs3Mh/skJnwjyDP6cmftBWKmTV20d/pTF316/SP39humS+VBOjg/4/+F27XsnTVAqjA4MpeHZ6kFQYNi9CCU5U1m88uIjy7J2eirx7bJbGp67nQ+micNJl4FcBPY1giKkMRhLsh2YREtK9b8uKFBP7gCkXbnJ/jLNbD6Puw3Hw7VM5HOPQrGkx+1neizwII X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(83380400001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KDllGfzk7VbyIDbpvRUidiJNgyPxyTRWF8tN1GeUgJBrQlxs/SCxhuhYAsLq?= =?us-ascii?Q?UF+J7eY/ftFXXly9HnZcJaM5Jfxx5YFQU+KJGrqp+z9qwjTrdG7kaoNWJkW4?= =?us-ascii?Q?WY7qIX2qfyHToK3ZO12swtXdiE8LPJiCpgogERfAwUQLywqHlpHKPa9pqA6E?= =?us-ascii?Q?j3imsFHSPSxrOWdi1d6v2DLHDGUjUL16JM6zCf0wg8Hcw820JvQxwcukw5tH?= =?us-ascii?Q?WXN6VUIqtVnvOl3Iw65Z/QmHP1lPniJ0UaARmMuPS96L3a6tEv9vnp9nnHvi?= =?us-ascii?Q?Ln3E6AyWnDdMXNU8ULnpPOZZcRv1UmMmTSbEwCzkHBnJSghw2y+1DtGaZA2I?= =?us-ascii?Q?6GA5KtE8Xr7gdsC8/MfNw506mvWivizee1wNdZXQXzLvXgbBzRGS7vCvDsD1?= =?us-ascii?Q?3+NOtJqoIsvGvxI8G+iIKmGKxXA7LLx9vF6nPKmAEY7qwuUhklGgm1z4pp7s?= =?us-ascii?Q?dvoxIDG5Y+GGH7XPuN5pE9OymFJ6Vllo/TlQsE4f67lcydDMZvfN9NXIKczx?= =?us-ascii?Q?4km1HYA4PGZ2/LMmnb14wlzjBxkRQor1jQVtjngoJXZGrHS6jyRP6geDo+3b?= =?us-ascii?Q?xrmCPV+qrZ8yz5XKDi3InLKlSu9penI5jsbHRaelixO1NA/PeDnrDDVXC98J?= =?us-ascii?Q?yATKe5ZFiC+NMtKWAjufKNz7T/lcHmbPgBRSfukpnswnhXGUA/aLyU7X/KE9?= =?us-ascii?Q?Sh6C6N5mi8Av8VsqwhjA7hccwQmX214Cj0OGWYlLRdBTGXG26OyZQZv6Nej4?= =?us-ascii?Q?MHsfcBb0oGTPALJgH61pS19o3pudYivKZkhHGosaTIzuif/5XIGeeXc9oBFJ?= =?us-ascii?Q?pL77y8Ep8ImVyNlwrzS9HiHYVQzweGIsDkdktbyXh9oB8YuczXdWL4D55gaB?= =?us-ascii?Q?B+MX0aRhyebJDZUmgkDNyq4hN1M7T3Gukd6Q88ElcVdFkNIeYk/Sp2sDdrTY?= =?us-ascii?Q?qBLJbJgncJRwpnnOc2Q/y6MshNY+/jdFDqRxF3w4AQ4KQBfWDDUZu6RFpJ0y?= =?us-ascii?Q?XzURfRGly36NjpZM4DveI7aLVLlhePhUfA1Zl2krM+Hn50LuKVkUPCEGYGE9?= =?us-ascii?Q?LGzXEubKhmRamH20IU57fDybA2ZS3rp3IW4FUHzps2E+4BnYQT7GO5ai8eYJ?= =?us-ascii?Q?cd5kjsZ3cxLuwAp2UeM/UwoR1WtXSlE5eI4i8+FLnUryyknijPPCuyYyWrdR?= =?us-ascii?Q?yikiN1BRqYdl8Jz4gD/r4TC93IgS7my/B3Qe0dkpP8ymkUIi/itrjVakF2n7?= =?us-ascii?Q?kPT2W4u8Yyk4Mc97eEjK8Oolo0U8Yjvw9WoXLdJUtG3yr+zENNhC5Z/U2PY4?= =?us-ascii?Q?drVJvELSfnlSZ9Xpp6kgw06W4/cJCMFQrNddZlLVwNyqxyczUINaKo0Y8bRU?= =?us-ascii?Q?y+urc1PM5Wqa16xBg4GDfJ0UA53MO042OErmjBXc8ABCJOpQb4Bm1LbF921n?= =?us-ascii?Q?oIfCMsIL440GVeGuyhPKvFFEU884MpmDvIV9osLbiim3aRB6DIG5BrlA3WQ8?= =?us-ascii?Q?N9e1/vaFR3+wA+mTJaFqn36dvVCVRyBmiVgYU3Pt+PpI5k6l1IqoPA5lubFD?= =?us-ascii?Q?eW22vowdZrTWCbANkPaDnSWiLfzGHHSucMkdpESFtn1YMRamJWRfpoOKi4Ny?= =?us-ascii?Q?3w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37964bd8-2a51-438e-eb33-08dab3538d83 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:01:06.7986 (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: HzNcny/Qi1YI4uzOAdzd+H8X+iSTIHHaCAB/eRd9U8fQSL7paD7hCcIaWRmFE/xuYMA+MCmVT9aoqjalhOSMFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" Drop the useless msk->last_snd and macro MPTCP_RESET_SCHEDULER. Move last_snd from struct mptcp_sock into struct mptcp_sched_ops. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 3 +++ net/mptcp/pm.c | 9 +-------- net/mptcp/pm_netlink.c | 3 --- net/mptcp/protocol.c | 13 ++++--------- net/mptcp/protocol.h | 2 -- net/mptcp/sched.c | 3 +++ 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 0f386d805957..a45e00bf2f3e 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -110,6 +110,9 @@ struct mptcp_sched_ops { int (*get_subflow)(const struct mptcp_sock *msk, struct mptcp_sched_data *data); =20 + /* round-robin scheduler */ + struct sock *last_snd; + char name[MPTCP_SCHED_NAME_MAX]; struct module *owner; struct list_head list; diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 45e2a48397b9..cdeb7280ac76 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -282,15 +282,8 @@ void mptcp_pm_mp_prio_received(struct sock *ssk, u8 bk= up) =20 pr_debug("subflow->backup=3D%d, bkup=3D%d\n", subflow->backup, bkup); msk =3D mptcp_sk(sk); - if (subflow->backup !=3D bkup) { + if (subflow->backup !=3D bkup) subflow->backup =3D bkup; - mptcp_data_lock(sk); - if (!sock_owned_by_user(sk)) - msk->last_snd =3D NULL; - else - __set_bit(MPTCP_RESET_SCHEDULER, &msk->cb_flags); - mptcp_data_unlock(sk); - } =20 mptcp_event(MPTCP_EVENT_SUB_PRIORITY, msk, ssk, GFP_ATOMIC); } diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 9813ed0fde9b..1f2da4aedcb4 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -475,9 +475,6 @@ static void __mptcp_pm_send_ack(struct mptcp_sock *msk,= struct mptcp_subflow_con =20 slow =3D lock_sock_fast(ssk); if (prio) { - if (subflow->backup !=3D backup) - msk->last_snd =3D NULL; - subflow->send_mp_prio =3D 1; subflow->backup =3D backup; subflow->request_bkup =3D backup; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 03312e762606..a9d33dea2a8a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1469,16 +1469,13 @@ struct sock *mptcp_subflow_get_send(struct mptcp_so= ck *msk) =20 burst =3D min_t(int, MPTCP_SEND_BURST_SIZE, mptcp_wnd_end(msk) - msk->snd= _nxt); wmem =3D READ_ONCE(ssk->sk_wmem_queued); - if (!burst) { - msk->last_snd =3D NULL; + if (!burst) return ssk; - } =20 subflow =3D mptcp_subflow_ctx(ssk); subflow->avg_pacing_rate =3D div_u64((u64)subflow->avg_pacing_rate * wmem= + READ_ONCE(ssk->sk_pacing_rate) * burst, burst + wmem); - msk->last_snd =3D ssk; msk->snd_burst =3D burst; return ssk; } @@ -2378,8 +2375,8 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, msk->first =3D NULL; =20 out: - if (ssk =3D=3D msk->last_snd) - msk->last_snd =3D NULL; + if (msk->sched && ssk =3D=3D msk->sched->last_snd) + msk->sched->last_snd =3D NULL; =20 if (need_push) __mptcp_push_pending(sk, 0); @@ -3013,7 +3010,7 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) * subflow */ mptcp_destroy_common(msk, MPTCP_CF_FASTCLOSE); - msk->last_snd =3D NULL; + msk->sched->last_snd =3D NULL; WRITE_ONCE(msk->flags, 0); msk->cb_flags =3D 0; msk->push_pending =3D 0; @@ -3274,8 +3271,6 @@ static void mptcp_release_cb(struct sock *sk) __mptcp_set_connected(sk); if (__test_and_clear_bit(MPTCP_ERROR_REPORT, &msk->cb_flags)) __mptcp_error_report(sk); - if (__test_and_clear_bit(MPTCP_RESET_SCHEDULER, &msk->cb_flags)) - msk->last_snd =3D NULL; } =20 __mptcp_update_rmem(sk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8f48f881adf8..a58fa261f487 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -124,7 +124,6 @@ #define MPTCP_RETRANSMIT 4 #define MPTCP_FLUSH_JOIN_LIST 5 #define MPTCP_CONNECTED 6 -#define MPTCP_RESET_SCHEDULER 7 =20 static inline bool before64(__u64 seq1, __u64 seq2) { @@ -258,7 +257,6 @@ struct mptcp_sock { atomic64_t rcv_wnd_sent; u64 rcv_data_fin_seq; int rmem_fwd_alloc; - struct sock *last_snd; int snd_burst; int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 6324a8a76382..f6c622e15584 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -68,6 +68,8 @@ int mptcp_init_sched(struct mptcp_sock *msk, if (msk->sched->init) msk->sched->init(msk); =20 + msk->sched->last_snd =3D NULL; + pr_debug("sched=3D%s", msk->sched->name); =20 out: @@ -81,6 +83,7 @@ void mptcp_release_sched(struct mptcp_sock *msk) if (!sched) return; =20 + msk->sched->last_snd =3D NULL; msk->sched =3D NULL; if (sched->release) sched->release(msk); --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00048.outbound.protection.outlook.com [40.107.0.48]) (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 D2EB47B for ; Fri, 21 Oct 2022 11:01:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/o6wiRQ8dGbQrs37ZE/nX/fniNUmleIemxdMCeKrXp41No1+M95gFWNeCrod43Fb6XY7sf1dk+n90AzHxscGL4W693PolsO1pL0TXrDf5GQXY/PxpZ+ILP0/5a2rC2b0hUiExKajivMlqVS9/GohApJh9hWZMGnKwshvF9G+IyYaszVWYwsMEQbObk1htKmhAoMAh4t5KqMolA9RCUWxbIFtlSbcv49OyrJZG+ZSIXgi0AZCgY1LilJKmuI9LLfjnjIgOad6zSsNvcKJR/Yl924rWJB5DOCrJd1LWgqaAqIH3y+H0A1ty1mJOo3MVQfTEKjnh6/027v7e6yYmodig== 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=boy99iNTYOGEolv8Xa3CF6Lzhhpg7VbE5nJ64sazsg8=; b=Ft1k0c4/4uAPY+I7BKRrQkiDGpUhAy+b7xkqOzGNJdJlvohmLFACjdtbHrHxBtBMt6X1zK7NyMmlxH34yHRXbX5SYqo/eUMt/OTYb4QKNO7wBckM5t0/Oxn2u9K4WUgFsVlD2cTxda3gmfZCn+iR9MsTqkAVDe/xpmimjjHmMW2RcfcLdppoElhsk0iZ35PUwXP94W2PndrRZ7CVsPqlJglqAUeUmmu0znKdo+xSS51IwAoOWHCUhO6x7xyTPxVSiAp1e0GRjzPaVZfTxIMs/YZi0M8X7Lk87AyXd+xM4+P0QQa2Yx7gHXl9UxKOIOTifP0acBIVXXx61c3rWG+Ctg== 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=boy99iNTYOGEolv8Xa3CF6Lzhhpg7VbE5nJ64sazsg8=; b=kiDXmv0mo8AWkx7EK9oVRzFLVBjrg7vpc+5NMwWynMEiJ6sFlhwSZQmSLfmF2Cg7qzwhCTBGVjgPainc9vZ7Np/6WCtT7+iKHL0IJqrSlAm6iuiAarIInn/Gp4dtgVxIzvh2w0ymoODcEAPIkeWu4ZGDE10JELIkkXDXQepla7xINXZuNJn9HQczy9zsyerrQDBfVvhYZVn1SqPVmyRsfksuIa+BDe+szWCJnrQ3U3liu0JUcOmEL/pMhbxB5+Lk+B2HimdVoZJXQw0IErf+KRPH9sIChHZLZT2Lf6hwwQduAizOkyfyO14BFqPBI83m5JzP9Y1mzeSZn28+vRY+ZQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:01:17 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:01:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 04/19] mptcp: move snd_burst into mptcp_sched_ops Date: Fri, 21 Oct 2022 18:59:56 +0800 Message-Id: <14220e2e48a619afff73d8935901024fee37a710.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0006.apcprd01.prod.exchangelabs.com (2603:1096:404:92::18) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: ed5e3fd4-5021-400d-d872-08dab353939f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ss4s8sKH/Aymfh3SEMvCsb9QdkTSjWg7mg1a6yazQalL5AoB/+DaC5zAnM/aVk2NMMp/+E9IyM7oyCJ91ckxVBn6farC2pDjxtox8YXAQm5hDLPjJDrV1t1tnp+LBjXgLhM6FKRJkl9+dY9cdubAdmAHe65jlUvN8vL7CcbwiPIzbtrinr5JQZOaeLyr8bMW2ah9Gzj2ZEOdNU8Wz/JIpa5/yAmSeIu12McjcHqj2lOEv8czwNrX5NOPmGYBim6OxNlhVJV0wuzidHZQdWvQHfk8Iu2gh7EQIO+KuL7gD7x/9zrJIaqnHSnHmFVBuv0uwczt1hRTPmkZ3jhA1ArpkvjWUhoAGgWUmh2OYsDx82oTIqtbhO7TpVjwmOoHo4A8V7+ZzOsEVNfbqZ77JBcRuHENBC8S+RDZQYOVtj4EzMuUbHdMWtJqH8JxBp1XOyfcLygElpF1VDF9hsGHX60usPOQ1ZstFux8w2r3xZXKAsQgo+6nwYXfuBOXgQdnNjnNi0dJ6O/IDeb19nbUqZ+hKcoy3KjIb9ndXuV76qkffF6oGGlpL5Q9+AqfKr+HYLETgfYyLEus70P92R//+qqRvljiVP09+CCDjPvwYtT43xqf22gPcrRsIRosMsNDSe3ubT9CEolG/bAwJwZliJy7XgyGOSWo8xt/N7RXiUxaJxD6v1s+vSwzML81vznvF5hVp7rrG0q+o9SdkanSQJ3OQDT+qrVl5XAQQVfUl4ItBkzQxaF3/rQ6KEFRMfFGbieK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(83380400001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DtNJpl6yArPulZL4guQ8mYYAhUYJnXhpKzKRrKVXFpeu6Iw/tJrlmM9O9MqB?= =?us-ascii?Q?iUT67ZeG2MxZ1AW0byZe3PKoDsHTtqiQRdz/n+QfQArt9z9CCywCsEQx0bHq?= =?us-ascii?Q?2+obfh4t6E95Eg71Qg/Q7m25rS8kR9x7M6uKB/tj/lFO5NMgRyIhuOU2q+aD?= =?us-ascii?Q?+eweId67n6g5Dt92uKWJ3NBV7XqjfrhyYVSY33NUNkzW/PMz+GgaoyntC1+J?= =?us-ascii?Q?BO0352D3JczJuPwMxTA/jPJRFPi0HmBbUzGTFo32Nt8bBWhKcQVtTrC2wlwV?= =?us-ascii?Q?Zq6iDFlTcQCcORrjpgKmiucNvG9ameNhUfBGgGKLNUyGkFIE9Aip6wNFZXrS?= =?us-ascii?Q?oOWz15uI5SNI/PXeIYGSCHvrqLe8iBAVJTxZDEKqTwmk8twRxzAjSlMrdJiD?= =?us-ascii?Q?VWOkqtTCyThkPoa4SwKdfg7llvDp7vFwSdM85QSdMccyCrvSU4f3UHeKZ1tP?= =?us-ascii?Q?mHo3g6QpSeGAXtNHX4m1rXlAWthxkQSBV9NZXUfYd0w7RB9Q9YcbhFLWop2x?= =?us-ascii?Q?6RcB3PK4aO0SQx13nk704DW1Zt5fCfIhSKRYsaULZvZnKBXwrzKPXGA29570?= =?us-ascii?Q?ppa8GyuDy49eBCx/JY1dV8Bst7iQe3uT4b+wttvbrxSxn90w0xIdjurxQblA?= =?us-ascii?Q?2T26kaJiESDN11iTEEfqSx5XzWJMwQpqr+naYoqhArsT/INT7ghG9nSsKUJc?= =?us-ascii?Q?2ctyF+NTLIAQU6NGYmliqVHijp8DDuDcZFj398Yr3iw9vzA7a43F2SwZkCxm?= =?us-ascii?Q?l0YBeP+sxsjWQhpno4LwuhaY9Ed0FEYVlOL0GWPPkE3Hb0RuqM0l5UlfiEut?= =?us-ascii?Q?EHc4ozSeq2XbQEDElXQ7oQlfKGa4TadzyQBglFiE/CcyzrP/gx00b3kEPg/4?= =?us-ascii?Q?J8LMV/W6Jlnqypz+72VT1l0mDi7ooPpnLMOPU2/5DFV00T5Bo6OzIGPUyZQ6?= =?us-ascii?Q?wCaVjgT0l2ZXXcZhl/xSApduHfXYjBr0Wt5IAQ/B39X/iNJ2kmpDXTfV/MHs?= =?us-ascii?Q?ANCO0xFEDqQYh3hcFUmCWJ64Dmh514CsswJWqhSPx9sK8lgrL5x0gvbNt50g?= =?us-ascii?Q?uxV2DEBE+jEHwbxxZpgH6UkEK7OJa/xnjmHmdHZeoJj6AoL8JI3+51iuAZau?= =?us-ascii?Q?XFGGZ0XMHI+wfBBocilB3TRo8tFGXyp0KW3BQYD3+yPKp/5IObmhI3uh/B8X?= =?us-ascii?Q?l0zHmfhGMsmZEHxmmm+3zHd8HlGpk0GjF5X6LbR5kJ35oQGNvPlEitDkJw8C?= =?us-ascii?Q?fXh15raT1zhog4wkuYvWkld7LO9KdYYkICqT9ilV86cZx9rFAiaNm97ym0vW?= =?us-ascii?Q?o1BCFzCQCWpecQbDH3px15sQFgqGrllTUFTZKoWEF+zJPRNmfZOf3acVW18C?= =?us-ascii?Q?YgnyEjxOzAzGK4Ba98U4mR1jX5ka1LumY0snMFuhoG5HQmoxKQoKCLc2f8ue?= =?us-ascii?Q?6GeYdQRDDAfGcrK20BOyAf8hIToMYNQVJx+hlagf3CrXnuU6zk2X44f/A1d2?= =?us-ascii?Q?vZqbspW6+8Br3l8FPLUHgAlZMhLP1V8DIXCWwq0OIbHBTEC0sovyuWhkFYKE?= =?us-ascii?Q?3kYzEQ5tXJ9qLt2p49t5ueXT9VNu4HN+0RAotKyb1k5D6WAJq7B/I26rYL3Y?= =?us-ascii?Q?+w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed5e3fd4-5021-400d-d872-08dab353939f X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:01:17.1886 (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: lbl4IZFZvIi6sWgfUDq+Us8gIQQje1d86OuvuJ2fyPuUqGJHU6JOicC+MVEdkhCR1qUuw4VxBdrDy/PPuNwv3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" Move snd_burst from struct mptcp_sock into struct mptcp_sched_ops, use msk->sched->snd_burst instead of msk->snd_burst. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 2 ++ net/mptcp/protocol.c | 7 +++---- net/mptcp/protocol.h | 1 - net/mptcp/sched.c | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index a45e00bf2f3e..a0c01bf153b2 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -110,6 +110,8 @@ struct mptcp_sched_ops { int (*get_subflow)(const struct mptcp_sock *msk, struct mptcp_sched_data *data); =20 + /* burst scheduler */ + int snd_burst; /* round-robin scheduler */ struct sock *last_snd; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index a9d33dea2a8a..594206bfe9a5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1476,7 +1476,7 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock= *msk) subflow->avg_pacing_rate =3D div_u64((u64)subflow->avg_pacing_rate * wmem= + READ_ONCE(ssk->sk_pacing_rate) * burst, burst + wmem); - msk->snd_burst =3D burst; + msk->sched->snd_burst =3D burst; return ssk; } =20 @@ -1494,7 +1494,7 @@ static void mptcp_update_post_push(struct mptcp_sock = *msk, =20 dfrag->already_sent +=3D sent; =20 - msk->snd_burst -=3D sent; + msk->sched->snd_burst -=3D sent; =20 snd_nxt_new +=3D dfrag->already_sent; =20 @@ -1545,7 +1545,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, } WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); =20 - if (msk->snd_burst <=3D 0 || + if (msk->sched->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || !mptcp_subflow_active(mptcp_subflow_ctx(ssk))) { err =3D copied ? : -EAGAIN; @@ -2285,7 +2285,6 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) mptcp_data_unlock(sk); =20 msk->first_pending =3D rtx_head; - msk->snd_burst =3D 0; =20 /* be sure to clear the "sent status" on all re-injected fragments */ list_for_each_entry(cur, &msk->rtx_queue, list) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a58fa261f487..9b4f4443fda3 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -257,7 +257,6 @@ struct mptcp_sock { atomic64_t rcv_wnd_sent; u64 rcv_data_fin_seq; int rmem_fwd_alloc; - int snd_burst; int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; * recovery related fields are under data_lock diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index f6c622e15584..0487206bb832 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -68,6 +68,7 @@ int mptcp_init_sched(struct mptcp_sock *msk, if (msk->sched->init) msk->sched->init(msk); =20 + msk->sched->snd_burst =3D 0; msk->sched->last_snd =3D NULL; =20 pr_debug("sched=3D%s", msk->sched->name); --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00047.outbound.protection.outlook.com [40.107.0.47]) (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 0F9157B for ; Fri, 21 Oct 2022 11:01:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BhqBzts0YCX0ypRZ+Hq0Hpre8l1jU3gdWsjl7l+bZC8CB4wgToVIKU3JDZhnC8cz1IUIdO5QDVjVSl5dhGmgUINOJFZVfAwMI/BEcLlPrwRsCCLwINoB8+LFMf9MJ4D80ui1fqoM8DaeI419KiiSv2AmK63Cm760/azkyP1ehn0s5tXkJhBi8ivy8nt0RdcPaYnLMWQV9fWrdlf3rbYBVa6Rudi5icvRANPAn1cbbZ33Odaismps1LaKxo3lIq90YXdTuMC/ZSTsklUpbaDUHq4gqi8BxxaUevrn4xmWXFb2JqcpvABJAmnCSTTeFymLD+O8IObSNxSX1WwCcE2ujQ== 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=aYZ3yaQfWYpYCN0UWfNREMFoQlGYUicica0wmEzwi6U=; b=anRhjkzk/9QKeLFdsNSkF0Xo4fnV368Z+Zjz+g4WXNQQKHyZGI2ks0SVClZIyff6jFKtepqIxODMuxdRpW3njn5fCXm1+sSqVMe9nBfXEV+ojzDKi9neLgqIyWTevTLDmxxoLP8L8BkTm/aF5GC/7Vuh8J7GesPSYmg1V7fx2gRjg/idWgod+mPuKKAJmNmv6dbyah8iQyL/P/77UMlE2EqLJ0FNySSY6zZzy4G4Y9EuP/MxjSaFJfvSssGlFVQ6esoTdn0Dd+08vvGx794abd3tbJCSOH1gu9o1OCS9MqZdwRViMsNVVjC5LfRKIizY3rMIvJu79HDI6KgCh3Tl/A== 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=aYZ3yaQfWYpYCN0UWfNREMFoQlGYUicica0wmEzwi6U=; b=H+LX1DRUfwZvjmhuq6iJEzi3fvut2OlFybLN2aG7UGENOoXJQYfNRgNC8CQ+ARqXzOKo1ypklQQFS2LBMTYiq908CVC1UBfRJFGABVHM3CE5XuTsT8JTN/Q/EceGuGjKJd2WAvc05P6NpYSDC0ZE8olmdcv+hZy8TCwjWItOtj/9dVnQEul4YzJKV7TWm4pC+ol8DfR3hSWvWbOblmFZTby+6itnSb5nCMKFXdV07mkLx5fVeywr/kRV/t9o4idPtqoJnR49eoFQwaQgWdOlzeqnqka8hnSyxhEWIdIOe4CVoHfqqSH7wvXntRuqdnrPihF0zdIO34DF2bqmlI8aJA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:01:27 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:01:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 05/19] Squash to "mptcp: add get_subflow wrappers" Date: Fri, 21 Oct 2022 18:59:57 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0010.apcprd01.prod.exchangelabs.com (2603:1096:404:92::22) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: b994cc2a-ca02-4708-b338-08dab35399a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v19/AQdMAtLvwPCHvtqIiVhsk1H4sLn1KwK5dhCSXc2d9Rw1pVs0aX4TtyBXpHKcYWZdOdsYwEsq1wm0KNDlST6cjTHubEIikkcWsJwu+xsy1fN9IDHuFCRtBN10vqigXYYuTEeEoEm93Mx7Ys3tflxckkZdqLS2xRQuhXFR2uGJBmpBGzIYW30K95WFh/8nrBrxnEoTKLBjIAseLXYnsvsO9k9ztMJseTSGftd6P1AtafPyldbeCCEX6y5y2mSrE5ZXuCXyTY7YJYuc8qV2vyQHtn3tfZ08BlgfdbT6GV5clmX9P/m8acaHfjMoh8hBD61ISmtRbarcF2reqA3DDGYwcmFbfeZfVe6ZJplifx2YP0be9HY50HYOZnRJDGAhhlTpuugbqprxIUezoVf0bgZjIUHV7rD7usGNCCplU7mp3+xWPR0yd0Nn6YMAJTCvq8seIf1HVM9yS6wmZzPDzWXxdezHQ0UHdluuoc2Tq2Xi0f80bnYjErPbnx5coA/En8Ha7gC/K9KQb5q4MzvoJ96JJ26GNy8nW6KiSr8UgRF5oa9Bkdhr+AnJmuS1rmM79OqfshZ5Oc7MvTBR11vJgFXSTAPmYy6bN+D/Ggce243Zf6/EAuNJ7sGQ4u8xDpSSAS5gOZsWDqNUuD1nxOAFZ8Z44y7S8AGh5V7Dhr5UqddsYhnW/2Ed3FcUA25HPU34Ljh7p9U3jJqzIjtLyRZAiCDF25pd+0n1yjODl8zIwaW2Q/Xh67kx74+YafaETNcD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(83380400001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J/5qVyG9cxbHJEZwcbgSwzivhAzr0ZhgkIAWhCYHCxV3ODFbWegvc7YOdDzg?= =?us-ascii?Q?eKUSTeeYyE8kwXmawFmj59we5q1ti3BqbAc4zQBpcRwfz8PYheDvGwkQaUk3?= =?us-ascii?Q?SFh8ZAA1pO/ca7b6E4HHntnYRaWXwUHXFFexRIb0GlLQy8sXPQiXerDAMIGJ?= =?us-ascii?Q?H6+7WjS2ZjomEkz5b9hBqzpDI2IcBlJeUoK7Na7EHNSXNr0fyisSNxfc/dCC?= =?us-ascii?Q?wsaDiEL+7LRHoZTebCVQBzk/Yv9nLtMmydGwUVt23tLgb4EuTiZVbzwheD8T?= =?us-ascii?Q?Vx7XEoAUwV+0+sijZL8CoSNtDKEmLDIt4zBvpewxbeEmtYuSK6H28BUtqkAm?= =?us-ascii?Q?txFzRCDWykC2vcXsRHe4CfgBmNgLpYD3OLPCqcJmZzVL1LA6mDHGRtEVi5j1?= =?us-ascii?Q?hVyE0xvC4mHHhm8lqYHhRIEnVms/VVBTBCxft94i7WRz0e80FF46F7gP5k/c?= =?us-ascii?Q?BP2iV7ea3I89o7PLn4+o54I7MRYxf3n0d8MeN+XQ4ytDYPsYmYF0wtt++VKn?= =?us-ascii?Q?y8IzIh2tU0KQu4wxYuzRL8TPmQ8S6IJcOQkfcrxGBIJYCJuc1nrdktX0I0DL?= =?us-ascii?Q?WnzBHGNqkOLRrCyD6cmrQ8wCTu5gQqX07eBaQAm816kNQQk/P3uwrmtN86P4?= =?us-ascii?Q?jz5S5NUrZp/pbx3q7NpYB6Mr+2Sw2/cY4TWJrdqtZUHF132r2fiQZrT38bY9?= =?us-ascii?Q?1oSltnxVO2vVxKzRjyaELXhOZ6t8v7Q6Zyf7Z18Ia26jNuTYYdzXu5j8TcHF?= =?us-ascii?Q?WiRRXe8/cP9Om+LtVql6lavi0AfqDjb05MCKMk3/qgiu36Zhh2MQVIn3t9Vr?= =?us-ascii?Q?NmebOKL1sZJjMZnJP+3qSXHasPSHLE+8lxfmZc8vKQ7q57uyryrUySe2EwP8?= =?us-ascii?Q?kxRC4V+16OQd0D+LqhTxfvMkrf2XJSMys+payAXjT+HRXAd/U5VL5cDuNi4n?= =?us-ascii?Q?qFcVJDKjjrhEtWpi3gW4LuBJC1w+23PCgBCdR65lHRsVCcvpFsC2tEyMk6K0?= =?us-ascii?Q?EJA4C6QKC26Au3OCCjaeF0j5Rhq63p8KhoQfcVqWi0eZnzv7LKDawpmj2l93?= =?us-ascii?Q?TwENARsBXh0yPpgMn8lu9tSFgbBpcpRm6zksL/UJarygxeV7VD79zOaoOnPN?= =?us-ascii?Q?clN0O/B89fYV6oZwOX18PfavBoyf7+Cgzagz7VO1qf9SeufuWMjF4mOkqVi4?= =?us-ascii?Q?UZ/zzrqmFrFAiTPjswYi+hFBgO4EflH/l4rsYXG2KBYW+HiqkGH7bVgtYt2w?= =?us-ascii?Q?/kgKJ3TFRTbF2rY3XD4thJBmBxaNNQQh0xLEu63Z5pLIhRhNX5QckxSPpJIB?= =?us-ascii?Q?TJ8mrCFw3lJ2kQM/w8pywTs2CscF49LNicttT9Ri5ZYW2h+AAu6ED1yoqJbH?= =?us-ascii?Q?U03y8AJg8apHRnBTHYMac4/0i0bKv3xwbMxzrG97gGnuEDjKITufefhcbrSD?= =?us-ascii?Q?4+PsJxQbR1BLbsXiQjS/oKvvXA/PShlkrm7E9dNyuh8yfUddmUkfJDU0NBUS?= =?us-ascii?Q?V8Y3cnouiR5NppXqCyXRLkWY3iCHD+l4M7iMpg1cT3Q7FcPm7uaVHlAaSldS?= =?us-ascii?Q?9SHaj3ioyl/rf0kzNZD3hF1zOabwRo91qNScdNTNu3l9i0P7uM6MemOPthZs?= =?us-ascii?Q?pw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b994cc2a-ca02-4708-b338-08dab35399a8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:01:27.3598 (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: w6VXZqoleYXUkSm+cxWmIZBpwFRjBdCuygU4ApKTdGgUmKV57j9ezHo14xZoAJg50pHiMZ/Q9fdY79SwvXlClw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" Please update the subject and commit log: --- mptcp: register default scheduler This patch defines the default packet scheduler mptcp_sched_default. Register it in mptcp_sched_init(), which is invoked in mptcp_proto_init(). Skip deleting this default scheduler in mptcp_unregister_scheduler(). Set msk->sched to the default scheduler when the input parameter of mptcp_init_sched() is NULL. --- Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 45 ++++++++++++++++++++- net/mptcp/protocol.h | 5 +-- net/mptcp/sched.c | 94 +++++--------------------------------------- 3 files changed, 54 insertions(+), 90 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 594206bfe9a5..4ea12a2e1f96 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1406,7 +1406,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +static struct sock *mptcp_subflow_get_send(const struct mptcp_sock *msk) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -1417,6 +1417,15 @@ struct sock *mptcp_subflow_get_send(struct mptcp_soc= k *msk) u64 linger_time; long tout =3D 0; =20 + sock_owned_by_me(sk); + + if (__mptcp_check_fallback(msk)) { + if (!msk->first) + return NULL; + return __tcp_can_send(msk->first) && + sk_stream_memory_free(msk->first) ? msk->first : NULL; + } + /* pick the subflow with the lower wmem/wspace ratio */ for (i =3D 0; i < SSK_MODE_MAX; ++i) { send_info[i].ssk =3D NULL; @@ -2213,12 +2222,17 @@ static void mptcp_timeout_timer(struct timer_list *= t) * * A backup subflow is returned only if that is the only kind available. */ -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +static struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 + sock_owned_by_me((const struct sock *)msk); + + if (__mptcp_check_fallback(msk)) + return NULL; + mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 @@ -2296,6 +2310,32 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) return true; } =20 +static void mptcp_sched_default_data_init(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ +} + +static int mptcp_sched_default_get_subflow(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct sock *ssk; + + ssk =3D data->reinject ? mptcp_subflow_get_retrans(msk) : + mptcp_subflow_get_send(msk); + if (!ssk) + return -EINVAL; + + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; +} + +struct mptcp_sched_ops mptcp_sched_default =3D { + .data_init =3D mptcp_sched_default_data_init, + .get_subflow =3D mptcp_sched_default_get_subflow, + .name =3D "default", + .owner =3D THIS_MODULE, +}; + /* flags for __mptcp_close_ssk() */ #define MPTCP_CF_PUSH BIT(1) #define MPTCP_CF_FASTCLOSE BIT(2) @@ -3879,6 +3919,7 @@ void __init mptcp_proto_init(void) =20 mptcp_subflow_init(); mptcp_pm_init(); + mptcp_sched_init(); mptcp_token_init(); =20 if (proto_register(&mptcp_prot, MPTCP_USE_SLAB) !=3D 0) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 9b4f4443fda3..e3e113e7f957 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -633,15 +633,12 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info= *info, struct mptcp_sched_ops *mptcp_sched_find(const char *name); int mptcp_register_scheduler(struct mptcp_sched_ops *sched); void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); +void mptcp_sched_init(void); int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched); void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); -struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); -int mptcp_sched_get_send(struct mptcp_sock *msk); -int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 0487206bb832..1ff2955c6f26 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -15,6 +15,7 @@ =20 static DEFINE_SPINLOCK(mptcp_sched_list_lock); static LIST_HEAD(mptcp_sched_list); +extern struct mptcp_sched_ops mptcp_sched_default; =20 /* Must be called with rcu read lock held */ struct mptcp_sched_ops *mptcp_sched_find(const char *name) @@ -50,16 +51,24 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sc= hed) =20 void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) { + if (sched =3D=3D &mptcp_sched_default) + return; + spin_lock(&mptcp_sched_list_lock); list_del_rcu(&sched->list); spin_unlock(&mptcp_sched_list_lock); } =20 +void mptcp_sched_init(void) +{ + mptcp_register_scheduler(&mptcp_sched_default); +} + int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched) { if (!sched) - goto out; + sched =3D &mptcp_sched_default; =20 if (!bpf_try_module_get(sched, sched->owner)) return -EBUSY; @@ -73,7 +82,6 @@ int mptcp_init_sched(struct mptcp_sock *msk, =20 pr_debug("sched=3D%s", msk->sched->name); =20 -out: return 0; } =20 @@ -97,85 +105,3 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, { WRITE_ONCE(subflow->scheduled, scheduled); } - -static int mptcp_sched_data_init(struct mptcp_sock *msk, bool reinject, - struct mptcp_sched_data *data) -{ - struct mptcp_subflow_context *subflow; - int i =3D 0; - - data->reinject =3D reinject; - - mptcp_for_each_subflow(msk, subflow) { - if (i =3D=3D MPTCP_SUBFLOWS_MAX) { - pr_warn_once("too many subflows"); - break; - } - mptcp_subflow_set_scheduled(subflow, false); - data->contexts[i++] =3D subflow; - } - - for (; i < MPTCP_SUBFLOWS_MAX; i++) - data->contexts[i] =3D NULL; - - msk->snd_burst =3D 0; - - return 0; -} - -int mptcp_sched_get_send(struct mptcp_sock *msk) -{ - struct mptcp_sched_data data; - struct sock *ssk =3D NULL; - - sock_owned_by_me((const struct sock *)msk); - - /* the following check is moved out of mptcp_subflow_get_send */ - if (__mptcp_check_fallback(msk)) { - if (msk->first && - __tcp_can_send(msk->first) && - sk_stream_memory_free(msk->first)) { - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); - return 0; - } - return -EINVAL; - } - - if (!msk->sched) { - ssk =3D mptcp_subflow_get_send(msk); - if (!ssk) - return -EINVAL; - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); - return 0; - } - - mptcp_sched_data_init(msk, false, &data); - msk->sched->get_subflow(msk, &data); - - return 0; -} - -int mptcp_sched_get_retrans(struct mptcp_sock *msk) -{ - struct mptcp_sched_data data; - struct sock *ssk =3D NULL; - - sock_owned_by_me((const struct sock *)msk); - - /* the following check is moved out of mptcp_subflow_get_retrans */ - if (__mptcp_check_fallback(msk)) - return -EINVAL; - - if (!msk->sched) { - ssk =3D mptcp_subflow_get_retrans(msk); - if (!ssk) - return -EINVAL; - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); - return 0; - } - - mptcp_sched_data_init(msk, true, &data); - msk->sched->get_subflow(msk, &data); - - return 0; -} --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00060.outbound.protection.outlook.com [40.107.0.60]) (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 51B707B for ; Fri, 21 Oct 2022 11:01:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GLEDQJvSF3bKUaJDXfBAoGxvUFqhLSfy1tSvZ5ps0am6cjGeKA2QP8HNUdOxH7mJtqcZOMxT3nuWh9BSL9YhqBGsqrkQL/CXazj8UZSllvKX8w2FvyrgewGln90w0EHaIztuAGyCdqBDNC7rFvOZ3awVVJS44NTnZnUYh4Jb1CqCaRhyLe6zwtaRcW6svpULg/SPp8CIRUkUUPLX4XSJxAaP+IXm9GczP4b7XAJWBGEezV7Ddy4CcROWeaat0kRHhIQvwP9mofPKzYRiszYRjhH0Au8cCidKOWEedTShN6KMDVb1GBhtcbXm/fFnhzVqAZQz15mKWaU1AxF31Cvv/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iLG3FOwPqtJ/hQL/djJpA4lAUiUND6uo2vouSU5Ipow=; b=Vouq0ZCwvh1u6EL02LFXzLZORAKkyLX1hWsnv+sIfVD6bti1x08JZEc8AADRJf2KOMVBaWRHq24eCaS/Px8PiOL2q+nl8EUWmbly/UR0vIIO20nXGjGLy559oZ8/AiA+Yg+Q07PHVmBoFDXTsooZKQ2oPtIZlfV5/D3JAil7wejFLgTUR8CGzU3qQgWwUYY3GERNWqeBXHO8SbVBMOI707AKExc7WBZoWVqdbFvtQAzIJaT25r52/YaQNVlrj5ZbLlMQslY66EFYRluOWwq21tUqITP6k5mGpIACzjH+EaA4Ei2PvwoFSoPQGLAtvUohgfPjc7TGKOm/vmImJ+e4Cw== 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=iLG3FOwPqtJ/hQL/djJpA4lAUiUND6uo2vouSU5Ipow=; b=f+QCQ92CkvXqdAGdRTDWAvqEjEEIG8Bej3c69nVFKy3hZRyg97GxjJiPbmYYPMs7SrqtJ0lA3Zn+WwcpVQRbHkHAuCRaLn6EHvWnCzLi4bAIgWAlVCHNq8FmM7PfQAM1Syk36pMcl1YAzEYMI7RvYNGaaWQ/WKod5kxlBICiyiykKuIEuLYiLjUFoOvZrSIL3vPou3xH8LxNvS0sWyBjsiRr1njQ+mVPMpcwC+NLC0diyJWzALqQlFnvBh5f6zAp9WRZzOHtNAnweAGXvteVkU7SxBsVUVsJiJXz5sOzLHYjpwrnna02w8kgGl+L8wIH42AsF5WOjz3u8Bj6S10CYw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:01:37 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:01:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 06/19] mptcp: add sched_data_set_contexts helper Date: Fri, 21 Oct 2022 18:59:58 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0019.jpnprd01.prod.outlook.com (2603:1096:400:aa::6) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: 1cdb7645-7704-49b9-9e8a-08dab3539fe3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GL6ZwnqFBrmvZ1VZxVgLJSpeyjwCRrwsVDCG0tWQtz2qcxZvG/eE+LaymwxZQwvPdh6U6zPZQGKLehRbXju59RA2LFwKoTP0xSjdBkIYB3cE/9rM/hRS6fL/W2QcQQ9hUSH3NkW8a6d/BhJhw4VfS9e0monWjITWoaJMI9VItxRqSaAN5IhgOfmcYW9L6WMO74oXZAgZMHO01362ShIa/yO2QY7zeLU8P+ySvTQtJcr6Q6sytwNAXmQMCUk038TypKEsneXZ7Zp0x3NXWFpASnNHOcicpfgNvKat8nMehAptE1cqVMzbXrT8gBSlT1woCZyuwfcTw3EK4Kb/ufIyoSv337ONwfXf1VxbJMCK9NEwWC5LDS5RIe4g2H2iVTCusxfRe/p6Mrx5Gi7SLf2Lyoa0h7HcRwrIKJH6pp60ee/bHIGoyixlTQkgiJsK8Kg6+H8y5c76IQiOyIx3GkBs+vpPIGG1OIlqddb9Z6ToFfe80G0BY/ouJDBqV4C0DiREvbazcMPnuUb99xD0/pmgCyv+V1MgRGZQIdi3njcNAb1+y2MaD0wYR43CZBVXV7ZtxMAebcUJnz7dW7o65tMsEK9OFQ/cHvMXFciSU5WMl3A44VCaWjOlLzj5WoOsT2Hwa8qvphlnWkogYgI9g7FEqT0BUSO1l1Lb0UaYomHKfG0A/PAkn6f5bueht31ME6a/GLbMdJcSJdU4wtmDWrQY+z72VRV2hJ46/GwLJKBSjhtuDIlvYg1BY/ar7kS2nhIo X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4GX3b4IaAHlZv/t9VnrqC70rp2ojAx94d0X5CRn5zmIF1C46KEgMsYtcG8ru?= =?us-ascii?Q?7Jq1WrUVa93jz2xaH4BIWVgdU+44D8dxZDuusYApWMSt5IM5pD8xqRpguGT+?= =?us-ascii?Q?6K0VRer/oRwnpwasfqifrS5f3M8Yxlf5Y5scsVhAO/fc6ZmpZhPSjE7MjclB?= =?us-ascii?Q?L/ftAKVc7+76Hq8jGI1gJ2/gGNFp0U60Xdy1U9tCgEb9dqPTW+Mw5kBGdNSY?= =?us-ascii?Q?F5i/AYVPBUbORcgKGOQAEb+F9p1TZ9+EW4JWrLMacWds62ZY/G4QJXiD67gc?= =?us-ascii?Q?VOF5CeytFGjbC10iAQDef7fkX0zsHwQesYKDYd7/zWl9tAbHx4tbINRwSvaW?= =?us-ascii?Q?2xKt2tJahA9kX5xnCrvux3ncSjLg5BbH9PlbJxn/QTjfqQNQTHLVYQLL84nh?= =?us-ascii?Q?fEQUffEO7c6zVd2NIVTDmEl8oLDjc7gsIXgzXpzLM/Z3SC5xvKCrkvFqrfwX?= =?us-ascii?Q?Lj3QKPuQmj8e4J11/ede3oUxXQAqcw+APq7j6sG5gdDrFJiO4lFUOTwJGL8x?= =?us-ascii?Q?9e07C4wSmVzupHyaN8PDykYej1M/W8TbkUOpVPNxQ9bY4bG4scM1WKdHh/Ey?= =?us-ascii?Q?WPzSIZQwbiQQAjd4dmr6Gx2XwgB7fmEDuvaleRjUNRfqaShrV0cKjBXLgtoN?= =?us-ascii?Q?jk/yBDjbWnrR0MpOAtdcPJ7wWktZrUx9m3+s6sayTPUsSjjyeUCNLaradxvB?= =?us-ascii?Q?dwnk0G2E7k+ayDHhypw7LczbO4+HdeVtDSnqBE3gG3pSr4W1EnUlTPEW7WoC?= =?us-ascii?Q?3NyttKuTSST0kKcdCa+8MTttFVJx0o7TdjQ+prKhO7nCJz1PunLN4Bp7s2EB?= =?us-ascii?Q?JP6XNtPYuXotPKU7SLwundRZ7Zd53jC6SttL/qFN7w/aVvIuCHHUfABPBQ+E?= =?us-ascii?Q?uWuBqHfhvyQNWiEUqDVQwYPpXyEAWJ9ThvA8YkA174nTwCAGnpgyAPq5/7yR?= =?us-ascii?Q?t5o6I1H7qSRyTpAQolrFk5bn2XF1N8p3EScU9lPaj4ptliKhjhWLB+vh+Iw1?= =?us-ascii?Q?t+G2C7a0wTUM9RQSrbU7oeB8hS1dTC9zKKv+nSUuMMMoBNt8YaCOTxxqsXY8?= =?us-ascii?Q?2BJ7U9eKXGT6mzZTzv89uDWaGppn2VS98uDlkREIpEv/mjl3zpP3/ivmHT79?= =?us-ascii?Q?6k4v1S4YUBX8Uh8PpYFjep/mtD8LQTq/uRHQBGY+vBS7B4lWoUBQzCuqivrn?= =?us-ascii?Q?i10t1D7ITmT9KVjcxP2T7ioTGqzPXmt7eHb+LHNlAHYIf9Gsw1chFWXvEIzl?= =?us-ascii?Q?YIg+L5k5wcC6xJZ0qTDCH4oGNr7LgT3Db981muMXCZ9JGo1Kdj3tcWYz8BZ9?= =?us-ascii?Q?HEO6T2WHpNCpNcqqnNS/mp15mTAWFjAqTsBV6evQeUUkbD1Hph0nJy+zTwHk?= =?us-ascii?Q?lejt8gsC2e8+rMd0VaHNFQ8QK8R+C5WbtDWp/+uq7ptjUnDMa+UnEI1EA0Io?= =?us-ascii?Q?4IM8B0HpS/cN+nIwn6Z/qosAObq/zOWEyEp9mC78ImIupXXOyPnztCk/SmnB?= =?us-ascii?Q?cyHVb2KDGS3u2D7VxC/16HTeutABtfzegWUoTiNlesp8vEmR7Vq1uqnwTIC+?= =?us-ascii?Q?mWFcYltY6YXoFbbyw3y/fidgklpjRdAiYuvIvHmmrUV1QuOmmLC6IffVX/M7?= =?us-ascii?Q?zA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cdb7645-7704-49b9-9e8a-08dab3539fe3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:01:37.5623 (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: lX+35oCIZe30XFvP8rpV7URUCCobUaR3EgsBNvzVXNjdl/r+xVHa/H/ilin0XArbsAquqCNsIqPFAZjKlymS4w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" Add a new helper mptcp_sched_data_set_contexts() to set the subflow pointers array in struct mptcp_sched_data. It will be invoked by the BPF schedulers to export the subflow pointers to the BPF contexts. Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 1ff2955c6f26..500ca89f6424 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -105,3 +105,22 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_= context *subflow, { WRITE_ONCE(subflow->scheduled, scheduled); } + +void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct mptcp_subflow_context *subflow; + int i =3D 0; + + mptcp_for_each_subflow(msk, subflow) { + if (i =3D=3D MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + mptcp_subflow_set_scheduled(subflow, false); + data->contexts[i++] =3D subflow; + } + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i] =3D NULL; +} --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00064.outbound.protection.outlook.com [40.107.0.64]) (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 E26FD7B for ; Fri, 21 Oct 2022 11:01:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jdi1ene53RWVAfHRJFjtBeYK8+rWE4wQZE1NSuWeRWTd+e/Erl606+okxs78Y2gWYNSrRAf0QsfekZ9UettEHFS8ihLqhNTNicz7aFBouHXIdug1a7PwCqfnoShZjedKn4MGUYzAXJJXdV6X6YZ7SAEh+AdfXyoZBmnJU06uu/3Lk4cXXG01BB5ucwmXbdYLowGeih3LVfLej4KdT9l/1T5PBCrIBZtuZfNrtG17dQLBV2yO4HAcmIy19ftyO85Qs0zeB1mquQU9R0W0IQJa8h6i8hvYZn7Gi0L5kkksjsf+1c5DJPm22rnXtf3G4LFP4oYjnjLyi+L4GmcElkzv1g== 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=wJlUEnYR923SbjEr8XhmdDc1WVaYv794/wZoe7ly3L0=; b=EmiMLlW81f19z2O+woaFOu5J+wTddFR71/QViCxun+/L3DPUR1Y5IIu6IJtl7RdO1e1XYlXHcJ1sTwOUSN6HuZ5SGU9LAVIPskhpnzf0I0JSWGV74NSrXhCM6B5xFirlVO+p/9Vv8lObe2S7AY9PTUiVk8FXz79yfWdedTewNaDNmycSd+kW39oXHWjGjxGtLsaOlJou8elK31OhKogl66Wi4XhTqylHRFRPhdEH6qfJsl2CzgCqKJJ9rhUs7B9oOie2MPR8a24KgGbhVDHrRKYeEXTpsItSXIn4b9BjuprH19k8VCejVwU1+osJqvt8yRkEc6dbNdu71hp+stRV1w== 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=wJlUEnYR923SbjEr8XhmdDc1WVaYv794/wZoe7ly3L0=; b=KgFH2K0aNcaQdZiUG8zofSjzMBWbHFgiPMqCPaMUh6ShuqErsON1NlQu+eZceayocu5ZgR9suboPZUDGDrc2BlJLs3yP8rF5fzATwctbietZ3VXOp8qdJmzgNc0lTduY80z5AcQo6nH7Y/nAPkkf0kerwl2Okn+vHh4cagR3r5LnNt3OLAJvvNz+7wDMYSjVvllAvHxOV5wax9xHUzQVXNkcLGrIQ4387Z1vUgjAS81Q5sS1gEJcaePu35UxPrZTsxoidEmkdcPPgUBTZDmB5+mNk4oN6Yv2oS+4YEt0O8+QolUCMHHiJIVApw8fqURupRRq4ueOT8KfI0FJlbnHKw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:01:47 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:01:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 07/19] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Fri, 21 Oct 2022 18:59:59 +0800 Message-Id: <9bf109af534527fb9afe33ffa0f63257c721c0f3.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0102.jpnprd01.prod.outlook.com (2603:1096:404:2a::18) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: e51883bb-1225-4515-b48b-08dab353a5e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /dIojgeXr1OH8MYPc7wpYzkK4G+HTX9YzNbZeEHxlV9CAtAhUcOxjVKpgm2zYg+Duwa8Rj+um2tAvgUJInin1yEF8hEOqob+d7dN3XAp52Nl04Y1dvcjO2/2UtlZjrQtuAkMc8j9dgz7WfCYEVzQyXUZsSIzDlO7u9LMLqCk9+Dhl43we/e2GpsRjg+50XHTrNHnITGbfAvCJbtUVrOdxQpXNlxFiv3cdFWC+ttOM5pReRKa8Qmkwf9AW0VS2XJpJyA/reA1yYBR/od4VqVkC+cBhfvBKx+Gq4HuFLFP9e/BCEuaEr8N5UDAIRaKnD9gGSwc7Q+R3CNYqqeLd8iZBRkTtZA2QB3MQS6rWq6qpT+cgCa6/dGijDxbgYFG5SVdEmFGd7GoAQgB+VWfiVWHEiSqVRHf4sQc2A3meyWB6Xa1oRqhqL97qr0MWJ7jCDpRmMAMP7c5LvNyt4AiGoGwWUEvsfRvnBue1j8LU2OztozuIl9J8/gpHlhTNI2Cr+BV/HZQ+xkHJtRKAZ9JaCpz+6k+WtyOAm2SrRWNipkbDyrKKFViYfTg9B3U0Jf7Q+Sej0+bqwMHPtqAujiOmuysTlib4TfCVUfbKz7FiRxMRezsK1LheBNgwzxt1AmlUf9ldJoIH3o+PYzNCpNW/JIFovL4q0DD2yCAItndKrzZwxXPhVsfME6de3Bu9Reqzmk0EIUROx+cmmxcxbByl3O7hzWKQF7kQWBoyQLquARXJKUA7m4fHpi0755tIGq5qOgy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(83380400001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UuQE2TL19KBW+WpzaRVh5YPzVgCRU2+NupMcmnXHtebpEeZiZWn88GlPuGOu?= =?us-ascii?Q?vbQw+VMjbiXi9IGmEUh7Za7I/nNWuO+tshWXKxpkZ6fseT3xDHKUWhx0XuIn?= =?us-ascii?Q?1rdd36iY/SwfaELeeruY/vbDUMdZQrAxHfwFXawXb2rQSuEQGRbliD08mkqI?= =?us-ascii?Q?yEFwLR7FQ42HOP1nnyFMgsxl6rzE3mzKVfN8LHdNMlQ9jDyR+LWTsfUt4Qg9?= =?us-ascii?Q?WiRXRH8Fd0MhwKpZwIp/9XTm6XOZymfROhkYbHvwbsZeLznmMvotDGFwl0gh?= =?us-ascii?Q?YTekZgZqZvlvzuyB9TPcQH5q1Wo52ZgSZVm9BSn2Sada+2l1yFsQjRvAuAEa?= =?us-ascii?Q?HZ1naMCMSWVMkAKZ9h2MkciB3DNsBW2OYsf38ZFJLUgDdP0F2Fo24PMRnPoB?= =?us-ascii?Q?7PeVNKuTwS7ueeMr8sfl/IkYWbv+l3ePYJETb1GPHAk2MnBO6WqLRhYXVZK4?= =?us-ascii?Q?ade1ysY5Tq85dxYBxpfRq7RbFQ20PZta0gocewPZ3KQJH5X7/AfMyR42CCj2?= =?us-ascii?Q?i6P9X8skuQlcUBui+2pGa5PG4SOr4RV0iQqZDdllLFTBxGN2K6gqiiptxEn0?= =?us-ascii?Q?GieS43FDsRUEcX1dYfV0JFYXoWr8o3MbSMiBU4gr4JjS2rjp4+lv0joQTsID?= =?us-ascii?Q?5emoprtqmE/5dOCRwjbgDBTlKTyTudgOIuCUnQpWs0QQEAio0H2oNRiE6hbt?= =?us-ascii?Q?EJyDVF8tLVSpXVDHWy4eItxa71fxqqWdIo/xbqYUl+6SLQrtA3Z0SClppX+q?= =?us-ascii?Q?JqwDRRQ6bdvpqte4abvzUdDDrQf6l6WLHDPo47oJCDps95/cpUhGPSeVWlJY?= =?us-ascii?Q?tFtNh8Kgu+OLA4D4OpIvNaBiK2l01RPExIHhm2YSTNG4VOGeJA0pKcUfnJhf?= =?us-ascii?Q?F8NEVXalrsStgc6Cw95vF11kNdkaRuCLE+GpvBZuCCAYlp/WuDf4lrGN9w7j?= =?us-ascii?Q?obdyRdhN5nftmM6EMwm4UTmhE4ZCWf8LdoVxRiwhiWmgPvirEMJXZsziOFYF?= =?us-ascii?Q?JxKtTdQpcTLfsrRkHnehJEy33EAoMNs4WeF+mxRCgv473AVBnZWFmdkVdvv1?= =?us-ascii?Q?lsu0sS+2+eMBKoeS2tTxxOM6FutAINX/sbUD6a7HTg5X8IA9TYfEGZOfOKa9?= =?us-ascii?Q?EYac7Zl7Gb1fsgNt9XPuUFlA0976IzArVsm6an1d1FFdrsxb1pOmV8NL6DSC?= =?us-ascii?Q?t/QPlMfKRNhSOMiTtAQ7SES2Rh4rLBYQ4EB0P9wbTu4auIUYcz/kKKhZgGCs?= =?us-ascii?Q?VZQJ5MA7CLApm9ZAIx/bdM742CiX+XgBN64y2jm0Z70fWxMXaZX/4qPrOceN?= =?us-ascii?Q?B3FVycKQVbYIuN+fGRBVRMNYQNA3PC7gIEDew5XIo7KSGY9EEWjcwzF5Zu+d?= =?us-ascii?Q?TO8DL8slO9YriHF/FiELTvNq51EltXuaX0TUMeIotPseCDl/teD9DMewf0aN?= =?us-ascii?Q?N/SzDKRSX0q0+/duLT71gS8n6fIsvqpyYNsRH1G1P05x08ngCOpxjl786tbk?= =?us-ascii?Q?gLhd9AtNeyXFY51PGvaKNGWOWdJvEoeLc1Uv/bU9L1R7+vBdIzNm2jnkwtC0?= =?us-ascii?Q?I+R0PlygYv5KEnptHgrKxUaQ1fQNUe1XczuQV6B5Z98t1GkRe9LkmXy8psrV?= =?us-ascii?Q?mw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e51883bb-1225-4515-b48b-08dab353a5e7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:01:47.5773 (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: iu54PKm7txAmRcQMZwL0t93DbdZkOKKlzuCsfNTz5SCLd6ND3ARMd2cj0xCCZll6ze4/sbne/6E4dMaeP/cLyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index c7d4a9a69cfc..2a7a613f87e8 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -246,11 +246,18 @@ struct mptcp_sched_data { struct mptcp_sched_ops { char name[MPTCP_SCHED_NAME_MAX]; =20 + /* burst scheduler */ + int snd_burst; + /* round-robin scheduler */ + struct sock *last_snd; + void (*init)(const struct mptcp_sock *msk); void (*release)(const struct mptcp_sock *msk); =20 - void (*get_subflow)(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); + void (*data_init)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); + int (*get_subflow)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); void *owner; }; =20 @@ -260,10 +267,13 @@ struct mptcp_sock { struct sock *last_snd; __u32 token; struct sock *first; + struct mptcp_sched_ops *sched; char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subf= low, bool scheduled) __ksym; +extern void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) __ksym; =20 #endif --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00060.outbound.protection.outlook.com [40.107.0.60]) (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 DD4617B for ; Fri, 21 Oct 2022 11:01:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lu2/vBErJ5I6tkv3txvugZZ5rqTTtXpHZTDU62gBLsDYjelR0pE6lZ4u8nvnq/W5/vHJ8iUnZ6MAxJHX1XdXBUvF2tSoYERqLwDsA8DeYymcMkLhU2LTgXpD8yVKJU+kqXrn2xV0k1PxsjTzj3OJKt5gO6T4rNZkk8jvJpRey/mrA72kavE7f5VjV1Hn0BJSMmmU+VwYo2Kh5pZPPevCozw4NgFbDdXhNi9W3o0z0znn+XSXjT2LUyd9NW6gXxORb7r0ZJEMN53NHmRqj+mTltSElmda1ZZcFxwu3ztDpHhk3ErMU+22bpCrsW482jYLDrGjRsKTHpMF87fovJfK1A== 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=AJjowJ4690G2NdLtiQ+Je2I0ckCnZXEC/DGaQQoUNmE=; b=ibqpPPElzzuaxSI0iCkWFrX1ZqV6V0rxsCmv+Ge4cwjkaB6/57YWcwlXmdA0Ym/7lyKOvmV7AL+2364xJSCEmhsMtxUcC/3IC1O0lXHOKPE/BB5caVPxQULZP3TBMow86FvYMeoLBplAo8iY0ITsCNk3kPfPG+ET4AQEeBzjKsd6Xjx4qnm4hZTT9V4S88VHzx5QefTsbipkmY6rIIYWRUxJuhjTgAfuAY1BJRLGYUjdIqMF+6Vjaf5gQ8ecHoXIbFksMzobq2X/68d2ragmIapDd/RfAPXEsawYTU2R2sCfyNvebwxG4aEhA2l/hZozotnr5vn868WS8EbyByZfKw== 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=AJjowJ4690G2NdLtiQ+Je2I0ckCnZXEC/DGaQQoUNmE=; b=Ukxpmix4eUmnuKBR9WHo9j3/yzuREQvxb5l6CR7b7IaL1o9JP5MNMzBICIf1WqatOFKkSavnJeGEdbUmQmLm/z5lFH4IMZL1hAymWxGmcABJRyLL2rjP8G0BmR9uK120eFU4SkIJlsNR6lN3xMvWIuXCej5g5kGfKzDMddsjaaGWHLmcGC8HE82jWs7/BrNs0qim5rnzqRrLLzJ26ke4+Kd33xMVgNIbHwwsfwg4pw5mlPCJN23Jn8w86+JHKIwn+q3UVDjv0YuOe+9FawLrRqwqaBuxSkTd217NV1IL4AIDSumDmgB+NJ1WKgbVpGYJ39MpMgaCbSqTKBO1M1bo3A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by DBBPR04MB7835.eurprd04.prod.outlook.com (2603:10a6:10:1ea::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:01:57 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:01:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 08/19] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Fri, 21 Oct 2022 19:00:00 +0800 Message-Id: <23cc44284f711f1c47369c390cb3da831ee27fa9.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0119.jpnprd01.prod.outlook.com (2603:1096:404:2a::35) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|DBBPR04MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e3fb0bd-1a0a-4445-05ec-08dab353abe7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Z51NI/A8n5OAbIQcbcJ6uljYDJ7Yq1KS2F2w3pGHLeRHQSn5IDPahGnQwhUbTrHhjKOKJpi6OhF9wuB+JtYkFnOhw5kMugvhfo2KvvNsmCXCzoTC84hUt+vFNv9VhDkuG/kK9bC79V0lEe2R8gUzrCBhPzJ9NH1ULZoaIUzRlw6gXG3IZPoEiQEI+8qkMS82w2ImKZPs4i8v8XVi7dX07Gwtra59mDaTc4Zr8Fx3zuaahk3kINPQ3RJWRj9281kuUFL6hXRSHR/6FXuOcDNmvVBQshi+DAT8JIQsesqeqWOxeRGmXrHYwhqsnJtn/DDIJZuacV/zqmcvYdZ2kIqBg3Hrt0Fsw6tYs90Rb0i40s5OARf4VQJgFP/acnvJktGOA/8NpcRY1AQk0rEBgC1Z1J7BrhgbwaSZgDG7xcOVmp+imJlrZ+yGdOqvUf02afZ9cMhEwxDzfp+AVqIet5VweD80EbFGDCYCbolqFV9tvqm0GaiUub57qXYURotmNrxRu5fhipjxIhiRJMzBIbFCl9WshzRktLoSD4LxiOIChs7ZT1Q4BKT88db4InavgumBYmYHnhraY6oBL4PoRMT9gHY0fvvyjGuMEkXTJEh2TomBANZzV1/px6L5L3Zjt4gdFDvBMkuQVpAAs8V+NTq9VZdl0mAsuBttbBpT8JvXF9a3CWCCnxQtxkkHGx9fQDRuV4JkEXVRY+LJNUcHRVXeT/aoOmfQ39K11FA/G6lI5VFuE0zdFOutI+VECau6DpI X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(396003)(136003)(346002)(376002)(451199015)(4744005)(44832011)(66476007)(86362001)(8676002)(66556008)(36756003)(66946007)(26005)(6506007)(5660300002)(41300700001)(6916009)(4326008)(316002)(8936002)(107886003)(6666004)(38100700002)(6512007)(6486002)(2616005)(2906002)(186003)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k7dsgdQ8FVq6fVcGXoMm1RvyS74D1BzmrP2PvxXo6AKQKjsh9+wRA1UATWz6?= =?us-ascii?Q?1lrOI+7RIAtOdYalkf+51wjg7sf4kXfLecdg2qPciZaZluncRcVD9zFaLzEj?= =?us-ascii?Q?6Deeu6c2SvCUF9H+oUcA/mhSkeI4FYP1KwaTfJHv4xCgdzvuKHQgF84E442X?= =?us-ascii?Q?jMqlceOuv67wgpa93Akkkocgs9jcCZhtRglZSdiA65B81QAAXn8w8eBWU1M+?= =?us-ascii?Q?ZfqPUhR6Ipa9pY0Vcmy0qhIKvs8X9WzKnJodnxVPsPfYpRxJK/HC7nZYFE0/?= =?us-ascii?Q?99yfZV9tsrjop4jS+qzGQkJPb31SOo8Q2E0T6fSI4/bpcPr9MYHV41tNiD1x?= =?us-ascii?Q?mbse7nA2TMu99Un1XxgQikw1XmXdTj3dbpSFOxJShkrTvPSFacLhmNc+vWoH?= =?us-ascii?Q?+CCVkBnZww2O8/ITndNpZ51nSpC/T6irzkUWkTaIINJ+j1HG0y7GOJOFia7x?= =?us-ascii?Q?w9bG13aRTF92tDy5czTScFNCfJe1L4ExKJd1uGIFCAHQr/OTU7SvbnVQhifa?= =?us-ascii?Q?a7cFbyHOAXfshOEmeTLoKaQf9t2+bVQw2HOeBlysyJDrj1VD1fqklWjfa5tw?= =?us-ascii?Q?Sx9OE6/monW/zZMg6GzY00mVuBu0WdqeQsc+Fni2VG8Oun4GHGQA59J4NVwk?= =?us-ascii?Q?UVWenKiK46mEAYOxnxPbYZrwJ/GDF7AUjGHpS3Ef4rE0hsRxjncmMssnu/sN?= =?us-ascii?Q?OVDCpyWoeVyx27XplMKtyU0geTIQhpdrzjjeKDgwJsxCrSIE9H4W1+Cvf5hl?= =?us-ascii?Q?xj+jRrFo+GJ7iwWQ2Wjm81S2NpxhicuzOiIkxuuTtr0rIY2fI/gKALp0EpOd?= =?us-ascii?Q?6hDMnqLsvDCyNRw/aRzdL4vUmtU8snmQDBGT4UyQ9d8X+Ba53svZHv3+zmU6?= =?us-ascii?Q?NYvRtAXPyzDmKwga6lXV/Byf9n6koIgEwfHKkRmrgSPqQPw507hC1d1+3DY/?= =?us-ascii?Q?MhIEd6j/fOhmF/e3FWObomosBpndcKHeOh8lCWjl/BLJxlwC0Jrhfz6JW+1/?= =?us-ascii?Q?ozPAH00HGG2kgopPTZJ6E1a72oSX4hrLCOXIF+uIZM41DGHAi+4NLxsVlU6o?= =?us-ascii?Q?2eXRi5T4lH8w8PQkydXEKQdJV5LtQYX5ayyIWgTCNxkgkABe/rYCDWYRK5se?= =?us-ascii?Q?iO1pQ7fqV3nBqj2qBFMYr+HDQYRQkNidkRoQxgN3Bbbe/rvDDnFpF94kj2P2?= =?us-ascii?Q?rRXnwVf47U0ok61vgg4/s4+9ytwbi+MhlgnpEGR6Dgh4lFtFleF4cBRUHWsS?= =?us-ascii?Q?+m5hRXeC9S2DHaYlW4/GElQHZqeYB0BhoPtOQZW5KKxYjWnMKIlYP/3N1AWt?= =?us-ascii?Q?2/zk0AFZzzHMW5CMPMYV22hU6J5AMD493LYEbl3KttMG0a81bA/LEUhcYtwL?= =?us-ascii?Q?RzzpaAQRZzqtrG87VEJUXszUlshBZhoBKIeUbBFgjBYNaFJFXXJaYtPh+85c?= =?us-ascii?Q?GBQJW4rm2i6nKre3cBHdnETW8z2UQzdFFmbjUnpLpxmylNBEA74q3KxFiioG?= =?us-ascii?Q?atraU0MruYfSBVG5S+k/OD8T4YcIYNS1ho/R9s3GttMMbKt0AuGrQ2EaxhOs?= =?us-ascii?Q?x/iqRR7Jz2gS6bBpS+jZjPfzSPy40ClFOLYL4WQ9Smun29sf1dPMpqFgcteZ?= =?us-ascii?Q?YQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e3fb0bd-1a0a-4445-05ec-08dab353abe7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:01:57.5141 (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: 2BsF5F4TQYWo2m+xg/Btnoqqh9bNOaiA9Iths2XqY8mIpU4drT/pksskQf7du7JZI3Y/echeDrjXzs8pMWkikQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7835 Content-Type: text/plain; charset="utf-8" Add mptcp_sched_data_set_contexts in kfunc_set. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 0a768898990f..03decb05755f 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -164,6 +164,7 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { =20 BTF_SET8_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) +BTF_ID_FLAGS(func, mptcp_sched_data_set_contexts) BTF_SET8_END(bpf_mptcp_sched_kfunc_ids) =20 static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set =3D { --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150088.outbound.protection.outlook.com [40.107.15.88]) (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 805DA7B for ; Fri, 21 Oct 2022 11:02:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RQTv3lU88yOJGTe8pMArQHN4FjH4ADqL1hDIHBlOxRVW6h9dFWyHLoytVZul/m21epthXzOXj/q4X2e59IZ90vyWtXX7nk/52skjdezHIBgZDfCSu8EzvMBJf+r380sCIASMTGC2c+1Mcul7AfDdnTGC6uC67jwwweU2ogatKZ+464TpQG6FyTe5KGgmtX69QY88FWdRKFgvoRGCVmCWUiC42Urc7V+uDC0CVrT6Imv1UaA8BW4mQ5RVCQKEiHsq+wcmgwr88iJCbMVJFNRSwJYCa426v6aSyqF2JKpy77NHr4PocX4l1pJcPZ5XZ8PIKjiPAzLDP8fhfbcY5OMttQ== 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=BnDh4myN5PG5rA51tFqnEO/Baj34uQClbwjqgpGiogc=; b=GizqaUAi3k7AYk2X8KAtPYrUr6J+QR1rVOyBNw+fJEH89Q89j6KsNeumJJCL4Ea9Y86wT2dShUee9JuMilYDgrs/hk/Cp+2cDjpL+8Ssqce8uN3ZWS2RsDO241JOeL/GYDgvuVVJzRjZUbWV46ZjpmhkvJs9BxqdYLm2bEOcyqqwJjmSjfQgDdYOC9SQrOi9QgIu+E/5zeSoEs7bQpdBGueU0r5l9tj2AR/YeleZF0DuEa5Bl+6PNZy+rwT9WqOOdRAHMfklyBDqA/P9RYMRqUy+9I5YgwcG/UI+CKhGFIyVWRdLqfMKin/fkXU+HRxLNjRLUVrynbz5CN3Or1Y3qA== 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=BnDh4myN5PG5rA51tFqnEO/Baj34uQClbwjqgpGiogc=; b=Vrj3pXCEfpSw0Nsn+zzX8yKGiCnVW9WioFoBDdgVXtIBz4WBHNZgds19OKeZRkbLld2P3hKwC1v4KpehLx1SMO9bK6ip9y/IaDB0tmMBTaTyyHacXXrAoqT8GmT7nJhE4nFSRfaEScqbYZiT4sm2eihNTjgf8hZBZG21t/wInvcKLIG/M0jYwJe3MVIkzliJ+SBKz0EpzGyWYhiNDxl5eDH+QRJ/QcNMRzn0IdduujEUACO9OktEeqdZLt0kUdGIxoElNZuuJbrM7jmnayt7ouUaagI93LM6HavkYLGx9giKqzaPbNfNeth5SGdh0Q/MVIY9z06tgV/CeWY4vZqfew== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM8PR04MB7281.eurprd04.prod.outlook.com (2603:10a6:20b:1d4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:02:07 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:02:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 09/19] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Fri, 21 Oct 2022 19:00:01 +0800 Message-Id: <61a0479fa257aeca966e332ea3cbc7d55d031029.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0004.apcprd04.prod.outlook.com (2603:1096:404:15::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM8PR04MB7281:EE_ X-MS-Office365-Filtering-Correlation-Id: 53f20b87-4bbf-4042-3440-08dab353b1a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IW6ULM4O+4nCD+gG56fK3Kr+6cD2jVsihMywOPc3Ekct+Oq40z6ujrEZ2pXDmUk2D1sK3zadib36q8VuPBXT9kY0YrHQFx7bT8DLVhZ0XsNR1jsPqeB0PvDfWMkTn1WNfoRmDJGQBl6l6/gdKTSOGp2um6nzXqzBrZzKOjHvZZhjS0j6/cdE5/8YJIXgnxvb/OQHrMwYYvkv3gqHBJH9O8nnFBe88pSGwhkN3dPsPHGX5qBIIWK8G317koIV3CRSaFfqIyTWhEmRn6Y6CaDqEptCGP3uNygd3H+2TE44/htC5hWm8lEVehdJLL7HGbsfvzjOQyAAj4oeICMXvthwzeJmAXB2dkRrpVAvDW5RmAu7LEfqNgVSI7zMpHunt0pjpaxDP3sXHCD/usy3d9yQ+MVrPddEaZEzECR1TbhTb4kY9sKGsMeG2/Wg/Q5DsiQW8MtMGcr6O1SzFS0uRrHfqPo/EviuRDw13txFxTL7ayqWwfZZBDtdhjXUoMjpja6pCcU8bDUjswFqlnyVuAFf4lMQkStZupDq7aFCXRbbVXs4yzEw3yqLh1UdvrkEg2tFzWUmzciEeXAsKLC4W3FBT0P8RhiU/Nu4DUPwooCJEAwdBy9yk3vVpthjHlUDD90/icwdvCIGurcMwCL8FzTFT1Jdppo8DNPoPBxiRvXv4O6ohW4qtb9Cy3Dk+YIg0gsrMwvhnkBFzNseRTHUUMQwXDTGrnaYYUgfgmMI+BtVRw5tvk0hQDfD4CKr8DO5DB3o X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(2906002)(186003)(2616005)(6486002)(26005)(478600001)(8676002)(66476007)(66556008)(66946007)(4326008)(6666004)(44832011)(83380400001)(6916009)(38100700002)(8936002)(107886003)(86362001)(36756003)(6506007)(6512007)(41300700001)(316002)(5660300002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AMTyTATlgI7G7IJLWd+DgUVVC+yeoOIn1UylcG08VgN+rkukA0saCJzS60dg?= =?us-ascii?Q?qmYWnxSSgqig7Rxbcx92iXzHOlFppJtuuf9ci77g1RGejucDlCLIhMpRpSID?= =?us-ascii?Q?ue+tNcKAiCqOpF+hgFcK8NrrYjYXOjtPuhRbZIPTxa3KY4VBCWs97g0SSSAE?= =?us-ascii?Q?ejvY1SktXTEvLZ7k+VPJ2wxHq+gZVCuHWkmern2Z66E1q9lAu7ca3dPrmj/R?= =?us-ascii?Q?gQ8xCawh2ZmV0fyXwEdnUNdpZ+mQX7jEtAdAb/ILR0ne7cHZkxBl2fi+JBg9?= =?us-ascii?Q?9PrDs0juOLRg77buGWl3Sl+kynuP5DUvOv0OrWWjrMULucoqKVcfBM0X9Pxm?= =?us-ascii?Q?HkeQ8gUSA/7+CWNGg0Yw6+HmhqQETagl3y+IQE/VPm4k/90DZOQa7A3c9ZTq?= =?us-ascii?Q?clHkOQh3/C8T74WYMOQSktJCaxhVqI2JXeU35VTFkau/S8Up6N+6EdgwLogf?= =?us-ascii?Q?JphuCMGJC+/TBJZyUioSvWvxcvXLc0fKq4O8sFwd/oHfoCOayBvKWyh/b+Vx?= =?us-ascii?Q?7R2TN57QSXTwWN5tyx18qoEYv1JUJWYMRPjBQhmCC/aA2EAfGw5b24GhxJgy?= =?us-ascii?Q?PpuaqT3TBb/RqTiEhjwWoINcWKgs2YiNplndJq15DfRz706sEuObKi/rwHwz?= =?us-ascii?Q?bXp7aPeqAy00HvIiRC8uBzgbG7EjF1MU/KBT34zYMvumXB6MKX6OBEkNOoCw?= =?us-ascii?Q?SbFJJxsBC8NGR51FzrjMj/zeraYJhBcpLq/xf/napPYk3lpEgP9xULmADGzI?= =?us-ascii?Q?Ij/aq+0+NOylf18d4sexylhT4Yu7hBIH+uwnWAYxKp5T2nBL2Ko5dsmz+0Z8?= =?us-ascii?Q?4y2eFBYE3oJrlbZKgbQvm9nZcqFI7MRi4yYXuZEsIqiI4OkFn+6ODBy9TSP8?= =?us-ascii?Q?5T0x20L8L4amQVB4wVNOCMtkLo0Sva+oZY9ldZmNzs3wDU4U4h5/e7AugWS6?= =?us-ascii?Q?jjZDLjJ84tFAgGYNW0t0ncsgLLhFsb/bUtfqQrfkY+hEyaqClg77sCU3lCfS?= =?us-ascii?Q?g5WhRTl7e4jODr6n5AsfFmfsgRQOmZbvsr0lNvQ618wDEQOdMkDYLrKDhtz8?= =?us-ascii?Q?axCiKRkd9ngX67FdByEy/5LJ3R7XVnnXSl4n/jZuqk8M4PSu74o/PPWyJEL1?= =?us-ascii?Q?ClppyJLx6Eu6PZuGhEdLZG0Qdgnt8oh5l+SP3ohnkhUz+5nKHTFCZzJLVSm2?= =?us-ascii?Q?P8ioKRbA6YGUGh194HV+rCFUYu/LxORCI3E4q7a55gkEtlM6yNqlQ/aMMf9e?= =?us-ascii?Q?HBe/nDk+hDsjpzx/7+OnYnbabQBeuo7hf+/4m2059n1HvZioLDg1f/Nz6I/4?= =?us-ascii?Q?WwC80iGtRswHmogJtJipZeUIYQNkcESub4NH44ZDIpVr4/ND6oIXtE8DBU9T?= =?us-ascii?Q?Ir5FjYd0d2eRQ5hU179Rd1yxAW5m7UtFLDtc8ieiqdMVrRpBJinz8Ey5jR98?= =?us-ascii?Q?51L6zPeB5TgbTOziUr6QvPeECKG5qdfv8znfZaAh6UUBAW6GvPEKiDYwPKPE?= =?us-ascii?Q?ZFEAudq99P5pQAyFIyz2/bM2eOXFOwuer7/i+NBYufHpwGl5XTkOmDXhxHWG?= =?us-ascii?Q?c06Wq/IvR55hh7IHEi6cIL1mtRK590yXpBHytLK7hXR8l8yARA9SjrFLz052?= =?us-ascii?Q?/w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53f20b87-4bbf-4042-3440-08dab353b1a1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:02:07.1854 (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: 67L04OXKxd1g6XBwx4M2p8jxA0OOUXhqIihkoi3lnpGEzxSFValPr+p9h0G0Z97e3TcRnAoajauqB7hj6BdQWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7281 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c index fcd733e88b02..e4caa2dd8c6f 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -16,16 +16,24 @@ void BPF_PROG(mptcp_sched_first_release, const struct m= ptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_first_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { mptcp_subflow_set_scheduled(data->contexts[0], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops first =3D { .init =3D (void *)mptcp_sched_first_init, .release =3D (void *)mptcp_sched_first_release, + .data_init =3D (void *)bpf_first_data_init, .get_subflow =3D (void *)bpf_first_get_subflow, .name =3D "bpf_first", }; --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150075.outbound.protection.outlook.com [40.107.15.75]) (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 455C37B for ; Fri, 21 Oct 2022 11:02:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fy4gXbb9WcE780xE0eKwdcFqNrgpTyNmZtnC58pMQSVOI6UbLSyFg6NDXJELhc3DsNh9CnjPXI+7sfbhjDof00jIjTYQwMo6URsJt8uOvr3hJz/Us8f+A8geBX81Tf9MmiRt1/YmXxbjXek9vAsG0bd9W6xzgRUOtV7IX5EvKhjXzpxIaei3l6zkyfKTnMzdyCiUd1Fk5ZFWoCIaWHh/tNzoAw8IcX1ZAYZ6K36dkwrJcAFNs/rb5iW1MUbnkOwCZUMW5UiN8vzLlr/+X7d9wFM47/WoMNAsI8/Ymj3hypRtbncdORy807DOTfNCcQhu3oUX1dp4XdRJJDGvt4EUXA== 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=0PVfXsdGgJPJNdmc3V3dkJQzFVGqb+WIe+7PEFL3m80=; b=JlgKoUfqlEQiaxeC1/nDMdzWeI3GPXB9sen/vTXeSBTw//rp76keMmZUAeyV6SRJjHgunyQDyeIxAml+EONLVv0iDfYw2TT2a0qul2MDZbsvLcF6Lqu018WQpTzy/o4jwd6SNjZDyvvOqtr1OrSp555UlgyiZaybQXJmfPLkMvmc5h7rGXpPSG2TlWBvS5F+9n4cLW3Vq8BnUMtdQDBJRbkZ+reEUvSoY0jtGBbDtbLD5/ElHHMfrTK42ZK94Mm0CdruylDBpik8lPSV49G8mzX6yg1UBse1HmYvtO4X6i4bynXi+Rebwi4sMbxJ/ftFYcO7Qc7912Jc18WjcLVByA== 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=0PVfXsdGgJPJNdmc3V3dkJQzFVGqb+WIe+7PEFL3m80=; b=FcXAUJDf1jKUzNNBdRvsWwxCmbL9GYE5LCixrYsYRxDULKVDwTkz7H0rXC5tmPO09bYqPJP1qKUnSKeKwnoSMaTApObQDqP/wm5zI/0RTjc7FBhS4PdGvm/mb0fE7j0qXRypponkwfMKFzdP9fEzps1I6oxJ0xiF11d1lNl1b9Da46H5p0vz1GyRExLTPjybcbt4dekvji5BvhnwWonhdPzvLf4MgGTR4jNNRE0WSlFDR6+w7GoY0WM7FscKroPP4elqG0DbyUp6kBK5evm+vNy3KnGxMguOcYfS0/Em1Zy31ZlUXYo7xiHJgo3bX93hqZSKinz4Ou5ARNejz5VMqQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM8PR04MB7281.eurprd04.prod.outlook.com (2603:10a6:20b:1d4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:02:17 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:02:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 10/19] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Fri, 21 Oct 2022 19:00:02 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0148.jpnprd01.prod.outlook.com (2603:1096:404:7e::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM8PR04MB7281:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f1a7859-5996-49fa-004f-08dab353b759 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6xYCGcKdGgahFmz51B97HW3GPadOnXnb+nSX+2bpF9GSt9Akf/2AXa/Ibj20+hFhW9MwkST4ggnFo+Ev/eDl41ScxkJmGJbReKlZT37+3lK4bkxs9IZJOY2ytOnOKZDwUu9GXzmrNm3APFweWXGMziag5VjFxyGIOu5CWIDwBBT6yIcDVa0KGzxVkr1sQPr0+jVZDdzg746iLGc3LH/9VVJ3rlXhI0KOc2LH4Y6gB5n0kxkSG9GK3njtQQF2fCL52Hd4BrqxHlvqsWZqQ0mBTIrfcpVPl/+e7/z7VENLc9EQk++93q2ZUlbZGvvRSvU6dTFU2gPT2yPDYbd+JqH/FBaVYoBrDWzg1Vkwsv6kODe6Tv8xlM+HAuKVIgIWBLy15MRFROhZzd7AbNoFrEv81iTM1YIQnDytkLPaTfg/i2nvtbHYZ3YEkcszF2EuP4SmEyfbv1EDW4XCsNgOMyWWVwbgcclwooRCVIj/7yBIOSGbYvY6PTdIzjJL/ptttuylFtuY3ETvJwokNA/uQMsqOX1mGLE2vRNk7cw+hoSFBfqsoAhnxMw3ByGlHqR/wFsUJ46VF2/pQ+xUhfU0atW+Bit38YP2vF4VOVgoPBCzk8Qpp/9mdNqqPlARRSObb+Z8hWFtXqFFxz3l8+duEGcISMZARrOX8+jAhP5FqOy6fFfd+zVpi4GvJbIdK8njYzyEN5soFBFwBqM39am8ElPiwMllQvcE13Ptt1rhqohsV73ItRY2p38MAx62nBnhIV7l X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(2906002)(186003)(2616005)(6486002)(26005)(478600001)(8676002)(66476007)(66556008)(66946007)(4326008)(6666004)(44832011)(83380400001)(6916009)(38100700002)(8936002)(107886003)(86362001)(36756003)(6506007)(6512007)(41300700001)(316002)(5660300002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2nW1s0vNvGmcViItLNyowLiQrYRharRaj1aqh6yi+UAMv7993D/y9kjwqGki?= =?us-ascii?Q?IRimdOcWDhOto91FuKY9cwXhKrSMGH52Xm1M6maHeMGNDgtG4ELXyH6b88I8?= =?us-ascii?Q?jM9zQpW951nXgz3awejsCHWkX1qOCqVY9r8+1L4Ov8InMuQzCnw8zbnw7uBp?= =?us-ascii?Q?A6r5rz8kn0cCVWuq3/5uRcGzt6fxgG6pMXpoEPXrDkyigdN3rXiu7j+g4unN?= =?us-ascii?Q?CUaFigFFeMiA3mqkkCRGkE5Trv+JDPw/ZpNVPiDEHoL7Qh/ppWPpJFrLNJSe?= =?us-ascii?Q?aXQLpqK+BvlKqaRg62DYts+qJS7Ac0gP3pUt8CUmxcpOPIzJFwbcyNYWtsap?= =?us-ascii?Q?cARVeC1V4aLUF/CguOOTmeeBpFvH+LyQ/6fu+h8JcyTAP6EoBvIqm/iy6TEg?= =?us-ascii?Q?LDgOlMWWzT5o1QfrjnzSwUS6yrF/yAM23UbRjyIBZbvuZqYe8PIQ1T0O5v9k?= =?us-ascii?Q?5YVNQ10tI7T9jWrgf4HSL2knzlGQP+7P9knvzyg6IIsBxNjiRMSIz0hXS4uu?= =?us-ascii?Q?4JDnxf6KTLgNgTC2KIWRdwZa8M23TO7oxlJ3SkGv7kWDXwYBcUNEMca7WE+C?= =?us-ascii?Q?3ZIdcDIqGxXmuyKnayhaU1znxYfF2ly0k73sLoffJQ0YXn5VMLkKrduZO84a?= =?us-ascii?Q?58aB7yLBuH3FDkP7MYGPfo71RjGRPY+0wst8mq/PnoRFnsnbg9Emxp1eJ/uC?= =?us-ascii?Q?T4SDzhamg617KX3DeiUlNtJ9NPh7mPZ62eSkYJavzj1AvUbSepsuUvYxTa3j?= =?us-ascii?Q?OGFSNdDZJmNM8LF1XYMYo94+z6BSNCxqvVNuN+/Uy2ZjTVvs6cVeNjata2BV?= =?us-ascii?Q?Ci4bG7Krze+ulEOm5GNl3G0fQLPihgYWngT3XiUHhXwISp28nZ2gxzQqPb2W?= =?us-ascii?Q?mUDDXUy+IvVRPQ4GlEDsuyJpjGeCFk7mwNdG7mFCFxW9yqy4C3dH23y/Ubda?= =?us-ascii?Q?Zrwt6I+ode6ifDc3ncCgBrpyT9aTDseN+4pz/pJMT0b+XvNcsr180GEn3A1r?= =?us-ascii?Q?Y4N3GoUj5egFlsIsdI82jp81KCMEDshDVjg7DjkN3mA2a6oPYcdqAL/XN6bn?= =?us-ascii?Q?4Kvc8YXG7OO+KsHgeDAipdLNoZa9+NkzOno1VRrnxzrmNQpL5A8DDm6x7EnU?= =?us-ascii?Q?nus3v7kVzHrmIGyiVnE7DL8Tmc05/iX1KAVBkYtelIz2fJ6sINsKGFbjKHPb?= =?us-ascii?Q?B+nDlBOBkSiLep/zXwgjnRbykV8D9RaFqkMVZPLQp0wF2L8NEkroBPpVm3ba?= =?us-ascii?Q?Gn53tdJaK3X0gn60iFsqPKwQbv7Kf2m0oe6jnXZrNNnbKGxe+D4ENmfTcszU?= =?us-ascii?Q?khBrQOE3A5YBxYtsyTljjsy4L+CRRs/1qLDX2Sibdss6Yd/Vk0/iQmN3USTr?= =?us-ascii?Q?sTtxKHbSmZAoM9MOaxT0KzCdrOat6aGilec9AOXS7KVHVbJqQRP27mvYjEA3?= =?us-ascii?Q?eJpoOWqLLvyIaEeoaxNYH0HIwTMU7ZXekYE93IdVKrr/ue/S7ITIkhLo3b+Q?= =?us-ascii?Q?b8GK7U0kl/YoaO3iKgZ6X0Rs6O9J7rirVS4PhX0BHSip/NEfurZmYS+v5dvy?= =?us-ascii?Q?QWapSdW3LPZKj85pEJDgIQNWj3oip3uUN3vf1sbLVZN7g1XPVDE3+W7T79z0?= =?us-ascii?Q?dA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f1a7859-5996-49fa-004f-08dab353b759 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:02:17.1379 (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: +zbpxu66iCVYz+VUlX1l9nj7+eK1WdIJGm52jZLNYK0m+NRVneejfq7y83lNfQe/jl63xHHA1D2rcIbccr/yZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7281 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/tes= ting/selftests/bpf/progs/mptcp_bpf_bkup.c index 949e053e980c..b2724426676e 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -16,8 +16,14 @@ void BPF_PROG(mptcp_sched_bkup_release, const struct mpt= cp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_bkup_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { int nr =3D 0; =20 @@ -32,12 +38,14 @@ void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct = mptcp_sock *msk, } =20 mptcp_subflow_set_scheduled(data->contexts[nr], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops bkup =3D { .init =3D (void *)mptcp_sched_bkup_init, .release =3D (void *)mptcp_sched_bkup_release, + .data_init =3D (void *)bpf_bkup_data_init, .get_subflow =3D (void *)bpf_bkup_get_subflow, .name =3D "bpf_bkup", }; --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2086.outbound.protection.outlook.com [40.107.247.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 795667B for ; Fri, 21 Oct 2022 11:02:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nARlBStGk7Db8nrtsKbvUa9uhplaTBeI0zHloGUHyLBw19AfnHFh9AGAteimZ7/1gIHB2bCYnDMI/9KJt5Ed2ME3zx6NxWDsN93B+9MsQBqDi/RZvxphTPDwDcG7LN6BEQ9qKPg92hAG0CqLyG5f0+qy2ydV3T1RBR4+LqoDr5P+OCb1K+NkSb7+5UveZScNl5TxdXcto3VGni3IOppkyfeqRM80zRnNOR/+Wzh5M+mDcsw+SAj8JYvKEOKgFHi0YHQiK/t4inM72QWCNJwPS5mSAUqBbPFRpyOtT8AArvof+A2EVrUNxZOCA07lPrC5oJUHK3YmdGqgNUCO6dzuig== 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=qvT8Qh0I7ISI4Sl0vNv5NvwJblCbHIfRtq4szSiBCfk=; b=QgYlPZG2QtPv8rz89TUaCaY4HOEut8cD7dC/ceI7vKwT0WeTyefmc9YJcxV2+mCI6F4i/4rc/x125pZZnzx7F94/nFEzr4BVXF+csXCvOZkv5gKTfoJdzE73Q3FqjdJa1LVTwymKtpVgbTxlPK4BWl0zN4UgzOZZFPNhfWwjRIGLsUvy3PDCA/hEXCWE/DrEnqUbZI2q/KWBARXZwX0WQqRXpKuQ/Ota6g1EPJhcvQUSb9RkdbS6841pKBOAADKA/3eR1BCRL4jUkM36oHpVE84vGAKacXxwJ+116QNDcxgcICymJkcwwqKeN+nUFq21LnhMRVuQN0/l9nYF/NDBTw== 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=qvT8Qh0I7ISI4Sl0vNv5NvwJblCbHIfRtq4szSiBCfk=; b=XMV8Emp1qYcNojH+x5pwlhTHcSe1nYnELEnpJxTeApTa6o/QIB8OCrg+LsZGZdspIkxPJYF5P/+XjGsP7ijQiOjsu3a/3twYcOMMHYlXaPewaHWPcQkvRchb6eod6C0M6r3Ixwh+RrBqexKti+4prRxJfDd4GUCO2VXgARAC2O2BqGCtnhjcYSiwvNIV4TkqQf1NoPJ7ie/yE0CmNFUIKIrDm5DfcDVRMeU4hExqJvUt8mU+34V0VswCgffsykAlZOCaTJJPU+ZWDeZJyNr9fD3TWy0upj6U103gFhhl9GsQuhiAvw+dRNoLitIOmaYpeivlqyxu5Osf7EeOarsY7A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM8PR04MB7281.eurprd04.prod.outlook.com (2603:10a6:20b:1d4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:02:27 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:02:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 11/19] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Fri, 21 Oct 2022 19:00:03 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0145.jpnprd01.prod.outlook.com (2603:1096:404:7e::13) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM8PR04MB7281:EE_ X-MS-Office365-Filtering-Correlation-Id: 04e6374e-72bf-4cc6-3b4a-08dab353bd83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UPJ7THCKatFCEoWzeUxPaQ18htULu/pA8Xv3QaxmbX2cCpYyKZxz7hTUAY4yojrohsrfvXP00nODtjpsSiyPAsdoMlSn4aBuxYPOJM45z5rjlSealPYWCKKJjENMXUYyANo+N5ArQBJOIhYZ6hN8+XHbruplYMcKFcATe3iVAnGhOhEuQ6JmFxizQOU3SGSHnMYdd56KJBxKvo9ezs6e+lcOxX6BhtOE1VlWM8eubsTryG3mmAUq+nTwOkYDyIi9ZonFFodokrudPdlKArzYko7TIaCmYt3fKXTR+Iv17ua2gHCthMfmK9YCbB88dJvTKn6IkMWLWUomOAGsIxktYGHU6ZtnEACNMDhy4ln+zHTR+I0NcMkJ+NIgB9K2GWZNfLhuDWVobPQQ8QfwRDnbu2XY3L1N6YI3NxlBNsSsa/8y7AImXPHg+IhBggoEGpGYWf043NcT5v7LRUjcfQDrnmHg94nsdkOFZzWWNo/cKtp58JMAx6a2o9SS1hhQnJEIugLmEfJPhynhgclKE5Yo8Jm86T+kOXvr41qniIl3K7W5O+IcCrsrUl/FFaRaVb8IB8lENYdQvx8qz/GEraxFaVNlLuGrKnLb3oGhnywvhCtwjPyKk9mPfvxt8fgVVB8qjj2hSkMfi8dfZPvKuIyg5KG2YNNb72ktu2vgWPoNYryfHyR68VVcqCmo8ZF1KUxEydurbl8nUftCY95ycYyGlxzQvlM3ej2VVoirebHJiy7oeMa4jsCtqxg4pAdy6xMI X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(2906002)(186003)(2616005)(6486002)(26005)(478600001)(8676002)(66476007)(66556008)(66946007)(4326008)(6666004)(44832011)(83380400001)(6916009)(38100700002)(8936002)(107886003)(86362001)(36756003)(6506007)(6512007)(41300700001)(316002)(5660300002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1u0I8+J2pm8N0VCcKmobunilczg5EkzFg5fNMZQJXYO4UJjZQ2Fbu7zCNn0X?= =?us-ascii?Q?d4RdzHME/ldIGUYewDALzXa80YhW97a8Z/96FZtgm/XsxMQLmg5UlVzPieKg?= =?us-ascii?Q?iGIJOTgDswfQw4/C9Oyw56dar42Q2wdDhiklvNCHZcx43+d2Ams0ilh9sZIV?= =?us-ascii?Q?1l4g4pnuL/+XK6aQBCReQdTCHxsjjNkAiU4FFZt8U/Pw93R+pv25BeziHFzr?= =?us-ascii?Q?iYMgrJtqOnh1IOcd/qV4X2QI7BicWo+u41KEMP9h660YQcuNokc7Gy6pGb88?= =?us-ascii?Q?bXo2XRbp/hiyrW7wogv9SvVjf9IFaIGocwjvmUBgfMglWB2lGDkST2UiaIqx?= =?us-ascii?Q?MVb2mK+ucXCrYouJbCMSIWF95xuW4LXNfgCYhysPws5v/2xMPdXzX8t5nyGS?= =?us-ascii?Q?kqZoSdVrwhS93cUviN06d7rnHKOkEXv1oqZoO6VGLsFtOuJ9h5wrBbV2mlVc?= =?us-ascii?Q?wDE0aJws8uGApX8ydfu8Fx2oD7SNA8iwObC43efL+odJHKZ5oJHvXt2X3nC7?= =?us-ascii?Q?9pgW+XeBM5RBL08F/v3y2ahQK//H37K7LQM7Da/RKbGXxQ8/BdQVrhk2fr9P?= =?us-ascii?Q?56/aV8006G49zUhM4IWxbt6Xrk6x5VE/Vkz2hLreIYGvBhyKCEzX7NwWduD6?= =?us-ascii?Q?ApMbRpeEHLZZZSfgxdbAlyzMnhmtrOCbsj9kg3P+P8kPY6c4WRzD/xf7OULC?= =?us-ascii?Q?id/0lsIjQGeU5MeSwn5HNKs+cb0akTM3Sxri9hQiMi1W6Wy13kJSZqu7BCPw?= =?us-ascii?Q?O8JeRu8hgXcQ7sDsp2miZvu4Ya1saiLdsb7ryrUzV7RIsCGEuDnj2BsxikJ6?= =?us-ascii?Q?iyestZfQ4BTaQDpRj2AqYVFMqpU7eDuXYYxReNJ7Ti9ZDrk/3Ak9ajuTPMeW?= =?us-ascii?Q?8tGzf//XuLtccXvM6l8tYmtRs0Yw3ljAkictcx38nUvdAbbgb3wayy3aXKUh?= =?us-ascii?Q?NXsnzz6dVLgGuSk/SW4m4DzuIvWs3kbL52jcHAd0RNvanKkNyWnZ2CD1O2Cx?= =?us-ascii?Q?VqJKl3f/kCgT8xE+FhC09c6+HWxiVUnmNh+tUA+bXWf78E8js0y9HrJdiu0m?= =?us-ascii?Q?F5cNoRG90vv0tR3+Lvh5qLwE1zP50oODcT1onXRPLvPZrikC7ZAT8oQPGVrX?= =?us-ascii?Q?P/ACQNY4HJ5Tnac84ffNEZalUVKMMe/5WEaCYzZ/tVfCi0VXNmFxRL6pzgim?= =?us-ascii?Q?gAY3LS7ChJkb3jtmM3UuMeM1odWwUiomH1SQwV7qCr3hGqikWfb5ZDFUxN3i?= =?us-ascii?Q?liqBNpcS0MTaI2yfT8dBfzpoLgvexrgF0TTlhX3huwZBP7IcLGTpI8fRajxv?= =?us-ascii?Q?cVBWviu+hykVpIooge7dw7lmqeWHZlAYd6How0yztk3rjDHPUjgGyjx3vPMV?= =?us-ascii?Q?5pEdeUYOMwMgZbicoz4hCsUBsZhht10gbVm+Sc87ppanJmMrrrARWyAVwTkj?= =?us-ascii?Q?zroD6cNaMi4L34GFTKAmxxk8WO9uj1zBIj8D7sOhVWHp+3ipGoyzJ/hdXlpM?= =?us-ascii?Q?QUf1JreoQx0m/66NEokSqgEtcKK5CskFQX+GNpwra9pLDEHkoLTq35eoi0PW?= =?us-ascii?Q?owfJ67/ZID3gaoUUKDzamIOFROlOKQuTrzZvlZznxwfjxthgX9VxYOvuYx3h?= =?us-ascii?Q?mA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04e6374e-72bf-4cc6-3b4a-08dab353bd83 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:02:27.0435 (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: rRGhhjsoVT2yYFL227XX03Bnz4MfirwdFWtvK6Rd6t8ZaDa/Ay5e7fMUfvTuZUl8gXQH6e3dpNHyFuTGig7VLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7281 Content-Type: text/plain; charset="utf-8" Use last_snd instead of msk->last_snd, then last_snd of struct mptcp_sock could be removed. Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 - tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 14 +++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 2a7a613f87e8..01cdf5d9101d 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -264,7 +264,6 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; =20 - struct sock *last_snd; __u32 token; struct sock *first; struct mptcp_sched_ops *sched; diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c index ce4e98f83e43..2da4e89ff2bd 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -16,16 +16,22 @@ void BPF_PROG(mptcp_sched_rr_release, const struct mptc= p_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_rr_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { int nr =3D 0; =20 for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (!msk->last_snd || !data->contexts[i]) + if (!msk->sched->last_snd || !data->contexts[i]) break; =20 - if (data->contexts[i]->tcp_sock =3D=3D msk->last_snd) { + if (data->contexts[i]->tcp_sock =3D=3D msk->sched->last_snd) { if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) break; =20 @@ -35,12 +41,14 @@ void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mp= tcp_sock *msk, } =20 mptcp_subflow_set_scheduled(data->contexts[nr], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops rr =3D { .init =3D (void *)mptcp_sched_rr_init, .release =3D (void *)mptcp_sched_rr_release, + .data_init =3D (void *)bpf_rr_data_init, .get_subflow =3D (void *)bpf_rr_get_subflow, .name =3D "bpf_rr", }; --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80088.outbound.protection.outlook.com [40.107.8.88]) (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 A265C7B for ; Fri, 21 Oct 2022 11:02:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fdaGYBGAwv90LgGpdeJ7zOGp+ilYFsKRVp7Fr+WpjUbZ+MM4ulClpo694Q8vYrH/sqirqzIZbcJgb5PNUEMxu4KKZ91qEqhBnbl3zOQQtsPFZiHBvddouAYyXAmn9JnnHp7G8+You1urBMh44MD/yR7rQedfzwd8bON7EzIrbPxcYFAX7S1tkzeILvadIHgZcYF33+tgJw6qhFH9cNl4U0gtAzGPu/Hy7oKIMHqmqmZg1yof8QzEQBrikEWx7er2K21zy7fMq8x64nqurnn8s9ZGefiuDHS9LA2aZPUw5wRBAHEUG7jddViwONxgbRaAd61/lS5pSHFqso6HqJQ/mA== 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=pPBu1o36lwfR5uVG718Dj9BOPO8IuxUg7FoBvkr7R24=; b=NVc3OSSLe22j34fCB1iBuaRxtFImF9hCgi/moe0dLeOUN15DHYhDMaj3GSdNBO+xn43jDyJWYGRJa3PQoar8X9TfH8nEGCohciYYNPF6ZWtLg7cDMZ3t8Qh+dmNOVSEPQ/PP8w/lW8OMUGeh/5mVUUoy6iXE50KunWAtufIzzHmhcRAOxb2pFtQg13lxxR3NeY2VNiY7Mh8ngVSWPrEGPJLrc5jSQSUjhAhokpIw7L5LWWdCN2y+UJHXHqaTJzgUA1ocBR+BGia8pyeKMT6LZOnQBmtsAb+PebjrreBFxBKcEQkhWfykgyRa26g+OtmPcz7VITvxIYkX3SN/TWOoIA== 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=pPBu1o36lwfR5uVG718Dj9BOPO8IuxUg7FoBvkr7R24=; b=zKpzVntqZpBCQ/zn2fb6C5uXiknEClCii169bzUP7khShQQz5LssIQ3oK4w6fUgRRQz8EBJkqvSN7SkNCpo7k3oBSubMci/wt4prZxs29Lb+rmiiINcjZqTvGpLuh2cr70kDoKHujot0FVVw3VbhiFSytXIyRAGykgJKJK0F7hqfOMjYb6V+2KxLthz/z+lphmCK7rhj1fCaDdBRXjL/x3PUakBj7MYdxfgmFyhSzxkQVGL9dhd0NRFvRS8dIZdYKCcqVYwc+P2NBCOaRWjqgARjvND7dfzqU3OpwO4kOjE7z/yDVZbTuOcDET5M6vWCDIEiLYqkmsmFIMSwO/NxSQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8245.eurprd04.prod.outlook.com (2603:10a6:20b:3f9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:02:37 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:02:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 12/19] mptcp: add scheduler wrappers Date: Fri, 21 Oct 2022 19:00:04 +0800 Message-Id: <6165639e655a7b13a6843528c9b1e2a3d7d28b97.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0225.jpnprd01.prod.outlook.com (2603:1096:404:11e::21) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8245:EE_ X-MS-Office365-Filtering-Correlation-Id: 3557da2a-d81d-4635-c9e8-08dab353c35e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p4F7OzzcKyoxL9JoukLQ9Jmx4gsSaq5wRfTiD/7eHZ+uwOEx17rfbsavveAe1zyFLuSwfTtdAY7iQduhel8/OaIo2FOQqAHixYavF/l0ZCTZYszYa4ZSpexaVXY2bgO00fLouD3xPz+dOZ+aU0x9Q1Wp6AinysLJoXfHz/murAPdGw56XLEaIzQlw2Ho+CdyQR526Wcu5Ko2EPIeAyYaASs053r8Av/MniGymS315QOIr31/rVxf2RHWme9y9hsvt3+QZNIwu92+XIVIwxKC+exI4I6r64JdvfW5pAEIGMk57nBwMuNs6UoorSZFx5kGSt+OvS7OrHZeWb6Mq3/fwneN5fN5ps3/x7mLgszzIEMyZLRLBV2Z6vYA+fGhzUO3o4EfJba9LWEXCMHqPn3jon9ze70/57os4x3Je3UjI1Onnf9UqXjMTMJZ5dTkjjoJN3wiDg4fHYPX0kxQYcQtDWc75HIj2spqv9RgbRHCu3/4DFZ+XQ8zw2PaCPRDXHbUUqPCRz9BqPAVunFOWuoSgLata7RNbWdsdRpFlWrLFOGRNl92rGP2bFIV2eJcskGJ6eKxN6ipgfjFQ9/VW9JlIRjAzxhK8R6hpI6k2pSAPQEGQUvzqw5FvVsKYfJIl0Db7KVbiMFqXK2ztSVqcGykeG1zTLPqahDmSjewho09d6MqMtaiz71HvTrI3gxPpcvxcCAFbBu9zFNDQ8fAI8zk0n9opkzhaeryzdA3owjGqeyYFPeCYAjnCDqI9OY26tFL X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(396003)(136003)(346002)(39860400002)(366004)(451199015)(83380400001)(186003)(6506007)(2906002)(44832011)(38100700002)(86362001)(2616005)(4326008)(107886003)(41300700001)(5660300002)(6666004)(6916009)(26005)(478600001)(8936002)(6512007)(66946007)(6486002)(66556008)(66476007)(316002)(8676002)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6O6AIT/x3W2Qn0aSXAxxoxwy6Rk5Agkc4Bvkuh0+3Sb0R+mfVSao0tJEhcRr?= =?us-ascii?Q?lnwC8fu0kpgdcNCXN7gheN7zkJdfDneK9cFew2thHChLZ6uhbE5gIXIZdpmI?= =?us-ascii?Q?UQZDxO3X7w1ZMTEoZNGV11rCEgHr+E3ol8o7m1Vfx0w5hUfEoq38b3v+4uvg?= =?us-ascii?Q?tVX33y7D0H2o7EfDrfSxIZbY+7dD6/P07VJ3VprZOQ9WtHdf2to0d1grJPCh?= =?us-ascii?Q?M7WIe4acQ8l6nIwld7adESulQDs33mq5MrOTmgFu9Vc/in7CUJeIhYHH55lK?= =?us-ascii?Q?9H8uBrg7970zLK312RBG2yt9OgxVHKwu1ArsVe/CwzHNNppAZSZbhtmOInPp?= =?us-ascii?Q?8zB286zGS52xDnW/EeSVrWytoTTVnqA+toXkYOpOmzPAY+4PK+4YJ/spG+Et?= =?us-ascii?Q?A3CBUmdQWSvWE78ANeAmefC/9drvuAb5MXRPNpPjuizHqoe4/j339TAtDuuT?= =?us-ascii?Q?RuBFq4+LLb+lZQmVibAeU3V8HCIqMb14omtBtspCO4RNBC9u+8NQ2XwILpQs?= =?us-ascii?Q?kVSSxasKKAxkHH6yVfyqgNyyp4Ef4PA0anEpvmd2YMwoxSx4IjurB3x1iCyt?= =?us-ascii?Q?+0lgVCc0bZvSlIYs1LnDKczhe3vUJSQBjIhuYBb0HjnhWzjQwsduuG2Jsg/j?= =?us-ascii?Q?2VgHZBKbW34O/KwsDgroNv22IZLU9BDDgsAjeITbafynRYlWjM/3n2p68tlC?= =?us-ascii?Q?0jVuJii5mNcsPbeubJr4xLSNoaHZ27mwuVv8EZ54nm598CLId18uG5BbBB0M?= =?us-ascii?Q?Q/YA1DN5Atjvk6tbrBrag+GzJk1+feVbSFAeORCnvPwebvrMbd1DRlnVKyRK?= =?us-ascii?Q?yOcHN7laphW5zlSTXUR/Vs2qND25X8Bds3NvoP1lTPzgMOPlfrSH2EfuXoWT?= =?us-ascii?Q?LD7qRBGocjd6S3LdKyXGoH2nKLyH+shdvLxkPs6soRZEQyLNu+cFfThfgECn?= =?us-ascii?Q?EpwUv+I1ceHFQa3qShrNBr4YdGpLxJJ0OMSd9Sm1a0t34+Y3QW0LoaABVTOm?= =?us-ascii?Q?ysLl3/d6rgz8197bK16Zj9GuTfKWzuuhAsKWmeWsamnO88LAdqRZpTXepkP6?= =?us-ascii?Q?zOUaoq/qNNcG+pO0ornp8a54IDjBeSB/b+lSnPhr0fHcUGkM0o3PzVRyQVjZ?= =?us-ascii?Q?8P/gtqB3Wyu7I69ke2fTTEciQ5bVAsk/NvoLyyECrrjeg0SbkrHPtx5dumxG?= =?us-ascii?Q?YsGeaVFEOsIE/tTCX8aSL7jah9/8+aVYMOSzXXuRLDsjLZibmc6ht265LYHa?= =?us-ascii?Q?IYavH+IJFwDm7oX8WJ7XUTXSK6zWhpCG8WejGXu6ozoCiyv26+ln4KJdrwsv?= =?us-ascii?Q?zvuZ/NP+j1dvF+4xPz3MsFdQpklT3NvQ/I6xSPJ1VD3442FdfmqzWefhmE16?= =?us-ascii?Q?DH9zBQ1GLFzx0lbea1J6K05KyIRH8NUObzOIIKOJUx+rzIc0fBjusmTm4dE4?= =?us-ascii?Q?sKDjr9DCni1RZHLiDtID3EY9wqa1U0JStdI4wShQytZXWAaT964QFMTF+Qzb?= =?us-ascii?Q?5rwydHvp2fVJthmQjTe82wNBOuIpvKxyIEe4bDCcxYBngBnaAMEyx0/K3Ftq?= =?us-ascii?Q?liKPNsaOhxNGVoRKwKrHUDNvct9Y1CXUdqVCvNMm3vsoi/mc5CFJI8mwtVST?= =?us-ascii?Q?RA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3557da2a-d81d-4635-c9e8-08dab353c35e X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:02:37.4647 (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: MIbPvjovVkE28zRgs0Uq4rT4MPSGt1etcb/4ToD5iYNO+tdPBmFymlmW94qwL5l3+FhiECL79Ug2N5Tp2xIocQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8245 Content-Type: text/plain; charset="utf-8" This patch defines two packet scheduler wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke data_init() and get_subflow() of msk->sched in them. Set data->reinject to true in mptcp_sched_get_retrans(), set it false in mptcp_sched_get_send(). If msk->sched is NULL, use default functions mptcp_subflow_get_send() and mptcp_subflow_get_retrans() to send data. Move sock_owned_by_me() check and fallback check into the wrappers from mptcp_subflow_get_send() and mptcp_subflow_get_retrans(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 14 -------------- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4ea12a2e1f96..c55e0fff6a18 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1417,15 +1417,6 @@ static struct sock *mptcp_subflow_get_send(const str= uct mptcp_sock *msk) u64 linger_time; long tout =3D 0; =20 - sock_owned_by_me(sk); - - if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return __tcp_can_send(msk->first) && - sk_stream_memory_free(msk->first) ? msk->first : NULL; - } - /* pick the subflow with the lower wmem/wspace ratio */ for (i =3D 0; i < SSK_MODE_MAX; ++i) { send_info[i].ssk =3D NULL; @@ -2228,11 +2219,6 @@ static struct sock *mptcp_subflow_get_retrans(const = struct mptcp_sock *msk) struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 - sock_owned_by_me((const struct sock *)msk); - - if (__mptcp_check_fallback(msk)) - return NULL; - mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e3e113e7f957..74e4097f9ddb 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -639,6 +639,8 @@ int mptcp_init_sched(struct mptcp_sock *msk, void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); +int mptcp_sched_get_send(struct mptcp_sock *msk); +int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 500ca89f6424..83930a9b9059 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -124,3 +124,46 @@ void mptcp_sched_data_set_contexts(const struct mptcp_= sock *msk, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; } + +int mptcp_sched_get_send(struct mptcp_sock *msk) +{ + struct mptcp_sched_data data; + + sock_owned_by_me((const struct sock *)msk); + + /* the following check is moved out of mptcp_subflow_get_send */ + if (__mptcp_check_fallback(msk)) { + if (msk->first && + __tcp_can_send(msk->first) && + sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + return 0; + } + return -EINVAL; + } + + if (!msk->sched) + return -EINVAL; + + data.reinject =3D false; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} + +int mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_sched_data data; + + sock_owned_by_me((const struct sock *)msk); + + /* the following check is moved out of mptcp_subflow_get_retrans */ + if (__mptcp_check_fallback(msk)) + return -EINVAL; + + if (!msk->sched) + return -EINVAL; + + data.reinject =3D true; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80070.outbound.protection.outlook.com [40.107.8.70]) (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 135CD7B for ; Fri, 21 Oct 2022 11:02:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OcUNCfO7it77UoKA8EZpGJL1RHBvXzy5j4x0PIJz08AFVa6oYApquea6AKQgDCmpB7oYQaUSLgqZT5xweg16/2umhe7efTWvxsgZ3zdo2EI59SdEKeP3rgD3efAoULZF0Zl4AxHp/qNmtzE8X0Sk6O8+XkzIcfmTjx61nqv6fsYI2m1PrrplWmOv1j/4Ze/xwSblBtN0Dw2KiiZdk5++WRqrkzMX01enEe/JzaOXrky9lOTjhqmKG7gNNn1r4D2Exs1TeNxxzD7sZiwAD532DctgfSvn03umCAkspnyI8xQS0YpH77DIkonhr5E2lmY1BjiZ6hBh5DEAkS8Z7CDaXQ== 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=JjQXIsJdjiY4r9nl0TaOY9x6sm5nIbmJf+7q5FvZUqE=; b=CUKqJIeWAcmcAMGIcgA0y/SNRPRYXcF0rDEgOKBoP7XnMp0PmEwzf4sHtLO7yoyuCpTtfvXwIGze/53WWYZl5vbgimqPH6nGkYEMe5synCXjH5w0NQdUzscKzeghEPJdi4lUVz0/fl4tgCfC3AixTw4fmTNSpeQarLr3RCdTreGW5W8X4CDPxMKgBoHorFdY37UBI1b39IwkfJacw/PlgUdP2wxvldKc2HJ2XgNQ3REnJjJxycbnEBdzWzMSrhB6XdDqEPGku8YHtmt8xT4ktjfbJmQq95a911l6g/gfvYt64hDc9oXwDypILB52yXUgCCe/D1Zk5wekTtYtTuIOUw== 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=JjQXIsJdjiY4r9nl0TaOY9x6sm5nIbmJf+7q5FvZUqE=; b=uc5BBYu2oLL+NV3QUfyARrypgQ20DtrnodTZbtYoqbmSomCOe8xrGfvw/bt9i6hXL0eDwFpPC3kdZKYDpO6ELlXZQd8y1Fi7TQqtkUWHls72Yw1j1NaOa1QzKrvSEizU4ocYMoeUHRxieQ1t1W2E00PzNQ7DK4/gaI/E94oJ+Yo2m8wSVEbRhD87dVaCO6C8ewsB8asKBdqECIA93G6/7wfm0zBFUiMC8jsCEojDhH/dnMsCXBvLf8O8Uq3cmcyBTD3cEYcQ4T2maU0q6+dSuRCr9tcYe+waE1A4GxBbKlRMfe1G182IGCk4ELjeky5n5AvSZk2/LyQP+UWUDe1zYg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8245.eurprd04.prod.outlook.com (2603:10a6:20b:3f9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:02:48 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:02:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 13/19] mptcp: use get_send wrapper in mptcp_push_pending Date: Fri, 21 Oct 2022 19:00:05 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0239.jpnprd01.prod.outlook.com (2603:1096:404:11e::35) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8245:EE_ X-MS-Office365-Filtering-Correlation-Id: 16ff7d0a-0f8e-459b-a292-08dab353c986 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W98WVwnBq2n2iJ6J6LL+eHgDBwjBZVP+mX1Q/iYlVCmQRpU7TlhHG68S4N88ncwqdJ/DLDg1xC8474MBCRG3hBvHDsGtZsobyPQjEg5nA0GQZqmLcSHGpEHTAp5Uw1YLwyQxC5qfy/etndOE0ZxnNHo1jAppJwcNWsyX2bVTA1YBhjIF3DNBpQ16NmXOJWy7NHvyCeQAEymcx7ZYAhHIq8Y89RIkggmmRu1Kjs2neI/c6L5grE2ELBmagzbdpcLovepGCc0WjAy4DQz5R2AtaQf70HLlxVhCvB9EiGak6qcjiJyI7ZMgcGLdRs0pQk7Ie2M0T8AvpnDmMkIQuz4GtGEzX4bD/AHXpINYTRMFUXlmj0+2W2wbQEQJulcVbjmRqWTbA1g/gkD68RYjEMLcWchwWfshmUQjfNE+i4fxne31P7erYpTfohxdlRpxGw3DyR3ynYzgERM+ytt9t07atxNmK6RLp32ODGfX3mCh4drPqrIlcKzkXmpbCNgFn2lYUBdL78aUF504MjIWC/6AiMafzRGHW9gTMZykv7hE579fcP0kSq8rDx6Zjbufl+NCJMc4YAnJuY8/6OiZMlVt0RE/8a3Z9rHE8k1R/wlXVFN+yQZ1B8lsdhj0HpCP+6q69Lwe6wjrybUACvtgc69Xj0ejppK93v+4G863/BUxbiijhI5Fb/UomRXg4dvMt8DlyFWzuNAy16bqvmskNNMw/IGvV0lgQzqClua/2rBVFQ0qE7uaUCJ5sEytUqjL90Yw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(396003)(136003)(346002)(39860400002)(366004)(451199015)(83380400001)(186003)(6506007)(2906002)(44832011)(38100700002)(86362001)(2616005)(4326008)(107886003)(41300700001)(5660300002)(6666004)(6916009)(26005)(478600001)(8936002)(6512007)(66946007)(6486002)(66556008)(66476007)(316002)(8676002)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fvJBrZu1ugwXH9y841uHS4te11BkspxzGL5mIeUVjogUtf17h+0KzJM7XjX/?= =?us-ascii?Q?HDdAcYpb4Q/woGshwJbgnlVdS3m3vc9sv+1DQ+TLW5/fBdlaimFV8gu3H96r?= =?us-ascii?Q?uZL0fpj/wtcmO9T31L1KrEHLgsGRu5ekzQnsGEXAfct9yEziK5xSqcHI/KRr?= =?us-ascii?Q?scBXsMhGTNpBP+D93BHYBSJ6qLgpdd+tKnGEySTWrjQMOQYdlPXEW07xJhU2?= =?us-ascii?Q?H1s9zNMZA8HxT8upYMEb8MrfAEiPSN1w2IWbv34spUBL00lDM4at4g4RyxFU?= =?us-ascii?Q?5MaEaAf3n9njLXI6fwAYmhhgI4AbleW4lhGkwn3gb0D7vg6dZ3D2x/rvgj0o?= =?us-ascii?Q?khU9kT+qQltbKiv1dS8Ykamz666tdzmqNJ1jhAMfCen8TCKEZ7ygWkw2OdAo?= =?us-ascii?Q?fZN4GtUsGPYlnu/Qn5JMDixt3kjf6nK6fLVfxW4pEoKd7mYwbJh1begzRAqn?= =?us-ascii?Q?g5P93vTtpkxCoM+AuAIO/gnSDKaaWVw48aDhmT7vd2bVzT8txJpnlrntwk/1?= =?us-ascii?Q?IICxcTYP2J5m7xM8p6Y+7KiEITu9r0CGKUcBSv46dMxGdGppjx6JmGCtFdwP?= =?us-ascii?Q?LD8f+kCwLGyX3fXOAImf+QmpCu0ftIv2gL1iECILu8SpRacIe+OlcHECViEe?= =?us-ascii?Q?PSwJTpBajmMWkVpCegP+tQA7J5QAfaYCN2QobV7v+6whfmsNhu4lMd0LGywQ?= =?us-ascii?Q?jKEugl+/Uyn6+yRbYWbrfU+knGevHPiWb4oOddzuBV6no8DBGr1wp324UfR9?= =?us-ascii?Q?K0DFTuACcBalkG/0uJJTM6owweQ/OZGyZr6lmaAIMncapAk7xyg3q7+kYJtr?= =?us-ascii?Q?tyF0pLPQqb92jK9/oJ08YYdzbjH2BCAKnCGtQDKG3HlEJzq2y6WfbHWmODbA?= =?us-ascii?Q?6pH4qiwK3fQCqJPL54gYecAYnw03Qn48jdmJ7Ex40AT0aIy6pMeZa8xjzttH?= =?us-ascii?Q?1nawrnHWL44/UWhZT2sy99kt+RR/CiNzAXIQJCMwLUPq68gi9PLC+bGqR2ll?= =?us-ascii?Q?dFsbGFaRp/Wcdm6bT/UQc5tbdNhcesuFRklqoSnKnUXyWNi1teUzchLv9QTY?= =?us-ascii?Q?PjemjnNcw/YbnQbYC++6/s8ENx7tNZ5grq+QJ/awrD6MB5QIALcMN8savoxN?= =?us-ascii?Q?ssW2noB20ijR6PUZ3H4VeZKST+kItwnft5NB0puIOgj0XXqIWZ9Zjsh0HtAN?= =?us-ascii?Q?cAWB4xd1fWO5wai59il+FPH51A2XV/Rx3/kqt00JBFXjIl7OLGj8yPaRScis?= =?us-ascii?Q?X0rBerQp32SUhI2XK0QFKUoyIlqXSUoMMBVeUhE2D0xG+BZ8YiU1ZqfrApdp?= =?us-ascii?Q?SAVwDJHEAGwk9aeRQVMGILUIlFYlich0hwnxnmUTyIGnEt9woY13M8DjnPFm?= =?us-ascii?Q?JbdPwjzX8RT10bohE+D5GwAoOr1x9OGq7Sk5FFIdPCd+4lFKXCuXit0TS4bS?= =?us-ascii?Q?Lx1kJmSDGAzo2zWQskPY/jhVFmZ2/TOZbFvcDgTo3pyWV2Iu6Bu1x2nLal0S?= =?us-ascii?Q?SGAMvw+mzIhHO6CmokZpPD/KP5W/Ma9il+MF6GDweO+unA7S/bDLB4kIK7/E?= =?us-ascii?Q?FullVsqkm1dB0Uv0XzLtSWeegDOWk5hlZkE++qv/K6PjOyupd4n5iHIe2kPc?= =?us-ascii?Q?kw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16ff7d0a-0f8e-459b-a292-08dab353c986 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:02:48.6671 (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: mp+j2fZg1W6UmYr4xjQwZKpVUQwR7Sr/A7N3yBcQ9GKhWJJxBszK/xSrviwO5ZLM1u1Xgp9igltdyjinafTgag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8245 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c55e0fff6a18..56c76cae93ba 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1563,36 +1563,42 @@ 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; + } + msk->sched->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } } =20 --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80054.outbound.protection.outlook.com [40.107.8.54]) (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 274A47B for ; Fri, 21 Oct 2022 11:02:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mtx1TMShHti79td9Vxk1aJG0uJRQUcTTr4uhfNbrvUdXDx2Md3yXMFip4OvNbFSIlSTZWuHVB5+K8T5A4r3no2lmEIZbnlBG2Tn74G3kRMQcPrkByuRRcovcnC0X9CiuD9zpqpUTpmmXcSLLMvPdLs1k7nuy2gSMp/OdW+FREuVUbnWWYqGGEomz7tHcq25saEy3Bxmgw8XXLjnsiKFIecWG4nYxFJSGR9hpMs7jbfHB/emsZv9rGmZG6eR/jsRuIqndDU0tMBNDeY8hSBjKm7qjS9M+YyiVhEMpQRZiVrL/n7xCAU6z+KnHvPE/CafyYEdfUDpvvTs+UZgdXmz+Gg== 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=5vEDYqrey///f+dfd4hXTL5Sic2aadMAP4A10v3UJzw=; b=RzY/EErOaJ+EkxQFe0CIltJvGYPe1rs/Z0ptU/xycy1LYdSv6jUlv6cXrYFvbHo7PTkXvX2MQsFVVrPuGNOeIM3XJ3wg1VGD+y+pwSgb8Zt6P6hdPTh8VD2M9b4o5fJ4Hm25TXRMPrNvo1Z2akJmgMoW6gYTqd4cXaXlrlZXPOwu4Mq4KzvbDY46+XRYEypKx3ZJl0OSjXQ/rS+PADG1GdEPZGPY/+Gfd//I75OTBTsOfpdTMFg3VB7ciox9xnDcMz/Gl8lmA9NxG8yo3C3/8UhXqrTB9/ruCKqX+Qx3SFE177GTay/qh0Vuh3pfRLmX2jaLqE+ENXGxRfcF4OYOlQ== 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=5vEDYqrey///f+dfd4hXTL5Sic2aadMAP4A10v3UJzw=; b=dtiE0MhVIPSjDMzUtKnc2f7uvFw6p17TeetHv5hERQwyI7bL78Ht7i9G9mgvQT//dNFigBgzwCAT7bJ+OkxSt9hMjkcs1nQSqg7kqPOQD9bsD5qeU0r7Kp4g5QXnzBK8qoFLZR0/hcXZmuNvfhOGumzQ/rg3zSoKmFj0tHudDZlirUUf6fXJcp8ysfov1RvaVm4Flf8oMkLa9q4poc79B0RnvoiGZxnM1u4bvoq36XQp5ed7eBkUcQ8hR7gXqG4KhZIZcXnqjTihbOOKZXSmQcWzuiauSkBXIgLV7g3KvTrbtC0Yhjkxr0qYPVV5VwF4Gf1NySGlRr/mlbvQkqUN3g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8245.eurprd04.prod.outlook.com (2603:10a6:20b:3f9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Fri, 21 Oct 2022 11:02:56 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:02:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 14/19] mptcp: use get_send in mptcp_subflow_push_pending Date: Fri, 21 Oct 2022 19:00:06 +0800 Message-Id: <9e8b82d557eac7f826282e3ac2a374c72e820237.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0134.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8245:EE_ X-MS-Office365-Filtering-Correlation-Id: 14a01d02-7ab6-4025-d4af-08dab353cf02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OF3nPPjfm5WG+wOza+4Fkd/HyWZFGpua/gAcYaWYFXdsnDuBiebteKXu+r5cSQrfliVD0UvN2RzXnl2xlSeppGrQuF7yeelV7yCH8HdNu29hQhcfQi+u3s/MaGBDT4sTtDGSDOCJJ/NSdgtPcQXX2xygN8XExoGu5Ra53HSGQt8zy26L6em5kDj9EtNgmrystqvDMAYsdP/KC7UnE3DctSzalao2TrjReB5/AwRwFJ21tG7GaMRKKEJ6SoJsMakImXSEBJJRPYc/Y9zgYRprd9+ZebC10BV919DmHYsC0bkEsOFdH1u5PDDsqLD3yTqCZTtyMXTVqw/U1JlizxilXv5wMTDDMZ59SJVp+dn7pLDqTkNs45JE9VfPhLbo5EH0lL+29hd2PbbwcYjETdJYujMHe7m28YQgfZlVm1DHIfzunzUHkwdFtfEHb/0uBbF76UU0Z4hg/FZE9SjElJMvPYvPrRgVG45wJNFg3Ytss8g5PNp4G80uOJ/0gmI+ujwyhRp4xsGcs6xpnpImPbomsPg/c0pXxm0IH+0Ja5Vi/p9Z9ccK11PUb4Unc5izEQtjXcPx96M+cbK7kDfBqJ1j2RWc4fmqPV3bfqHNUElLFTKBOG29wOEi7xEF1oVelfe/YWKiJvao+VVs29LBhzZ0OPCAjieO+ryXKeT+TGrnBYEK+kDqPuqzaIIpZlMORhC6VGBMFbie0D8FanPF+/0mPqFTSB+ERt8fJx8qBgWLollpfmG6lnDwJRZwBdFA4QMO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(396003)(136003)(346002)(39860400002)(366004)(451199015)(83380400001)(186003)(6506007)(2906002)(44832011)(38100700002)(86362001)(2616005)(4326008)(107886003)(41300700001)(5660300002)(6666004)(6916009)(26005)(478600001)(8936002)(6512007)(66946007)(6486002)(66556008)(66476007)(316002)(8676002)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DkIq8gVrYAvkf4youOE88lFR6m+BKaKGwAEr21TrpmjpKgk//2ijrJKhJqqf?= =?us-ascii?Q?wWydLSXL3C0ynRtp70DXNTwoKvXKXQpkv8PQ3quLDnj6h8wncB8+TNU0c5vj?= =?us-ascii?Q?2s7QbTEuFUIM9Z941Ao48846MHTZw724tzZ8YGbx/zn7IJqIVBSffyKqoe5m?= =?us-ascii?Q?lMizwvWvxIgy41zmp41VmRScedZmEDUZb6tsZ0rcCU8WR3h7VOwy5Wf+GnF0?= =?us-ascii?Q?N8hZRdgNA7NozHeswj30AZcvE8PmlDDiA9fM91aEtp1mfplWqjmBxvUpYGZL?= =?us-ascii?Q?6RtuhWtpjiengtdwdnSldrrM+A7yQrzLhlUjpnExJo1SKz5y+fdN35X2FRjk?= =?us-ascii?Q?ge5FiEh46fcsv6Ui0fyxxDzlnYOUc7A5ykEEFplXW7qTnppEAbB9IBL8uHiX?= =?us-ascii?Q?fbrSjSwDo/bHs9MZD2als9tVA8Kyu3hjkxjacnHq2McA1lZ7A96pN1z1vtk7?= =?us-ascii?Q?Eqcm942yQFV0t0nuzdyYx5MsKlBLG6uFYm0xy00jEmRagkZUwEw2f1obbRRm?= =?us-ascii?Q?Ob5DQLJLITzj/E7BPtV8t/Z7FXUL7W+8yT4YxinPdLBSB7Utom8c7cIWEnxU?= =?us-ascii?Q?0nUOdRscxZclph60kqiUTz4Bo+5oheOeHgwStoA32B0wFSWnNnRV+TyMv1AJ?= =?us-ascii?Q?md1jpDKT5bKIxinbdzBwNtf/uaveinv41oUshxXMYJ/PjuXFJv+O+NrOI0fX?= =?us-ascii?Q?XPUc4E28pCb3obhDLl8zyyrtEtU81bm1sbqT4c0oUwfLixFZxPvBxvI8FRgm?= =?us-ascii?Q?Yd47RP6cT7OwAKdkbBelbkgezkGEYJv8O3/PVz4uHB6XTjKOvh3tb1iA1nw8?= =?us-ascii?Q?k0Lx7R597x9e7/MA6HD9MfYXeS6f2nn3ystkiBhjJpxqw3/Fq3eUUx2g4e5B?= =?us-ascii?Q?HIRrFJ+brWtCYgRPiy6R5aGinhO9BpnKl3dVHdeiT7uIBAQXL7oli1JH0rGy?= =?us-ascii?Q?hbMTo38UY7sdQvlpwfsCI9Jg93RqnW6Hj4u2D4PttEVM1Z6ZvwxgazMEeOGG?= =?us-ascii?Q?NBxaKMXWCJsaAOt0DJFhu3BfeTEP6ka6E64thd9BcTXyXyNRDm1hw8BnRSzH?= =?us-ascii?Q?pIt4EhgGc6h8ewOLvlVsWXueOanSlnXMkTgHxGW1xPiSSgXXJ7+pfYx9/AWS?= =?us-ascii?Q?v2tke4TL6lvg2j9RTZCkA3b5ljrX08WuPe0jnQOT/0i/eT+AXGKMV8tVY/Ve?= =?us-ascii?Q?Q2WJGiN9DQ/i/E1rNAGCNfd8a7uX4wVrEX2ZL04LALLGl/qvd5cPxfTLwZV3?= =?us-ascii?Q?lAOeDMqxN8iM1N/ReDPvyyQyrG8jqtAZa5chBaDyWDcE3ai8KLynVL8oURE4?= =?us-ascii?Q?Jk392qGtzqQOtSMTQwHFe0JcAjXkV8vD+HczU5iY7keS/AL0LJyZ0xsdyCfv?= =?us-ascii?Q?BQqGWcJVs2nAubeaiWHsSA+D9PCV6Ysa92QMZj1t4yWgiAfAlN2eAKMuaXQR?= =?us-ascii?Q?WFfKDfbKnOjfeIynDukmHY8X+DmH0eSO/tMtLGZxDpckfWV/JWp2Rw+zIrmE?= =?us-ascii?Q?uFDec20mBzhForq4jqjsCSxOe42osm/48fACYQ14nJfiLAiWAPULognQaU/c?= =?us-ascii?Q?45HmA/3Rdd1dC6KR8o6g6usDkqVJuq+XexJCfWCQXlcVwSWL/6yNFa2iz3eu?= =?us-ascii?Q?9Q=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14a01d02-7ab6-4025-d4af-08dab353cf02 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:02:56.5573 (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: mujfAyGlecWqfzMsI0aNO4Irmr7rfL+Qps1VuKuwaFN4VZKc3OUQJgnW/eZ3aLi/X7GtziyU8sZRi7n0EbxMoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8245 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_subflow_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 50 +++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 56c76cae93ba..0dfe78c0856f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1617,32 +1617,54 @@ 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; + } + msk->sched->last_snd =3D ssk; + 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); + msk->sched->last_snd =3D ssk; + 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; + } + msk->sched->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } } =20 --=20 2.35.3 From nobody Fri May 3 05:20:03 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60040.outbound.protection.outlook.com [40.107.6.40]) (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 248B47B for ; Fri, 21 Oct 2022 11:03:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JYDr/YQBh+RFfFKS+azc610n0aUsXD6MXI0N8c9BI3RL5t9GyxUm8WNxeHu7OTLQWuB6BXAkomPdIdLYROoDGwT2Kxo2oO1t6MMTiROFw07ol7t3nU+MaLu+bUBA4Pia1gEUyP69stP2YFlidpxFCKpPe1efwhgdCQR0K1LEuPi/VXeK/iZyipaw14QQfYIhKss6063BdbhQ5IWipw69ypTFXSuMthtz3J7Pqs18aEGfGo+Emiyr/BU9SKq630OaApZi7FkjMSyZAoEWdCh2xlMOg0YuPdqB/aqLyGbzcXT+5/PUrDL90lGS7t/DBSEYVG+Hbd/lPu4ARCojt94XuA== 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=9/FArWlz71xqmit67L6LC5+GSyJj9Up5h9y+kOu+gyQ=; b=nXwtIQv/9RjB9TCDdugrdeYEArnKUYO9d2r2+4DttIc3FBcxHojlq162lieKrkfsEjtr2Yy6/+e7lJpWXWlJIzBFhu+0e0DlFSh8y88V/gUUXT6fnZH4ueJomZ+allQISwjyy3SpeIRJnfIaVi5AdmtG/pBUAJNXnr769fpHeQdv232E45I3ZnmjHx7urYWcaPJO0FDNvxdCf+M5usKJD8XJvqNPoqfflJ1mHzO0H+Z1+V/OP3sIEWM/g4PvZhtxNU4sA771CGS+BQ1uJKrtkVCXa2H53j4U5HKr5ABXv2nZMVfNrwCRySavFt7EQ8B2nnLPDduq7gifmziuUsPq2Q== 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=9/FArWlz71xqmit67L6LC5+GSyJj9Up5h9y+kOu+gyQ=; b=ah0Or3S5OPbj8Ikcald1ciVuoV29SPn+tk6gp5zLF3ZG1bnE+FFcsqpWGWiHevmpm1n1JJ4Yuwo+Tw7aLLKmOj6IIvvAdmVzvK4VsPS74gXD8nxfItyzSK3w/wP/QordpXYte3pJ/HqITRx0YYrrgKMTZp0X/kQ5NoG7KBgPT3jSpUAObLFyIKPuqfJSHkhagZOyCBUt3kLTqcIYi1HgUfmUbgWJUOuJlkpwpfXF648ss93OrNWE4mVxZPqwqEpsxgIAnCCvTNPkImBKvpZJi7vzSvEPkc0jfR+yGtTwYCOoVJ3+Yz5EVJT10CXiVGTgIrHlgMat4A7Cy9wx6hd+FA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Fri, 21 Oct 2022 11:03:05 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:03:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 15/19] mptcp: use get_retrans wrapper in mptcp_retrans Date: Fri, 21 Oct 2022 19:00:07 +0800 Message-Id: <9add136b66cb44341e6c125ce518cc5df1262ecd.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0124.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::6) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 01c65536-3ed0-4ba3-4619-08dab353d43c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OtgcnixqhadNkJQNJuDldI0rahxMM2YtBZn2qjpvS4zFuXFxuWqFTzrdZ1zd7MYJAqyY+gH0fq7sUuG6XFrqRVUs8oCOwVKyauUVIvmPOpV75YvNF+DGyn83bavM1XWefMqdATOZiCCpI5B+vTRPjM/mDF3CKZFVjb+zGvJ2QmFy3E5Uf66P39EnMI8rDT/eCMLV+q6phbe/rRRvLuHh/G6wOUeDFD0vyDpD5Ekm+Jn52rdkNcAeGJrgJvypRx+GFeGbUkovwxnU/rLfY4j3sYWf3IySKB6qCNF1OFSz9ZgJOLe00htxuP35iiePhQJ7xJBMmeFeYwXGOGqtExmn4o5fAjZ7GCER1xxmP/ieN7pywQ+A0jMkalvMGNdQIpH030d2s9xRnFL9hws0+oHZUkbTV0vlfX1Aac+o7Nq7vWAf6P8SSIfmJH0I0eM9sUFdGFVcCGbYGXQwUxe2Pk4efpms/L27Hk26HKWXetQrqEF4VLSGST8ixw/swmW0FsPhbJFeSejwai9ttetimJocLvUHORcyzMTfs9gmOD/ThtTY5Wo0O6aO7mBwjpX8k1n21zdKtU9F5l34hSTg/1L811IdeMUSKNadU9CSAyvdvks59PZ5omifeSi3hAZCLvHy+lBf0Twg5UIkvklhywUswnxPl9/MpGsG8IkXEU3ZN7iZ4GxF+b16/gdNZtrixHzIPIVJK84KAjj3jarM9FphNruLYAjKat/meX8Sx1dGw8ENIKzL4hemkzmKEZCFi7A9 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199015)(478600001)(41300700001)(66556008)(66476007)(36756003)(66946007)(44832011)(4326008)(8936002)(5660300002)(6486002)(6916009)(316002)(8676002)(83380400001)(26005)(6512007)(38100700002)(86362001)(6506007)(107886003)(186003)(2616005)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xsKO7flgz8ZhvNK9NfrG9vUfVh3JC0IRwrmlsmtxWDWX+wp1keV/99dpk0yd?= =?us-ascii?Q?WmIh7nKK9uNtP4oPmXlSuz99Xapkxl5GIZ7yj1y80Ap1arW7P4x1KwQf+vo6?= =?us-ascii?Q?/E/uP55IDVZRxb2Y7WoM5dHjW4HKTcfM6qlHLuzLauAJUsKhFMvDGwi42r3e?= =?us-ascii?Q?lGWORvTpu9RX75QAtTU3e4ievrGl15xPWwoVFsKU9+efzH/K78xqjUvZRvO5?= =?us-ascii?Q?OkIsYuFMWu8nKmvl/LLP70RCYYQ/GKXOBrB6YaClBBWvioV9lVyikbEcRON3?= =?us-ascii?Q?6OHRwYc4ZmGYCJbv5i7KEErWGchmkZYc73xihtqH2YH8c9zW8Px2w0y+mhIS?= =?us-ascii?Q?dslPgPYbrkqNTBr1p9oCBnYnlq/ra4LznuEerOSrzz3ikTrDnMzFJsfB5iLM?= =?us-ascii?Q?OxH5cjp2dSvbqsN8N1qH2lXHeH2/mMhtO5c97V0C28K2BJRs8ssTsPIt+XF1?= =?us-ascii?Q?3LOrWo8EjSh2b9aaVp0nWzm66/YCRhQOmyu2bGgTb0xMcgAcAziZbcMi5QXV?= =?us-ascii?Q?L8wxtpJtRp1oW0bV/neg0VpsHUcz7jtJAp2w+ADniT9JyCdoskPfQA8kSHf0?= =?us-ascii?Q?rzkaBhVzIMHjjQuUhTCn0TVFod1dJGRA/8mBB5yH0Uz9Na+pPIgMWRBZG1NR?= =?us-ascii?Q?vBDb2dmjQIA6Teg5zDKAcFutuVBcQQ4QjHeGu9sckYk81E7/4jXCjA1slEUH?= =?us-ascii?Q?pCD9h24cBKjUTjgz7QufzzsT05AUp+jklhLeaNPjckvBlxID5ERNi6xrSkTA?= =?us-ascii?Q?4ztzZMjDRtU/8J9kPkKb6yIHW0AitEQC+QcfG2d9wMXqx7af1mpg/j4dQ0Jj?= =?us-ascii?Q?21oPeW/OVRzkeedRKRZtTuv907FF37Sk3OrzORI8cely+/V8C3Ep2SM1mr65?= =?us-ascii?Q?ar5e+wyvVvNfV7QNSnYMGhhcCDWn2IIDAcn+Zdqb2bSq61075nuugoYirwjG?= =?us-ascii?Q?cr729LTSRnGdGAHCljIoNZ1bCGADfeUTCLUAoskV9BEZqxxRmVpmDJMvLfTF?= =?us-ascii?Q?alZe1aCS2cLhnnpv1alXsm9dHUujnmO5PfzBDqWqsQM3gfckgUqV7DVLxEC6?= =?us-ascii?Q?F8KW4+GWxGkv0nxvfO96w37+0ecv4PoOsc2/2LohGwl5CiWhfSWk8N0KdVjX?= =?us-ascii?Q?N00ORpc7ZEZXctXupvbQGY0wFnCA/gNHR/zd4AWhtXXK+oh4UxN/5DHseZpo?= =?us-ascii?Q?zONmLRO2V5MxAlJe0zoqAYc/5/ueK6PTidShuxLKom9OIBUlGOpkH9EUhsE0?= =?us-ascii?Q?nnanWdCIjO476+sCVhcvzyPk1zN68o4vDCWWYF/Sc85X1itiTKl5WV4xBKVK?= =?us-ascii?Q?A7rg5n97z1onjS1v2CuSkulz9ntSUf8WPbaKBpAB4cscBLJ4ur9k1SkekKbY?= =?us-ascii?Q?4cohAvWSNygPb/DeGycn+aSnU3JkLFtVwVmfCOAd3gG2WV9XgR/qlVhUrhSB?= =?us-ascii?Q?koC3D3D27x1Qey+i9SDJrlJ9nLpI3cr84fsxt0anDBFoK84r/3jBPI2jQdZL?= =?us-ascii?Q?E170ql53l+SCgJ6KBQvyXq8r7j6VZj4M6T21211Eok+3dyrvk2RbHytTUEQp?= =?us-ascii?Q?rvIkfyUF1EMT08YPuKgQBbrgn2wMlM+KGNGPjjnz8LKE6AFzUTc6oLPATlWf?= =?us-ascii?Q?rg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01c65536-3ed0-4ba3-4619-08dab353d43c X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:03:05.3848 (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: 7Z5YetORBd41KJBgAm149gt/ku0Y6gfELZ5vRURPiaGKOxCAiUlr94MsxuX7stnaXdKp8j/hQa2Cnv1mJICD2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 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 | 62 ++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0dfe78c0856f..3e8e06448261 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2545,16 +2545,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)) { @@ -2573,31 +2574,46 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + u16 copied =3D 0; + + 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); + msk->sched->last_snd =3D ssk; + 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 Fri May 3 05:20:03 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60050.outbound.protection.outlook.com [40.107.6.50]) (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 574B47B for ; Fri, 21 Oct 2022 11:03:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KuOPWkEcbfcCVWDqw5TJLrWprjkHBzOpQkpU8+/cFJKi6+Nohgo4X+SPjLivVPm6ICVzUrP40rBi4NiRjn6ofJO/Q2XiIme5sLFCivxyVamfHRLlbiO7TWwo5Tz0VsC1mot30eI2cBC4pbViGy20cp9c+lToYkz9PDrIOkgdqgDkZ/ZgmQJWdB68y+C4jTkWBpMAKUKx6SmYg+BniYr3T0lED/SJi29lIeMW8vUAnw67VwNPJkLY384YjjBaw5whGdjeiOtzWVFyFogT5S+yXiBSx1cN2z90SKtQMKf7pAotND0JZEe5EjZYzTcZ7utreHc/SmjdX4W5gWfhzWQUmw== 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=dSC9e5WlALdvL65tIcGpgi78Dd4+mOZga8dVclXuxsQ=; b=TxvFk97PJtXyoSQSOrnyKd407biaPU2r4gS9tBvM+5lsV2NypMixj/0UpY1w32jyGsPtBMqervAp7z/KFURQKpWnfm6WXd36v0XAV1pzCVPZtJnedtKvCl3uz+iR3rVtNcIFyTseTFfpLzfwdZu8J1kiOxmRhghNXjpraXkA05tWtvHnsK0hby9icqVd71vdb5BuA3ELlQS3uG7qCmhdbxytsNWrSXWLuc2B8atwQSnkVJFGkcCEgcuUEXexT/98iiysukQo8UkWfbVULU9GxV5nrIxCat23ImtmHhWwHq4jv570BBuiI4Ryvbit7LW5mul2aUiCQBEUPF5oBfe1pA== 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=dSC9e5WlALdvL65tIcGpgi78Dd4+mOZga8dVclXuxsQ=; b=M9LYYWOqQl47wQOCZOJi6+d2EZo6QUlkXEp8mwRTVs6N6DZjzzTH8cPp7k+xS04OIUUT9IMoP/m1Uk96KMqfBshiDAfbGj/OVC3pGKc2LkbTF1RJOxZ5AR2oZJu517aRHtl6wrQI7n1tArpwKZLuR4UDEAnGtoJhs243V00dQBE7j7ZNRv7VT6Kc+FLkqnkjDQgbi1oHeT2LHqzAYBzT+uIG4AIiMq3bbA1Kg+J4W1KQIXWJPbjc4Js+1YwVDK+qAVm9Nzc00xa2PyfcAy8X1xOVguqaxeS9YwHDRENfFwo9FQgiIa6YfIFfWvWA8b/cmZkKCACB5TgkeqtulLJ8bA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Fri, 21 Oct 2022 11:03:14 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:03:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 16/19] mptcp: delay updating first_pending Date: Fri, 21 Oct 2022 19:00:08 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0130.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::12) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: a39adfb6-e074-4509-f2c5-08dab353d970 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: clxoSkS0MXrj6eKY2sRQZ73YmKBBjlaVAxQTMXMyEvl0LkwxOiDFEs6PBggLTgtUHaX2sUgmuf2jmkEkrF8VqkhiHPMStbQpwkfxLodF2UH6asEsztCi16cqU56HPhHUuTgXh9pvzv9EVFFmPg/kiB0fnc6bFUOzSKbaKEOO//nNutu6ixZxHm7XimmRdrDf1uIiPi48iYAnzSxe7xIqTg9MnaQSF/QCooVSomwCICjioZsaDEV4fKMZ8jDD7dbQWyqOPx6DnsxVY4qPwJPCVE19ImSiO3Zc4+pqKVupWzBIckVsduze7acw7i8dYzFJtxo4X4EzfhhYah2+uqUxFGDwHT+ftwBeZgYYtPL5lnIhoXC1H6yb99FrpqDQwE0ynRiII19lfxOHS+PVO0k3Meps1LeQxq35n9LRmQzeO4fXh+cIz773FFIEd+MEhqOl4TJpXg81XwOd+GLy8mIm+xAPlh6dsmFMyCP91HDH3n64Cqm3k80qEOX5pc7LBCZcyqpE8xDDm2n4TPtFvPkx4zX2kllhpzj+kke+rGTGcQwaDCuzV7VidXr6tZr9gtwjyfRrgEosLVsqDJIaVc3yHGqZyWsz5FEeTqOWqEPTbibCLxjA5yxgBZQVlWY42MfF9h6Bv92jyMAYnxAboxYbzfDqTLHqsh2Xu8KjDhllLKHaUQDw2F6HKUO6SSgubfTg41lCfsjKss1Sr+YdyN4HOLHRH+ArDwi7MCka2IM9yJRxrUgn1KvQm7gJHoEpg/Ay X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199015)(478600001)(41300700001)(66556008)(66476007)(36756003)(66946007)(44832011)(4326008)(8936002)(5660300002)(6486002)(6916009)(316002)(8676002)(83380400001)(26005)(6512007)(38100700002)(86362001)(6506007)(107886003)(6666004)(186003)(2616005)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+Cq3zhuqYTUXs8VAUcHaEQeODjxsohBwlJVBG+MYPkcZBUs6OPpDCkpIe3xt?= =?us-ascii?Q?lotr/4uZVfNc21MeE19E+0hrQsUmYgBkJrc0l2kcoLHnnKTjRtgVtPEEvEr9?= =?us-ascii?Q?oAidfk5MOn1HqBXKdGYBkOlH9I1Sxptpgob2DUPtedvT7+cfrVRchn1ufpwb?= =?us-ascii?Q?FAjbpGJNPGeKxEFWfpQ6Z1YU3kOHlzGap4aNU/AsdedEtSnflTXeEjwJS9Er?= =?us-ascii?Q?L1GT0xKeL2avP8qygZ6ydZv0bjKRGxpzzrQen0AGQdodaQRQIM9qxFcPVnLi?= =?us-ascii?Q?TePMUA0bKm6R2zR2PHMqHQjB60Tdt9WGir7WfvNvgsbQxQhBSPCkSB6F+WGH?= =?us-ascii?Q?YWzrFwKkSk5zjzk/MA6xZup+eUGtv6DsAIMMR5EuHk6Lu7pwhIUHzWqMFZYk?= =?us-ascii?Q?bUSDKj8Fz+G+I95702XdN/0xjE1KLesqrjNPfpg6scCZxGpjcOkkG6uNlsr7?= =?us-ascii?Q?lHx0AaF2r9buenvZgLyczsRqPxMTW1RtI6uLXpgL5+1/dIDuKVCD6OSyd1P3?= =?us-ascii?Q?fHwFBZpWKnp1dVG8ouumjfHEyPGq9uBGBdMMp+uiFhuG8DBsqU40ImL7DRBz?= =?us-ascii?Q?Hlq4u4c3nje4ZoRmuQJq5KOjbpc4KIyiEb2VlMwcdWnsZMKDRbLI21BzZZHT?= =?us-ascii?Q?inrSPNX/+cRZ7FouKMiNevptc5YExMgEgDHax8dURxuIKnpjumY6kEtP72i/?= =?us-ascii?Q?d+d5aKh1oLSqS2fotH+V/xARZflISUQLNhsZRGTTdp/N0JSeiRLCpcZMW1rg?= =?us-ascii?Q?Ic1O4TOuLf+E46XvCgfuxmQcRqosjZZ+7cLvDduM6Lmq6edzNnJl+dyXp9ss?= =?us-ascii?Q?BN1EsikmMKu1jXvU9e4fT9RIO4CTrywv2yHolkxwkX6o718W1LlqfpjoYCCw?= =?us-ascii?Q?KXhJ5repWEvDfUmnm5uXPIxaolw5rf8XpIzEwph8QLZv6xePo7pT1CttVGsN?= =?us-ascii?Q?Pm4g765cvg97c0xNKAN/+qiviUOPFfs92JEdQ8gnwdygZfd41t4HunaCNALO?= =?us-ascii?Q?MNf5QWo2RLEIhWgs1WAtmiF0GYHhEbKbFsdCdFaHSw5GPnPtI5+kcv9ptKmp?= =?us-ascii?Q?srbAFeQK42cPwW/lRoMhrH48qikEbvK9UyKBrnmVanQP4RC1sLW9BdvYeAEh?= =?us-ascii?Q?+1rBsERwtSTpx8JBohaVeJAFBzzCQVRDDNnICosaDYLkLDqbceejflzrKl+m?= =?us-ascii?Q?PomdcxbqRV2ZGCVkSROwkOOYFZwHxQGhRjLCk5XoIrX0t/5WREEH8ufKxn2B?= =?us-ascii?Q?UZMWcpK/4igIopc1xOoCMhIsBo/4XYpWFtoMSVTy/675t5R7ViHvThrSmOhq?= =?us-ascii?Q?M0RKZHaPKZR3rwJ09Zm0RAZwD/EhpV41l/AXkSo40tAT8jeqSSluWF3Zm/vD?= =?us-ascii?Q?GFrKGrHPcgjzkuJH+5YIJvec28b92Rj5A6LLPBfxVMcXFeilVgGdCKHOV3cO?= =?us-ascii?Q?N/a8x79bi0O0J3UvD0q/YA7lJ4REue2XjF0Kbl5OzTqP6pUhv9NI2tl7w78U?= =?us-ascii?Q?TZxaBcIOUoIRIFOn5a1/ltw+b6zn/Y6ZJom4EAztJZRcBX+GXMKGr7e86FX8?= =?us-ascii?Q?XpLVx+xEhrpX8jTYngI5nAoNplL3AeRoedXOGfm+FI4jjlyqFG/9mhSVN5Zz?= =?us-ascii?Q?pw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a39adfb6-e074-4509-f2c5-08dab353d970 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:03:14.1499 (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: WEuc/1svIt0d1ZYzXttE2Nyx9SSQnwoZpBBwRpTtu8+Dh3AhpzCRsfwGslgGBLkXtmVQeToJhqO8Shhp9z7uEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 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 | 13 ++++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3e8e06448261..26afec5bc212 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, @@ -1511,6 +1512,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)) @@ -1524,7 +1533,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; @@ -1543,7 +1558,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->sched->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || @@ -1552,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: @@ -1591,6 +1607,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); @@ -1600,6 +1617,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 */ @@ -1633,11 +1651,13 @@ 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; } msk->sched->last_snd =3D ssk; + 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; @@ -1666,6 +1687,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 74e4097f9ddb..262ebaf93e9c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -347,16 +347,23 @@ 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; =20 - cur =3D msk->first_pending; + if (!cur) + return NULL; + return list_is_last(&cur->list, &msk->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 Fri May 3 05:20:03 2024 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2075.outbound.protection.outlook.com [40.107.103.75]) (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 640A97B for ; Fri, 21 Oct 2022 11:03:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZNfcfV7YGGFRiRyAH8yPY+XjDzDTZi+4VuD6duwGJnqn6KEZmq9YRd1zBB/TO0Ys2LF2nGrTnmb6d4gc9lWpo8G38TihKNnm01GXSbZG1hFa9b9LeeyOPqgRe6K2mWgTN1s4NJ32jX7DlUg6Too6rGiqkDTWzGUS9DG9kBtyKsc02fkRQgNCxL7ABRnULmh0gbZDcy9wYrnIosZZ5JG1f9IhtyCqmSFtgtX1731jgYM/OJBwGvhsfc8nG4Q1MqJCeoCrGVSZQPuzF4cb2vVZsVcoOpneoTVtbhBTbJZJQJkYtHQxkprFIlVV1y6KeBZa3mOV2thz4WNOY9vgj5Z5Uw== 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=wsy1TKYm4o5iBbv1kiurZ+1UnOMGb9rFmN8R8mi6nVo=; b=aS+0W9gtKjDjRxQf3t8AuqMFYRehWDKU4zoFe9eUYTKZ+VbsZjYWFN1cx83+PDtsaFJXF/ELMz6eG5bZSnkn9iKMY9qcKD+bhpCx7pHsJf/CqzQv1/QStprJhvDLLceMj6TvRPfZPaOBInRVX5nXPAOJxIiLyGGtit9ZcSEwA+UDKCySQuvvNgig9W7/KWIctNHthPS8x3S3uMTOddkHBkbsXjiq0jVhCuqfk7jnDn8RIKBPeULgu6RF45xNdn/VxWlh/WbrRzYmrukL36+8H5mh4jMYNE8ZKZ6AI7NadiZoTzFaEAtP093jS8Dw7Ecm2Y4G45xHUPmoBWlNulwBPg== 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=wsy1TKYm4o5iBbv1kiurZ+1UnOMGb9rFmN8R8mi6nVo=; b=kXFhNz8ZoKqSYOlVn59nBpjEcN2ATpB/BBOJetYjd8WoxwUvAfBQGOE8EPSbcKUbB1B7wrMl0WfZofJVRJZVDO8K/tlNj/um7Wn6oZmSKLwMY48TZaYMuGWnQP040Ufb5yZKEU63mD5OMKlV3exnF8HLCW1l3h0v52O9S9tAMxMZSH92mTjvjs/QDjnhiHFGsPT4EZGQ0BeDtfjl8x17W58fLqVlZrFYHGAWTwAg2CKt8VbfmIj/eEpsMasWtFDYCo7UfMP5TncXjLBfh89TRcWsITvv0++u1NQ0pys3Pk1j1DYK3XXjLlR8n+3Jw38I1ulY25H3CsmI0A7Zc7KZUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Fri, 21 Oct 2022 11:03:23 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:03:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 17/19] mptcp: delay updating already_sent Date: Fri, 21 Oct 2022 19:00:09 +0800 Message-Id: <39168335db0f872ec0bf65bd8589fd74edacc363.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0131.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::13) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 77eb903a-16eb-4385-4bc9-08dab353def4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wgcvrrIjxTUtWVxwttx6rI9U8/o4hDHekeypRON+/vEYf8K4dkf7taVSgLLBtMSegiiEZd0yerJHarULxajhVNI6EnXrW1WX+x7ITSfBLgUBbCyV/OL9SrilVGGee/WzFksESiNIfp0TYCr37/vagZg3DP+wQselmLVlfaunfeaogezgKIVQehjebqQWSwIZpE7LZ6OQazL83TtQqAh91QMHuhFOTMS9J4m2SRMmmESfpXj10P+6Y6xiqbOvwamIPHmFKGharVdyRFNBUeMVjbikmFbcoCNawKDxVhEEHVzj08EPgTagPZqw3aaw382bXzu4VNmdtPJzlc8CmSG9Sl019c3JHQ8tSj0ZU9hgsXx9F9rF4LnM9XhpEsLdCeQB63wl5cgsnpTjfd5dLBtNeBka5BY87COXs5cqj7gCEDtpbptHXV6GtpK9zAu6ZPw/12mSWDcFEaAdjtYCWzAezu7GXErnFfhqmDayZQYqtp/QHVQhn4j9HCaHd4TWBdFKLKnbin2Bm5OnZHnosaqmDnQM3jvNLyapllDdq/VzJcX8fnaE/jzlLGEoeYuQ84necCDQ6Du82sFjnxf8Yg3ppwkcxlkYl4IL/Tjf+oVO/fDNp0ztstzGfkaFV3QMyh/SaNKLMKtvJ+YMKCzMIdSPnTzxS5OnO3o6ml4k3OrluKodxUCa+p7MLOR4XA5r8a9qB4F+Ipxe4BiOuzID0eubsWnIOdR4sP5NuwyedAOO9dThmu+sQG0kVxdHnzwQlKDH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199015)(478600001)(41300700001)(66556008)(66476007)(36756003)(66946007)(44832011)(4326008)(8936002)(5660300002)(6486002)(6916009)(316002)(8676002)(83380400001)(26005)(6512007)(38100700002)(86362001)(6506007)(107886003)(6666004)(186003)(2616005)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h1/SUDE5w5XthGZDj94aEJ2QryesvbP2xts7iwWkR5MjkzkcK7QmaRoXvdHi?= =?us-ascii?Q?Q9ZQPcsDHQyvHJ+zSPjbEATbQx3xOW2rYsYu0raTl31AYrTyyyvkI4yaiX5O?= =?us-ascii?Q?6JAQfXwQIgjUsl03a86GKYT5B6/e0cauHpPYkOok8zET2+skP3XxnGHSu1j5?= =?us-ascii?Q?uPXu/JF1ghom7AWPUruGHZ4p7EC7IBdcgLDjxrSIC0Hx5l9/r0mVK6NEEWFX?= =?us-ascii?Q?iPbSd/NmBc8vTsXE7y17wjXxkJs2JlmO2gor8vLAezSQdLRHplVCbNlKxAco?= =?us-ascii?Q?JGsskit2EkzWS48rqx0f8cglZc43wX7ekBrdoayMPeb5jC5E4XaTS3LRdB87?= =?us-ascii?Q?oOoKkdE/3c02Z5T7rfSn0R7+GPx/8/EAjSGPbPmC0Vii5Wy+g/k5GJxDWLx2?= =?us-ascii?Q?e7G/H26UWf4cFRqX/lMw7IGDAnaJdLJhg+SsCVELcVGimBnwCzXt8c5dmrov?= =?us-ascii?Q?rX94Z6cGobABV8TtJ5AX76mjJu+OIhypR90Ok3Ov7D0GXQgt8MS4LGr67gOm?= =?us-ascii?Q?WxWarEy4pja0uo7iEGUWI8gnSv23aMqSJUyndKtIv5wrk8Bg7TlV3LKJoedf?= =?us-ascii?Q?TRFwcLgdza3U2/D1l5XA8l7eVDnHWkOkNjlSfi2GvfP+XW/J8OnF+mGmUOqO?= =?us-ascii?Q?M7ZTrXUiE4bBEMSUIs9/UmjX3TcolDBcQVcRvujLsT5WLe+WtCLXoNcX0QgS?= =?us-ascii?Q?EMYsnOxRQiWMsFKe0w7y9XkXeqLNOK0qiCuz61gXmA7cVVqYWVSaOIXzB05K?= =?us-ascii?Q?5OvKSMNNSNsQi1jS+eC3UktxsD5P+ZyeGyx/SLiS5jKJ8wKVMYWbN3tsQiOh?= =?us-ascii?Q?mY24hp4MldcY1aK8z+z7C2vCkMs2UOgz/vFolyP65Pe2mgAHGU6XD0tV4XtP?= =?us-ascii?Q?rfX/DKpl4VAqLdsAvremPj1ZlYFxpNcFr/pGrEM0suuE1lOZ+mlYslbdm2hw?= =?us-ascii?Q?zYkks1RJcaolQLfZ3JN+jj/cgEMKylI2kAfgL7a3BElBX5e928nJSOtmu5bK?= =?us-ascii?Q?jEnKbU3y/8gnGQCIFbFzRPHt5aMFsnny4NY2e3IB4WPqIP3Oiy84/DHWRy0Z?= =?us-ascii?Q?KZQaVjUgMz35LdGceXzA3m5JCQTlBCjPqlPM+O75WNdDv6JblUUPp5wl+A5j?= =?us-ascii?Q?gPL+MZ9EM8y2L0kTVjR1Npx6eWP86aaJuon6XvjqoBDRSc/x0l0L5lEIqDOV?= =?us-ascii?Q?0unZ3qbSd24H6aNdsoWPzlsou8Km4LlvnaLFjloDrR7+Jtgk+iCMvr2fJxX/?= =?us-ascii?Q?lEsU8zHGPgcII7xX3ASkmDvT6bqdevuW2AauGaO+Z0/VdzSvEurki/ivNwV4?= =?us-ascii?Q?MgBshq3rfG7IhVqd2DvWkphzFrA4YI/eoyeHngMvn8UfKLKZxRS8VSqaypDy?= =?us-ascii?Q?t/b5vnQkYWQXthsUkde0trq4licHj3O4ie3qN1KTzjDntSjvSU0uRdA9b+uk?= =?us-ascii?Q?brOgCEKZXOootkwSnkjiRBu0hqbIC2Y9OGXJOP2L2BPTM91qGoR+hoLh3li5?= =?us-ascii?Q?kueYKcMk2WNLNYZLMCE6gmckLuivoOUuLeecdgTtkkzdiomnOBAqv1+0uoNg?= =?us-ascii?Q?bMN3Jaag3P1a7V/hK6JzUlxeOFhnxjK6M0+ZHrhrfNI75QnvRPxbxLr2syca?= =?us-ascii?Q?2Q=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77eb903a-16eb-4385-4bc9-08dab353def4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:03:23.4930 (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: JNLO39uBk59QVItUEdA48Ys2dX3qycfiEPZK41VUbb5nCwY7VGT/qD0tdOnGncKx8djOKwqA17pYSuLxqgPfGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 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 26afec5bc212..9ea3af9a0250 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))) @@ -1493,11 +1494,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->sched->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 @@ -1520,6 +1521,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)) @@ -1543,6 +1561,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 @@ -1553,6 +1572,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 @@ -1617,7 +1637,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 */ @@ -1657,7 +1677,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool break; } msk->sched->last_snd =3D ssk; - mptcp_update_first_pending(sk, &info); + mptcp_update_dfrags(sk, &info); continue; } =20 @@ -1687,7 +1707,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 262ebaf93e9c..64a169547b2d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -241,6 +241,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 Fri May 3 05:20:03 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60060.outbound.protection.outlook.com [40.107.6.60]) (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 42D687B for ; Fri, 21 Oct 2022 11:03:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R78JKrFzDqID7LWcVlcA2iCkEmsikJJCQJ+7b9DmvCVk0zVaExI//mVcEgROrLABtGUvr7DKW7idwX4ITBtskRzLXDGC7D3tfeNyrDd8uzUzv2OPlNXWW5ELnrzWaGjMKUh3cBVaZAKJWVpq7r3pQpM/1E7u7LUEgZ677O94mmkD5UD72bLxjGAoyxsj5I9FMo4fHQ9eTA7f/fMvOPajLdhOWnq5H5Am+ON1ppatOsKyq74HVlzzWexPF374mIQ1iL6tk6a6chOFCwkaX9yPGlgo+tVTNEmqEcvgpRmQ1RHbE2P+CySF0TR2nfy4QEkkq46/E0l9GRQnCO29EAonUQ== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=K76/Ava0X/8bpDIlThNz0HxQslVcrsSrDPhc2srv6FVh7YLuZx+TD536bJ4oK8BT5iNsNv9K/G4UU3vP0qH8wdIN4yg2RM+i5QyObCSgG+fIApvFiGnO22BOycWI4Bu/1jNAXd+Z8ETboz8mKcdmh967cOAqgw8DvhTc+yURwq8U2+dLtnRzllXSaSTrIIdkCyhpYJY1QEr6x2T6OCEs1Xl5chtBJu0Ks9DQ55ux9lmtRASP6itFcczpIonYtl8MYVs6eKz9W+dysj50V/0hTzrisDeHkCnoSHFk/o69hHULdIFXctv6zbZ0NrF39nI7i4KRrjFHOWFSbB7HHfAfEA== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=eMaXP2t1+7Us26j61+MbUL4DyfYRJTDprbNAot/PjkIz0jYrKztmNs61DGakHS0xW3tnYpuCaImGIJM9eu8zSDwRUSzl1eeeTPEzTxNHCWw8uXduCG7fPPe44ZQ5/XmwK/6+X2dNMqaTdf8Nj5Lc+pH+ZzZGhIVD/zbC1e6xQEAz7MyrO60U5UjOzbbJ/41O1TyP4gXbfjrZqz/Ylt4lA6pgJJSzvTg1QtowKtVtoGp1WicG1n8o/gg73UAF0PZivyJa7O+cPEyGmd6J6F7f0ngKmEvvyczxeiEYqkdCndnvOTkQ8rO6OhJXxs+XAzDHtw9oGGv1hFEug9vgmTJ2iA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Fri, 21 Oct 2022 11:03:38 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:03:38 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 18/19] selftests/bpf: Add bpf_red scheduler Date: Fri, 21 Oct 2022 19:00:10 +0800 Message-Id: <06e28fa77986381e61adb7a7b7470f1d67a52add.1666349129.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0088.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::20) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c5747c8-c9d4-473f-085c-08dab353e817 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xLcToLcnGrR6QL/jpmzoH6oR40rzoI55zbyIhv5Voh80ICwv1xnOElOsOjqanhA3MHtXB5xoNFNHUF2cfRhsa8szDkWzGaq/gHHf3dA6FO3tdPoZob+7KFEgDu4/qPEmsXrlvJn8Slua2ICewp21iYjQjryQN5j2dnIDI5X3rpdxJ4TytnRYhZiPyfjZY0ABdNbAwZNQm+ohD8VCl4Alh5vgfqZplJ03+pDkJ6c9JK2dkpIYDbFFIsURiWALnqumLfoEQhWjb+zWNA2Bsxa6jx5I3vw1oXReyy+C7k3NoifdSwii0eNFemN764XN8mVTpdQ5UhZI4Hnd6NyWrAlnv4QlG6jXUm40adArpImXN8aQcm51Y3UkbrgakgiD+ON4kDtplFNmVRx0W4nvU9G84ZVwlXnDHLbq7gAYWblPgxZ6m0F6Q1fI5yrluF8ffv6kvlXVKFcSclMZ7tDI/Q2RHBTLPEs2jG5/HnQzm8FZ4IiAgodM6viUOoNg4c9ko1zPqRAQ9fV4btwgriYAruIUimdqSmS0Odu/kI+MR00ZVcXzPXVCJ8cRLuVjLYYN/TV2LOCPoqIPns0xMdP8SDL0vou6Oce555wdBxMYTPf7lrh5Na24YqEtjzttptWd2nj8hmmJrWiWwPC8yO/WhCicQCZtXTck77majEl/LP+9JVYRqBaoeBP2k7GzEgqinH7xwazPz4aii+Pw01cOfXCpodhdQDjEectQ2i0z27ez/dYqd6AVY6QW/VzAHnHxLKMd X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199015)(478600001)(41300700001)(66556008)(66476007)(36756003)(66946007)(44832011)(4326008)(8936002)(5660300002)(6486002)(6916009)(316002)(8676002)(26005)(6512007)(38100700002)(86362001)(6506007)(107886003)(6666004)(186003)(2616005)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KFUap3HKVEHGOPELBr8c3qqETJGK969DLDu8N0Gi0wQKIiFnwJQsZLZzZe4S?= =?us-ascii?Q?SKNApp9zcS8z2hNjDCt53/QwBX+rO4VvA7lTIeoX6tVzrcDKrfIS7YlwiLto?= =?us-ascii?Q?nWoTNyvwCH8epe45YpWYICEWGZUF7c4O5NtWup67Bo1cNmKpATcBz+Ir6e2d?= =?us-ascii?Q?zR6EpzUp4jLoP9IFhOusdkLpT4N8KGsatqAjajYQmwktyMk0BoQy99RMjyn5?= =?us-ascii?Q?Rj+v1/WHfBRpQOU6phEsivTYOeZm5amKpAhCpKJsofgH8o07T8SiVJs5b63F?= =?us-ascii?Q?ZoJBRLEgP1njigyzp2X8T8rv+ESuwefjHJi1LbkxbdJV/n+Di5m/Rdu1ZtH/?= =?us-ascii?Q?Nek8LWRlzU3h5v+Ax5vrjEO5gadxDwqPPAHfTz1x+Lxx5ucByacoQqWzvsY6?= =?us-ascii?Q?TMzJcfADCxmyHMy+KdnxJQPSgqhtfGwhV5D5nEMUJE4bRo/ECwXIQMzAowNr?= =?us-ascii?Q?Yolt6vCxHCYiHhyo0p3H7/e+sN/DwLughoDUQ36qLsJn/yC+zK/csk++pQYJ?= =?us-ascii?Q?OpF2vqiIu+3a0+7ocvxQ5CQRTWjgtJJBh05g+26ZVSQWo9tbBg7I1x7fx482?= =?us-ascii?Q?BkuhGy2evI830vTZByPG5KCyH2dOo2RJuBDBznBpOTSM67tIZ7j6EqIKnj7b?= =?us-ascii?Q?YJqb5JcyOuXf1+D0U+QFLYF87/8zraDqW3jQh9cFb/Runl7YHo4EdXFc38HF?= =?us-ascii?Q?3SLW/Sy+sN8owTchhnfNYbhXRR/DzEen2kfjzHSwuI0Gc9E52SxGJbaMUgZc?= =?us-ascii?Q?Aje0z4xQyd72HUeIKP3TsGUfB2kXGxU70AANsGO26WdAmUX6tl/+LHEGVTg9?= =?us-ascii?Q?JF2sk73OhaqYDfzRYGT+HMO/8Mp2sWH0H5RQaQ7H9oJvghw468mRbtQ+OuM/?= =?us-ascii?Q?bw4ABZ+hq6m2U6u6Rs8afc1ivBAOFyBrV3PmKrOiccdjzFehawVMb9Qmk9k5?= =?us-ascii?Q?ZWX9DPAusJcCxcKXGINiPvg8eppfqyXc3namnt/bDdQLu1+gbPwyxqWRkcSX?= =?us-ascii?Q?2wdg5hlwa81zBGnRTu/HBKsxEJW3je5b0Pe0xxQTWb03317PN5BPJEUIyF9R?= =?us-ascii?Q?KR7oZkN0v1O6X2VIMm06UC1qcmbr83bd375mSMBeZ18P/qFN3gg0KP/A3aUO?= =?us-ascii?Q?ztab74Hat2F1EQWOgC70L7XI3V/soA6j8GKDBSlme/2nJzhd+dnJrqA2cyDI?= =?us-ascii?Q?3V0y2ex8tAPCTYdnGVjA30D7TJNzYTwH6Gpu9AgUBy11Qb5dBxSZFeNH7Vvt?= =?us-ascii?Q?VPu+uVCbEBgXEH/UthzqPy8q6RV4Q8QxQYbkptGe5zZ3nwzODYw4y81qv4oX?= =?us-ascii?Q?7vOyc9F8ILKCajCr28/FRLCN9tsuiVQIQR7DOQjMMi3CNaZIzJU5LmzO/qj9?= =?us-ascii?Q?IFjYEHVLxGQsvFPJk0lhs0BLtZXKIKVeoMRQh+77q3gBk6FutynD1LTTTM73?= =?us-ascii?Q?voyg2Mx0vkU/PthXgC2ykwZICrlmm266sbbjw2PUSTHZxpE87NDkpIuogG1u?= =?us-ascii?Q?+osww2k25iGeKYgsnqY9iyiIVm2lHQv2PdpK5yBwQZFS5CMkAO0Qm4A+pYeP?= =?us-ascii?Q?CqS/pU0LIpGisfSqOMvlWrJrUe6GfdbwRUB602DmCC0TaY+JkwA9QZ6Q4Kl3?= =?us-ascii?Q?tA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c5747c8-c9d4-473f-085c-08dab353e817 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:03:38.7577 (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: +tERlIw1M5Cjz7fyIzA6eemVVakkG5AW18x3AMpy9+Hj+RhnqBJz8wL9EAjpn6cTHOg/R6aVCZoh9wjEqb8xYg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 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 | 45 +++++++++++++++++++ 1 file changed, 45 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..30dd6f521b7f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,45 @@ +// 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_data_init, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int 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); + } + + return 0; +} + +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 Fri May 3 05:20:03 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60063.outbound.protection.outlook.com [40.107.6.63]) (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 6013F7B for ; Fri, 21 Oct 2022 11:03:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mdZyaBIrLZLnMcGmIITK0dp6yt7PMPwmCXxf1Bye2ffxafIIU3h/Q1zn7WZPOj0+nTB1grKMo95bQ5D/wlf2VCGe+PVcFbRvwu9+9qyPGvuHYJETYHJmI4mdhSe89IHi2W6wng5QUKQlBwlve1Y+zVkBVFRKxvLHPz4oWw4Z8WCiHtBPPvDp8T1juk1MrcupIrkApr70oXUPzwycVoixWrF1xgnAO40SwVFPiF74qXgMTUV1+SwDudtD6aO7ZUi8w3sBvelAZfuxw6KFw85FHIcNx94I1xcofYPYs+PusNuWKoNkygqFbi4a4lXVdcmNkHfLcKFVyEhmJzmq7Epf4w== 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=WGXZ4r4q11CJFKTanUaD7BqmPNS4OZ8bhmucRsRrcBOMOCqqDCwNDLRHEyGJSZT/DmJxU7sItBJK+lwi8saWbwk8smTPE7Ts/SyU0bI3Z3RhRG55wCTq9aJGJH0oEJKKTQ+iCxwFqyx42WaCZubgDjqr47RF9/624Tc01MwZ406SVPWIe80pXauwrG4AqqgtpLEKIauBtWQUpcuxOYAyeO0USTZYiK6qV//Cf9osV+/HfGN7EAL3d1PyTZ7K1YFIt6/3g2Vz8wUO4Mm86XgDATds6cJBU/ppVo8HaehXaOfWyRcodeyMGvNWmWx4gXV8c3DCD2lfY+KFakLFyQXyAA== 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=uFwOV2f5sVkS9UV8R1LGJShKjQyK3EM/wcRmIyhs8/AEuR75m8cOkQWDr7HyOOlWOxlUBHElfDs6OXYPLQ2x6ZC9wU3vhTXDkfwnKpcmTv6hKWmIDhzZFceLDRfZOsq97VZBFPOxgMSnmF3hioddMxjaMc8M7xmM+/mCXO4aBXIQiZUBNv7N4a9utg6tQChm2ZeFJ1hjO2nstWc73957X0Ub+XxarWos03UFblPjkCiZwj5FyXKIasmEnuccM4qVoViDxY1AqxpCqI8EJhtCzxDw1L3eFSPcvT9jt4wzDkzWSlJHlnEcVoyTYgszxkm+ko8ovepTNSLoAt1QKqzReg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Fri, 21 Oct 2022 11:03:48 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::58fb:e772:9521:1a5%7]) with mapi id 15.20.5723.032; Fri, 21 Oct 2022 11:03:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 19/19] selftests/bpf: Add bpf_red test Date: Fri, 21 Oct 2022 19:00:11 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0115.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::19) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f9c4012-d991-4819-5d80-08dab353edd8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2owvyckFkNKZgQ8dQTPYX6+qd3SobYx4wzIq/oMwkhwzEAmsvtXWnNEl/UGe4gllg/8cE+IHpOGiGJs2EcEJYT2BNXEdqyw3vwrM1Hn41qFEKWhTHBZY1OQ4sbaPwVXqBp6nNAIaiXV9wMDaySmz8vPcsddrKLYC6NStlweNtTYZ/PKGTLNZtEfZ0j66BxkxxBrQyYoF73iaoAlofIAmn3cd40TjpikGEwZ49WjgtBuadVV9yuDN+KxeTLTWhzfmdFzcHQuVCoJLrKaL4T4t4YE0RDpTqQGg0GJjSEEgizaxKCqeo2dEnZK2HSS3BlHqaaQW3bT602t+Fc1RBrqxNAuWkh8JPiP2t8heuJdW8xbSFwtzn/81BSUqpOQYmeY851yIyH7N2esOFBuGASewIolPvBUiOi5bhi8eNl6vEQeecmtUFm7ED/CjU+l2gqwEC5uLN/f1spUmeVCB39/GVoqDxEsAl8Txk47b06Qwux4bhYiP1ZjJWsQwfgQnl9eIvW2OOktX4M9/w4E1BN7itmj+9GUBrRqwLt+LF6wGEloibJaElMqQx/dWvmA387cx+6leSEZhqc78ycalCXZ4SCD//L8ee5Y079p8FqXvO/Aal8X/9OzCYFaN0QJMt/JppjJ9EoTCJKHlPwUGeaxMlt242AEB40di37w++Iz+DPiBNUfNXnEUXC8XZCvZVW+o+o2Gx7I8EjXOvG4yd59Bu8okaPUpNx/2/9Dr+1z86imomTs80e8xgYlQoehYs1Yh X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199015)(478600001)(41300700001)(66556008)(66476007)(36756003)(66946007)(44832011)(4326008)(8936002)(5660300002)(6486002)(6916009)(316002)(8676002)(83380400001)(26005)(6512007)(38100700002)(86362001)(6506007)(107886003)(6666004)(186003)(2616005)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/fiVK3FZJ0+3n2qeZbR1+TUwMlhGlTzy/gPDHNQa3UCB5LLEXhnsw1roWW7T?= =?us-ascii?Q?F/yV7OGz6EA0GN4EP2baJ2HczATcm9trRL72lsYtVrDpJqhwi/1OT6ozL0je?= =?us-ascii?Q?BdklwPtpDH/5wl0orpboIXXhuijl15QaOF2UQONLpkpoqXDDxcVO4maxcxYu?= =?us-ascii?Q?ZK95TKOPZQaA5beLQ6zwiey+6s04uA9rxbW3/asoQyU/FzUrBfXbtZyO73Fy?= =?us-ascii?Q?SUN5RRcld+aAbWD6aUb55+2n3Hp2GY79640wsfyn+DGjGKMZ9aFG+DSFrVKz?= =?us-ascii?Q?/19mFmghx2sBN09uK488hUWIMyMo3DhZihga5ZPNmGfWt8OK80XaXo4lTASC?= =?us-ascii?Q?GPsfs9Pc3RBol1GwlAK4pcYskvJzAWJP1iHhU/oZiPY+7+A+UgwaY/HzEfrP?= =?us-ascii?Q?MtX/g6/uccCJ+fcHodrMDbm54dNzx7HSz7o8ts/nQww5IM4xtV/3Vo/JQkGY?= =?us-ascii?Q?ZLcmub/bJJbzyUxunIrI4xuKveEkb6EYI6+8pIJ0/s4moUXitioNfL77gpyJ?= =?us-ascii?Q?kxnGHXCgfmfPfDAgraaS/g9lpAR2vAaVjSqGyMV5zLfz6YsUkQrnsYotAS5f?= =?us-ascii?Q?ky1hh4Nll9Jd1dh7RWTJG3rogIJKcpH4OMSELlX6/mJIevdu0QCV/jvYxt6I?= =?us-ascii?Q?dhKPUgkO8mXb0evHwubAtbuTfiahXl8yU5RpmNqlUDX+yZATFt8aJSg9QSIe?= =?us-ascii?Q?TRZAoqSPLzr5HtUu04JpbmtZFKuTF5ht6jeUx9QwuTL8X8zz2rtMw98iWEd/?= =?us-ascii?Q?gKUy0Wo6T2XcISjqj0suf/QmuMl/z0Ql2eQReHVO0b7T3nYY1tMYR1jLbrUe?= =?us-ascii?Q?lB7bZOAc2xhM5uvDeu2q4amSAXZPWExRxIlsfMsMph1MhHO2ulo+KTAY8H+m?= =?us-ascii?Q?tbfMh5xb/3MG4RBYdZBRsVgFyWDebGp4k2ePMMI+Qwp3sPw+ifgG15Wn4W2T?= =?us-ascii?Q?qgzofixUFuaiawUULjX08DWSc8//VK4unx1z9wpwOUOysviL4M2dYGPj8Yec?= =?us-ascii?Q?Fl+iKJIYQPRk1rrklwox0ALU4aej9eK2cPMiZqsHKKiU9M+PkPa5BtFSCD4x?= =?us-ascii?Q?Gv24Jou+4L/0AIHYGpPBUFGkj9KV4l15sa+V9jQoVyoA8PtOJ4LQtVUYUN7i?= =?us-ascii?Q?oPvEXef5c1UA0xth2uqQPeZNo1IpOnz3xmqg8OPm6EYU/uxK5KS+9bgo3g1k?= =?us-ascii?Q?nc6R1JY64+jit3Bq2P9/9bKOh0UkB4BHWG6AtlnlF+kot5eiLg1mer0hCOKD?= =?us-ascii?Q?lOOJdYEKQBCCj3Ia5RBx+nKX4t9mJRfdSLihEisJkbbrLVd9gqSt2p8LFb5j?= =?us-ascii?Q?N/lw0LQ6np2zNA99eapnJJe58J+rzBZsiYqO5LncSLKltlpn5NSR5ZncmMIk?= =?us-ascii?Q?PtUVfpt+8ccohds8twgZPiiZohVJSQDdDNxyyIeDZ9cW4pfkJrzsETKko7J1?= =?us-ascii?Q?dTH+G4yMDm1OPOhhcx4W5yr4+16B9090RocPBGTYAGmhYnX3mm6SGfNPYhsH?= =?us-ascii?Q?tkulH1Dra876AaQx6Cp9CiLR4t+fsjFoWVNfu7koOQEG2c2S3NDmaZSkqdu7?= =?us-ascii?Q?z9v/tZpskEoF0bWspz8AwJf+8Ef4B5daqAVPkGMsk8RJAAb3cmvVpjr8f5vT?= =?us-ascii?Q?Ow=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9c4012-d991-4819-5d80-08dab353edd8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 11:03:48.3196 (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: Xw8H7NtPscO253sQ8MVF7WjcTLi2E+5oE2nZdFjRRy5PenNUMhK/2+SUFU1Z17T4ZCGtWhiaBe9hYWEu1fALCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 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