From nobody Thu Mar 28 22:21:15 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2052.outbound.protection.outlook.com [40.107.249.52]) (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 76EF26ABA for ; Tue, 8 Nov 2022 09:08:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c5BEzwRDUdarCLLNt1jKG9Y0twzTWMaFmSzEfqkry+zHgy0gQNwd1YkKv9Sr5UzkMQ4Ymr0l6oK8EYiSdgxVLt8lfx2f8g8oae48ahSNOiJEMp04Br7/kK7rsglyu1EFbCMtIDLOkspYFppZZKgJBKHqu8FA4Fh3PN21ht8iHeVYgVCQHdLnU68f3MKTyw5mLdM9mXksRzJUT0fzRuR8e/vUnt9S1E7BiI/VN7RVtE5NDkYTGrCbAcPVzo+L7jsbOqi11UwX4Dv53KSmn+wVbgapsey/PHVjVmnqusmBBAY8IwfPNLm0ahSEp1IVNSxq6aV2/8AMbtpIUkpgiDPSzw== 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=6CxmNvKQrlHMfC3kjBCcJLMT277PKcoAB+XdGj/fYpU=; b=QAm6On9mpW6qC0bO2r4lSqMrxUdUnBnP8Pk8O6saz8zYTDeJ1n9ZXiItbs8cmeuryg76ut5MfXAQnqj9TB5Q/6OAcEscj2h63eD2Nh3YG8PIySLkqhQPIS9f0XtVsrBLlrUHaqFgm8MlX0djH8x3r8scVZkAgBzc0XC5ElIm0SfjmnKKZuWm/T2Kbhl6O9ymo1+ZYqIC750CCITQHBZt1WL9ivKy4X8oujfg7DLkci4Qr9DLS2MeB4ceD1kaVpSlmWF4mJw/+ydeJ36GbM3hW1p5SgNX1NclvkKp3MAlo4B2g+uoWqO/5pYUz0R2lUk1vxS4lkXe6mo5S9W8U7KIbA== 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=6CxmNvKQrlHMfC3kjBCcJLMT277PKcoAB+XdGj/fYpU=; b=M3LXYQpjabTzrMpdvzIrNbOJ/qQz090OBJPB4jrqBQN3l0H0mjs4kPnE+CJrz3jczF87XBz+8rKWXM1uhnuNikaWvzScNrDoIeXJvCnIjFocm/jERljSl5MnRtDCJFs7vKzcTiWprXr8PikTh63tt4fbgFXU1BwAdZRz5HoAZAis6JS34Zxe1YjpxkaOtuuyAxJScQc3rOBieFiDjdOfqrUp8T2zdSmsnHQCALDDClZKEytz//0e6HuNhJYDXXQVduL7erkPMq86At5uynZvlw5EjRVOr/TURpxv0tq/g1fxUlLnXcYyr4wyfSpiNPFxLLo/M6sA+hCIgc82Fyw61g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7914.eurprd04.prod.outlook.com (2603:10a6:10:1f0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:08:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:08:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 01/15] mptcp: refactor push_pending logic Date: Tue, 8 Nov 2022 17:08:23 +0800 Message-Id: <828f9d2e9fa1738463a443140eb8f071e41a6fb9.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0011.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::23) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7914:EE_ X-MS-Office365-Filtering-Correlation-Id: 25f25a78-218e-4b2f-e151-08dac168d2f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c4SMh+kTZdHolahq5+JSdyFJz4ZZDXyJ8nGPKistbvne+FUEHoNJqgH0hvgCVraSGvonzgDStAmjR9NJcX05dikU8bSYzcz+RlKRDaypw+g1KxwUJ8R1zlTjFAFS3gOSbzF+K+7DiLNaGRAmQiXtgD8jHcJX9wH2ChkIG4piJys49o6xHtakx5DCOikacWeedkkRE6Lj1oyR9wzAbeHB7wzDdHOZKuRdntaUH77QGuUaVUbni5AXDeLwMFnmL/Ip7neaoyjC9eCpiMORa9eMKxU1ei8tkj6Zd83WHJYXZfUdWeepPzq8xo5V8yu0CE4rP/8nyH4kxZjmVSnLCX3Dk6CccvD/YfX5sbPN2h2zarx8+mkQBpI2OkiMRv8FaIB0DUvtQfUzyxP9VmpmTfbIYAQBfIKhW78FHYRv1by/w7eQAa5UgGGgpM82/JkYaVH//Re4lL4VQMkjXFmZKWgMzhDA7LawYwbjptC4V4+v3sma5nePsdiYZ5o8oofZ2ZDh/T1UFgS+l+QRevFU5exYsQCCwO21vlSZ/7DwsUSClCetHz2tf4C1olcw41GOXtCnyvbd6Ghu/3/YEH4uLRrb+UFSRXrcHTgP1XhWUraqOkbrnB6EZjyudcM5wREHb1vti7Hos+9UhimdevXLS+xS/TwYko96s6JTOxLNpvjNBNrxJYRXJY/3xHh8iZBEmPJUIhcOqNwSb0wJsYKug90MIHRdMhAKuyhIFYDmIhiQ510ke1U7sM/d1NOknNt9Uz64 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(136003)(346002)(39860400002)(396003)(451199015)(66556008)(66946007)(8676002)(4326008)(66476007)(316002)(6916009)(2616005)(8936002)(186003)(86362001)(38100700002)(6486002)(5660300002)(41300700001)(6666004)(26005)(107886003)(6512007)(6506007)(2906002)(83380400001)(478600001)(44832011)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TCNRu3V4gtbsOk3BEXWsdqsDNCvN97SgXQvwpyrDF8QqqvZyu0KcBNOPiqK3?= =?us-ascii?Q?8fI+oElRunFjZq64sbSNgutmnqCKFoFjSpsG59Nk/16UiYCFf7iVtajCw1x9?= =?us-ascii?Q?owsc+Wn91G6mrWTY1u2ZlrxaeA3uZAYo5eikJXT4+8RzxsOIz7db/XH34EsD?= =?us-ascii?Q?wMWViqJjA/RKGZ0sLEWTKO7dnvnCZOJIgbSAdfvasry2hf2jh/urTqQ4AhEA?= =?us-ascii?Q?cl+O3ytXDmvmEcEhHszhLgUSvMhg7CEBBuQj04QuwLu8rxn7En6f6DhlAVp2?= =?us-ascii?Q?Fb5AOqC6D3EmvcfxGRfq8mPEwQUPQYKPNkTnaiUb1libdfDOtU4vZNcFx8v8?= =?us-ascii?Q?5z7sZ4FwWMeZKz+IAs8smXQDkCUv1T5GVcX4ZQoL+NNoXUOIuQ7lO5eNTbCa?= =?us-ascii?Q?qBjVJiCIweq59tQix06Ql9xp9+CuDh38LmG/EgG76aG9mV2brCK9n78g2p9d?= =?us-ascii?Q?vwC4o/qMeE4kkWxMjFIN5XGJIS7I2uqhzIRyAqipzbkSTaAmhjAcOk0+kuc/?= =?us-ascii?Q?f1j7MW3DbqmAvlklo7cUQzHgZ7bobyBbn83WNuoZ54Rlu0Tx0rtDyV92ggHV?= =?us-ascii?Q?oAsF0x2dCKK8oh2g6mmnXBstHS92NEZHHZwo9B6B3ZB/fPgBeLUY/yvcQDI3?= =?us-ascii?Q?dAftQwiUzpzvLLY/uJvoK0cX3ca/+lsGVsJJMOO2yrkxqiDmNIHFU2bmZeRt?= =?us-ascii?Q?Dp3Ouoyj5VKtOrCVpZz+EuRPUS1BD2q2PNvGHaewAbfGYO6cdbz76LQ090Xk?= =?us-ascii?Q?x4Wkg60jyH3wmH6JZB0kNauKM8Hf5BHyxWfiKzV2YVvE8yi8DWSsuqC0tZh0?= =?us-ascii?Q?PMbBHbw8vBiReLfA+vCPREyXxdaUjvwWcACxik4zOrYYm+zw/V6X1n2gQ5W0?= =?us-ascii?Q?AKiLo1sd64qdgma3sEuUnZQKInw9dmJs08IuPZWEiYMoUHVVXw/zLin18INJ?= =?us-ascii?Q?o1g8Pv4O1wtOwup0JGekCPIWjaHmY0qmuoC+Ndht6X5cPjaAaieJvS0tkL17?= =?us-ascii?Q?qJYwCd2xpcqqoph9JUzOw5T5ctp2WUgir/gOnnnMflAbN1U+muZ5Oy+RY6xY?= =?us-ascii?Q?QmJZJGvrNzFMx8AAICXA4lGOekkUuU96NHp/RZs1lxavCSGpiIi/pG38tUvn?= =?us-ascii?Q?pDwRnhc0zchouWPp3Ftav/YTs/JX2HnCqq/pCneEQJMspHDh75kVLEFCS6TH?= =?us-ascii?Q?+tSUfWvvNEx8B7/JvLbMR4ekiEK9ONYz2i+KyaK2EDGT+fuqYx3fyJ44NKqZ?= =?us-ascii?Q?WPLeXiSHuVq6PfL5xZ8ISDgMSiokUewnw0FxtlDj5kp9MHQpvdWbI2LUMGaW?= =?us-ascii?Q?+dfyclERkgyYtNo1f4nQfdPi6SwqpnSHoeRaZze67miG45xhRPEtOdLXtvBl?= =?us-ascii?Q?AIpV9G3/6V/VnLopl7PjWfvpqBLcAwMiWuyggoij53lDjpV+gkb8v11NGF7d?= =?us-ascii?Q?f3c348V1S1AC7tPLmAVX5YxqytucUo27VzM6Kivh915jux/dGBl4ExwSWuj6?= =?us-ascii?Q?sqgqWfjBUjbms5wOpepFi7l2msHFwKskJQFTwkLJaS+4iWin/d1b7+TmhhWI?= =?us-ascii?Q?e1WpVbDHKm0t1S7eoRqIighZOmWRsN6Q6y7AEGee?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25f25a78-218e-4b2f-e151-08dac168d2f4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:08:38.9650 (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: 8z3mkzWHSfG2R/bP8MZ0LiPbZCkSfobzlmWSFjsV1locc5+k102qM8Hwr9vYNY54Dk80mV6HdRnngra6iAvBEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7914 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 | 155 +++++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 73 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ede644556b20..1fb3b46fa427 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1426,14 +1426,6 @@ static struct sock *mptcp_subflow_get_send(struct mp= tcp_sock *msk) sk_stream_memory_free(msk->first) ? msk->first : NULL; } =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; @@ -1537,57 +1529,86 @@ 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, + }; + bool do_check_data_fin =3D false; + + while (mptcp_send_head(sk)) { + int ret =3D 0; + + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_get_send(msk); + + /* First check. If the ssk has changed since + * the last round, release prev_ssk + */ + if (ssk !=3D prev_ssk && prev_ssk) + mptcp_push_release(prev_ssk, &info); + if (!ssk) + goto out; + + /* 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; + } + do_check_data_fin =3D true; } =20 /* at this point we held the socket lock for the last subflow we used */ @@ -1608,49 +1629,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) { 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 Thu Mar 28 22:21:15 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 5CCF16ABC for ; Tue, 8 Nov 2022 09:08:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dq2Z3SsvFddqyOm3oOgLaGoO+OGBCa4VUhPT+vi6raDjWdAi19ZGbmMu281xsCVhMQ9FqDLsdxXJAxQmOQlcj+76YtwkGogeoGdC0HPsweN0P4UIS2lP2Eqtfdr8A2X702ej7Biurcwl9ZRDANAnsw7lBm4GAC9HNsXfQtRiIblQ10GtYkchWNMdT/Zn8VqSbPYDisgvVWUjBrFG9R5cZpC4huFNFhhVLIHUpdL1il2QgTL0W2e2uJnXOZMCCr1uY8Mg5HfzP/JegatB/24EsWrfLZRnMFyR+mfTmrCM1gOGY3M5DdO7XufP45ToIdbe0DGIsyz8l8N5ej3z5DJPww== 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=T1iPBo9fZTor5zB61UNFiv3m6JOwYDgOm3RcwKqi7Ck=; b=l1FDkc20q/t/16AuFZZ0GdKLKjXmGrIaBq+B6tUuA+ITxsmWzNeIlvKjPKQd87z7/lc7esxYa8Ye7NhRaRqSGv/F2xiTK/d4ZmDIMiLAJS7Na8jI5JhCuEafuGTDg0EcPWkOcDNs8Lw1RZ8MUHKSW2KTn+Q0HFP8d31Y77d68o41gT3UMfJ3rtCunL7lfYRP4Rh3t2PhSP+h9GSnqrqZ8mqFN5duSGxVMi54A4IPnLlB2NqQ4gzk79GIKYatGSbn2zkFdibRd5yAkZ7OqtB0J16fsh1hLSbWhW715MMjwVIUGAmOnHsmthhQMYUJiBNdvIgzXPuD15vw8R2leLGaEA== 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=T1iPBo9fZTor5zB61UNFiv3m6JOwYDgOm3RcwKqi7Ck=; b=iGiIJNZ2LvwzTTXfWm7UY4ODBSzqlGMX4ZQTwzcBiz2dfsNwUsxfujLg/6DCHdw42r2fW27de9GZR5XvQoopiT1rLU8clOizg2BmzVNHF5qE7jAs/4YyMtnpV8t3LDnEnmE0YTNvgwKBzjUdzXFTzkKIrDZguHCwE7Bm+cSoqq6/spSzgyZaCPrxgK+z1dj6+O0zbd7XYRRhlo5a/71uIeo6z9FVbA0qaf9gdnCn/TunnEbG2ZAnKEtAG3vhK7MXJYBr/bQGnlJzRim3btawcXT6vbG6o9Fq7Om5YML9dYVWr0KHciwFC6aruEjjAQoRk/8lY3wdz4as60ByMAk/3w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PA4PR04MB7599.eurprd04.prod.outlook.com (2603:10a6:102:ea::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20; Tue, 8 Nov 2022 09:08:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:08:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 02/15] mptcp: drop last_snd and MPTCP_RESET_SCHEDULER Date: Tue, 8 Nov 2022 17:08:24 +0800 Message-Id: <01eed357c459605e487cebb729a72c4674acf4b9.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0001.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PA4PR04MB7599:EE_ X-MS-Office365-Filtering-Correlation-Id: c1cbff8a-a734-4c55-f7b4-08dac168d771 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vRjDLDNYqmhHLuAK04VkH8Tf8t0F/ZjLDeBqDBIL3p3MRsJvXyi/BJ2A1bhsc/5TAyYIMxhYCVw6FjW02YmXFhEEV9szBcdcRUCCKyokI9LSn2fViujvhQPhkrHuaMVrPrLDLOKTXmY6yRngWZehER3UYBB1KOInQJk5c4xEdvzqAFrtVIjA2LkZ8iU50Up8/p0WuVtJoH5+vj/Gpa3t911kqBdvpNGSnA0DUmSlGZqV2gRQ4P5dgblq/jqOq9R01QJayZvvHAemXaptLvcsF5EYCnG9Z0PjQRyEQGuIiR5URnbiFqqyADVdzi8JAwyS3W7fipORrImObCef7SOYncGJavC+ySxzWqCyYdm6AKQK7Ri2KlzFDfuAaBGrDz+CrlmmUesf+bGKPHLxKKkVIbYs7yycl1LjnJPaOAGa0srCzYR+mu3lu4yt2vF49QkyM18hnZ5xZ9Tj97+y3qLhetTeZSof25Cp1+JXnyuQQUcJztHRE6n/ATyNHC2Gjh3999/Ds0Zjphj3FdgmExOSsKm/ACo74LVavmBHODe9L26Q8jhtFQLjbVId8nn64vqa3u7sipF52uMpKsRyvjp4ifZH9xNjAmGU79n7gNpSpv1JOBg9tKldOYriRk+I4q5eyzIjNp79HRfcD7Z5IYZVjvHBqLLyGk0lGPtjHLNEQAdoxBAcuq6tqTjBksQlLCQp2d+zChb6izjMQlIk6c4nRQW0OwY3E2/7mbqyGHPoMrWyM+nzkH4MhMKyd9NBWdEr X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(83380400001)(86362001)(44832011)(2906002)(478600001)(6486002)(38100700002)(36756003)(6512007)(26005)(186003)(2616005)(6916009)(6506007)(4326008)(8676002)(316002)(66946007)(66556008)(6666004)(107886003)(66476007)(41300700001)(8936002)(5660300002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cC7Zx6BX1DCbbbo2T7uEBQnJydt/YH7r/BK+vuL3Tngh7I2U/wEIGBBpL3hS?= =?us-ascii?Q?Lo6kKOiB7Arf1pXT+fvuQl75VGZ958qv/lKQS2mhvxC4TLOzToPwHCzR0PS4?= =?us-ascii?Q?Lc4Y36BCfrs5GcyfVxSBzai/X0Yu5PJAkyHM0pqPZuyqDPZDq7QuRTsjnrZG?= =?us-ascii?Q?siz1tREepQ5sjOW5qd/J9H8lR0E9yH0uxT5r4zrYELpVN4P1X7RhOcFHPUhH?= =?us-ascii?Q?W5MuJho2eo6pGQlTHrynbYkPjsBCDCEpp8gLhPg5j/imwemI7VqPLF322MyV?= =?us-ascii?Q?1uqaVwHsSJyl1yoDe9eRhC8UHKXu3n+6ONsDsIc8tGCOnyAEtdF36BcyIDX1?= =?us-ascii?Q?y8Bgu7tsk4qRzr9Cc7sjK93yUnz9CZUKx6V8UOsZxGREUDISz8K8uI8BqHxx?= =?us-ascii?Q?eoC9Y0fT3zOvoSP/jE3BJILZFBQRBf3RRSpY2LZxzq5D+AGUwvB0vfC/Od1U?= =?us-ascii?Q?HobReK9cKiV7893Tv1bT+rMWRiEr5q1SGwM1F1pBQe5aSr+94M4Yg1jIj1xy?= =?us-ascii?Q?pNw+YRbacBoGa+U01VrNkD6VsSm+blz4VxDwl9wauU7QX3wAX8NqhSFlc+Bc?= =?us-ascii?Q?DapuxYxyKP7IUXWnF4Ead5nbMl2mDQJfJvqYIf6WAxVFr1ChH+z4sIghS7UJ?= =?us-ascii?Q?XbUqTMlEkyRX2TeVatM8qbB22NDsbKrSXS5HVUeVRrj8GZIen0aWAsUvJAId?= =?us-ascii?Q?rAqXLqgNM3yfmU5VTdkT0X9nWlyJAKZ41Lirv0Nys6rbdKhiEJ34xqNE3uNp?= =?us-ascii?Q?vSkmOYN4TBbumNYa2S7Veu3j3qL9g+nCmj4yrI5CBKxLO78+KqhwTkG0Wz+H?= =?us-ascii?Q?EORWVhlX2FhBg7IcSDSx3M/ZB7JBxAZAlb5kGeYulnyaYCCyyXcM56dZhalO?= =?us-ascii?Q?c0Ckz53DdjGo5RwG2Dly8Ef/jnbIlRwM8FzxfrOtKQ/ycGEuFEYl2d5kIwK2?= =?us-ascii?Q?PGOTPzkkCO5eYkWfVLBVexQBlb7TkBLkV0UEJsrCy0yPuRQJJQR2hsShBTOG?= =?us-ascii?Q?/H+oga3XNS7wFm1KS9BZnXPaXlX5nnDpRkv2dypnQpJ2H5AZh6Avh4EwrWBh?= =?us-ascii?Q?HZyF3UiNOczVio1tsQiwYdd6QRWR3Sj2zdsFdc4MnPLgaJrVa6JMtWC0kE3Z?= =?us-ascii?Q?bHjYaftULBSO/5ataz+lcD0MJc3/jYS/My2lavhA2i96BFSNdVR0Z8pfd4jN?= =?us-ascii?Q?eA25Py1GHdsV/GSV6bMoCGOyx4ctYBtS2TuUqrWZLKPUuhlhC1YpeDSSYCTQ?= =?us-ascii?Q?UueqRg8VeEfhh5C80LLyysMi0wGCebfe2fH8FeWWJ6nJ3OtY0WKFJiyUCHAr?= =?us-ascii?Q?q66381ZS2mR5ra14G3zje4ZEBXZlS+BBjZ5tFF+C5v/xcE1zvgakU4un6kSB?= =?us-ascii?Q?x49E4bFv3wbqrD5F41bcIuSE5iWjEzU/N7J6ed7HNNIY3FX67eafCMofLdWk?= =?us-ascii?Q?ELyJ+O2iMFMiehxyRQHlPgUONvSTYcr0pxGUh7vwqTh0drqvHnXR6lfIicEY?= =?us-ascii?Q?eFVtoYd/nubVu9q3X4s4fhubJyVe/Hbm/SGOzAP3rthX62uwtYLqFS+Jobdu?= =?us-ascii?Q?jA1QG8DnkTWsB5NJtkqrfzspKrTHS4wC2jwOFnXM?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1cbff8a-a734-4c55-f7b4-08dac168d771 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:08:46.4488 (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: 2aXNL1xvxap+/v5TZka/rTsrI2elENOb2s986ecsIU/jpXXgI1WnZZQHVG83QxVimlgiwnpwktaZjVK/NnkraA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7599 Content-Type: text/plain; charset="utf-8" Since the burst check conditions have moved out of the function mptcp_subflow_get_send(), it makes some msk->last_snd useless. This patch drops them as well as the macro MPTCP_RESET_SCHEDULER. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 9 +-------- net/mptcp/pm_netlink.c | 3 --- net/mptcp/protocol.c | 7 +------ net/mptcp/protocol.h | 1 - 4 files changed, 2 insertions(+), 18 deletions(-) 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 02469d603261..b0b83e03a4fd 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 1fb3b46fa427..d7aaa49c64f4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1478,16 +1478,13 @@ static struct sock *mptcp_subflow_get_send(struct m= ptcp_sock *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; } @@ -3294,8 +3291,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 8df6d95a3247..e93d64217896 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) { --=20 2.35.3 From nobody Thu Mar 28 22:21:15 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2076.outbound.protection.outlook.com [40.107.249.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1BA56ABA for ; Tue, 8 Nov 2022 09:08:55 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4U5XcCh+550+KKoY+kTPov5zzJJ5mSrcjd3tL2uWzJtxiTl9e78mOVNEbAPD14wfFBFrAgmwh+ee61nFivUm7/2Un+TUl4Kb2PteXALL5gX+XdolIdubGltSmhNgABJPSgk8N9xOXhHUnz8Nmg/z49vSwNC0hxWH+Y3zbmoIvocQFf7XsriwoUgKF/99xMevdbzqAOq/HPJoNxoaD/YYvLf6K1eNy+vfGWoZat83oxQipPfNH4skrHn43MkkBP7TGRDca3wJjSFf9V5H/L+CgOimiIa/wEQNRowP4+0YdxiQMH4I+Cu4jLQicLnql+OPS8VhF27tW6rA7wNHBE4hQ== 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=x/4/JsCXP+/OKQz6jjCp+OtHk954GaICx+c/+SeaJ/8=; b=MekIrJmjtMx5geGrXbjG4hG+TdSE/RYZw3ADhei+PHQwk+ZnK2fh/imDNfgM06Z6UC0jMAFuXxWSuQr5aWZYBMNUuaMookugRTdso0qWpB3pSGCqxaIunMAgrBb//9GU8l0QUY+qJ3N+PA+7kiz9OIlVcEtPbwH2aMnmNuZ+gxHrs4jEWZH6LzHCzzBgDgh7hHzATqJG9+g4zQLiEJNuW/tOS8uC+hxwGx6o0Dw/F4ZUITOlOp7pzYovS5rA437Y6tfygij8rOSWzBny1dDjM1+U7z9YAXjokPEaIzl7srFok4CULY5XS0w12F3zaVemQ6TG7isMeVTm3hZb50aOQw== 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=x/4/JsCXP+/OKQz6jjCp+OtHk954GaICx+c/+SeaJ/8=; b=nRkC1UoNv2ArdA7Re3ipK4SFAFAlUXmAl+1dtphozh14AL6zTUaERUyuVjn/NVUxyYMZ6OBQnFRLFWN1RveQ6MZmnnxEcMLnToQh61PNYwuUNWzSOuMlbSd7mxVQqcPSaGEkwGieQa52PnR6HrpuMDY0t6kUv3jQqf0eIkNU1TnhMn3QNHb7WPTMLZ0iq2f4cVNVfYx56ZNuFTouK8thA4huFKvLwTmzVEIdFMetJkkYOmUsAw1JMOydx8pgWcNCN+LZS93gOj7PoiW9qZq/uQqMuIVvebTF+nGb94qUA/7U67iu3m+OEzxfivuu+JB+NIKGt5OaE9VUMan+ymoh9w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7914.eurprd04.prod.outlook.com (2603:10a6:10:1f0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:08:53 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:08:53 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 03/15] mptcp: add sched_data_set_contexts helper Date: Tue, 8 Nov 2022 17:08:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0004.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7914:EE_ X-MS-Office365-Filtering-Correlation-Id: cb15e492-7390-41be-1230-08dac168dbb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xmHvCNLSIE23cEqROqZOdkWBiiQwENtq1YjgzCicZeJaku8JVXlc5IFaf6GtpWvUnkdX5gci85F+d1DsMztA2mh19i9I9GmEmYTV0vAS1Oh35/fs1OwWyG6wuPkSQjqt4odyNDhIIN973zvrbbhdZejPDoPG1wp1sFemwg1aYCrHeibAPNqL+Cb0OSfzJRLASni83EP85SqwkyQaFu6IqpSImXm89ktob531cm6Dbt/QcXN9FpIfuF4xDoGTB3KnQu7zsLpaeM7Fy74tUZqyCb92Wc+ZxloorU4ZjrRhiayimWCqfHuDqVCKgsEqj5WC6AbWTizG086F9T7Ik3l38mpH6JHwzzsxtPRs14Xou64FsWTN8T88tGfqfY1Q36shW9AdPpZs5o12buZGuu78PkO3uDcR5tcVCqhPKQX/5e/nzFZEmF4wXnETKX2vspAwCJ1bhf50ivSKyDRGifI0Uyv4VxAe1UHBvPGc3736x3bnW8+5hL/6b9Cma8snPcqYs1WWi1ywPYFWaAqy0AnZgNeWcD477QWkO3/RS4n81mZPvxFptEPNxE0GxxvBTnf8E1fkyRAzS6XBYS7D6gqteSbxIl6ifAz6Wk20ediKrf73dQkpDRkFwzhUXkB7xg6OdThBC3gPRaukErgx1AEdi0mIDiEeLpSqC8YXCzlZzTZrAuhC/DBoXSnYF9LQiLi+xoUjs05HB3hvQH3OZ75Fu9JtooUT4ZQoj9VJwItBQ2ubbwBSGIzVRZf9RXX25nMx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(136003)(346002)(39860400002)(396003)(451199015)(66556008)(66946007)(8676002)(4326008)(66476007)(316002)(6916009)(2616005)(8936002)(186003)(86362001)(38100700002)(6486002)(5660300002)(41300700001)(6666004)(26005)(107886003)(6512007)(6506007)(2906002)(478600001)(44832011)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LOLK7yow+LrwLvBezLpejPFl/LqT/ryGk717l1xPlEHtSP4zYQ8nL2qxWbP3?= =?us-ascii?Q?CU3BFipGVDE0jVIGAg4M+5FEEAff26z/sEuBepYWvUUTziBcDD+T9mXM/FIu?= =?us-ascii?Q?BcIgPJTw9ZH8RvjBPVa2OqQ8CChbJiXKdFQNEsSPk73E/a3mF+JAudPrLsD2?= =?us-ascii?Q?LJnvsSTZJKeLhjsRt7b6Fmx0+2RFcYlGNc4n/4B6VeRteZkoNXiH6lfmtPtd?= =?us-ascii?Q?D+cg49B124vybyDfoA7Y6OnTgD8aIKTG/3oKcLjvPd51qe6g+ZWxmNCIY/sV?= =?us-ascii?Q?bcH4aKsuzZerB6qn5qNbu+/fit2fJHyx0S/zr1ZrqpBHA4E9dVTGsHC1Ul83?= =?us-ascii?Q?PS4ZvWQmXcAhP5ritOGMr3fSy1b0+QlKWQ+xC/JfTsLt2OGWopi2L1PUsm0a?= =?us-ascii?Q?tG4WmG5Vd+rRCxUw6kf4Ei9gXHeKLKyH5pXO4Rtq9k/KfHIFfeUmHF5+WJMs?= =?us-ascii?Q?362a8pnahORkMf9YBS1uy2QNGciXJGCMktOl/U/igHsJGIjIGV3afY/Q5cLk?= =?us-ascii?Q?s+KH6H2ZF52o/roTFd6cp7m3xOUisqsjgz1/YzbuneFNAeJHovYPzrpGEOG+?= =?us-ascii?Q?pK6JFXCMWSzTTsOGSvhQgecFJX9u6QDqtmoYJE6OFx0Yc7eTJGUYYryVA43x?= =?us-ascii?Q?L/BO8k0atpph1hRMCbEov+VTC38/gsUEpf39fTHpgChwCOVpV+OLcTm3vfg6?= =?us-ascii?Q?ljnq4CvzWoUZxxYWeNr8M1rr025KU3R5ZAQ38ViYGiHshTSIf2VlpMfwLabI?= =?us-ascii?Q?LW1RDLHDp1OpZzN/+jTlOmw69KHlwWvIEahqUaKG9k9PnlFH2/UO0wGunmxz?= =?us-ascii?Q?P40ozZ647ZyQv50zUAcrdyv3xEelDduftzDtSqf41W249CrO2o+cTxtUDwgE?= =?us-ascii?Q?YErPBsGSvVinZC+U/i9s0GerMv7iIirUNweG2TTOe9LBPCw/dCg4UPcIkWdJ?= =?us-ascii?Q?/e1ZN+NSxPiYCpE2gNacR96JeMPwpDn5l4v4P45OnOrxurzDdsD3SHmJJrZ9?= =?us-ascii?Q?0MXxBOQEhfvN60PUxVPVyHxDZl6d+W7hF8Ac9uisgaSII0RKj4odLOE43uey?= =?us-ascii?Q?PCKEHDSLsezVHYXgXb3oa8/Gnq7TrUikvLGzmF1GcmcLe0M+PdpBxqoxFziW?= =?us-ascii?Q?qufRnbATkZMjYuDXZabGec9hMRZf70JVYtrziGNF5vKUKHTvN9sm3ON6uXdR?= =?us-ascii?Q?kjAlMb0tEF+AagXu82peYV2KnvnyHorsWqy7UAbZWfh5gfllY1qoFB/hSsa3?= =?us-ascii?Q?GMmuHeuw9WK/FzMJzO+XFQ/pky5IUL6TCQnYfleOZrW34AMroG95QOffOu7u?= =?us-ascii?Q?Fp9bJdeqcZfT0vba5BtuvxFPxGRQucxXOq4mf1IVex0ws4Xy3COGghw9tb+7?= =?us-ascii?Q?jW/AxOpf9YslBFYfdNshc7eJTBhiWIm8xL1KOfYkL6TqTYD4M7co4PhAH/Mh?= =?us-ascii?Q?NDZDOBDndUAvbrX1u7P3ViqLwWzkd3gxmDNVI8C+Q+eZA21Pv6NuixuwheDM?= =?us-ascii?Q?3nukvWFDf6Aro//RJU9/24ijr3/qO2vuKJtldr+FoobtFhCChmTlNR+S/iZF?= =?us-ascii?Q?321gq7OMyFpAiktO9Z157pYtypaZqquiBwVx2Zww?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb15e492-7390-41be-1230-08dac168dbb1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:08:53.4014 (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: z5+PH5M6/4vtIAIdj5F1z+dJKucgE9Aq4owrvcdHk6vPBUYLVailRdaVLzx8Ujj5T8Lo9GiyOYqCdSA6F6elVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7914 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 d295b92a5789..5a910da1452b 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -93,3 +93,22 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_co= ntext *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 Thu Mar 28 22:21:15 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2078.outbound.protection.outlook.com [40.107.249.78]) (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 7928B6ABA for ; Tue, 8 Nov 2022 09:09:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k3osB7t0KzEF/8JYeh5nOm6+MfNYR4GRl/6FMgeywRikNjGk7VywKZAbNmYFMawkw8aGK+ulL3VIWhvtVxl880pHPnZZaLS/GB4SPLziIujI/FS5YZgSHNNd/CCrHuT0/RnPGoCdhZFj+7ao809F6p1021QqAvjk6Cps71Y95vvVUKsydsHlb/Ln28NSRzVOivaN1frwOaJprVIY5YpbhvN8q36//9RBe4dOs1HJY6sOlAJR2ezN/l7vgkHsKM3V3azzi9TeIshjT2kD9XY4bx6kFCKeR2pIe7iBW5bMOMxLWJAdqIlFG824a2mN5eJR9dgGIRTu9g/m9f2mTubkQw== 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=fY9QF5iAszTFM/Lu7fkcGRgrUl4rViwkU7dZc8Hf2XA=; b=nNzsenIlv0WHe0GJhXWOZhqLcfp1P7Ve5/VJMNdVsVoXwtyf9UsXOCpj6jFWKo0Z6pFVailQh1SDbqnP/RDjWvAqAm+33IOv6af9HROOm+H0ZjaPl6Sve1flfEobpvk6Dnj/MSYDaM2QHIlCFV/IUjXrXsrj0rok4UnIgDvP4lJfY/IFyTfgARPbwuJaT7L5qTRJsnQ5CBsXFmqHLZ1q7MlnTOQj72/HwR9MgMEmrfA18zazrUwtPkOGaYkGB6z0pJVwEv85QDSML3j8vw9Ib5y/vZGDF+jvhgGFNseG7DCv4+I0siCS0tNqhUXhJ3EAljGHxLZRuGD46+El4vysEg== 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=fY9QF5iAszTFM/Lu7fkcGRgrUl4rViwkU7dZc8Hf2XA=; b=grZKp6LQLyQMJnb4xsGfuumXHSSfaD2oAoDWqkyZcMdLdx4ANk89HCQrjd+fUktjJu5ZLf3Keqs3xcJomTCN1HuAAqi5nUPjrxkPvW+1J9z89TYm4ablJesIEi6oaXvyTDTE/+ryHpZKbmUbnyPT6LMMVHli9osRCV+Z9/GligHNq+evA9otF2cm+HVXso01D9TGmXgEzFNEJE5B2ZHUFf/71xKtrZtSyX1MHG9RGVxZjLkcFAZm7Vs1IWS2sM/CtPXIxfO4xHsOqB5NcIPiHS3qUHr3mfOrPFCwZ6l2Gj+YG8wjmyIGFhJeRMsgzxiySCo1af7QGZ/zji6xpsOA3g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7914.eurprd04.prod.outlook.com (2603:10a6:10:1f0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 04/15] Squash to "mptcp: add struct mptcp_sched_ops" Date: Tue, 8 Nov 2022 17:08:26 +0800 Message-Id: <71e18ce88db8f2a7dbe4163060a5fa38aabcf332.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0014.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7914:EE_ X-MS-Office365-Filtering-Correlation-Id: 02382fc4-cc39-4c89-d8b2-08dac168e03e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rZdqgByjgslKPEg2Hvrhp7z9rphLn1dVOIGcjX/ekFZ7vHxzONGfeue9XNjQquW7cfpfe+JpoCZC47A5lrDEdp/HsmPHR+Da+UW4DLAu6UShbktCjYqKPz8T9943I+lWUzBi6nrwtNjpAKeW1f94VUI1cDE0uoHQHQenGljAopSF9/Jt/Q/wXl3KaMutR0wgbYmG8exboJUqVkTOnFuDb31GaZ4TKlJzs5CFmzhCJqFqhFbsxIzR9gkajhVDzc7S8S0MqYVdxT/jsVW/7bVaxWwEMEhUjxlRjHxljjgCWzHBOt/2ExCQaLgJ3ju8ByW+CEWP494mFEVhhrFvvK8+o+ByUtyzdzpu2D6nmP7Ou/fey+KjvK+/S5tcdeMeJ9aYIaVdB8z0j3LDsJGoNzbdjcEPzXJC7fe1xGL465X5Ed6VRaNaMrQ0ckLhktoxUGPewxO9laREyPGQBTml+4fBtoibzJSOqkzmbvgAMJsKy5O4TFvyLbpdOKEpEkNz7THcjbpxFv7hDuIKVXqz77ccrQtIJJV0YSXgqMy+Xoix31AWUmGnycJMXuEccBvhWKfDwLDcjPVKAE/RzEMQ9Lm7vznG8I0u4fhJkofah+X5GMGYs0+Dlmw+6q1OBNL5PzppzDa4+XihcozeCOLAaI7tD7RqheOIi1h2jRgO4z+yhIEthSktWQYrBqLyT2lr8OPlvGeafDDaUkagaI2VL7J53h3Xl211ecG7OdqXvM8nE1pjIDhmBCyPZ4ctnLZM97Br X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(136003)(346002)(39860400002)(396003)(451199015)(66556008)(66946007)(8676002)(4326008)(66476007)(316002)(6916009)(2616005)(8936002)(186003)(86362001)(38100700002)(6486002)(5660300002)(41300700001)(6666004)(26005)(107886003)(6512007)(6506007)(2906002)(83380400001)(478600001)(44832011)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RDD4phtR6DmJDRJ6hgzG7LZZyrnZrb+rD00vWXO1FLOVnAWeqR68DsYs1fVe?= =?us-ascii?Q?IN3EG90kvnxZmli89ZQDWesxELXK5Q++qWYlhb/sqzKQ35RTvnqVB1/nLkKu?= =?us-ascii?Q?T6ZwJaQzvvkrvqHklzEjtyADfeITM+mVBWC4+G0QvR3Gn6unggEjLjylADWy?= =?us-ascii?Q?ls3LEb4o5Xv9tYgPDTSnUX6h7OM2zJKV1sg9hv42/9zcOWQu3CzSP/GZMEuA?= =?us-ascii?Q?X1aMqn7oh+27w1X8IGjW/+kxzw5k9CqJvetdQNJK49wrUuuNtqSvWPYKJjv6?= =?us-ascii?Q?cgtZ+7qZEnI6RwTGpuXDPuOSjPrp3RQ+VfhFv6YPK4Z6R7k3c5m+yOawjpUS?= =?us-ascii?Q?ugHvO8hlByLxL+OpG9jYHYH6dxcsWv0dexRWdFXTWGaFVKwOU6nIELmVSoTC?= =?us-ascii?Q?yDzRpRy3Bzj6z0chw7JV3BEJWer+F+WG8o5vrjjgkX+OoEmX4mO1SStYNoTQ?= =?us-ascii?Q?mFd7cZ799guJnf6sA72sKp+qBC4CSY3Oga19f5lYZPWdh8bt5Nf/KfATqCHx?= =?us-ascii?Q?RwNQbA/BcZZS4MdsuuQzifRQd30pV2+PqdwSBMy7BGd4gbmd8TCgBUO1qLZ2?= =?us-ascii?Q?WdmJ/TWF+9DQJCcjJAh/bb81bctvhmnfZzWQAi50ykw64pNWKqzRXDp0G4xy?= =?us-ascii?Q?iAI+vhewEjhyepIqFhuIULxSu9qXU6d3gWjZp1qBf3lfxxh0glQiAv0/GFxz?= =?us-ascii?Q?6OM6fT6Hz4VMfMzwLdCHTFFvBrwtFoQYfTeKgEZ9ZqzYJWFL4ukbaW8PJjES?= =?us-ascii?Q?t/33RvUYZk8kegwx3Vp9SDutm+Jyl9wvthfrhdHrc0bUV5BbK9qbE47ztm23?= =?us-ascii?Q?hPt8s8sI53CD4908hIQWVZgfoX8r+kjfRpC8JcjlSt9T10yMEhJGwUEJitHB?= =?us-ascii?Q?8Uc2vmWPPttcheBnZgo8gl8aDnRZl+W2ce4QWBz83P5f9PKNY8H/OeoZdw5w?= =?us-ascii?Q?XQWOMwrrGBPLhZxO88jdp2nsc+wBrnW4I5IyW2hWnohK3XGOuv6LvVO6rpX9?= =?us-ascii?Q?GvRyqh9YZUx7eEFnx1oJL8IR1AvVTTuEShvItmmRiDofHvIVYIK4X8tRytNe?= =?us-ascii?Q?k0laEe+va8daJUnAZRcZrlQ9VI2/iTRXxFK5vAC5EVIkwBp0mRtx3KhVUcjY?= =?us-ascii?Q?HKGxPorsGI1P9dUSDPupa8Fs47+iWTI9kZrSskVNnGsOV+v/OxJ7W9dvnNpL?= =?us-ascii?Q?lOOszLT8JIXNHEmRyjwUGfF8jQhvAcUM+lajp6yBu6fi6KiyZays5MXAGdWR?= =?us-ascii?Q?wXPse1keQDVyCoL7e6pgxBkuvwPe1jO63TvuZq03LiWwckLmdfO9EsWqjZwX?= =?us-ascii?Q?9wiYfM+L4uGoHK1/DsqKxyI4obRl6iw1VXpnltWpe3bXjPLHcwPnKv1daeB3?= =?us-ascii?Q?vIAwFniMPXmRH6VbkS6qyThMmQt9wFPyUe3yjnBTouUU7nc8+TB9EMI7SDV3?= =?us-ascii?Q?v8xeFYr4lvwMEhLvjcb4vKuwGJWsJuEJoM0WMTvQCbOmjcjldIMzZ4LMQfc8?= =?us-ascii?Q?yWOWvFIsZ0Tb5IJ0+womkVLTQ2RmRgIpy8T0+TT+qGs8kPf/laek58nT0CvT?= =?us-ascii?Q?BuXZis5xRgMOOX7lTRr6ZuQgjBxuiIR5/sjQmBG9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02382fc4-cc39-4c89-d8b2-08dac168e03e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:01.0727 (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: Fe09u0sWrzCxTqMtmYPChaVBY6q6v784xrTGtmgkRPXli6aZTMrQLXjBDGabJeVWzg/9LzXfA1NQCmm9lIDzng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7914 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 5a910da1452b..0d7c73e9562e 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 Thu Mar 28 22:21:15 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2048.outbound.protection.outlook.com [40.107.249.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 2EA806ABA for ; Tue, 8 Nov 2022 09:09:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lnIPBmSazVBrXqVZBYwPW60sFrF1LNKJTxFbAnjkydoPokb3Xe+BHXig2VD6uyC59nXiQ+JO58XvypjK6IjGvNQOJS8KqjBFhrl4KyC5EwpWFdPIKNTURua3cMDhcj1TonSLN5+z7HC5AwXTq4rfOERz0H48YRv+LaU73s/5qg0H7tPs78iLH8UsuEfwLKboP6RDg/b8CJlKkRv99ay+JnE3AKQMnVdvHRrMk0Ew9FlcpA+UPrZ9tD61yYbEW0A4scshbgI1IoFhcKii0WQviH5YR4KXyqMIfA4quNNe8wu+02sV3ccbmpTlKdt10j1E6h0bAN+jDhE1uQZdJW3nwQ== 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=cKrkdCE87NzU+XdrELRcXHVhJvKWasTkIYQ0i8XCnJI=; b=koFmIDblprT0E6M9d7qfMnr4YA493gvZXrQPJEHTxWIZ/OWAVTPbAYmf9ASQ4GPaiaSYkg+1UVDT9cibUtBMYblkLmafny8uSy+1FmFOPKXx3SnAh7pWRHIFvXmBFSKJVGKNPfffhChKgUC4hwx+rGgwWiHgfiHI4MOff5ffYnnYjctskKpmg9GFWYNGghTPJVv6O4vm5/WTOozqFqecrB/YxnST7F5FCwR+6snxwvs2YrR3w9hRI4xpg5OFbg17UHR/UGEqvb5FcX87FUvOpwqXTxeSnoBtbP0vYrS8SqlRnSkkXrIrF5JVTgM0FYkEwwKhnhF8i+TZulJ0WwqlTg== 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=cKrkdCE87NzU+XdrELRcXHVhJvKWasTkIYQ0i8XCnJI=; b=HaCx/Td6eQezpDQ8EhtfTBv3HUOmsbrx6Iy1XR0qjCqq6/wav78PMT26xgOx9JkefOezcH6LyS7dOiKSgjQAIbnvQix0FTMmPD2a1OOzuWH6rqM+aCxc7BZetLAI3NVl+iwLKOhLJDk9PYbU/k4eXkLyPnTrMeqxD6/m2Cf4tEy8F4jZEeCxAeA4M0J9Z5479suGuUfLz38yptZC71A7I7a54QHSBhsrGYx2KAngtF4GUaA/K1oSTnvP8bS+PgYz3EMKN+BZ2CTK6kwi+0aTWvvW3VSQDE31YFhaTk83egKE4UUzvUEuxM6WM6gYY9jCf6B6oit8Ezrk810wsXvNbw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7914.eurprd04.prod.outlook.com (2603:10a6:10:1f0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 05/15] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Tue, 8 Nov 2022 17:08:27 +0800 Message-Id: <74da28510f4d1907757fe377f8431dbe4f00f98c.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0001.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7914:EE_ X-MS-Office365-Filtering-Correlation-Id: fc1ddb0e-d4b8-49e9-3ad4-08dac168e3bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9PFewbSG9ntS9jEGEteoe6vMk8rA8LV7Q1caL9dsvED95p145SOSdis7XsxwN9u0yfQ2BMYLaptc0otiu76MPJTbWrRpFHXRjaj5JuDM12eoAk1OQQPAmBd6ZNhjnjGqVkqlwU3ge4R6dm0JYMtuopL3vYSC6P6KujjSdwzvwuPtJYba45TNdvjaWiMrNR0V8HBZ5/in1JXIpoa9zGOpc+yD83J6/yyUBuS2zrBowxcrWRVSCONiDvjrAOSLduhQHWcysbtywslQx2xQr31aevc6/Gid+qW7LPFBiA+qhcaK7dpFwW+t0XMohrZ2j+BJ9V1nGEnArp9nkuiSzETHPI7MEISSJlMNcpKf39HJRPO+apFJFQvXk/lZJexRk6sEcjUgbIbebSnfBt2F2jQW1O3BNA0I+SUzTpof0S0nZwQOo+ZhCfJU56N0r2H8XiQzOu0x27jYJxDsAAlwHbczMfMo1PUHv4CRgXl7YGbxD+ix6gXdzvuy3VrynduqiqGoE/Xf2dAHxSG5nq4MIjCwoEeJqiVBapOyVaUyoLMn7Jk2hx5W8IcGVrY2NAEz5mFjjwohp3bmUIfS/LD4szCF/wIRHkFVFYVuQ09nGTOlOYTyX1sZARyJFkwMsPwoz+TjhmGEdzxitlnPqlz1JQbeWjlKh9djbZHddsED1LL5YVxDlzn3M9tkq2uXVtcvsicYVKthNm125aS/NjjK70k3Q9DoyrtiSrfH1TPy/MvFzbcfk8HHOtrVrOkM9caN9t29 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(136003)(346002)(39860400002)(396003)(451199015)(66556008)(66946007)(8676002)(4326008)(66476007)(316002)(6916009)(2616005)(8936002)(186003)(86362001)(38100700002)(6486002)(5660300002)(41300700001)(6666004)(26005)(107886003)(6512007)(6506007)(2906002)(83380400001)(478600001)(44832011)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bBtz0NM0dGG8b4pYUOxuIIWfXGpp9fXVcwfAvQ2UKLF3qs6E07+1e/tNj0LW?= =?us-ascii?Q?2Lw9URWZ8aZBe6duldDewTbOSdFhUiA0SheIVkmIG15LxtoBHWPzSXv76BKQ?= =?us-ascii?Q?d6YIs1vtD2J/j06PegCwVxwo/VtEty9I9KnXpe7QOHTRbkpOWriQCo/tCzxv?= =?us-ascii?Q?lE+PKXJsA+jnDFpXpqkCsRvSzj7gu0HyK/Sg2qNaakng1B0hbcwXXWBjvF3J?= =?us-ascii?Q?5wygwZqgzq4qNvR1Kw2lEBjQrHuLZDzOLprJSalmMNH+5SukHjOYJU/r53Rd?= =?us-ascii?Q?UqdAj0KntL3nJKNPYFAs4gkzYWZMUZLPJt2uqwEPUxNuQ8xmB1/NKIonkg47?= =?us-ascii?Q?QVldNwGgNA4p67lHexvKNZab5GcMVKhiLolS6DNYEeBIOlB7eViRdl4k2AL3?= =?us-ascii?Q?ySjbm0W9oRPzcGXWntwOXQ0DEc1YPZFd64fm2at9DDSPVXe1O0Cr77OjLy/a?= =?us-ascii?Q?uHUQR1FRz09MpEIQ148krvP+Ra+5iNq+Vpfr5JYV6Ox8Y22iN1EyCfUZw1EA?= =?us-ascii?Q?ZUAowQa7Qc6BU2lpA4PDSsCR1DREnzl2H63iN2KQzK29OiqGWzXNcKDFzGJS?= =?us-ascii?Q?Pbona3X+04ysXXY0SY1Fvrml1sur4h7rjTWzFePt4dXZPirg6KdzKF65V7gf?= =?us-ascii?Q?0aRd88SQyq5ZeJ0yZfq1tFeyV7WcMlocVujq1tywJkrb6y6yWk65leXPQJnP?= =?us-ascii?Q?oySpPbBRxzJ5U/iI6bcc3oGxKBJN5BIuqqKTu0ukYXYAkRFk2Z0Cekw8Sg7w?= =?us-ascii?Q?FRcM9EXp1LSpEZ7DINBH9KPd7/a502ncGe+WNfwRslPMJCSy1WijPKJIercW?= =?us-ascii?Q?BkXMnBXQPPbIsQ0ta5gy0ABGqW1YhQiD6NCvwWiq9kt7WroK9vTWEWIidOGK?= =?us-ascii?Q?EGmXjnTTlaBcsq6g9Gfzl1JQbjfFEjEmI6bfV9ZWjBlaI51C9a0mmi2vpuOv?= =?us-ascii?Q?0NgpCRhM83/8xwpEH02zpPvnia2p9H9lk5voP9xQau0/s63rdrEA5U5KT/up?= =?us-ascii?Q?2KBeg8P07EU4Wl8xSEbtu1iwxfmS0uR5x8XqkaDWZArQQ3RwtAtn6KIRASTp?= =?us-ascii?Q?7F+5ajbYoKHxBOylZmgDSwS0jJE+TEUFW0z4YWA6Pchu8RjCxftg71dQjII9?= =?us-ascii?Q?d4LZuQUQQn+TmFwZT9di6LNb2BKYAZZPSvX9aJYokTIkg+BUgYluoR49BwqZ?= =?us-ascii?Q?7R7DOR1dtr/X81R3YzYGd0z+QpCkOqm13U2Sj8pa8oc6yQN0mRvyO18+26BG?= =?us-ascii?Q?LhnVzqXSLIvB5QPtji6nrfODUm905MPdtl43IQv0KG8mCOvWDWMlUJEUR4dx?= =?us-ascii?Q?Oc4mAaUt43342+3vKunOzHoHC+v6QO5HSKIERcxt9mk3YL5vzKZPWduOytZ5?= =?us-ascii?Q?X3z/Jgw0vhaOS/cEvlquLx76k2nDe2AuEkyfv7Sdz2mZACh4lardyUXjfENv?= =?us-ascii?Q?8rk3HT4mwYKSQ1vSQ3v2WLNAKscAuDjcxJxengcvjZJ7RJTw7jz7f7EMYXuT?= =?us-ascii?Q?OSmwfyTrc/iH6hDhpEaeTozB5D0JCOZG4+BCB6/swvo9RLGzzyTI9ByP2CRL?= =?us-ascii?Q?AL4BW40dfqIJvGwoR/WXaJbZawC3qeoREx8zn75m?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc1ddb0e-d4b8-49e9-3ad4-08dac168e3bf X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:06.9160 (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: 4y0iXVaLCGvYmPYFXWeCVrHgXFWdfCQ9ZCJTDrWJ7o/Cwl8wMUkOGoGod8ptspzm5ViqC7NW//RbkX1i6M0bPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7914 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 8 ++++++-- 1 file changed, 6 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..72c618037386 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -249,8 +249,10 @@ struct mptcp_sched_ops { 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 @@ -265,5 +267,7 @@ struct mptcp_sock { =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 Thu Mar 28 22:21:15 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2062.outbound.protection.outlook.com [40.107.249.62]) (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 330486ABA for ; Tue, 8 Nov 2022 09:09:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFf8WqQR0hVAofjjjjNAovmkFd5VZDEGsMT3yEaBAS3SkYn3IhKwOE9fVIU5hZPTTfZXyReWNLvLKZFxIjA77jYiZZTE08eS35/REztF6PtD9WrdzCbUHmcXblJ52EQfe4Ev2cG18gYlNiuQOhWflHByQrl7ALB+ls7mR7G20DmD4wjIYpfM6cWfjVz46lN471yzzt7sYsGxi63B9ilRVDhQW7HdO234jQKhG93wuwwTVtZYnwnqnCX0AXLdfhB9Uh96EtQ2uHXh/xdFHbxaaOKmfzsylcElCVEeGZT4bgV7ihEHGs2fVYxbqCFLGZNf355AdJYcyQABZVgecEAS2A== 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=bkCQyuKW8C+k2ftNqCOd/p1PLCCoME9+6+v25bYKKHZR+TdJ7FNMeEWIbIPd2gBLBY8Ry3VwC6gjhMYBrosGKTeWEi5nm1bypGFUsFg8HKeoJ5fiNPrKGTfn1gc3iVzQhRmIfsaFsRjXjrcIOwcXAfXnp7fOaUMCyn66cGYrxfgA4NuVEZd+BkBnhZ0eR/r+8hhxC/StSFYdikAPUCcA+kH9B8H2q54KKuI/5FIQK0FueeBBWxi9hrcrqlmW7vsL2LNLqWCx/d/234ofhey7/Hq+1gfO8yH7taS+oEXWRzgVrFPMmNEESO4Ahk/4WVpxgx3fC0KmNd4W1HQRPPld+w== 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=XXr3HWmpdATTgwfCkAK/w0fbpbDia2IehHBHOPiH31c5M6+2xZVl/Bk3OZ71CweyDewhbtjje9S6/yNN7zrqNz1q94mmd7fwU6Anz5wP4m8wFvYobhpaNnlNmQfIp/SF8Hzs3AlXii5riUMmdr7q7E6sN0ZRb/A35vt+exjTsf3BcKLBhJrELuwEfzvCAfcuBQOB7y3D+M4zSZTthuOq9jftjpWeB0M9ouytlZg4LONs+mJlHlvYb7GiwaIR9YYrwbVsDt7QEx1hdjFPp1E6Oo0w3JKVl6kpyBeuz5ctFzldziEtA1xbNlQE3qxIFeJ/ZmPIpS52oKrS9i6QtNiQ/A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7914.eurprd04.prod.outlook.com (2603:10a6:10:1f0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 06/15] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Tue, 8 Nov 2022 17:08:28 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0021.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7914:EE_ X-MS-Office365-Filtering-Correlation-Id: c9cdf2a5-ca22-4c72-619d-08dac168e86e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OYEKdgOSWoTPRQkidla6lgW6I6Q2ozh8fwtfAuKq/Bk2Ogb+VQbmOm3Fa/JgiTDgCNHFPXF9T8FYzkrGARkIBnEWAB5QWvm6cnS8E8ulhLwuKfhrfziGQEPn1txfiI5AUjXcJJ8Mhw8udNr/0KwRDKm8H9R74xDfiqhlBSmriGJlzBvk9ZPPjYgb/qlKEaswBXL/McGeDalSMVNSzNWVVkcfhRcRQy1LcqljV8OowuyULSUPKMz963ZljUtABRW3BIDhtfwOCp4XaLJ0hYGfDXE0ezg12EfY4sUFO+kJoqblXPdfoY81pbO84N6uP9vHqb+dddQib7Ie0W1rR2i+PlXQJ2mkNPz+vooQCuLtLJ4f8JfEi9qX/g4pgH9hgoNwoGftIrf3MA9fdWVINCNvYcQhSCsYZW9691zGrw9h1FG7DGCmwXeABmu3cxi9g974Tap9gPwQvMOE/Pi5AocxOHTPPG+zgFUJKtm+1kmTk+NfmvwUo+C9L7LVg9rxhVApwOWRW+J3RN9d+cwnp+lxxTmYlVFW0noBr0WoEwkMQcwetiS1kvGDiM6QyAmuT9MoO+zqjAFrVW4R921Zgq7KrBIO8ZEjkRIfkdK6CHQLku/TUCodd/7EQiYsCtaxZXeHV8nU6WyGN08JRIlV/QTLDn92mUbx+BY8dlGfkrduRe0TnpkEZNLxlJzyehnAvxjgwXawhph2U+o2rvU3UWsIfX+ULSgQgd2Ug/aeeDi4s1V4XBZpaOHD3X7qp4iCZmtT X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(136003)(346002)(39860400002)(396003)(451199015)(66556008)(66946007)(8676002)(4326008)(66476007)(316002)(6916009)(2616005)(8936002)(186003)(86362001)(38100700002)(6486002)(5660300002)(41300700001)(6666004)(26005)(107886003)(6512007)(6506007)(2906002)(478600001)(44832011)(4744005)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xxt3X4wxBOy8bl5azfl74mAp6EfNwhBu+Lvyix2Wa+bmxQ12Xc1kcM42mYhd?= =?us-ascii?Q?NY6bus6/2PMVTnKRUqdwjilksdUGtfUSzBEXDwCFuGnBRMohmivQO+3+PZIX?= =?us-ascii?Q?dxUlMYrLFoxT069p3h77xWc1O792bVXpRgt/Em5UWLI1l1QOKf/G+dBSzTkd?= =?us-ascii?Q?FnbFtYOkxgencebqhuW6Qzgs22v0pDs7I/HKuzresW3doXs3fdLjbxQ3g1FW?= =?us-ascii?Q?Ad3WdEFrqCXcnxT9daYMVlMH1e3kEaUKQtxCP+Gs9rHwKvz6R8E1GobqrGHK?= =?us-ascii?Q?ntMfdusV5caFre2S+P66ymliIvV6lFKyLG12Ub5wReo6IcCrYJObgDXaLszW?= =?us-ascii?Q?FOu2AA/a7zmooozKxIkwcvQ8Vu7uGcMdYTLkKLK2EWm+dudDZPOtLAhPPzy3?= =?us-ascii?Q?DJpAiSNg/6OE2e1jaYHrXhpgewZL9DIy9vx4VG7uQW9ti4H++VIoBJi2LTsm?= =?us-ascii?Q?IzmIA35oHPb5Vd7DsYscJNBe50xI//NHruOrF5NqhibxA9FJ4Iny8pFAb8YX?= =?us-ascii?Q?9IecNXMtC9y7VEwcTlt4P25Ec7nL7JsntKAZjU4y3InqL+wKtF5yiR5rjT0a?= =?us-ascii?Q?5z+MJEz/MZ8Ms+G0NbI5b3sEt6GkgZCly/vcs8GJt2x/mggK/qZxw6zvHZjJ?= =?us-ascii?Q?XOjycHk3ynObVAI4ohfPHJMPqVXDUuhT9XO1gZobbLZQPk5pYrnTNJ3yag3+?= =?us-ascii?Q?Y9GOwOCU6yf1bzmK+NGATm/QwYfssyE4r7/XT3VLoQwz6pi6kjpv3ttiEODM?= =?us-ascii?Q?B0G/3hPLM0UL+GuL9uZ+E4gn/gc0CiYgXqyQczoGHQjYULsQK62Hg2I0CO29?= =?us-ascii?Q?5U+3zmJN3QXuSP8KlCM9lF/Ic+m7tzY09qtTe/TA7kHg3iIRExEch47ML4k1?= =?us-ascii?Q?DDph2j5qkUWmNlt+hGWBDxmbXhv7yrr2STnbmO1AoAX0dAEmMzR+pAO1fGYZ?= =?us-ascii?Q?6MecRCaJzq4UDMhID9bhxNRf2i64cMUBhVFTm3SaEmYaLJpmllU9C6ny47Uc?= =?us-ascii?Q?5BkbvNqGluemhZoHrQ7V+h+ivMm9CpsUPQqlIJx0xf9Apl5eRiASRuBZnBZW?= =?us-ascii?Q?oJiTG8ar9nDTQv6h34+06BpiVmHMwDcp8aVlgSED0AsmDDKaWbJqLtyDfOy1?= =?us-ascii?Q?lY5B3lzJtRiXOa8c8EdiJvNa6mzLrokU/UPoVlEeb4GRXt5b0wAzPititQSO?= =?us-ascii?Q?NHr9ZX4jxnAijmQXApfhdPNV6pbPgtXxsCMUBqcCeBMCmzC8RrO4vREonvXw?= =?us-ascii?Q?5u/keeZF23SzEd9rBAZsIkOErLUwgJmTZFFaK32I7higZw/Ba/esMvQ1HsCW?= =?us-ascii?Q?pdR+NubZUjmDWv0hCPCFyekPU8w9VpSNgKWSVMfJu7fhFtOMRo9bEbsU1HtA?= =?us-ascii?Q?PeWYK0zOdDGX1GvSc7kpXA0zzhbRwV0C2al6JqzNwqPbk5e5footst/NkdfB?= =?us-ascii?Q?ZSDGVT371vyILNug0DI3pTgWLhym/KKG4jH9mevJo8Djy9z04dS/ERFLMagi?= =?us-ascii?Q?RvGHYAc0oMLfiZRtQ65VtGGhBx7K1h57skgmgfYPeubwlPBBaDazCK3H6Ket?= =?us-ascii?Q?Bj3SH7rWTHqjaMtWyC/eoJoDGIAO0spKdaUQxIfy?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9cdf2a5-ca22-4c72-619d-08dac168e86e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:14.8372 (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: ndqAhHyF95ZyG0uPqHWHI+FQlOU1sUW1aIsmUzJgHyqpODOoHyHD/pwIkayvC62fCi/Le+lg+kfxfTdtQbDeEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7914 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 Thu Mar 28 22:21:15 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20081.outbound.protection.outlook.com [40.107.2.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 1A43D6ABA for ; Tue, 8 Nov 2022 09:09:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZb3u8T/myLEAXrYCKJvDil4n6EU3+XxwV3VZnhQcAay5UHEAuXUG6R4jRpl4mHJa9Me8uF/jkChyMawLat8BB4smkDml8YpUvfMiwijK7R1U7aa8XJ40whKtFsuKMMH0vaNTMsvylKiBwqZeZrIMQAjsZXDeLIb8m3Da33rDTH6cSbuKxkNxGRomjtnTiZDHZ7UAQw7/97XIdLNG78pb0mOnFqqOqR0q0dwxmOGMWlPCvRqsMkL9FzG1njYhtNUH1PpKOOmv2soZDvXy8NQvUlI0qwhLHtepPGQ2sfjllhZK3QuCRkNzlcE0ZijiRBtx+BB8fkVTUPu7tyOQ4mnPw== 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=Uc1I0KtjtQQIbVe8vW6RIooEAwc3qIArFHXAyOd0tD2MWIvExx8ZQAoxImftILpWvp9x0FBg2bUaopUiiLPzYdNHJ6L9xdh4pY2ASQBt2vVRfm91uyMb11O5oJQ9sEgotkchnGjAUQZjAn8YVP4b92Bf6pAdNuTVQct1L1qAX9IZ7ceYhcNuKFb0nwP0PTefjqbsTSZHcA/SPoPfCPL4kw2EbTMX+gLX4+wTARb4QMF+p8TznHia+w0pkyBHXWxmiFtfkEtkPKUCVZww2PPEX7NK0JXceEaeyrMHvE7ILbl/WPh+Ni5F+zjuCD0OndjfzhMcujGY8TrDMwg683eMoQ== 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=3vy49W5Qi8NjshxofTU+5qHDsldPHOJ/exdAhWexRwaOQFRfqb1mlOe78j6XXI6U4uofPyljX3K4pe1u00OzTNh711U8wPv4d225Cvw2c6/gEHJnHrtN68jMS6a3Fi7Z59JMxETvjU3d9PBaR7J3DcnweBFeidsUer/NxGT9PWtYaEQUAte0m3rwUkyjI1d8GPy8NAstC29Lu15emEPvv0A0CUxwTuqAlso/rqa+nRbDJk6aK1xtCA5I/kX++RRjLV+6FM5oSpgoZ3HePGZOyIJkt6Zr2/yu6/kmgREO0P7eBIDeMLHtu2GGzAjG+4ilJ0Ldot9uqczeQ3cIkQRWsw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB7896.eurprd04.prod.outlook.com (2603:10a6:20b:2a2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:22 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 07/15] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Tue, 8 Nov 2022 17:08:29 +0800 Message-Id: <00f0c0ab23efb522a31b252574288715759e1a30.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0010.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7896:EE_ X-MS-Office365-Filtering-Correlation-Id: 393b80c4-0360-4f92-9ee2-08dac168ecf2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vTFuYVLXkWB1fkMf3PHQdYf1CjLLjLasDgN4s/lMjnkB4+yYGNrfJ0nNF9WI15jpOMJ7xa9potF/GeLJTgDT2hwGZi6j9F0rOwl4VQI2RklzUz2l2oWrMnz8HSPlVCjc0SFWVGiPEmOl9jVNl5OAbthgwC45i8Lm+ohMJ1S7GyOmLincfAZaKdHTWUTp75fdLNyYtvpIPvmSyxdA5o5Ra3EKmP2OHIdaw0h8GfoHaDPfhfQxKjK9iLw5dX2LfiQVuRVMDzkHXunP2lLWaXM6174v9VwmF/VWwbXSPBF5gZr3H0wIQoBrI7A2P5rLlpTnLIfbC7RwQ56iZC39tLq6ESxMIiTa/dmUWpXD4bAS69sXt3o6v4Dv3mD//WkwPpvFCQcTH3HdudNAEcywHA90H9dMAwPJYbrXWPqE7ZmczMlg05mXNZwmwVoLlznLK9UFR4AYq4g84D1auHBWRLfZAqEK8W50kr9XRwJt3AAD161XbWOHd8mXuz1qg57TXbeDs+/+lddc2Hw8v2vJFnHOqFGVKb42Qbyi+kvNBE4QR4z1GYMq4Z2Pnt0ldW3HM6n5lNaF0Pk1BSMG0LU/W8beLgP1ervZIzcSzC8jKdDNE/MLiMELjx82H6Nh7UTJC4Dw7kuL3GEmCaQ6hy51a7cRvrfL1n3Qv69INAwnHIzRB8k3c9OYW+uVty8KGOQOiGNM3A2vJ1dldBcPcf/d2Xz9KAkChA3MuFshluj0n5ho6+a3up21pJ68W7j0VqhJb7EQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199015)(6506007)(316002)(6512007)(36756003)(83380400001)(8936002)(2616005)(186003)(5660300002)(2906002)(26005)(41300700001)(44832011)(66556008)(66476007)(4326008)(66946007)(8676002)(107886003)(478600001)(6916009)(86362001)(38100700002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P9dJBbcuLaXG998rV5AXUbht+F/dPC0jBaSC0hHaOB0ifXX0XUj/SKxtybcA?= =?us-ascii?Q?ixJuuGx9b1CxNQbYYegC1qf40rKtlrYZ2tvggA/b5TUWZqS4jPcv6u4EbpjH?= =?us-ascii?Q?qIhDDaA+URXyJMszLBqswzLs26B8zv0laMHc3f3YEW1h+4xJOt+nzkKyfocR?= =?us-ascii?Q?+k9dohIQyVbnO7PgXAtDckcDgFJYJZZQwiik+8SL3Dni/Ap+JU1AGWdhDzdO?= =?us-ascii?Q?hBTXClwp1foIf7u/sQytafR9lop2IqtW8ebDyBMck5RtDZIuytcxRn2DGrFD?= =?us-ascii?Q?WXLQ9KMyZ7IueJ3+2qcn4JWCsmrbHjwFykYEutbfGrCBgckf1lGU4u7y68Ge?= =?us-ascii?Q?kcL0p8p7LJYpp/0SqbHCf+wpdMy3nIKRNFiTdKNxkGWqHSy/z2nn/8nJ5aoJ?= =?us-ascii?Q?4k5hBKlw/ruI0GpVYKFEJUdgzBsMHTM5up3uTBbCo1zL1IZO072VrAmGKjPt?= =?us-ascii?Q?bcAoP1KL8eeIjY4oiaLjPBXTRZfLWtu0edt+j6GYzBgUzGvqGyNRfY56mJ+q?= =?us-ascii?Q?Z4e1qYzuPw8OgPYGEHf4wGEB/vQChUi421RoBhEqnRiMBQwTpHVZYdi3l7lg?= =?us-ascii?Q?xuIiUWSGCcEpzSpmFHAqUOMWWxSeXzrTjcTFfNChZJc4NNhi7alU+XxxSTF9?= =?us-ascii?Q?tdM6KZdc9wixi3ZLzLrF43XFqdVlHqvBG6y9l7WXuXM7zYrfmyICYQumx7kQ?= =?us-ascii?Q?GIZu18trG8gCR9upJFhZ+wT4uwxM1reoobK8y9wo2Y5q98CNCNgjPLjsL2C8?= =?us-ascii?Q?1PAlJKnMlw++9upRLBCGpGh3w5odV3Zu6RhpaPgcYVqUP0VLAuH7GLKME86A?= =?us-ascii?Q?LRST8jsL8Mn4P6sXJswkn02DXPTRMjgr5x7JFO0wpXopo8hhyraMhNNnC3j8?= =?us-ascii?Q?gJVGAWK8Rx9OXgwm3pVUDPpxt+479RTESbadWGnu4R/RVcpcan6G+0ZKJf6L?= =?us-ascii?Q?9M2u1IvkcDdUBtLOQqFC9/n/0KMlbmXPEqucCNJfOqAYj16rvpaEgDd5qJEP?= =?us-ascii?Q?5ybdHmGUwd+eIT803TR75fIgeiLCUbGt2jPn/S07fFiZdQ9uRxVN41RWxdBz?= =?us-ascii?Q?SGhElsOIadbxhgnaVuBhq5tQ/xl9mqITKfglB+Zx53ig/pdDYJfuU86L9wRp?= =?us-ascii?Q?ibpfp6kqdRAhb6+dKM/uTz+bSPUzHR7Vi4AQ5IHHSddYHxsrk8hBlnLhXk0J?= =?us-ascii?Q?A3WbsIcNeDByl5uqqlpdYvjW5hyls02hR86aYqnokJXELngYCWsyy9vuJTYg?= =?us-ascii?Q?gYxBEsDlC/Wq0L3PPzq61tsHgHjaBiBk63jpfVbX8YR04xK7E+sKQoOU5jof?= =?us-ascii?Q?wIXtTATLR+kKOcgJoIiObOUn8kYBA/pjA5MFCBT7a+5hQNPRTJGMm1H9K3EJ?= =?us-ascii?Q?k7/a6fFLVFQy7ZBuAzRLaaqVxRWmvvMp/YyTRqWR61IuPEnwmr1lPHeHdUBL?= =?us-ascii?Q?BpXdG/BmDkUVx+AR90wC8qP6G7Bahu4QF8JONWW3yoPczZ1Musf9N+W7tkSp?= =?us-ascii?Q?QXZvuoPBLzBYfN+v92U2VGUzZ2C67QdV2FTHIPXAZyMH15POEwoCeV6ZXU+Z?= =?us-ascii?Q?p8PW4AoWwz9jnybalSoQ2/J5kKceiooVtCA+GgUG?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 393b80c4-0360-4f92-9ee2-08dac168ecf2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:22.3366 (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: sev8ywDM7qK/9HfNNs91aGtjA5TH2Sce46BnpFSTCALbAhTt+50vQleut/nplWsFWm+woDb8PYYsSqE6XU/hSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7896 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 Thu Mar 28 22:21:15 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20044.outbound.protection.outlook.com [40.107.2.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 080F46ABA for ; Tue, 8 Nov 2022 09:09:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nut8J3U/xESNrCZl+90qglrfyMWap7vkIJs15qSyFA6qWBjesiWfiVHaZ5U67gRlLhKX+jPs7KXO43wKFmlkqPQ44uGxAtZOWRT88JgavFUy9tfoxoP/nmNGUYzmSEyQCED2jD12qO0MQo0GGBgwOMjOZ1tJt3b5Jc+uQj2JElh7LFrC2s/G1y9Mm5X0WQkVxbeWhqS0DaLgcHQ9q5Ue+ZIFZka3q+yMkmUIVizuVpl4tBBW42Yi+LXdiTrCOgNf7LomvOLuo3orIrkVmkMeTEx5Ow/4POj8sEiqm+/hrY3DQpnP5haI1G48JiKXT3ZLudFd3idWCr6hHpolmmFH9w== 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=OPrcEJvatEKQkzII80+dag/Sfp1nVq0NJrLQEaOgTmudMEw6mYjxG7W2cacTQs9CB0goElHm8OSOpEendRnXwUM8V+NXUYC7/yKYLtENotcPQuPlLsBujK0xKXtUwJNEnSh3/OPkRT7MvI/Ey8hN2aRL8NWz2/4k3ejJHQOJHfCC3vyimcUrsxKn1qi56b6q+SZI4/KjZzHgLtdBsKyx9zhYXszqi/QzFAhPgw6kyvsUZGhnLSibEPbOEdV3ybGFQ95XI3MQNazn1+EaxozkQqcMaPZkm8qDvhentGDcgzkJRAKxEVCF2tjS352UuTnNZ/KBIolBv6bq9JOhpCSM9Q== 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=q4l0ssTFaxTgeoBY9QeFgQ8syZSdkRdSbK8rGpRol/PvE2GkjjsezXAI0VtImrdDlgWC9ZOib5U2x1P8e3G0NZ2gbsi3E2F2Nwf2ObLYfXq7grRYNZ+Y2ByHpydt03Ff5gFWMX0j49d3huPJ7CNcQ3rBIawuhGLUgW9pk3k7okR7y0OFotGlDWMUSklsCiqX6JkGtEgt635pDhbfV3ZQBr1bsE+T70PxB4SL3HGawSqB8c/0CoxFkDeTI6n+ZvSB2jdNCyk9Ef8IJ5EsMwiXCYKUupiIs7KIURIDjAYPhcAvv3khy8n8fzImISxRTSXoC/y0/FDpFZU1Z2fTXWxI8g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB7896.eurprd04.prod.outlook.com (2603:10a6:20b:2a2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 08/15] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Tue, 8 Nov 2022 17:08:30 +0800 Message-Id: <7e9c264eac108083c72ba1a1fb155544b3bbb239.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0008.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7896:EE_ X-MS-Office365-Filtering-Correlation-Id: f95468b8-0f84-49e4-ee9f-08dac168f189 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8TOoCyCSaALQsjOBz+zh7HQJA1f97c457NRja8uyPhdz3Tk7QxXHT1Sc4yJ/C38sAjI9YuMcTN6xEPQysPzL4C7qJj6rLKaFMUEreifI8sy9lJR9F2RhBCr+QWMLs/REjr3OsKU2yOu1CJUK4t18SZ6SaiGeTkC8psLtDJo5npct1dCO2vWlWhXw/HL3dCBuVkQvf+3S5X2Z66tryfKIREo9HJSHDXv/aMQbIO5mJeCazNbEOeeunxub9Z11BCfpjDMUwMrnoDFKoPSXS7mN1BaEIj3tsg3ZFOOMOkqcbIyG05BHJB7A+98RFYqTiLmxrqwl/PWgZFMRwnjdhp6U3ITGeswhaUZ4kPXMT5SNBR/DIuaUTH8laTgb9rZSWEoOc9LjGZXzmIXJIhiN86D/tQ54trO7BuqatgVCWcScwRN91NW23vzfZhjV5PqSBuvQx1aQbneppVPxLPGgapFu5P+lOAVtu2koEcrFSG31y7pngj5I/EfKOsO+2DrDORIKIo9RBL3IHUZg2LuuGeoH8aPBPWbZZF3W893RqQAnVdpSDaJry3h5XjBkyxUUcTRtOES+Msdo2EIIimAsh5z/zvvkXxxKCEF+hqcz91IyyoX1Zkw72NG5nUz8iNmZdTJxrZw/VOpF9ICRqyBpqPEc6ZQpKfe0miVG6v2Rzgv9+ermMK66moSqO3fAj0auT4Ix54n5sMZ6GBRVBp4Kq7Djq4mKtt0VLUSJw8pNOJhrBkRdI0iUjqmXLqLk8B5Ub2Wl X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199015)(6506007)(316002)(6512007)(36756003)(83380400001)(8936002)(2616005)(186003)(5660300002)(2906002)(26005)(41300700001)(44832011)(66556008)(66476007)(4326008)(66946007)(8676002)(107886003)(478600001)(6916009)(86362001)(38100700002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xPQ/Vc8Nd0m2Yyf34X+cLAzVxvvK8GDsIO7qZt1AFDIreTbGAaExjmqj358w?= =?us-ascii?Q?epzsd45drPCTKXzwfNKoq4C+1+R7PAk4vjECnO7+BVX6o56VHfe/WKJ+KbMH?= =?us-ascii?Q?kwuT2PFMSsoOnn1D8Q1btQQ/I2c6yasXyTgmLzr0MCrEJAXzdEoZednElMrm?= =?us-ascii?Q?wRRZ1YhORxg3l/Hss/K2VKSQ4y2fdbeZUDvIpHsjN8W5UwqCOJah+al9sIEb?= =?us-ascii?Q?jAfPkyasn1aS/wVgaKJrMsIcpoQFFv5b2qh+aZoqpyaA6Qojqg6QNZJRwfoC?= =?us-ascii?Q?mFvX0M6U/iPnYIvw0EeUMFzNEIU+ed8HX+xt2HbOWLD458LMuSYbIAm+UjXV?= =?us-ascii?Q?dYu7JGAONbCnXWCIYjGLHrMYe/Bk1EgS3FrTiosj6LDrT55m14SDNQw4kQrx?= =?us-ascii?Q?WymQJITXCEzPz+6HCT33MHaSMpvQaGckmYVr8ZgMVktyXjJtHN2EBlJYzWMT?= =?us-ascii?Q?6BRbN0nsIq44VzxTF3pMRYNL7noKz4V7ttaCpKCz9tC+Pw3nV7gZVojcwfOY?= =?us-ascii?Q?qtswXzdLTSetAuaBvzMgf40xOpQUPdLg5bKIZ9XI+ji24ZS3wuWmd/x9STAs?= =?us-ascii?Q?7UG+GpBkK5WqqtpiPja7GqQTyASMQ+A8LRwoKuRPNKIWzLMTFjkpWl9m7OpX?= =?us-ascii?Q?ENFSDkBfngndzR31bsQgfZbkhpfIqiVCcUi7RSelvKTt2Z88sE/PVnBCBzND?= =?us-ascii?Q?Pa9WzAsZS+AgsrvFXRuQaOPpLcRG2kXn90jL4c1LHAvjkcrKfeF52UeCeKhD?= =?us-ascii?Q?saBBY4sxPFayMaVQYRdudIfJ6+GUGMB2WX+eFeJ/yyhpJ1FxDwHwEchAr5gI?= =?us-ascii?Q?weuz2d1ycrUrc7UirRXiqtJG8KOtDzV6vuKrz1p9KlHit3NMVcQiBceAE6ZX?= =?us-ascii?Q?nr/M7VpNvpAkNE7Wd6aT7fTlgFrEV8J8h6I44cMdmO6jMvLfz+v64VFiuDAN?= =?us-ascii?Q?ZEGyubRIglZQYUAuW7V3Now47N6Yd/34CdvGa74LV2AT32VmT46hiAxbOHiF?= =?us-ascii?Q?VlR5g2T86HoK7kJANDVaiFyuZN50pO7Rg8rune17CZ9Yucu8CJVJ4B661Usd?= =?us-ascii?Q?xUIsQEX4T06LvFgtZSPWNjQkt4a/E3KRA0q3q3nitdOPx2aSCbuXA1HhTEaW?= =?us-ascii?Q?aBn6TAJDwjBhOlVRcrqQ/k5L3TvZfKAiKQrfN+O01L2a7pUYWgYRZwuQaFub?= =?us-ascii?Q?Mf7W6f/QgFEKwUyODA6k6Y5OHJ8Lc4m5g0tRmjzxl8r0dYF4TWsZEgEXnKaq?= =?us-ascii?Q?EWNciHURh19ShQycHfaEa5K9Ap+33g7xt0bzXu8nVpcAHaLEgtM8FYJx973J?= =?us-ascii?Q?6rRzsRJuvYeSzI9jLv65kGy6SlIBAFQbJsIyX+YcX05DA+a3Fyn/4v6OdDKv?= =?us-ascii?Q?wLiUE7zNr8a+iRnoFbH7WzUcHod74100toRumN3BiPPuNmVdSaCNUdUltTFd?= =?us-ascii?Q?Yy7KYQkHF2KZpgS5N2kCr3qSINlSAvl9arKFhlzPn0KoYLYbOQhMsVGWWf+u?= =?us-ascii?Q?Euo6ADy3P2lylHftZ9G3cOaa8UD3ctwxmRCKTjqqfLlHYpac7IUAkz3koxCm?= =?us-ascii?Q?S7eMoeuiWWSe6NEhWkfjyaiGFa+v2tbR38/pOsiM?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f95468b8-0f84-49e4-ee9f-08dac168f189 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:30.0860 (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: ECEEAjv2jXKTWNJNxZo8GWrzWNLw/w2wE2Y+UHp43BUEQ70Pymqz7mqEIezP1cbCQ+9xin/xa2+mG5qHq1lemw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7896 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 Thu Mar 28 22:21:15 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2045.outbound.protection.outlook.com [40.107.21.45]) (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 320AC6ABA for ; Tue, 8 Nov 2022 09:09:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k5geiY34lRqZV5jjzwPPwvxa5DbtASVNUM/scrZMk7pmawWNJgfAi7MyASnxTjMyPcseJQ8LzTwlH0k7NA2Z9qN2osuRaIQfLAMzy7T3+dGi4KfKwXnkl3a50alpVHCeVsQ1Ni7N7ToiHvDtzWMPjfpUkGgdGuLLG+CFh1S70YCtfI443CU1kV7WlMx4h9KPEgR4kdR35pKia8k4a+b+n0qX4m0eJd2LawNtJW/Da8ZG2jaiI488Ffm1sEDb++vEKLLD2bEuJQsQfPp+PqxYozdizv3WTSXTN2x/PteI6+u7IDMCyza6AdF4bGt1r/8/lPDN5CakssCmUQK95S116A== 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=6MTxUdezPauo7emsfRWCE9nwFUwRdoHZ97YNn9b/Q5Y=; b=nmp7NLDDBjWrDOJg8amH8uGv3VdrOgpeUmixUzFdlHhD9nO+nRrFvtL7m1NCUDhUXx8OtzcHBRV1nDcENoSWvudrlRKQrYIxT+83ZiQCIziNhn8s9RQoaqitiOFLHyOcY5swOt0+kvx+xryyIQ0scihNXTZbmcjh+KHrQpaKk2zt/wWBWaJ0SGTx4UJO3eGiV9k1estd4gI04YHUJVWhmrdqRoSpkKxQIpcN1qDoTsHdLPqohYNJGzNFQxvdN9XHevf83Qbt92vMZJG3nJlWWOwqZUreOvAw+w46i5GN26HhJ1QCFuKZzZfIG2OwclAS5Scq6+v1RqwbLN2yKHeHLw== 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=6MTxUdezPauo7emsfRWCE9nwFUwRdoHZ97YNn9b/Q5Y=; b=bD32uKM1AqtBfBaWjxK8wEo7Zby7CMEDnBpyU0pSAKf1gN0gETwXtLUQwRwdbU4qa6E2YkpdPnpryMzuTB6J3IUmRpc/P/DI24Pg0twC278XxtHXUO59hZbNDcP6h+7qRJbweJN/dGJww//p48NtLXRcctZXVFVG8zFTOc3AG8k62E3w2Gq1aaQx1hgPaNVYVFngwZhAskWy0ZNeQrPih2qIEI6FRbXlAyx7QgCozykONaiIIm+th0CeREz1B8YiMhCdiqoR0a3iacuAaP/CRKgYbwVioQvCNZKIXwLpQrjekK0noN48QFnkr4V7qoXsJwv5mmIOsSKI528lWN91lQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8831.eurprd04.prod.outlook.com (2603:10a6:102:20e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 09/15] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Tue, 8 Nov 2022 17:08:31 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0210.apcprd06.prod.outlook.com (2603:1096:4:68::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8831:EE_ X-MS-Office365-Filtering-Correlation-Id: f3d51c8f-9365-436f-2df9-08dac168f5ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ygl7jy8P/2GKsW1K1kGkNiZd4mla22bAIPBfp86Ag8psGDYl020wmH2L6h7qZE6uX8b/THlmUPJ7kGKDf3uBoTkrvb+1qSBJJwtBcZ/kEtYVxm/dDeCGiARRT49lVHPrUl+h935XAyKWHPv4zH/POk1aH+lRAj/FPBQerZKA/dq6T8d91UUEFJ8w+IXsIiWJPnIsuXkIJn6PVtqRdI2G1Eejsmqe7C7ZyCEa90tkA4AzGcJbNFZ0Vg6a2LMPE1I1YzhABo6+lNPUj6FYntUxUAE2F9bZh64FoK58WA1U330yZJylBxuaowpewhxhrznhdAYJz5kwq1dV2KpU9w4LYPvVbrE+IK7g5/X7DMdba9eMmZhrSSd/8RTXSUKkxz4xg+V3b68cFt0oeS31CA79gQ+EbOHRg3pYZ6p3ZABbPRYT2WgEehecqb8VIou8JR4PKxMmPIrvsSuJyIPXUGqXR5tuA97YTOJ4OZPlxc/PbzrVNNLSA2sI1wIHRaazoak6U+mHb4Q4hqFk467D3vwZ0IyaMdOFdcZ/gMHQMIU35TtyGBTx+Ny7KerE+/0RmeRtls1/C/4LcirTr665fe9Qcnl0dWMe1AY5Us8by5YnniP+Dbf3hT/3ipiA5kqYBhQFbTN3uUz4SQKP+oo7R2ZQF1leykTd1AhHUMkDOwXGqTxKYALbrZ7HvtYD0jgfAIomcYrUyFe+l3XTrEVbPQWieq5X1ylYxYigJ306L3DNm8WB7RscVuuDUQ5+smceQge2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(376002)(396003)(39860400002)(366004)(451199015)(6916009)(316002)(8936002)(8676002)(2616005)(4326008)(186003)(41300700001)(36756003)(66946007)(66476007)(66556008)(86362001)(2906002)(5660300002)(83380400001)(38100700002)(44832011)(6486002)(6666004)(6506007)(6512007)(107886003)(478600001)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uSHEU+lyXZ92LkiSCyuHGR0Ti1+yuWWk/kKlH+dVOw2GaDerQBx15ArcyCay?= =?us-ascii?Q?Kl2bZYbh9hUocXg0Vu47QSrd5hR4IXh3parIDvgxCFhvFIc0dEgmGXKrsL5I?= =?us-ascii?Q?dNT2LabgXZk+v7wUV1qgJfcfiijEtZUramROJCf9WiWr/PTubjrQi++AoMHG?= =?us-ascii?Q?kMs3blzG9An6LpyQfyISoX5U32K1oIiXsOyCo79/FMjof6sX9NhE6Gq0B+3c?= =?us-ascii?Q?lH2+nyAqMVwsTlJERtqs9ubzTmgUzewSQ+VG0x1clyYq9usiVoPtMuDVCab3?= =?us-ascii?Q?Yg0Squ9hXPUkuH6i9eQd37GDOa2hTid5XzqpIr5yoyCOUX25Ly6OMCIqI+Ro?= =?us-ascii?Q?eLVORDq1wyqjOBi26vcAU7eSfNR+tmJoxObzqiizTmmckeJH5ZT7Q8WCtwAr?= =?us-ascii?Q?gOqycVVQU1CC8ii8b5OT7jQCnjDsuBSCpnRpKPeH2Hjx6YhHEM8KybvC3Xh8?= =?us-ascii?Q?Ue0957mEVTZB2hnK1WWLy8tIN1WRrWFaQqXbGW4AVzW1V2NACCKcIY1vPr4E?= =?us-ascii?Q?iZLbMCDOg+iGczRzQIpUy9alaDDub38nSLe+FtpM+XACw7kH/0bhWB3y4n6M?= =?us-ascii?Q?f93KP7WwOqLv5Z//GzLf1WVI9aH2+txLaV39nSHv6QbR0CY/LNxONncAujVs?= =?us-ascii?Q?QZYgYOzK3L8IRzPVbekmikKD61tDdUixPM8Of8jgNnQwpQJNFjuN5RnwZq60?= =?us-ascii?Q?KxSm4+xif3j3UXhhTUitx2lsonNJRCGbBJfeHPM42s6Ftq2wRTb/TyWtqREZ?= =?us-ascii?Q?96nZ2hGhL/VFmUdStaNxzza13od0/0ZqwCe2vd4PPe4rAClMROWO7U4DEDdX?= =?us-ascii?Q?hPzPL9X3p+E9sojc6z5A+m/JlwpiOw86uzEbIn5/UeE1JTA6Z5S5KrU59R2k?= =?us-ascii?Q?F9g+ggm9vH0HzgHmTS/uzvdAWMHsi1gZE0HQjmq5gOxX3zkKo2Ga5v8rHNLe?= =?us-ascii?Q?asO5NKppAms3PsUbvGxRLeAug/WqFxc5mDQC5tcdPwQiilE3KQfS/0am8R+v?= =?us-ascii?Q?JGC9xyL1dliMvFDHHFb5WM+nShBf0874RTP2QlJh4A3DmLiE2eSqYhfO1eFs?= =?us-ascii?Q?dEquBBtA5WBlgf8u3sF42yPdqHExmZ1XjP9Lw7UlExPTIU5TxYGHwWFND407?= =?us-ascii?Q?n6ovz7Y9igKU1sB/i1nkOXJcr/IYyoLmvC1w85AIjQjG8JfBWAiYjZ7N8erH?= =?us-ascii?Q?aVnPkxmg1QKpVCNoC9aOOCm5JHR+VE06oJcjFhlK9pbXGQkg5It9hX6BSzhU?= =?us-ascii?Q?5YK66V4VcRH2N/p8cmVqFFdA+7vEi3TxC3u/GZ1NBAgn0pStFAG2PjuOZTuW?= =?us-ascii?Q?l2Y6oIzdkW2MQGiPyy7dbT1yWul8m09FXOOord3QwL7q1GYm7K9C35IQugcZ?= =?us-ascii?Q?H8/vxzHcd0VdD2p4SIutPGcfRASHKkYatxoKKcULZQ+5eysotU4pJRjvYFJL?= =?us-ascii?Q?RFgrfDZ0il1B6so62Z/n+FnTN+neF1GdOegTC2ZQrpnEnPEjAEhC1l94S+7/?= =?us-ascii?Q?cvRx03bZPDUtywAYXI6RWWD+1eGA4iTCrHu/B9y0F0Fq1kr4BhDhO7DtSiz1?= =?us-ascii?Q?u6jhbt3tCZZZXAxLDMegumeXtugBXoXmTBjd/Kf7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3d51c8f-9365-436f-2df9-08dac168f5ef X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:37.4448 (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: YjbfgcmREeLTsQ/5Eyjyu9FrHztNpCqbHdQF5SElWuB+A9jVmWPmuZ5HYp7QV/E43zktsTT0ByWRSMN2mquIVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8831 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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..e101428e5906 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -16,8 +16,14 @@ void BPF_PROG(mptcp_sched_rr_release, const struct mptcp= _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 @@ -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 Thu Mar 28 22:21:15 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150043.outbound.protection.outlook.com [40.107.15.43]) (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 3DB206ABA for ; Tue, 8 Nov 2022 09:09:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IQeDwq3o1CKJncBnRFLF09/VzzNKqCHaLoiF4mG1Gf+TPGQmrirgzCx8iSK2rv+W3cWHhgRem01YV6Ty3YOaHnwsZ8EnA/hjBhoQfJgAdn4Fr/FrPFph3HsemaH5i+UAVanOf8owOw2gtI0SoqijBTI/zeGRXuqSs6CqOU7bodLXCM5w7H5+pGXSK+PLhNBBC+DNwNM4OpYC4lqyhAYAdsyPwj/B/H55hiMSWZy5Hq5eDQIeWxnl9wpHt6Ciee45iaMNmpssdgHQyKRUOnFgH0CLTS9VAw6aJ6jADbUB9gGI95oO59VMCE9EfWk5G71lPCU1m0H7evyRbD7c5sVfYw== 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=52+oT8AIRSG3AzGv1XxuubPS7EHB4M/zLvKNCIw2bpk=; b=jhWfJciQ8CSDdKbHq2/LR2A0aVsINyDnpg1Ry6OcGkh4sPekk5m8gczj00bI58q45R1yZapXRlZO8/CKpdr2VBNAisovA4VbzKQ5VCWKC0V9hpmCehc+XyJjg5x7d4tTfhwA+YFcaC6S9BoXNcheU1epmKCjpBSNpez7wO9HuR1YKMYswrpWGRi51CPsASEBXt8vQ9a0vxp6TQeldYw4W/7qJ8kldHUkHUttjBEViSFF/c6lrs9Y92z9kaAybSrcGQ5atUE76WnO/q/29q0hsxFSd5jsYKqsHbPb/t4eMc7wnb0oMcd6tWAaMpEqmQEwvUnzSLh9g9oZzy5V1azsGw== 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=52+oT8AIRSG3AzGv1XxuubPS7EHB4M/zLvKNCIw2bpk=; b=bkrdHJEAVLlRyPBgj9vCZ8m1NjarZLAJscKgO3FPYbzu6xhgXZMHPPHM6cn2iYwc55CvY3sDJ414Fi51hrHowfTAEHmqJbzaQnuEqog/uzeixm3ZUEBijgg29ULoLiRzA18bZHo6K+o4rep0bxoON1rO8yEYIeTbRa4o3rFqIxFUGhv1Z4gyXW5VGO+4jKc41iyrXSlP/kAeFOBfWIqaLsNZlmfQPSu3WfthCc9Fv25Cc/oBFSGUl6TE+CIADEFNrT4aLKr3PJ+d4Rl5wD7X3uJFlXDE5fLl7stQWCoYz4a6pgpvYyWXiizVbP2vteV675NUv6Y05Bm/LtudsAH5Ug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8831.eurprd04.prod.outlook.com (2603:10a6:102:20e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 10/15] mptcp: use get_send wrapper Date: Tue, 8 Nov 2022 17:08:32 +0800 Message-Id: <262f6ec0dfa2ffba15899460df4676dc15d1bd62.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0227.apcprd06.prod.outlook.com (2603:1096:4:68::35) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8831:EE_ X-MS-Office365-Filtering-Correlation-Id: 5877b471-a63d-464a-c985-08dac168f989 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BZcA42caB4Enf5Uk4u4SqZb8v2DNHIP8lFOKVRH/XfVJIfWpRvJ6FrWuDOmZ5BJx6EEEFIqnRHDmoSKQ/mw1IWCxxJRl9RIcxssQ2owHVaH3RuMMf2dkAfo3suYrFdCgGhBBPzHcmRqbaPXYJjPc7gbaaqTDX7xu8f51TUMFBlwbAxbbd5UUOB9c3DX5MZp3LqhfzncCeU4SxSMPOpCrhVpZSCersBKUsAMpr5XZQ6/POIF/jVfE9yT8A/u4RlTyVd4gNT7xtMHJVNIoBghsN2UDEsUR/jX/2HkNoK2qbIfYgF3XAKaT7yGPFEFCPW5fJv1xmLrimdX+AxXmioIZPG/L8Aoa9ctVHTx2zO4A2LZPymMkmEmFX39CXJ5jNc6XZnN6S9bDTrRcDuaBJuMJtJ8PY4BC/X5VszqaYkTHbLgBIFpSXmY/1K2MTyNpNmyOq7+n1SDl73qtl94sTLAfMYlSR5a9HXqXohmrovudWE1WJxT0FairTFmAHKSjX7V9PmjAfyarQKNQmpNhHpiEng+iFZ8mO7C7FCmgXv9CDHSSxrC9p2zvGK0ZL4bsm4F0rOZTNCjf+eKqZq6oAaRN3+JFLu+4/UCK/HWDFbhS7xUKUEIVx8HNlddktGoEWxUQQuSvwuecW7ySjGzGMjBUAV9VOmZa20k1Zj4NpaRQ1zvT5A7xI5/VFCqVoYEuBHeF4MqaQ2UnET2P224frC4CeVlkEdoy8iNi2PbLB1ouCDibBgQy9SkDFcwFXwOhCQrn X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(376002)(396003)(39860400002)(366004)(451199015)(6916009)(316002)(8936002)(8676002)(2616005)(4326008)(186003)(41300700001)(36756003)(66946007)(66476007)(66556008)(86362001)(2906002)(5660300002)(83380400001)(38100700002)(44832011)(6486002)(6666004)(6506007)(6512007)(107886003)(478600001)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UTS+2CObTRa+kGmSzFiy0RaTMoK41DjDh5tTnN45u7cjcDb5I6EO4XX1gInx?= =?us-ascii?Q?0qcfG6tTbC2SJLkSXhiX924QQEkWMW3ESun0M+3oVTVrlhTF48umBHZUft9w?= =?us-ascii?Q?ReKIVa09HbStSW3PNk5u8HzDZ9DmVkQRxItiqDqMrjTqrukNACaj3M689ZKc?= =?us-ascii?Q?4IHGNkoMASh5uo97Os3lSE/9VoNNBUphX291dh/KdZ1eXsd096e6tmN6XCsW?= =?us-ascii?Q?Spa39h0Cd7IsHhmgMrtDIvSA9qQlIe6YJDnQ5o9quH/d0vUa+5xxjbM1l82o?= =?us-ascii?Q?Fe/SY3ubaefP5a+mFmNSaE9EIokDN/zvUiV06lhoeUuNPEmonCiWpD44ymKW?= =?us-ascii?Q?yjkHgfIyvo1GvQVqLXNSpXZKKgz4wYwR4T/re8isNbV1pRZ1NBLHrcqxEG2O?= =?us-ascii?Q?kvEnx+xFQfCam79UEtuEzq2NRqyef2pZzD5RdWAa67QYQiXjzmQgMVOO5H19?= =?us-ascii?Q?juZnXouFLDLn5nj1BaRrlWKJqYRyqjUVz1W7t5rHgARTMHC+3F3Jyrd3zR4U?= =?us-ascii?Q?gtW1uT9tqVf6W2cbXot7bBCHN2TMj30Y6sJwi4DllCHRRbWC7u53ZoAMK4Lw?= =?us-ascii?Q?ZwzC3uLY/QIB/OhOqt6aS1Rd2hTjmKwzMKLhIGQpsGes/FY2r+e3nj5RpSlX?= =?us-ascii?Q?fZB5ucBmcNmv+ZXOakmk5nm/l0U4OmftqHOSl1W0B2s5WmZTeFJDQkLj4bu4?= =?us-ascii?Q?g2QlVsGVlVXV+wgi5x7APneVsMxw6er1kSu0ojTsdHuGw1ArfF6KbaRkM99Z?= =?us-ascii?Q?RiwSvc9uCd/7XnO7Tiq7+JhtISx+KAJO6ldtfWsK34bkWK/cvcAbIHCaGfW4?= =?us-ascii?Q?4oBEnVG6gry2Tqt/QpArEp6qRSDmSAYQRfxqjmXdzLvHU5qMHmb7ZJ5OnHx3?= =?us-ascii?Q?zosl5BN4s3qA7YHfraiaR7S4fO5qv2ARZDRz3NcXdfIChsrmwevPRC43wa52?= =?us-ascii?Q?8arc88yk83wetkK7fsYIW9mqTOCgFhCYdgK/dFlUYJSPt0NjUddvcf6zWQcn?= =?us-ascii?Q?EV2mlSocHlYNbDufZe270oQGD2iUveD0lqaB2I3IPpO3ALN7f+hJYXO+Hbdb?= =?us-ascii?Q?yE5RksgNx1PY62t4ery/ja6i30lntFILmTRYrEp3qnA9FYgOBX1Yd9RpQYiE?= =?us-ascii?Q?B5FsRbhAkHkPQe5aBD6P7nVrvrfflzc+fNnbWv2c9e669KupX6M4T9U0G/+Y?= =?us-ascii?Q?n6xipnN2cNhsX5CMXrycrfxMXJhaj25PVrevRQBUkboZQZQI6GWbCY3Aj0q7?= =?us-ascii?Q?jf7sIOJmErC/JKR9xy2N8FKLa0MD7rSD3PT0Ob63b7STGmu6uhuci2Ng6Oxw?= =?us-ascii?Q?8bi+vf6u9+yznXd2BTlX4021UP44J5gjyIONv19lQRNyJDc1lfx7MomedKBT?= =?us-ascii?Q?Y7ZI1mSUBEwZ6dhI9gr1x5+0l1ynw6yq8d+5H4V45GZ52gioM33XZH8TpEkp?= =?us-ascii?Q?FX6vcIANfccBm8/uJtTEznlcTe+H66i2hNf84JAKXc8bivevg8cXk8Qe2j+k?= =?us-ascii?Q?pAzfOmAYJ2mqYrKBKh2RQf03Q7lkcg5Tting2XAgrvAvM+X9HTqzlsnn9+Zq?= =?us-ascii?Q?j3Z2C2c8WavK3T8fLzD5+DRnbXeeeuxRd0qjqRmD?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5877b471-a63d-464a-c985-08dac168f989 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:43.7412 (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: PbVtOMC5kQwcFv+gtLqOrE1y+PpLdDD5+JXoxqTmb/cFoPG+uJP3q8u3tidN5DekWokKvfpkvEdwWknWHY9abA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8831 Content-Type: text/plain; charset="utf-8" This patch defines the packet scheduler wrapper mptcp_sched_get_send(), invoke data_init() and get_subflow() of msk->sched in it. Set data->reinject to false in mptcp_sched_get_send(). If msk->sched is NULL, use default functions mptcp_subflow_get_send() to send data. Move sock_owned_by_me() check and fallback check into the wrapper from mptcp_subflow_get_send(). Add the multiple subflows support for __mptcp_push_pending() and __mptcp_subflow_push_pending(). Use get_send() wrapper instead of mptcp_subflow_get_send() in them. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. This commit allows the scheduler to set the subflow->scheduled bit in multiple subflows, but it does not allow for sending redundant data. Multiple scheduled subflows will send sequential data on each subflow. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 131 ++++++++++++++++++++++++++++--------------- net/mptcp/protocol.h | 2 + net/mptcp/sched.c | 37 ++++++++++++ 3 files changed, 124 insertions(+), 46 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d7aaa49c64f4..5bcadb36b99b 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 */ -static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -1417,15 +1417,6 @@ static struct sock *mptcp_subflow_get_send(struct mp= tcp_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; @@ -1577,42 +1568,58 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) }; bool do_check_data_fin =3D false; =20 +again: while (mptcp_send_head(sk)) { + struct mptcp_subflow_context *subflow, *last =3D NULL; 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) + if (mptcp_sched_get_send(msk)) goto out; =20 - /* Need to lock the new subflow only if different - * from the previous one, otherwise we are still - * helding the relevant lock - */ - if (ssk !=3D prev_ssk) - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + last =3D subflow; + } =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; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); + + /* 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); + + /* 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 && + inet_sk_state_load(ssk) !=3D TCP_CLOSE) + goto again; + if (last && subflow !=3D last) + continue; + goto out; + } + do_check_data_fin =3D true; + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } - do_check_data_fin =3D true; } =20 +out: /* at this point we held the socket lock for the last subflow we used */ if (ssk) mptcp_push_release(ssk, &info); =20 -out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); @@ -1626,29 +1633,61 @@ 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 sock *xmit_ssk; int ret =3D 0; =20 info.flags =3D 0; +again: while (mptcp_send_head(sk)) { + struct mptcp_subflow_context *subflow, *last =3D NULL; + /* 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); + if (first) { + ret =3D __subflow_push_pending(sk, ssk, &info); + first =3D false; + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN && + inet_sk_state_load(ssk) !=3D TCP_CLOSE) + goto again; + break; + } + msk->last_snd =3D ssk; + continue; + } + + if (mptcp_sched_get_send(msk)) goto out; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + last =3D subflow; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - first =3D false; - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - break; + 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->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 && + inet_sk_state_load(ssk) !=3D TCP_CLOSE) + goto again; + if (last && subflow !=3D last) + continue; + goto out; + } + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } } =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e93d64217896..2bc0acf2d659 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -640,6 +640,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); +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); +int mptcp_sched_get_send(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 0d7c73e9562e..bc5d82300863 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -112,3 +112,40 @@ 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_subflow_context *subflow; + struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + + sock_owned_by_me((const struct sock *)msk); + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + /* 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; + } + + data.reinject =3D false; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} --=20 2.35.3 From nobody Thu Mar 28 22:21:15 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20052.outbound.protection.outlook.com [40.107.2.52]) (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 F1AE66ABA for ; Tue, 8 Nov 2022 09:09:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WE+TddtZ86Ign9ylFRr3X2dAXjPprjmN+/IxNi+eqd6Sy5Hv39LfepE3ICpUwvHpAPEA0brT8+bp10jIG/fWa2tbUSl2slZ6zXj8l0jM/PQPemmhobGEIWNab4zTxdJ0T8NM5IyJ6jUxck6SyvgJTRtqQ9xzrvGb5OpCE8TP4ffRQHrDXrYjl8ckmo5AW9tIjewl4EGeDyV5FYNrmkuRHQa4mllDboA+KAF4Hor1oh/2/wLNylIhb2F1AFR2y5iKormTaY9yXNLA8SM3zBaOcJhg+oykv7KIpQ7tpMyu+fATEr3ml1JIcnyA8pBCf3Dur1EEIrzvelya+TI34ctwQw== 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=eSzm30+7Jfm5nKSccJZlVXfMv5OMkKhbdewzmpIhJWU=; b=Xhd1UfLbgNtalZWZyCh5lcJbc6adUWan2kYnnniXWYZvbOmcGxoYjm8NmItlNUfM7Ut0ruEDVkuzmvYEvcnDFe6KiLiKvjIKoUVkAWNnAND9hTXr5xKhsOMeoTmS7hTnaelYtwEZc+vMVE/eTelNrdf4zok3goxHzJO5YN2+WKLr2Jxz4E5nHWMoH7BlSgYdmDfmcUn8ibE/ZeX0mBJ/L85+jeOtCfQjzENAephpI17e+DC7nPg23RdZJM62gPTmgCGm6Kk6xffX3ytd7BebeLn107Q0LQ1AMCXI9k0gyLxjlJr0VOERoGXB2pP90PEYSQ97/wpbguuEzLO3cekclQ== 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=eSzm30+7Jfm5nKSccJZlVXfMv5OMkKhbdewzmpIhJWU=; b=2ZORpJQ2AxG4jbEW8lJr3PUgEl+mIYu5ovexg0nPWhyaXvpVsL3cVqH7Cbl72RIubXymvvaaW6iQdFksOjwj3FHTVXrorfADOYQF2NyDpqkeSq/ureZ3E4VPrcnC4Gyh4efXKxEtVtVKoj9xRyaROlk6E5NrrZBo6ZIaFEEqG/jbqSrpE3sLWeVoDF7z9PdPSUM1RrLj9t7XHm8ECyRwEo/OIL5H8iF/q8jyU7Pa0zZaDf7b/QIKtnhYYx/+0WSg5dseBSFys07PnoK26s79D+HGPwwFXTkU8nGL4aduJ/i8c834M3DAjjOUX52mrx9I63Ns9it942yUe7H9CWvENw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB7896.eurprd04.prod.outlook.com (2603:10a6:20b:2a2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:52 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 11/15] mptcp: use get_retrans wrapper Date: Tue, 8 Nov 2022 17:08:33 +0800 Message-Id: <7bef9995aab43fa6cb8e895b0e5ea84e20f30d77.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0213.apcprd06.prod.outlook.com (2603:1096:4:68::21) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7896:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c316d26-b9ec-4a51-735a-08dac168fe9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FTCnEMqWZjh7ja8ipG1dxNFSsXl235T0dL/bdA/sqnzNFoLg/fL/aoUUUVwccNKfu6qF/eP/TRnBt9PnXUZ9gXiV92RS7jCgaAI71y4kZbVsjb6KkO+nq2uS6uNFuuJU7rWRLBWYZRydSM1kkpmTzf29Pt+UKX2xRfOdnqA7Z+GDSwAnk8/8C8hP/6Ubh7KTv5FpsqaQgID6yjYkh71mstPSdGjDhn+lQ4trFm1voXbCKfRGDKNQuEDMC1JygBx3JT8vXH+70t+ajJ77Yk7l/A+NRH0kg3lQXMbyFGUrHD7sNfUAZzgWENUzkVz09a/iVEE+oRhV37zRea2OCAkAkvKme7mAbVRjHwPCg+F70amDUZrV0IONNUwbAZpPjpUO5jh5e8iDZyK/04DQcPnEhhGGJhm14sipSpt2MkEDOZpAO5Gwjxtt8kXh9Pg6dZsPAvaMVBlLUOJC4iXpDFPbWNqiLMvAWq+/qD6yfp5RNHpWqs9h7edlQLQ9zOlCAsosknPJa9GTWXG7exQReeRVsGVp6m1m6LWsg/ooaNaNaUYIlcvTm1be53lMZRO0amKfuZfI++rr+inYn9M4M23jsH9T0aEX3A67S/qWdT6KIs1ratPpqw7uCBTw1wV1T6ZnHqVWcX/k8eUyHnqpuRRWElg6GoywnQuDZ+FtjnXr80TSMsi1oc74vqGAEhirSxcMYYA7eUGpsXf8LqHHKdvmRJ3NI5CyqLw0XgaEYJm83itw8cBKX6vAcLfvuVv/gmDf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199015)(6506007)(316002)(6512007)(36756003)(83380400001)(8936002)(2616005)(186003)(5660300002)(2906002)(26005)(41300700001)(44832011)(66556008)(66476007)(4326008)(66946007)(8676002)(107886003)(478600001)(6666004)(6916009)(86362001)(38100700002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FrHLCnFDb54E9YBjHRxhH9YvLq/VZptPWhYRa8rN7yYpOuRkvZJ2Efmp2tJ6?= =?us-ascii?Q?x6OmqoWKFzN9NgjNroUt6WiTi7V9sWoJXuZ+izC2Y45WQIRWq1ZhurjnnqkV?= =?us-ascii?Q?yPbieM/BRymA618vbvmCt7NQDb1I5wxIzumm7cvBQHOsypL7/R6wsuKQ00qs?= =?us-ascii?Q?EDlQxHhsIw1Wltlmo5Q6Q6i5r4XGRQHseAFFuHcegcq8m6G5kH16wn91tLle?= =?us-ascii?Q?PGcf9IZF8Af8l8jzKG5qT3GlxlEMRwhYuX3qdEgtraxOWKwcpFj1mhF5k2qw?= =?us-ascii?Q?+7xKwxqg1nkZhWtuw8GeXy6sT9BI86G8iPjFqaz7g1gNQC3pCUFEWdici0x3?= =?us-ascii?Q?kTHVWUmsyNSfrdAx9uR3dIZmi5dP9+9wOS80rHla7ZEQ8PhvSI30pxoBvaFc?= =?us-ascii?Q?ED0ZHKsLorkXiexeVOR88dis81fdFsYkCdGTNXMMWEtslWRCTRy3etnixxGU?= =?us-ascii?Q?64a7WeG8xyX7fca6T/CuPP0JGfdBMdoaW+rTIBnWk7GP5nDqUBTGLhPaJxyx?= =?us-ascii?Q?NPZfPqmDWgmiU4IOCCTPcLJNScJQkGJqynhujPV5UVnsDVddmaFAs7HxnXYB?= =?us-ascii?Q?8SSw37AUlPLk5sLWacIyHxHdlaJ3c24LG/zOei4dYkrYZdsKnXykElLIiaxC?= =?us-ascii?Q?q7rzFqmia44DBFg3kCNvbndNiLi6jNuGiYIDljfPUvUyMDgcY24Qvf5LMpFk?= =?us-ascii?Q?GxVjO5NU2SqtyotInZavNAwhSmlSlxiGLoTjYCD7ScQXI/n9i9qhYfhIPfZn?= =?us-ascii?Q?GR3BRwXfuMFR+IKKJ2i2V3W++CyIlnT0sSPt+x7MvJa1wHZGF/1sgLOjmuDw?= =?us-ascii?Q?70skWPORKSrFiJF8uDFi2RQrT3NZRMZfOLme/X7RPiXsUD3a44JzFSuDd+QQ?= =?us-ascii?Q?N6ahNZ6Ks1PzN/QdVnNR17f05hcncc4NC8KJwHAGrEU7Wu26PaGu0gcfAELy?= =?us-ascii?Q?7g6cHX4C62gNq5ondiJqnWjhbM/NxpnnQSKbzeXAJk+lBd+4QjzADpVPLcpZ?= =?us-ascii?Q?tanVlJjwbk/DCfHXTWdoN1GI5sJRLRGvbW7KVMPG3ZT0QVOHtJq/76q6HfTK?= =?us-ascii?Q?4kApv1I6DKxhuKO4AboCmnPFkXLCj2UECrgLNrFzzLhMrnLMEwD7Tef0xxoA?= =?us-ascii?Q?YEnQVwj0V75K3W2ouDyiDEuK5a8+Cym+D1MwaadRi7fCp6sTKh0/di8hVlFv?= =?us-ascii?Q?xjicnsdAgSBc4C5a7KiPYRB4/1zTylhYp/sBmuKuCiBLq1E0SM1XnsI5Yri2?= =?us-ascii?Q?zuNHv8M2Lp7Z49Fpt74igBF79Odgi04kZf0bxIcxDOznZOWrtH4y71tXg9uF?= =?us-ascii?Q?DfaLz9uU1ygOPsLAsUgUEpZkYNxpfjCzuNmdPIsPvqZ6UpXfn67W2ZdDe9pl?= =?us-ascii?Q?sJe0vYiMqVnboJd/ouNEMlX4/K7q7Jhe5MsVK2R5OGGDYhasCuNswkNn68ks?= =?us-ascii?Q?SM9EfvXjuMc0D8+RxEnnxElx2RRWdeg+0jnxrLz+QAH3SDx+e9NZAEHi+E2g?= =?us-ascii?Q?6nmkjEwtpRkmgkwViyoGx9OTzfjXF0xrtV+ih7Zl9Oanqq51Rdjx/m8mZ1wc?= =?us-ascii?Q?KLxSc+TtINxdYlovWJnn/doZ7Sy7XJUjFu0DaATz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c316d26-b9ec-4a51-735a-08dac168fe9f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:52.1937 (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: 53/pQDZgfxTgZWHFt7LyrUcKoCVl/3ppf4sm0iWXgol2e2KgMm5GO0UcKD5lZQb171zHrjOBGCsdrKnhUlOeaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7896 Content-Type: text/plain; charset="utf-8" This patch defines the packet scheduler wrapper mptcp_sched_get_retrans(), invoke data_init() and get_subflow() of msk->sched in it. Set data->reinject to true in mptcp_sched_get_retrans(). If msk->sched is NULL, use default functions mptcp_subflow_get_retrans() to retrans data. Move sock_owned_by_me() check and fallback check into the wrapper from mptcp_subflow_get_retrans(). Add the multiple subflows support for __mptcp_retrans(). Use get_retrans() wrapper instead of mptcp_subflow_get_retrans() 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 | 69 +++++++++++++++++++++++++------------------- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 30 +++++++++++++++++++ 3 files changed, 72 insertions(+), 29 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5bcadb36b99b..bf49eaf203dc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2264,17 +2264,12 @@ static void mptcp_timeout_timer(struct timer_list *= t) * * A backup subflow is returned only if that is the only kind available. */ -static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_retrans(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 @@ -2549,16 +2544,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)) { @@ -2577,31 +2573,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->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); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 2bc0acf2d659..f8cc14064573 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -641,7 +641,9 @@ 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 bc5d82300863..edddd7cceada 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -149,3 +149,33 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) msk->sched->data_init(msk, &data); return msk->sched->get_subflow(msk, &data); } + +int mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + + sock_owned_by_me((const struct sock *)msk); + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + /* 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; + } + + data.reinject =3D true; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} --=20 2.35.3 From nobody Thu Mar 28 22:21:15 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20081.outbound.protection.outlook.com [40.107.2.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 B0CD36ABA for ; Tue, 8 Nov 2022 09:10:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TVahJE9OVJE7ybreAvDdJ51/zAX8YYal+4WCThYxAL2lfu/xJ9WtdxQ17Wbs9XTLIlLNn/cjrnEiM9KXYI6LhAcYX3rg5mSK8pJ9a8JllrcNiJ6mnz9gFvuhw3azabuSz6x4exsBt192OvSgSOy5dH56AuVob9JXL2LTWXY1hSMcSV1RZQYL8Oh5GbZQ8mMgG1Y34PMOukjGpB6e7LTIlLKOa8Pt+ZKk4VOekS4yK/JFm5oM1a6LAca5usKZimkmDcJb+jHcYqm8gZGD3ATEAobjb6PGlNsFH3wzaKBV20po4lYsFmeietJ8MAm7msIeREp0oRUfCKiOg6U6iyz1ug== 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=5Y7KOS/aPgM38D7r6jjug0bODXEY2hZcu/Pm9pK1mLg=; b=DDNj+ITL0FQ1bP1vMkg7YKZnm/9noin36My46qZlffckSAVbUg6EZgNE4iBUrCZCJ1AYbJuIXjc1LxeVUvw2Jm9W+SpRDAu4Fd7qJZdBUKdIRErcR0KEk0m6Sl92qx3UCYVjkUGD7OcgX0zCeGVwJd70bWZ0T5oRehG6WaSGmZAi5MqmCd30gkBJtnRUWfSakngdmADhr3TW+I96golNC8C5B9o5iOOBEIDgn3Pw7BocB1/esrk/TdMogRg8qUas0hjL9hpPGXjkszn20GPJpwMKcHZnBjW1QCe/KERxDmBDtRxG92Lw3AtUQERlgRU0SRl9Fm1nbWdTZG8os/mO2g== 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=5Y7KOS/aPgM38D7r6jjug0bODXEY2hZcu/Pm9pK1mLg=; b=X1GRjUBGpqwzm9Rd4aGziZXXzceIOp3FlnzoFFZ5pqEtxYMlVdGEO4Qt1mEoREOi+lJP6VXVlzwCkdA/nXaeBTKgXhO+uBYdZ+9YUnDbJtL8jah9Mp1L8HdtesEk+Swx6PeSjc1hyqPAdfrkdSnNBsAmZPwWtJQMLkSOXDhof1gN9z3ZDF0CpNWC0yGDaQV9fqHQVMKa13hdD3lKe51gPqNq0RGOuoUUZSJqiv55Y+vnn4j6R2ZVsxxnSIWr4syhMubEI982CKvPZZ5dqj0Ct5LOZpYvrSOLWd/f2N6+a/hfMY2X5Op2wd/3q3u0QnAOyEDeqc4Fq9zhjr2msI2XdQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB7896.eurprd04.prod.outlook.com (2603:10a6:20b:2a2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:09:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:09:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 12/15] mptcp: delay updating first_pending Date: Tue, 8 Nov 2022 17:08:34 +0800 Message-Id: <5c1a07cf6f4f0dedb9bfcb7cb9f91df158f44e14.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0207.apcprd06.prod.outlook.com (2603:1096:4:68::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7896:EE_ X-MS-Office365-Filtering-Correlation-Id: b168a662-5813-4baf-f23b-08dac16902c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3Ivi5ZX1Em2dTE8iDAg6M2eeIF08pIZXq+JRY8aXek7fpcUaquRp5nzS7kgp7EV9vDREeYrwzslObY+zVvLV67Rc2SkzPUNfP9IY4BG5nzTJACzVNjdtwiwhYecwnXhxip8Iyw0QmeMMbPePBSt3lxiJ20D7+Pxx4cKW0CBVynvU1/LYLYACvk0FuYegWjDL/Nv2rVkmsiN/Q6Yaz+X8QuB6aHEfejFndS3ZxTXo+Z56fxM86nEh+hVjnoyhJPkyWBDR6ikhNVpYA5cOndnfm3kqruMiqUlyDw05KH8GnlhhPOiWbgcXeJVtMwLduxOiwWDO0eqyEufApZKo3UwuKkJ9UEkzerYKG3/QQxRU+h2w4ZZyt2p9fWN2uioda2QXRKneGwL9lLKURR7HoT0L70sDbO4KG8BuqjgqCqh2aorj+K7SU+QJNXv2D46HEuQL/eRLQWJSA3ug2kX+tJKlddijdEIYtcs49FQjgP916OPFzI9zod6c9kkKEjOWhjloU3TDGIc6/oovuAsDvzmqPnPIrdwui+37RFmsns7Ia8BbTM4gw7Zk1BQUjpExcZhBJ9rXpafR3CXv+d9JJfn77zlQqw3Ks2pL4MkXA0a6Fc4FoUoeoXy0fk/k8zysnk9hQMdHyeEfUBEzDIJcsDNuM+0r4oMHVIG2eJhfP2WK97MMKwsBezM+vlqpSvZ/DYgSCX4Sx+rCMgaiL/6MwnkLXjSMAn6kAMBFpE9i6azVKglwpRa0zhiL/OZt1W1XCRP1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199015)(6506007)(316002)(6512007)(36756003)(83380400001)(8936002)(2616005)(186003)(5660300002)(2906002)(26005)(41300700001)(44832011)(66556008)(66476007)(4326008)(66946007)(8676002)(107886003)(478600001)(6666004)(6916009)(86362001)(38100700002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mu8k9eQ0CifjXlQP+QhTtUJGQc0Y08DtSqBcxe5iOjpqanwQbzmhW3FsrBy8?= =?us-ascii?Q?kTRSz/2if5K9H+WpI7QiNRE+uvz5Lur7l55mVDW4wX6C/3rnqcNc3q0/9AIU?= =?us-ascii?Q?fUEULSyjl2mxwVii9Gqy8rX1RrpcJl9ssyzhj7pPILV0XxwfFfJGFm/AgNdR?= =?us-ascii?Q?6MyTul+Dm+RjlgO4vY0lVSDK2RzZWSTKtnxU8VJSnICQn7xqh8/ubH9LHkp5?= =?us-ascii?Q?ZnB87wg0Av5F4vcRDqEp7IrnH7P+TtYB2w/5llU2MT1C/Sbq0eAAABcqBWoI?= =?us-ascii?Q?YtmbcdS5eFrioLwcV+3BDyOVWSzF27EVNt+JrFcD7kZ11jacKKmt0w5rIy02?= =?us-ascii?Q?0xIQfYTQ6Xttz1SaAFe1I8m3HZ0DyIBm2yDP+680hDjmqlSka5DXCTbswxdq?= =?us-ascii?Q?gi4yjLvz2V4V4YgtaY91r6SuKemfSvplEUOHQYgOmJEp3ls3w+TWYqUmSIrI?= =?us-ascii?Q?xK4+njkaa5aEw7rjnXsW0eZBPqCqoYOtMm/CfaEPbRFZxZF3eN9XVtQ5PDpr?= =?us-ascii?Q?RDDia+g0PE7rVUypClh96ovSMARfUtPUoU17EBs/puzwN9mf95m/LWm3ciIu?= =?us-ascii?Q?OydnHcC2SdgCcqx8NHuRyAs/okoF9215S2FVAR51juxOAhkqXTudDUFHsLC0?= =?us-ascii?Q?HEmdZ3U7FDj5VqX2KTEepSTqMLnyFHlfWb6AQFApXSfWTK/YjeLXb008In+b?= =?us-ascii?Q?RXa3wL5ynavfUFkrI3//RBwY0m/LDOGitL/m75ZBXMecp7lBWyxv30yfeIXl?= =?us-ascii?Q?K3TN7I6Rnm1XdfAkWdD1QXH/WN784A03OCG7bAkJgT9LlxWudSp9ulHHe7ZT?= =?us-ascii?Q?i0myen+R716X5ULrHuuhunpRIAwgSiOJ1IIGauC3LKTB0sj6qhOX3SogSg4P?= =?us-ascii?Q?L5AQCqqoTO30lCADEDE+QZHczqWo6cKSIcy46ZkSewQlZGhM0mQdcfIS7nhN?= =?us-ascii?Q?Ur7WiNLO7/wf4TSnBllppSgGhiaahsFyeqHCrjUeWLNDUjh8Rae+e90I9nb1?= =?us-ascii?Q?B9ksToDG8WT6XYqwHw/4SDXb8ENvbVCrMBcSo0KboEdfzqb9tZu5UIU3MoUg?= =?us-ascii?Q?8Wo/xCLP5DftwU5s+qTyzeJexbWnHubGQx95FAnFQFsdbDESekEAMMuGpcRO?= =?us-ascii?Q?SVGUeg11gbCt7TdDEAQTQYGxPzoUupI4gvNJlpPNppD2JcSNcfULDvO8XLEt?= =?us-ascii?Q?YDzI82d4hP4u9ZK0SoPQTFkRy7N5Lec+tbkCJwQXwow1fw7Vkpik4NM7dui+?= =?us-ascii?Q?icYv9Cn1+L8UTlSuDaoDZseyQ3oBnd8qM/ZAWbTEvAEbnM84JrA8nKCvNOog?= =?us-ascii?Q?x4DNSkqvsJ304daqELJa4NVg8N2UtvpaytobUSj3hdVA709hqVp/5CuwdaMR?= =?us-ascii?Q?uEJsK+BpoGBXRQE51r55sSTNVirZlb3YPXn+Wwc2/DG9+grZ8fl6Wd8OxC0O?= =?us-ascii?Q?z5BksxMfeNwKlq7mxKdZA7jM7e7Puec39q7vLDM65FSLysipt9nmVN2tCVR/?= =?us-ascii?Q?tyy/qEr01JSMOLufYZ30L92T8TYEZppDv1SD7IHM/Fg6fetTdnLmGu0zSoup?= =?us-ascii?Q?IV6v+C/LaSijP4gHGyeLPEzzPCYCkVs9St4KdOaj?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b168a662-5813-4baf-f23b-08dac16902c1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:09:59.0994 (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: mLCNMOSFPBhjK0JeKMOpeY2kEXO0ooks6DutaIoLzTS+3gGQVapcn6FlH2rC6d97D2g97mxvL8Ar4HW7ODyaTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7896 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 | 33 ++++++++++++++++++++++++++++++--- net/mptcp/protocol.h | 13 ++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index bf49eaf203dc..fc3498f84964 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,19 @@ 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)); +} + +static void mptcp_update_dfrags(struct sock *sk, struct mptcp_sendmsg_info= *info) +{ + mptcp_update_first_pending(sk, info); +} + void mptcp_check_and_set_pending(struct sock *sk) { if (mptcp_send_head(sk)) @@ -1524,7 +1538,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 +1563,8 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, =20 mptcp_update_post_push(msk, dfrag, ret); } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + info->last_frag =3D dfrag; + dfrag =3D mptcp_next_frag(sk, dfrag); =20 if (msk->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || @@ -1552,7 +1573,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: @@ -1601,6 +1622,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 && inet_sk_state_load(ssk) !=3D TCP_CLOSE) goto again; @@ -1613,6 +1635,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_dfrags(sk, &info); } =20 out: @@ -1647,12 +1670,14 @@ 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 && inet_sk_state_load(ssk) !=3D TCP_CLOSE) goto again; break; } msk->last_snd =3D ssk; + mptcp_update_dfrags(sk, &info); continue; } =20 @@ -1678,6 +1703,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 && inet_sk_state_load(ssk) !=3D TCP_CLOSE) goto again; @@ -1689,6 +1715,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_dfrags(sk, &info); } =20 out: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f8cc14064573..4b13ba9df34f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -349,16 +349,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 Thu Mar 28 22:21:15 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2079.outbound.protection.outlook.com [40.107.21.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 942576ABA for ; Tue, 8 Nov 2022 09:10:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dzFv/wMpYIkhhT1iJ3cd/9JkkhYDvOMQuOzwNWrOztuYIi3DY0RhIYOHtX+u62No25b1WTrzX1D2zrieKwOFDL9N4XNZE0ru5e5odFg4hG/MmQpnMud4ce3RF0LTThDRcajyaxyoztSq+Y1njGg58n1F0QeoyoQsVTeb+6lfvzSBize7faes1tq+4peaSQC13eVANafQpJ/anSQ4n3X9euPdeplSBMIXz3l/SEm3ftn06wQFu+ZNd8GEpLzQ11LUsa9frx94r3qxLdiGAAbTvqWDNT/uuVS6b77JFFbSQzmeIzEFSR2BQL9agvEeqNGJaO0Gv+6HB86PDAEODwrApQ== 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=v1orINlyI/A0It99NkoBadOMmufLfxUmYtKySvKsPWQ=; b=czvZdTzBKzWzZszjorWXpDi3lgw+tXTlCg8fJu1Rayudem2Dk9gh0i1FcuoqygkkKBd3mg19rOoROpG7X7Z7odBBxjciPwiAMY6Jt8hhm5TLYqXShW82CuBdUu/WowUHo5HBhOkaSEx8H+SV2iOTkef/8fctpCEXNRip0Qap7Y4gIIv8BLgbKWSbB9iu8bfy2XEHtLEVtfdbc97MItsmsCQCJzyl9gIhPhED2+Rvmo4tURQQKGh62tXSvDimDp8x/mK6UmBJqS3kaH+SOr8+MZ3XV1NxKWjaqqiHG4V1aLdLaGb+uTRK7NJZvSXcCcRdeJVr2SpKpoU32RZGur078g== 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=v1orINlyI/A0It99NkoBadOMmufLfxUmYtKySvKsPWQ=; b=op7r5iC/TZFk8JR79UjKRid88GpfXWi1x1NX0uDkqsGgJWbg/bO297fHe9m4YEt0gQClJINOVW+xzB5KsmmjpCBtpDWEsMVnnOzwwz/fKeac7Ko2C1LksIf/5ihgzrx1GNW0vAAZ9+AQuRaoO2Mj/anUsnQ3pIsqyP9yuTFhJe0TGmI4byOx8i7YDCwrwdvwHS+NW5mPD4giN7skjcJRXynGDc4K6+fGaSx16Uq92fhrEVggx4I809fPx0sJt4qAjroJLwZKnXcq9zhqK61IHVx25FIHZ2JWtf0gIno0RJtfXZehq0fSONcjNuuGREsjbMFWrYMsAI8AyVa3H2GOXw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8831.eurprd04.prod.outlook.com (2603:10a6:102:20e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:10:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:10:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 13/15] mptcp: delay updating already_sent Date: Tue, 8 Nov 2022 17:08:35 +0800 Message-Id: <4efb16b4dd58a380dc23948a22785062d900d402.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0227.apcprd06.prod.outlook.com (2603:1096:4:68::35) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8831:EE_ X-MS-Office365-Filtering-Correlation-Id: 19f858d1-3747-4f1c-fe66-08dac16906af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WhK/llQWM+8hF5Nw9GqLYvdbevnBqATSAtmPOPo5/d+ADfdsXRucQySswmX4djMRb/AIvztPxjWIMh+hI8Ddrk+nLGC7Uw3gTOhuCzsvh0ic7jR9c/Bl6CKbh+8drddyyJ5aNHiOFUMNO8MN96JXUCKU+A7Ql9kOo1A3M9beywjF0ceneoNv/DDC8JtBBkmPvH4vuVMo/pIDnyw7rDSQnbaAwoVv5m25IWCqarwc63bb2g9AGSL/ZAkCI36bLgb6NW02OKtH4KJy11u8IZYczRuJ6bfDgqVqxvUAv0GuAB4/3kA2SO+hhd6PVPNBL45z+tTjvafkEIVpyopgq2VcyJC/PovNA5om//pMRyGfHanghTY/IZOY66jhU/KhrzA7qNuOPB9MRLuH7laoQC3IwPc3Y0UbfEtVfqCf62ywmDPuK3ruro3ba6qXN9zevYmed4c8n+6mnXTaVQ5hI7dZZFnnKEE1vXPlzHOsZmrBZ15DMl7UOGRt/vi5+pC9HeNnRYK4nvLbS5Z7ZmoNiergodWZYNIMIFFnJne4AjnDnCotOGkOvJcK0Rs+W+x6B/CFDkXfCQKliGJqCB8t24uLi99eCA4VD02dfzt5PVPkehsSGPfhtTCXabpQmxOAdgDCoRPAE14TEZY60UPq74bBxIz/b176jtd8azJvl0RiTv9ueWy04IqznudrZfwWZIE6z48lWRxXDOg05gwIkNC0fL0x6cYiBELPaoo9meOn7obP6FCBNzKcq3/ZkfmTFKwU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(376002)(396003)(39860400002)(366004)(451199015)(6916009)(316002)(8936002)(8676002)(2616005)(4326008)(186003)(41300700001)(36756003)(66946007)(66476007)(66556008)(86362001)(2906002)(5660300002)(83380400001)(38100700002)(44832011)(6486002)(6666004)(6506007)(6512007)(107886003)(478600001)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XWJddrBcXnM8iFU0/0X+iCdw0FfUlsylNQORpP+bUTtWTDm1JMYIDXyShdyE?= =?us-ascii?Q?MoHq/9nmkBmf3pmxLLxy+UHfspmoPNGF8RYcIc6uyWn5j8rlO9Mk8+KzB+bV?= =?us-ascii?Q?9gN+c6BFiJQCdPEWKL0hHqkQeWAb8ZKuFSwHYFkdlEANxQGFE51oB7ETIjCg?= =?us-ascii?Q?gKlHByFad4qetEJmlvvPoqbiLIpHNXQyl1XxeCUmg195wp/hVP02KSC9dpeA?= =?us-ascii?Q?0AUHjqvOnOp9xWuvBFq5RbcPJ5uczxnWsOGI+aG2AlXzx1xKWa3JRTHNrmSb?= =?us-ascii?Q?ffi7dr+lwc01fzkJ7d8weWbRrYZK8U64EpRN9lh9522cB+sQQQh95TbuHWXD?= =?us-ascii?Q?mZca3UquoWRq6JE6OBDofAgM5uBhhF2sUOpaX3rx3nZa+FFetXjqQUekOkOz?= =?us-ascii?Q?zSyvSIERoWeRlueTX6dTYjZipPv6xhK5YlR+fE2Ap5gbFjMbcNa/YmtbEHWP?= =?us-ascii?Q?3O8iofn1xwJaFDUpdxqs5loO4l/GWcbruesRgM619f9rkqP1W8zGTkmEh/O1?= =?us-ascii?Q?5hjDWZ4PRLfTJjdnPVOtUz0jNq0jpG0GsU/2KpFpbV08FbuWweQb4tb9N9QX?= =?us-ascii?Q?jGFuVGzSaVz+++TfqniGqNz3WrNx3TpBfqCYDnG05NB6GkeiQU//236smGy/?= =?us-ascii?Q?Jku6mJyBllBgdQ5QbZ4h8Zp5rSl3SZMdu9q7RnkKGHKuHbdN1m+fCh78CQB1?= =?us-ascii?Q?hP/JE6ba+G1OnLJ3xs8040k35kFf653NYX29bI+x9GqRQN/Qx3NCEGK2tv60?= =?us-ascii?Q?e9B2WTcLjdNGHjid4q9xqnGAQl6+4qgyCmUZfsIxDnnE+X6kKMxjIMpOE64y?= =?us-ascii?Q?FTt1SaaBY8cu1yRNTHHvjblDZNX2LWoB9quPjDdFIpnkmezSzTB/w7pT2zm7?= =?us-ascii?Q?mZDGtSNQV/oj9fA+8nv1RExTz4ewdkXGUbwkWD1s5GNamYTTciV2PEB5LjJY?= =?us-ascii?Q?RZGztmAOreO7BMQWXdXmNmAHHHx9ktlCrtakk5RawGNdGAcdi/3P5WkZbzTr?= =?us-ascii?Q?lFzmzynCYnynnmHP0ABnzmmez4yMfMq80H+k5wvMkuR7QQUTcn92q0cXkORV?= =?us-ascii?Q?38+ynGPns92mxfboHeODoN1jGpPUJna5IDsUY0oYTUatFJhXJ1LVFV0lVirE?= =?us-ascii?Q?MlmMw/I8Dn3oxFWCsNuunzIDZclKWNQ8sW2EjN84WCRR20Eqr+E/Jw8kHp3b?= =?us-ascii?Q?e2iSS6GQj/1IPSm5p2Eaqj7HaBeFG4evdkSJG/vkN2XCzhM0FAWArHgx8pcr?= =?us-ascii?Q?LK6x59bspl5DuzviHH9loTv15/uumU09myxFuB/v7YqVvHdrh01G/OqMsj9O?= =?us-ascii?Q?kHtAEXa/GWMAU5GU5OZ5U8/o9HzNR+DBejM8yAEEJsZFH0sr6uemd+F8bO3v?= =?us-ascii?Q?wmuwaxQg7ePcRsbAiwOcKmivcvQHqtNJM3FLZxcLawZN7gFMQ2onNxFtcRcq?= =?us-ascii?Q?ZA+c/MhdGiKCMNJ7Bv0ff71t3rHMAVFzGPc3LD33DPQ8PFXKNy5mkaejY+zz?= =?us-ascii?Q?+N+7DOS92hCkXS+aNlV2CXOVp+PIgTmELX7uPoNKPwXOpOBvynBZ95XBOl50?= =?us-ascii?Q?GBMTgveLOIl1O485w9XXfwFQ+tB3xSBdIUADrpI0?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19f858d1-3747-4f1c-fe66-08dac16906af X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:10:05.7082 (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: UJHlc71EqZsMbfDW7Z0UnVPbjt8Q+wUEZ5y2nagbIENVz79XWsei3Cc64sL6SPBd9oEo+lSe52Q2KlONjRB+bA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8831 Content-Type: text/plain; charset="utf-8" This patch adds a new member 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 | 18 ++++++++++++++++-- net/mptcp/protocol.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fc3498f84964..b179eb56b4f2 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 @@ -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->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 @@ -1522,6 +1523,18 @@ static void mptcp_update_first_pending(struct sock *= sk, struct mptcp_sendmsg_inf =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); } =20 @@ -1548,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 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4b13ba9df34f..5d85063dd5a2 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 Thu Mar 28 22:21:15 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2070.outbound.protection.outlook.com [40.107.21.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 710B06ABA for ; Tue, 8 Nov 2022 09:10:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dJBN5EbnEO/XwZb0GGl+sUfoigQVM3G0/Jqum81dwmJDzfTWULlfnntk5LEN8j3nU35YIT7W4Eja+2dzCKJq1WqwnCtVXVw3bF7knebqhHcl13I2mxDxpbdpiS7F3w6lHcU8P4Ofks9lzsVvY2Nwzjj//YP8bKsKKq91HcsjgN4oOI88q/h4fwQHdogR3NRKrEUj7DyKMihmWvvVtbO6eWMt2M7jhjjK7JVuJmcts8/HyWxIAb7xDsWWShPfyWIlcFPyb+p5Wl1tJFWLEPmb7uUQFlvGe4p7G9ba4ToD548IhWfy+/uDk7LQfVHhBTYD+A7GP5bUeoD3UV7b6zktrA== 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=bB/nNRHZvDIK426mIh51n3/m+aYdhwbMfNNxUwFL88hayQmBoia6iqw/KNfr/zeXjVVfPXgPxcGRI2yWfPuJF3n8ESeEryOVTzbcYatv5PLZjHsAOTPB+C0m203DJMbdKgpAx+3LiXt7o3b0FQuoD8wuoRU+C2FTii8vCHrUtpjQO7SNCCj4wcyYtENXDR7rYuwdJOfSGsBK0TsvyhrrIzWi9C5VS5yjixcYEZqnIlyQsomyTI1cJiz9cov3ZxRgwQwLm9ZpxpeuVPksUFdHYr2HCj3EMMzdXuSfJm0MOJpnelRqHz+boE01/GKXe5UubKWqFxZRHOl7z9VEp6QQMg== 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=WNOrdoFkMm/9kVC3LnJGBe2apNbaptUMrN3MTIBvMPtmP3ydxjdG7a0NpVdeT4r6GGEiwk48P2kdtylGbngq/Lf9sk0mQJFTMhqsZEbWB/2a+ulMP++xp3jjILtuave1KoJ1/anDHtTLknESUog2v8U1d2YsiA5uPeJFZ/UT0Hy0XLMpy7w671s2bV/qDtIJWZOjzuwmQNGJPCEwPZMdseayK7ZYJJNjiqSJ4d61QF9D6NecWxBiX/hUji5CYT7PIYA+6nHl234YyjmXGkmawQjphar295vkeNOkgGkxaRDZkvRWf+kQIxubRXwEguApcTVuFyM3Q8+FoeOkhjBreQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8831.eurprd04.prod.outlook.com (2603:10a6:102:20e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:10:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:10:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 14/15] selftests/bpf: Add bpf_red scheduler Date: Tue, 8 Nov 2022 17:08:36 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0214.apcprd06.prod.outlook.com (2603:1096:4:68::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8831:EE_ X-MS-Office365-Filtering-Correlation-Id: 019c61ed-680a-4631-d34f-08dac1690b8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bSlwy7BAb1f95RXFsHuPGqG+ipTx5XBDj44/HdoK7Q/KvlTHrV4HI/3xs8F54ERoIPWZjU3hByLEPfk5yJzo5WVsC1RTBR/RJJM2MJHVAin+pQakdLpxKvIfrfdYlpgliW/yF4b6l0hT2bzEnjAnHLB3R9ktXO9COCZBHqIbW8DJeHggfAKqSuKWGMHFNAnxFxj4jv9TO1lgrUVrfvxl0G7b9FqGW/8M8XT33ruPeA9FIB2PoXzHeMDklQE5WD2/sEKx7zBzYen/1D05n4H45axrV7g9MvJPiUhGge8p7X84K92wQmkVOqYqYjwDZN4NyvjPVh8Z9UlK/WtcQxDgfcQlzdM1Dbh8ArflKQQ6btC6aYjlkyCDyrAdvjhl1JJpcEvuQi1h/DUAvQAQENeyaa+d9TbbsQWRMh8Z1cEnz0bLmQeQTGVOz7zi/wIJzX9Bsz3nUTEYe0mlNhZQUjdcWX/E2H9zuSvNY4sE9sb3s2y8hb3Zty8Z1j6aC0Pg9EZeHT2j/DZt/ufSTzIIdmgptaJ8yMuyaTuu5SZAlBSQii+ZD/QpreSQusEXBbkG57/QLudxygKE7IbGSAdv0ZHrOUajsh9ssFYMyqEEwGGnuec4cNFgp93xe6Ne20KIrjgBcuE8Tdf4Qpqaq0Iuoci2ORUeKFa3hin6h/kKDHGIA87YjjuAdQ/OqLW7WCISdGmuLIkSLmIRzJePgSmYirLHYmHjqk1EuXwVLHGGqTfDafoIK95AlRVw7+sotqXnFImZ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(376002)(396003)(39860400002)(366004)(451199015)(6916009)(316002)(8936002)(8676002)(2616005)(4326008)(186003)(41300700001)(36756003)(66946007)(66476007)(66556008)(86362001)(2906002)(5660300002)(38100700002)(44832011)(6486002)(6666004)(6506007)(6512007)(107886003)(478600001)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IuWZxt43zNIzogRyW9m6nCti9cwLfICuXiV7vsUYZX3tpWTlmUslZ2n6Ki44?= =?us-ascii?Q?xfboJsaBJUNMIrORMS6W3WxW2DZqQ+3cy9IV5rg1jiH2cV5N0PT5r/eIAEhH?= =?us-ascii?Q?Um7NstsuX/ipoOGuTmYpXcw3uwOnkXYjH7ZzXBLsOT82tqvxNo8kQ+QZE6wh?= =?us-ascii?Q?oywup9XMW4oTTueZ1OZSm/ntOJ4jHMXQw3at+tnTsJtL+h0LrSruPUSQO6sw?= =?us-ascii?Q?qDN6HBdGztCriYv+C11R1NDZqQ/L6mtHX52GVC3PnXv3ks6Wmu+XuErg/PV7?= =?us-ascii?Q?nURVojjPc4jJ3hAL5Aqa9znVLGlvnnB0vldh6zRLVN9LU8LtngTLJPxflYlw?= =?us-ascii?Q?K9osDj50OsHDVBIuyIJj3RFXunXrplbXyzmcZpc+jLobQ3wL5Wmb06PoaGom?= =?us-ascii?Q?dEe+Oa3HqxKcuNN+uzdu6K6r8RoYFm2whwZuhIcGKjrofXkpcQXwYNjWWpUQ?= =?us-ascii?Q?EhSsDhYxuzTFGtmk7nCrYA9fgs6xnwpiv1YMgh18uJI6sGl6AuUN2AdZOWJ5?= =?us-ascii?Q?r3vET9jDUArPdYC+u83oiiDI7z3H5/N+uCjGgYr3JrqiXM0KCtDVH2kP6Ndn?= =?us-ascii?Q?BAiOpy24J9SIgwSni99Pusz+ioHYmqH1EyjoxycagptyKXqxQno5ZmUBjzTu?= =?us-ascii?Q?PAbv6zviXbM6xq1DRd9Uom/HWyfnFPWaS99NZsr5RpH4IsZtl29RNjupAh9h?= =?us-ascii?Q?AAwpZfq/6Dh9KEo4XXW6wA5w6yPejWEW9twduHwGwLc99PgCYPxI8JI7UFyT?= =?us-ascii?Q?Mi0Q9yISI+wgOU1HfGzxWmYG9fSncBH0OON7HIUaLpTGMaFpAfnuG6hoH6NO?= =?us-ascii?Q?ZT6saQtltsjQ0XEQ6/ZFQBZelXvNh1lP347sCNOt5huTw8d2LtT8JoLyBLxA?= =?us-ascii?Q?vfJI/rgYjcbkm+IYXVlCjdrUExZwTeJoJCZTTsEQNLGdE0hLDPQ4g7oNHEdE?= =?us-ascii?Q?6EjqoHW3syKdScn6Yqf4dKDgDpYQjawlWYrGMVrt1gSZzDWdgaX92OXINWT3?= =?us-ascii?Q?T0z9eq0KGBS7Kk08KJWNkWK1dtJsDAk0nfgikVHIt4WZtook0z9Y5WviWYza?= =?us-ascii?Q?2Wq8zQgnnQhHy1+/v3tKvom1kZp6amwIh5H4MImHWQBvre/ChQTbPewXHh7t?= =?us-ascii?Q?xBwVoiqHTP2jtBynC6G3zy4BycEbW31o3RRCaaf15BWum9PeT7ppJTl/AxwI?= =?us-ascii?Q?78R0f3az+2B6JaIu9Ty9rRam8DjxpEkpTHQUz8avFu0KU5nz2q9TMs0i8UKE?= =?us-ascii?Q?9qOPHr955Oo9uE6ql12y8d/iW1BVCSctiPtuP1zOtcpzQxruZTfczqfbgjo7?= =?us-ascii?Q?fLO9iTXyvlJHzBUuNwS6m9e5CrnJMzhBi2CYNCV0vqskDutiOhLdn/G/ZUWh?= =?us-ascii?Q?D+mHwa1W+hFMJs0U68PajXyCDI2x4XKHrt0sln+a5hS6OC5qm+OLh04KjRo6?= =?us-ascii?Q?vFv/A+Rgu7LKn5MZN7yifXHuvQAgzDXVVDTCOPaocfOkqWWrC6A5d97uTDet?= =?us-ascii?Q?lZHNzX9nbsd+1hzGxvSZUpLaBkiyqHRZDPXzv44WXQch6jGNc7QTTr2GhJhH?= =?us-ascii?Q?u4NYqPr7rdWfLsYnHI9DfpXZSUCRlxHDxeeLPWVE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 019c61ed-680a-4631-d34f-08dac1690b8e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:10:13.9263 (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: OKgoq4V4Drs9jw5dhX3zLUkoK6WRklrz0XJgHE0U9gY/UOXUWbUFndzLPOq+Cph5TPKLlZWYTRnIHGbzXc8IOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8831 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 Thu Mar 28 22:21:15 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20089.outbound.protection.outlook.com [40.107.2.89]) (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 4A44E6ABA for ; Tue, 8 Nov 2022 09:10:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DtRs2BZNEGwyPWTHsEalr70WXY5KffNbtiG4PFIWCQvQD9RV5rTeWaOtF/Yva/gMcTmBhSEIU3D8gmU0Y2plR07u3Soz/ZYLJD1Tb8gRjZ1+ym50aZ57UXeS86K+zwliad31j8UUShWomyv6cjJEmAoOSzDCVNW1/7boUI2yYRwd1rLkotdXHIJ+Zx5Y4la2fnvsPDM/LzL1nNy5Y0soISX1CHfPiug/yeOvGKhPw2N7ALaxcNR+zFV8BBheaNbqyAHgQe71CSPF1AYyUzKJMEy7r1tlJ+WeQTzssiAJjcs3CBwmKIcwtEMucoAd0NcmZZhBJ68Qxrpm1H9f0N3wMw== 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=AEEKkKtLldwBA1R44dIsZph/uxkzzpEQH34ev8wdBtW8j9AEQbIZfuLLI1bNOGVfc5pu71WFb5K0uW+GKKNMcV0e7g6YkJkVj3S9zATEeHXYvd8omwqKH6paeLZq/gqRjItGc1z2TCOWDCbl4DSpxZGeovutR5XJmaN6Wo6FPY0bAJLZf4M88nV4tvRPWl+aLMDCiplkP5RtCGtjKhlfmnoz6PAzfcywy8Y2sCqMt8KP9JWD2T1kVEscuVzWRmDSKK69HUOJG/olPjcCzGfT7fTVnXsTko7KIn9zsPYHQnR9DxguqbfdlhMJLYEYgBAxvwokYkfsivsNOuuzr1kPmg== 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=Et60ChdBXYxhVbYwmMnui/0zNkys8g4d7w0JKRaCQ/RDLPZERZuLyfjlbOUHLkrPhst+yy0LMG5wG+X5FywUk03rvBCw/K3UWly/F5H3Q418WEwMsGwfQfqN/r/f8qDfG8bODSludUus4KxRfvx5eTg/x0weiHlC8aEaIxdcniTGAIKZyVjMb6z10YCN4F9iMHn2WwluaeDaWstuXnczMruR1nkQAgYcX1/UKnB1BoV28kQ/3RAiTHwpwgmWykgsqo0dBis75+cdelQMoZ4JvSonzxI5exA9rH0t0qUS94k5HEwlL6dyrqEunp9tvsogRAkYLLKNAju3V4oPHmr4Ng== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB7736.eurprd04.prod.outlook.com (2603:10a6:20b:2af::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Tue, 8 Nov 2022 09:10:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::a1a0:6e54:f31e:2bad%5]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 09:10:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v18 15/15] selftests/bpf: Add bpf_red test Date: Tue, 8 Nov 2022 17:08:37 +0800 Message-Id: <92d945d60c7a97d26d30a7dd8dff441b5509968b.1667897099.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0214.apcprd06.prod.outlook.com (2603:1096:4:68::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7736:EE_ X-MS-Office365-Filtering-Correlation-Id: 25216723-7f3e-486a-3b93-08dac1690fdc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gwl63xddDcAX3abA7UFf8IvmWKXsTMI7jfzLu0pnKVbM4kNUXKgP9iTPydfK9rgXPkHjgMEkmspiwzghIQaEltpL7KHsgAvZgD81hFCCyfsEpasNSFJPW4+YhNnE21MdtyYv9S/HQT+W8vE4EAy9ndeKbo2uaBI0Bdzxqf7kcaH3JPCySPL/hoGYggsVzBp49+sRAQ0V9FTAsBkTvaedtIs8Hi5S8DNKm7B8GA2LMicVHl5h5JEVHuIZ6bN66ZVkBpv7t42KzPcHZl8hEfSVzbh13TfcVtbbpNMf+CdgW63iphuVCZTxgs0S4DvhHZxntlEKGhNUqdO7DN4G3KeuciZ0xJStJmqTu2vyaSAxTt7LGNBOkNXoxCIHP3EaGL+YquK4dRFGxlvXroCckdgcRTMdy5xyfUJKnzrnMnADf3mdKCr1SJ4gb03g9f93WEwzSwhKq00Xi1facLbDLHQmEbtuwSA09LZRp3ZdRHK2fLpVg1LHOTp2NGaomp6CijyMZtBOlCdzrX1QibUcIwaJQcuMOTnn6FxQRVvOwgCJHW2s2mP9ezLpqv22fzzrldPzSLDWzBYqXiy5sEmLVOfYBE9EJMtov57N622BsItRsTV8XqTbwRJw2WZAkFvwXvzGCsVnkeMstqc/IfEIwHXn/x/AjnOPUkYfBIxr+4WoXT/mPF0K24HqvPJ2QuLR8yAx4BcDknPFCAUthvBCtIdcizuE9bUFV9LLxQ3GJq1XnzjuI90J7GEq6AllHUr5I1kx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(376002)(396003)(136003)(366004)(39860400002)(451199015)(41300700001)(8936002)(186003)(36756003)(44832011)(5660300002)(4326008)(6512007)(2616005)(26005)(8676002)(66556008)(66476007)(66946007)(6506007)(38100700002)(86362001)(2906002)(83380400001)(107886003)(6486002)(6666004)(6916009)(316002)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NO5ATMLUgnxwH0W51eJRyx3HfNabAtF1AQLjPFwuE3dLU8q+eCF5IHYfqbOP?= =?us-ascii?Q?jxMLn3DkiHc83Oz88fmkhySactawVnEhHPfznEKzJ9cZEDCX7Q94XJU8znLR?= =?us-ascii?Q?2bJiWhBztJbW49iKA+6OWRWuGPM86POM/tztEH16mFbY/5ST7+ckNiqmvWs0?= =?us-ascii?Q?zYCuRAiyWvWNuWmqf0dhCB37dWcqvlP29HGKl+O5um6Qs0hxorOb18gytc39?= =?us-ascii?Q?2EPGDkPYlsemdVcqtxX0ZXkMMOF8f5CONbTydFr46dqLJT1wZ4NqK+GgNKfK?= =?us-ascii?Q?Rdjlq4h+5+3rPFdX8nrx5DId1E/+CmGkAOl9G8TVHsZAiDYzlbNtJ47z0uhN?= =?us-ascii?Q?mVi6eDrzDRAYF9FomYqPyQpFvxVSpgUDbpXXRrFzTfkySlRY9NJUAhW2hBM1?= =?us-ascii?Q?eJ+EmHUwPMd1GTVfXsSSOYX0s/zNfDUjJHF6dINUGaMhkI/VAsgnqVpcJLNq?= =?us-ascii?Q?MnbZvKcasMXjRUBpJtpui8eff4grDGv2XpxkqZY8u+Fz/xFWowavYdKPW4hY?= =?us-ascii?Q?dgo0BHnw7HguECOMDZ+an91S3A3Az5QZG9afcX5rM2+INuPV5wOD/ZCLgAb5?= =?us-ascii?Q?3a6ssEDTPR5zdatDrsnWbcTOzVVL048wx1a/bAr2GPbff7tHVXu9plLjs28p?= =?us-ascii?Q?qCXqhAlPrv31EkwmIWYzbafuCYFXnriipmZu4eOBU1y73imMYeN84TGB3Cf+?= =?us-ascii?Q?ZUeJdLkxaRm3PiTQO3BdpYYgHPQrDPKFWMlwnviMLtz01U3yLhh4S65Oe0lH?= =?us-ascii?Q?L9pCQvIPwgJGog7NTo647egCcgY+WP65IVqPRCn7zEyy8xlwES9DtPFzMExy?= =?us-ascii?Q?10CZCi+YhvPpGAfGdt5SF83kfW7u4425SsQM0XFh2V4R5obyY7lPvMKFaYE2?= =?us-ascii?Q?dn+cGSJ48u3Jl2qQPpKZO7YeqAA6giMomFrcQ58lZtVDDxPxQOfAviykOtFV?= =?us-ascii?Q?3Kljs8lcK0RI+77G/gNoxfxiLL9cv+MyM6ZxA0weXuNVvi/OalMkCc3WndsN?= =?us-ascii?Q?MvqpsPxx2mT7uRUPUSV146cKzkHe/jwYDXLEXDrGRxOZYHHle9kElBUqKvVr?= =?us-ascii?Q?LfWucPlsz67e1HcPyF+e+DMYX5NInf9BaMnO6yN+RYnIdZli1mEQb9DL2sot?= =?us-ascii?Q?GBOB00meMFMGoXUr4L1MK8H+f5VXtMmDxNufayWce/uVHab4vJeMV3rhje9x?= =?us-ascii?Q?7yby3pw4u49oWfo8V5H/cuSiyJ0E1IciRlEW/93TH06cM3hezYvrRx3tPv2a?= =?us-ascii?Q?mpHyGiwGHTTkyiGV+Yyqr8w36SKcpfzkD1/Skt4iFNTIsQ22XVGEGz0sZUoj?= =?us-ascii?Q?ScOXvjBmLaSHDfiqanvegFJGNEDDq9QTqWUcf/sP2A1an6E3iSic6G9dJo81?= =?us-ascii?Q?94pqjs8ZxlSpMpt2MdRKgAlee2z9P/kY4jAQh2vPdjQ2BF/bWYLn0twK82iA?= =?us-ascii?Q?NylFFpMsDzm+ZrvtJmwOdL1YOvdZdAWm4kfBhe+t7p32q6oPnVl3OOlFU0jT?= =?us-ascii?Q?vDfnmkBagdLksCQ975SEOzd71nkYnyDFZa7gfXHY3KGooAWQ67UD4XnsFRWU?= =?us-ascii?Q?ZVzsq8DxPR1Rc0S4Bb1cnxVtaotSd6rs57dZT78C?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25216723-7f3e-486a-3b93-08dac1690fdc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 09:10:20.9414 (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: pVoTX7A/IokVXCyRuANXoBmyCgSeqOHnfaFywS7NecOwgaTZFos4rVOpxGqjCaIleTw8ZZOARyKp9URVPgM/kQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7736 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