From nobody Fri Apr 19 22:29:49 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2059.outbound.protection.outlook.com [40.107.249.59]) (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 390F4652 for ; Fri, 11 Nov 2022 07:48:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L5JWPJ+nb42tBfhGtgJeMYT9Q+pYLeAc1y5TDf2S9uTi+UtVrjnSZajImk1xQ7MpJN6Jg3tzi3wLJqkE7+NVdPVY16QrNbhOzBIMcRDsIfefW2BGefDdvqMNYoZWfp04vz1k+m7nx7MPIPYlsC0eEYtIQMyiHt4r4KXekkTLNIXcuwqJQFhjA5fPzjLJ0wz0KugTClzI9VopL/Pi9yZX5HDN4rW666siZT/aZR4aU9y1U7LT/pSsRpamR5ceK/y+h+le64JCPRUM4B+okWohOlfemf1Z1BkBLKnNvZbKJMK+4w8FIKXSCyPEGwYnT8pcgtNmAI6AMTS3ZCLDPmf0wg== 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=qywcLKzhZzQ/sV0wr6AaOg5rvneaIg5mQJJzL0la8oY=; b=g34dxVm4bu4QyaA7hNQN1yu0LTOnadCuVK8iQNCirrctyxWWm+BqiM0QYNSKhtvyQO+KJz0359dfJjzuPm85fbyRQQvKQk+OtBbOF/8pinmhHVzEfvV5x2gD5T0wADwQ5Wf91JFm/Hd5cnuPHhmCgzoUGti0eR5XzIdFSctRLtRwzk+tKEs4EPeBFRavEyXMLCml7vIOL7TNlmzaCVa42moRN1jh/uvdsuOYBw4ckH0FvlfcP8QSC3+USz+xZEJfEZWakVEIXpnfF8EO/EM7UNwLMVGNoRc6HoEX8/WRXld5IJaVQ3qhVFHPve5YjTDhAl3jMOr/PFjVHq20+f+PtA== 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=qywcLKzhZzQ/sV0wr6AaOg5rvneaIg5mQJJzL0la8oY=; b=mQUnK+Z4HN7a5TXAnkd6lfEHzX5hWbkY8PREouM/cF2DVq5i8A3Si75PY3fNtWhYl+1jftFEBWb79aBHAQ07zVJSjhzXScGJvI8LY9txvZBoy1MnU782b2Zccaeg+1nfm4DHTpE4wyZ0Kr33PH0t3u5PVU4/wml3dl6JbQE9OTKVUaY7yzyZxD+Z4cicVtBBHTRjuktGU/WTVocdlDc8u+W4kfIYomR7bgOAVaSmJ6yblLSZ2HTRAVUSLC30SfyzgsYson9TIfk/PGn8rHy5XoXyWj6vWyMePX/3AZCJaOaG5Xs/YYuybXaIkai9wipfugem/YU5atJaCDyQEbWoHQ== 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 AS8PR04MB8230.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Fri, 11 Nov 2022 07:48:15 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 1/9] mptcp: refactor push_pending logic Date: Fri, 11 Nov 2022 15:47:56 +0800 Message-Id: <7db537bce55dd84dbc3ddaf6928968d1da0b7d3c.1668151131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0053.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::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_|AS8PR04MB8230:EE_ X-MS-Office365-Filtering-Correlation-Id: 10d05145-fd42-4698-6a02-08dac3b91734 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W8QVNCorp0IGSCFSAqWl6fuFWs1yy+Z0ojqMirIWCClGmULBFw5cowOP+ioFPx/N1B+CwQSJNbvxQps7pnL2Qdk8Qgl1XMh/5uhEKQIgHWhye32hPkgocoaCndobM3Xrtgxp9nx1RBbysitHt5QYp0fK7fztUDFqBMXYrQM3RVCz2JxQQV5h6mnzgDB1Cl9mKTw6PJ6gEkJvCz4a2m3HGSQseTTT9oQewU/l4solY0CDHZYQ5B3eWvBq+NZFpMg+f0pM5CxdX8W5++y/IgldBKV7Ube8Ktaf9+Og0J+QhgE186oieo8N/cFgww8oY9B3clL4wDc8afASp6hY5EYckutc52mLdNw7OcFvo+gWefbG/iOb+bpo6N9d4dRZsyDTBEGG0f3yo60pumhZaHEELqbARy/DQf5czS+Luc+jMyXW0723QPnxnhr/Q3npz2LMHH+9+91UsjvW2C73/D7bT+9JJwQnu6Mue5QEXCwZHjgMBj7B1fUvlOPielspY+tP6nNVngUhaoW8A9ZeuOGFPK77wzQYL0kfJs1vexyQm48AyezyElZly5JKxTj980cOtIVZIRpKcsnuqZkvAASb5U+Ul42Z5YKAcOxtIIvTPbX4Ir702pg+JADlKyrGc1s2b9DdgWc27XTfcSYO6KuDwamutS7GEY2U3tQz95uffmHtI7Kr5ug9cjkMbq9uxp6SZFdaPYetLOrjPvY7g6Uldw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(39860400002)(376002)(346002)(366004)(396003)(451199015)(6506007)(4326008)(26005)(44832011)(2906002)(38100700002)(6666004)(86362001)(107886003)(186003)(5660300002)(83380400001)(36756003)(6916009)(8936002)(66556008)(41300700001)(478600001)(6512007)(316002)(66476007)(66946007)(2616005)(8676002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3ebzDp4cWbjcQkrgwQphaJWyqlbOouDdy3In1bzWbbFew1ZPzSdAlsaoxzQy?= =?us-ascii?Q?0hfe+QUHLD+jmcQ0py/aqA9fwgGZuplGAXnSiDpynotV4mMjQ94gOvGxtBgA?= =?us-ascii?Q?oVJF7PaAxXFzKhd8tVVPBQjLz02b6LGygAP/B2WfezFTUHl4Cmw5L506QywB?= =?us-ascii?Q?ccoTwPEbs8Z4Pi8XBdfhBhl21y8japUO5w7EzxtiTfAZT8inOa01G0l1CtY0?= =?us-ascii?Q?BdNzH4qE0upb1Z479Hz8GXzeAWmU7rIOXp1T6FwLMLd3RKGHOdKMNFuELWny?= =?us-ascii?Q?ucow+21mw7zRJ+ytlVFh2BkfIRje96RYcO3TKkhEykZ/lG2oY6QeX8vYtEkP?= =?us-ascii?Q?XUF2xe04eKJyTCYM1FIksyO0bVu/ekPvKEwBY0Z+l6g/M5234RCLYVTkiIuN?= =?us-ascii?Q?id9DOIf+gQovhMX+94ViydITnbIyWjEAT/wUvE5CJ/lou/UaYtaLGx6HBAXb?= =?us-ascii?Q?t5/ta4szCAdSUsWvLDX8xdxiWKqBAhoqxzPagqxV/IjO+kXCarAnSyRdIxNA?= =?us-ascii?Q?N/BP+9kp5W1bn/lwxEo+3+20pIJGrOzeKOOIrUJ/oo/VGijHDnd0kPl+KUU0?= =?us-ascii?Q?/dcATgO02C4hSbDe0lLXKW6paxmeVsQX1Ab4MwMbjTzTjoRigsBP1aYOUE0W?= =?us-ascii?Q?ePWyc0lD0KKdVnmQCT8I+PzZD5cpp1SxDysdhnCwrvthDJsdfYOISyswuCG5?= =?us-ascii?Q?XxsWdn0/O7tAas7xk0SJWQ/A73NVfXWAwVl1fwcDHBr3/g6KW361i4alxgVz?= =?us-ascii?Q?rBinkFToAIYKdhRepQ+PJX6Y17VnTzIzndyuS6LbmbWf7SqKsYPEDw9Kju79?= =?us-ascii?Q?q0VfeoUW0EwiPWK1PfcOXhI20pERwSKy5kYxGR2GG4krd1UNc0GGPGmZLWQQ?= =?us-ascii?Q?Vh61fCT6iXWObC2In3AclCNbGXwVrSTt9hGmV6CZwQIU6AYK5QafHskqVSOr?= =?us-ascii?Q?0nSoZ/amHrD8ssUlF/RwouxlW8H5Y9i4cmrgIKaFPkQW3NQ70yGoFBeToAfb?= =?us-ascii?Q?MW/9i9vDEkMPZsYUb1Ou7M9MbT0fJcX/eljXA4BpmvIt/lFYBsw8xcE+X8LZ?= =?us-ascii?Q?LCkLAhTw8NLMjoKdMKNksEwjrOW3roQl78CHoU2RZtqI/lyzj0MYGsZC6B0n?= =?us-ascii?Q?jQ43iVKGnSjeZcGKCG7rI9C3MTT2Qdh8rOh3Aqqz4y4vfWq2c5ZMw7/YrA73?= =?us-ascii?Q?GOVt1o53PDCvCMf39xhV1Dy2Gv+xrmvt4iLnZcraL/9JEOLA543DQauk9NJN?= =?us-ascii?Q?3qKoo0tdh/wztpPF0E91teiL5x5haw3gujPkIAJho5JgVqW/Vjzf/+Oxfrzx?= =?us-ascii?Q?r8MQNyaBV8Y5a3NfzUSyfkXH2o4oxzieE/lLMYrd9OQ5BezbzmNZjam6H+Mq?= =?us-ascii?Q?occUSdi+cCETIhBebs2wEeozO0PMWd31jEKX94GXnQjL11rKVXo0JjOmwfW0?= =?us-ascii?Q?6MY9xy4yXEHSPnRsB6zaFLi3sr8f9gY6JDOg0TdjvOl0I0dVqZ73JLhMZIpr?= =?us-ascii?Q?c7UcXSMo/N8MBAEm09eOBT68Jfsqnn2dS3diuT1piQbfo4DUPVBwOyGEO8d3?= =?us-ascii?Q?J4MZI4yMTN8DH7F50mhmolzveEmN+hyc/WJRue/E0BavG60AN706IJoclFeg?= =?us-ascii?Q?FQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10d05145-fd42-4698-6a02-08dac3b91734 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:15.3585 (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: dYxBDEJCIsmRYvv5lbD3xTj86IKB799WuO8zEWDM9Dk4qFn/cQ8OgGN0qYVCh5o60uQ6dJobasSyOYCsl3wtjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8230 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 Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 154 +++++++++++++++++++++++-------------------- 1 file changed, 83 insertions(+), 71 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1edb8a03d7fa..99faf7c1a548 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1417,14 +1417,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; @@ -1528,57 +1520,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 */ @@ -1599,42 +1620,33 @@ 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 copied =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; + while (mptcp_send_head(sk)) { + int ret =3D 0; =20 - /* 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; + /* 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)); + copied +=3D ret; } =20 out: --=20 2.35.3 From nobody Fri Apr 19 22:29:49 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2065.outbound.protection.outlook.com [40.107.249.65]) (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 B9945652 for ; Fri, 11 Nov 2022 07:48:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VzRSKdgfvdMwMZvXvErGEehZremH3oyiEVXFoPcyME6le51Jq6m7esKjD7ZgPou0oGPjCB8ObR9VKE//n2rGQkTmn0gAlbccUPsHIi+0/52l2f3s+8DbyQaSnVS1wpQLXiQXR2dwhechR9Cm/k+0vIAydQLF43w2081ZfiuVWufpzRIGhLeabLpZ9zDbl6hvpDbezWIEDjTAa79/jmYXhTCqIx8+h/+bFy4xEOcCyh8jathOcF97/7jBQLZ9EPfVQtDpYKFgsTUQt2drfo+2qqzQ3pT+XaSdA5X7ok2HMpDZYEZ5J2Ktk0fy5thpc33xjscj3egxSD+vyEvCHlVmtA== 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=KxLfNDdIoZElNrznniz+mjSsunkrGrYkamHNbix1hRk=; b=kO10YOBS3rmDZp/NdAbJVCeinMDttC+kZ5GCvmFrJE9UrFm+PiqOUFkdCJotTK3p7tMvnsx+keYOuJ3GkXodtqcCixHtOmWOzt0TvjafmwBob7ZZjxiqORKtwb2+ngG4jYHeSGG/S5eHTA18cKbPEvFFN6lWPMX4gt4YA17+1tPgAJ6Lq43JrsO4i5eysqt6SCMXYpHewZWji+AInyOo0G2w3t8Wc4MTPNOJKWBYaqOUrOEgW5PMd7m1TbiqZFhrhX8gJSJunl6l+Nd2K2e2BFwqs0Hsfmw0canEXhJYFhTavAgCXAEQQeQBsaJVzWHvj8VsNJnPEsEJlbuRyNbEzg== 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=KxLfNDdIoZElNrznniz+mjSsunkrGrYkamHNbix1hRk=; b=YUQqw8JYoiwcHvHVnB44mmZf5/C64ebOLlwz6kG3r65U4u4tSnurrvejJeaOJ8xrPYq+WYqEBNhGHK4Xyi72KKJkU8GYXTh5tbgjfjkIoXCVslOG6tM4FKSXijiYODbmhpw7VINz/BP8wYVZ1wrSc8ardDh6leHc71LgCzi7rKNVTrJDN1fXBEs1ZclcXiF0a1FwYgmIpUjP+sqJTQI+FKJzI4JaMMzWRLk0yhE/nZv9tgI1udWI8oK7UH+SYtaofr+qoa8uUGm44XCzzRHLUmmVgwZIMJk9yp6Y4RfqwFKBCaiehK0C/9/N5uA8M5WrXpe//aAFIGEQRfEuLapRgw== 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 AS8PR04MB8230.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Fri, 11 Nov 2022 07:48:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 2/9] mptcp: drop last_snd and MPTCP_RESET_SCHEDULER Date: Fri, 11 Nov 2022 15:47:57 +0800 Message-Id: <8ee705e20b7f45d94f5fa47c97024cbbbfd4d1b7.1668151131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0042.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8230:EE_ X-MS-Office365-Filtering-Correlation-Id: 7814c2f6-ce2d-4c0d-b77e-08dac3b91ac0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iIU9wGaQJ8xdgIboP8SZXPFYxs6xQG4gy/nrWA0/3vV/LtdJqHvn722UWTN3lFyzgoxN86ehMK76yH4RLcalv/EINf8CUok5ifuwvY8ZHrYOGC4vt8vFhIZUtcuGirBzJ2C6qSWZJ8imzUCKp7r1HQOcRUX894m7Yqiz88+RFKnxIa0YTlzUu8bHYVQmkcAtpEvozO6ky7iw6hMcfIyosBixbY9CXFx0CuobZRgbck268cR1/fhuYtZAy+0PvvuCeTfOSZVezGRFiKlGqVXAZf1VLsZWVxIqd04g2UcLMICPzG2oAthiBvA+ogLbctiwsUzMLNcbYS3P8Id46auPdikCU3Dp+8Y6goiOvLZ5CPQZvQJ/nhshLrUXTejJFvee/8xZmyVmD1Zq665r+wpc22W5uNZaWNtraloHZGihXG0KzhQTfK84bFoWUtGuAo2Y+Blc2IVOI/SQFyCYtFHF1iROzMlSZFqK9IOOS+/+Ums2slIhAtAh2csVC0+aBanuFt9ESjPVsgybVsVuhPXwYYFsmPUHtg3e1MC/TH0hdMCIW4DnvdobJ4B60KzgIHM5eLDZWODqPWW1ftGa7rp1i6bQ50kpocN6POvizv8pLBwzSQvCpCf4JJ791NjnZdhHv1nx4aZ63nzOcAhrstHmbLWdxbhko7UNFYlPTKzQLR2IlcG2judVkG+YEcRypUSrr7eCoE5CMmsNiIPaQ7mvXw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(39860400002)(376002)(346002)(366004)(396003)(451199015)(6506007)(4326008)(26005)(44832011)(2906002)(38100700002)(6666004)(86362001)(107886003)(186003)(5660300002)(83380400001)(36756003)(6916009)(8936002)(66556008)(41300700001)(478600001)(6512007)(316002)(66476007)(66946007)(2616005)(8676002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YZ5856SKopRlSpio/zijudk5BbiPlhGhDkrBXGcX1Ts6cMPQeMpwZsbhrSuq?= =?us-ascii?Q?uyUVaRDXL6ammDLualzME35Bb/n5uADGrVrJ/uUV9ydYOfQtGHUFUsuYlMr9?= =?us-ascii?Q?hk3PBJ9RUpwqAPnsXEFNbg//BUN37EnDYcgfrdoFx2v4sopnDzK2Tw3J3DIW?= =?us-ascii?Q?sJBHbu2UvrYyXwCxtnIBk6eotAQXETac9f9W7kM4nSTePCPDtUEzJgY6e4ea?= =?us-ascii?Q?NmCZZ5a9paI/8KizhNPgJTWSZ0SRnr5Gdy9LLy09Hr2naXm18oyzwgrR90lN?= =?us-ascii?Q?XRMV1X0J1E0WUGoSkaflHLirIs/ZaZ89fUyFSIYIhVcq5LA5Of9Em2pOtFwS?= =?us-ascii?Q?W9RGNUEfcRgNaYitpyiZI1oJUcMopNHfvDAjypdnGzFa/tjGWQakW3j2P/4G?= =?us-ascii?Q?uj5HMurv7qdz8tu/oQn/qmiG/fio3Qv6UHWAMDoe5iCuz40oSXYgex6DvTjH?= =?us-ascii?Q?UKjgYfUwn77DgQR/PAegLFBXMz/2Qm6o8KKm+5S/7M1idkhquQChZPTz3YSO?= =?us-ascii?Q?54WFY9HwscWV/3OM4rfa45G4EmN45RfDGXjNtVv12oLEIoKGKFLyVPTzf0s+?= =?us-ascii?Q?QYz2siYsK9+um9nNi0d8eixzwNj7LBlYK51H6fvkP2hNq+Gh5nFfFDQ+JjeH?= =?us-ascii?Q?XqCkUgsySeLuZCvqrNoIeKq2nfYAJ0PBNDO+4Ad1RcDN15uPuVyIsQ7v3kr9?= =?us-ascii?Q?jeDBCW+P41G1YhRShBXDPGqtk1dVddfhaBtJAj+lkiX42b7WPvVRaT8pZHq9?= =?us-ascii?Q?M4a347opxGfpo/tzNlNxTpzHsLzHVFCIMvWZxjM3RzLsGqi3k/h1GZo3MApT?= =?us-ascii?Q?7Guv4BHe2M6v6MV89+5vXp33cGEWx/mxbXb6ar9Fhn2xfxy78gYI4N458QY1?= =?us-ascii?Q?lHzr9NEMhBLnpVf6IR19kxug3KY2s19LCAE/O8lk8uKcjQJuHoUlNN7vLQv7?= =?us-ascii?Q?K1hJCBDzHmVzmKYKecPu5EmDjLnKrhQ/kZCtJIsL8opDT4Wy11p7vh8WyHl8?= =?us-ascii?Q?bIPVsaZchVd6FDBNejeQcDVdTUo75PuwoocY+K8pAE9lZdh9x52bZeTY8vUM?= =?us-ascii?Q?/gzGzyeumMbH0++LvaXNSymrLDBqxFTa65ogF1cAwImVQ1IdGN6qqCzI4aCy?= =?us-ascii?Q?4xF/GDhubmqCrKOHQwpI8G0SpVeqLNErYvbq1QdnS+YRfqWYHGoXdZ2ELOEn?= =?us-ascii?Q?k3dr0zq7jRAl7AeQ/MtGoyJ7FijG4P5XUG3PjrPJ+tqOJ9nsU0CfDg4IvQRm?= =?us-ascii?Q?uXYtaN86XdoneQ83XfoSGyiFO5CQeoOP8Ls6/1BnzHrlVLKMEfTTsbCZ6xla?= =?us-ascii?Q?+JUKp4Rc3zrVXQio1r7IuDP7t1BLNls+i5/uDc5EM+aiMCsu/53CEassMt8v?= =?us-ascii?Q?e0rMHN8x+gxJOwRCqJ8bxE92ADYI5wvXfUI8KFXDeBrWyLoKa67M+DwiToIB?= =?us-ascii?Q?8o/Ht8ahrd00E/GhqGRD2QLQX6c1jEQ9KSk5mqiXc+GjEZfnWZI0L5tRSO9E?= =?us-ascii?Q?7lxf40/5V9EnerG1ziZ9WsHNtjBWz9/rKE2odAd+u7GsDO+3G+lzL2Hgx5OH?= =?us-ascii?Q?YfZrtVjbDve9Q2fF3cwDWTFgjw2/RBXNW9/m0SVjsF3JMRlTbBoy9bG5ugjN?= =?us-ascii?Q?ew=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7814c2f6-ce2d-4c0d-b77e-08dac3b91ac0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:21.4206 (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: aN8O2RuhohPw0K9YRgwbkAFSt08mYLOn4hVvnaDAjsSgaHy1IDChWFD8fVwrGZL4f1ciRn0RxLA14/4QqjoXpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8230 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 Reviewed-by: Mat Martineau --- 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 d66fbd558263..08806f97c8fb 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 99faf7c1a548..9e5b3cf27a45 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1469,16 +1469,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; } @@ -3284,8 +3281,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 f805036e3c93..4780fb5a8087 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 struct mptcp_skb_cb { u64 map_seq; --=20 2.35.3 From nobody Fri Apr 19 22:29:49 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2044.outbound.protection.outlook.com [40.107.249.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 EDFFC652 for ; Fri, 11 Nov 2022 07:48:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k/vuRBUB2gfKlllF6dI7oaQ6KgVo0+AaevD5prPBZT0X1HleEdTtZtWXpfy0Q4qj+2oIFfvN3O4VeHyVs/RU/uAg9PuNCrKRdEAN1HPL9uNvALaq49eEBWDXWN7Vs1KbRVqlNPBD07KG6EriZbpVmMEqopu3YKce7zMefcwwbvsdeUR1bgBX5wTiHCMjL7IJEyPCHQLiEDVAaDwd8xW05Lk7KQDmO3+4K+khwFLYzPza/bSNBLL99VC0V5TI4b214VCsWghFjVShXz83R88w2VjwnbXy4a2rkWvZP3IN/80KT1n+VGNkv3BeZwPNy4yb4WY/MvIH/gjIbWVr3ldMjw== 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=R0Yh4GyACPUYcHCMOXL0Jdm8f6ltKe03yhTux5SkPKm7dX1+g55EeKTAkocPYVICwlZQcw96QI3ZOzmmScloFUYJsVoUWgZG3OiFIXc0qyXVR3M7LkqDn19nkfXNzf08CnZk8gyx5PLjOhYlqH1xGdFEsxCOOW732EJQiDYY+xPwBJ8oV+LXYuURdhR59jMCXJBfsq0ATKCINzVJMixxU4CLLCFmbfTrQGFwvk4XpTelS9WyuvwParswDXvpEqkccQpXK3lMOxjybDQ81M4cgJQsIIPNI2npJ+FNrGLy1ULMJm0aDdx98gEwtPQikejn8/SAlR3ELiMaHu2a4MR/lg== 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=h62B0/m2xDoUVRuLcXGSPakrRgfwbTAqJwFHuE7VXmCztXF+P+ipzIBLry1O7zWlTBCWqBpzwQtJ3mIupkV4m/SdAIlGYNMSd0cYvPudh7YIhvZVkKJuJQGi7NWqIf6WQm8DbNyIlYIBcT8RRogrIbFjCS2v2Iex8JUxyX6hxQkj3VEfgSHVOGbtsxiyeW4WLA5fBCdv4DfXZZ6B+CoiFkmNmvlIc0WXIHY7+yY83SjqIFjlkmRZyvl/fPmMFy1rfPe0sZg73yDDF0slwO7Vi9IUu3LSGblsmGKv/6dsPjO235KPg9wdZ7mjpLD5T1PAUBInXgj49smk6/SfeOGYkw== 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 AS8PR04MB8230.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Fri, 11 Nov 2022 07:48:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 3/9] mptcp: add sched_data_set_contexts helper Date: Fri, 11 Nov 2022 15:47:58 +0800 Message-Id: <5ad9715e09a2acc245c7a504b086d6ff33b40a7e.1668151131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0039.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::8) 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_|AS8PR04MB8230:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c72a4ac-6d5b-4cbe-1137-08dac3b91ebd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pfDVkNmlMScsrLIaeEv9bKhiC59nOZzs8YpRonvbxzmc5+0mT2SXlLYHZ92VrrmKuM9NeVIXtTYSSg9l/16dc/GoMfB8awdXPaKtt69C8pUS42ScsgSE9NMNdsacbSUtFOAFD2Uj5dA9YVH3PU4aaLX2qTZcYBqqD3wmmz5f6EUssOcLEm3o9B2j7MuVi017zI+1dHqFfxpHIWNerBGkQyKiiwhUovCL/2QI++DoDCSCyE/A3uDP7l7LEcv8vNkS8UcQV+OLCOueBzyT+VNyg2nPbF1VPeV0Jx+LQYeqvh2m3KeRnrT7IZb7BQnquh5PZCjrSSqMsHgex1iGa4QePlvJ6uUt8j1Cw/oF6ucPmLF4zLUKpN9oSwjprtjGBnfvFVhPiIDivd0SKPnpn5HbnmP7y5mlgrwXqME588VjFLM0NxCyN8yZ4+OZj2IWfu9LA0gHD6GBNwj1ScGwy2HVDvX+wyf61cSdmFYvPFpnl2E4qNKJjOkD7E+jB4fDfbYvc7W9aUWwNPAXD5aeuWuq6HK/kUvoNWtGX3tPFJN9omnKy1Sw/znHsxl1fz+l2itQySSubUiIkcDGkWKs3Hc5yTfOnKMCz5a3Ykf2mmJROb1tz9aDAXlUbeislKAbLiiKLa6APwiA5wbTqsduKBJKHwVIGSsC/vPhRwtLDlkWh2ZVTUW5xrpTAQ7N56fdgCEvD0bVscL3gArlfi7MbL5fwg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(39860400002)(376002)(346002)(366004)(396003)(451199015)(6506007)(4326008)(26005)(44832011)(2906002)(38100700002)(6666004)(86362001)(107886003)(186003)(5660300002)(36756003)(6916009)(8936002)(66556008)(41300700001)(478600001)(6512007)(316002)(66476007)(66946007)(2616005)(8676002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nCbCcgdVGQpBsnhh/VtURvvMh/7aVU4m/kUaS5hKW0ZR8QFBXWaVp1ozdSCX?= =?us-ascii?Q?12Q76nv2t2GhJZeZOUwtQAhtf4YPiR4zhVJtM+aGV7qCX4Djb0PQuIjyyl5n?= =?us-ascii?Q?g2R6morAt6zMAzcq7hzv3BpRcracxmDyIBersIa26OLpTybtSqociNcukmSj?= =?us-ascii?Q?d0GL9Fr38hpOzQKTvcZHxdDiy/tezJnobS59q3JprSPSOMw5kW0m/x9qhRjm?= =?us-ascii?Q?1N8ChKpaM/8bz09iAHrLOSTHMDNsimf6KtF1kSvFlsGzrk+G0lgAv/Mqcv7E?= =?us-ascii?Q?fFf4k2YiVWoVUCLwzwHSeHUHslljt1iQwNnOWNSt+Qe8m/iAfJJMxAhpjnkt?= =?us-ascii?Q?Nw6ya4ZoB/ZeqPJaH1/+NQ8TjIkQoziBHYUfsZcbw6QdSHS1iJ7zUStya8G0?= =?us-ascii?Q?TwBxQAe0eQeG6znSZCxkX8PnHBI9fsm8cQ4rJKOnIC0tMBsDvpUzbAR9/qj6?= =?us-ascii?Q?EQxxtZ1xmJBv163BQM4OHnyqR1Zxf0+qfbhExlI/HkBt8H4tsqHkpIp6o09m?= =?us-ascii?Q?y7UzKhqTt+lAOPQ20k4LTe4j8FpwkUd5UZ3KKGMZP1E1A6ceAeNQkp6OY3LV?= =?us-ascii?Q?4HSnFpS9KL46mZfo5hA7FY6szj1AYDWkw5gzlxjDaz/D0o+k2L6vNTgRxbSZ?= =?us-ascii?Q?8AD4dZRA3IWjS7RtU/fxBAN9aw7cvQf9wXcHR8cfO3v6u9zt94A6jij8HzXZ?= =?us-ascii?Q?FRcqv81uGgWYsbagWuOb4cmaZZ9hMA0QplIO5W/eMED9dC/qCpEddHq5PE8f?= =?us-ascii?Q?WngTlAnVeXPfgh6jWExZESXvD+ReiYQRNDGdSMCQssNmkxE/LvcYlyL/5dNG?= =?us-ascii?Q?oDjiiXVnroyGPdS6Sm0eK3EINSAxjuXoKLpRAzkLNRhRNlrSo5UK+ncZX9xF?= =?us-ascii?Q?I2b6WAnID4+FDLVBaUJsoJ9Uh2t+U6hcLHLW2RAQu68ILVmq6aVLbOmweAlf?= =?us-ascii?Q?Ld+sgMETUqzZVzOZCDQZHovh9amB4fPW/kInDjvlK9NQfb7spPnViO3NspN4?= =?us-ascii?Q?rYM7eB2pqJza/majQG+htDoUrNfOb9YrSxyPsvoJnQsuS871kIH6ERG9RUOo?= =?us-ascii?Q?LYXVAVn0PHCWVqlG7RP+XmyBDZH4yO+ZFPC9R4tQUu6PnRPDgx4p1fULK0vl?= =?us-ascii?Q?Rgo+Zf1mQmT5LKdABMKSbYdEntHApo0BQr3wfBuUK9O7puhNqkZPAD0BguER?= =?us-ascii?Q?UUtw6VktCXlXNlJ+HOEzLrOodrtRvph0X154gR3CnWOuSlVS5no1ZCSAtTqx?= =?us-ascii?Q?oHV1YD2u+vWOn2m2FyL4aiwjQcRIJJB+Hp/FWJakyfCru7M+zKl8NXVbyao5?= =?us-ascii?Q?uiln4yxKCor15LI1Yx2A+sSrF6cBwtaseMpr7283hrl3zarw247qpiL8/3So?= =?us-ascii?Q?jMTCPUB665QrMs4X2KO2WgSVVJ92yCGGAjnx0ItOgHZFlKTBVRXdVDz473Ex?= =?us-ascii?Q?yaPH/cXAsMEAsB59IoBjReb6hSLsLUk1U2oSa73n4apCrI3GRmCTPvvP54be?= =?us-ascii?Q?M9P2czPY36YWTVk8CkxNBBAPH1h/7K/ThveCYZYmEuf2oPN6qLT3u35D62cQ?= =?us-ascii?Q?MyeehIBt/Xsu69PuvTa9CIJu2oocN9AsdJ7j3tPKya+1otAqxw9VaORm6tP0?= =?us-ascii?Q?KA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c72a4ac-6d5b-4cbe-1137-08dac3b91ebd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:27.9200 (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: vjYOttavnp3+9gvnmVc3DyjH5UfzLlJvDp+zwK+/+ylf3fOUpz5YB7ir7K0PWTUthgGVh5unxqQFpD3Ti3rfeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8230 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 Reviewed-by: Mat Martineau --- 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 Fri Apr 19 22:29:49 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80079.outbound.protection.outlook.com [40.107.8.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 52797652 for ; Fri, 11 Nov 2022 07:48:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kOFc26rBkWIiMWuv9CcZirJ9/srZVgm3ChLn9nXYckFdc7iXwqETRAW8y5l+jC6cvB7J+3Wlh3jLfnf1CIQIb6Tx/DEkZX5eM7+brgzLE+VXvc+3NDQjDvTZgod436gyLfanRiS0UxpugYWNqfmXCZMOANxADcZEmZtS+XmWZf+MwhhFngZsn08cdTB5Zeld8cr2/sc79mE3gGNInTMAz+9iseSFYUh66cfLr/I4rl001elRDNftLMOpIz4/jXTPEzmzBvq8uS55Kk1k4vNfEtACkTZO6+FR9HesmjqVxFqlK+m+TQLSriW9H+GKFXBY4sFUqPyhlTPMTv7JyvZIJg== 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=E2QS5543se/J0aZJ/yoT2omhaU7U17jYGOKRrJdles7OfMFB65x+sYC5uVPWWBM8yYMDen66LmyJzrJLadpQDBVGB7s0fKMM5phxBgkhnDLNJT0aeY++U50s9LYorurcxpfNJqmLTzlPRCfkwrfC3YbHUEAlDYdMOP3kpAhYNRMvWHQ+m+NuxOqLdpJJQchLvtHPJIg66GwlLQXXBVwfoPnC/k+6z3t3QpR063b/PwmQw3lTMRzGriZUuz7VdQkCi2lTiyH0QVTg+wxApcA+YdKzfzbD0zQUR5Nh9I1uJwLIs8/xyGAUv+MGXAtlIJTEODTk5zFV8W+c4fTHaHJy7g== 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=LHfHOG/zJ5QlBnUM5iYTyxOUQpjhkLXbqoVLrHYbRh833nm1tIxnJVMdk1sAzAyBLRntdRps9+VLE54IT0hn9osq2McaG6PWeL8ZDHrgekTt5K5InCk7wB6Fx2Ktq2ccaPUzAsOF6BP6sb1FyprUs8Hb1aU+6Z9WVPmrSyt997ajBt0I3KG0gDNjFMOkE5cjfKlRvpTSXUf2RhuhvWZ5+poU5IGESqhCMIzWTapBio/iR+euHjGGHMvwe6W6ZnpsqZwA+Pct4BcP5XK2JiyScp0uoN5Wi8BLtdG9OgE8oRPGxceZ1H2FrKID/kGtPp6gwZkBn6MSWStsx1KGghzE0g== 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 VE1PR04MB7214.eurprd04.prod.outlook.com (2603:10a6:800:1a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Fri, 11 Nov 2022 07:48:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 4/9] Squash to "mptcp: add struct mptcp_sched_ops" Date: Fri, 11 Nov 2022 15:47:59 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0039.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::8) 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_|VE1PR04MB7214:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c42173a-403f-46a3-04b1-08dac3b921cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kxCPcHgB97ZHCs+0EtUi0qOHwetXCrDkh5I46E/73IH2/jNW4vxRA9nNlIM4lgUe82CCLRmqH2lMPK2QErerjcfYHfxM7Ln8sg73InQdizkMmRzVw8OqPsTtPB1CCbGXacQczWF0eezInzahxom5x60F0xSF0m+nGchuzGv1UYbdtlp4AmHlhLhAksJLNiWHqI6A2d8EASwKyHPWXv9//8st2X7uY+mGkKAWeiiNSoKMxCwAN08Y3lLLlskRBNu+K2TsdA1cw8WvH6QjKuA85BYkp7eVwBZbLkFKxTzgRhjTJjMiJ5KW0U1Mg7SGpdX6An70oSp0J/kr83eFaQR8rfWoHMXWojdN2NTsFlKHAticoIecro2e7LFA9QnIKfD/C031oV6YmkAsIW2zsgW/xcmFSfbUv4mjVN+mcbym8hjuXDIytyswJEbdpulST7eMaFj2NjuJqd/rijHNFQ+9ozjW2bQmXF45pHhPUWTkHcJjT2ds4oJCG9mQPl7/eVypooxXh2vYeRuFLId5joVX328jIcYuYxKk8tWA7/Plv1TGYcUx20yUFgLeJDI7UxMfQyilOTt67Sj83aqvpvDjB81eT4dUh695vG7/3WCgyTBq4tz4mBfz8bYS87BeJ+qB5TzWO/jnq59W2c7/8OVO8/XocXUmZeBpmTo6EeY0FEEA9Dp6E/zYpqo4RWZnK6t6QO5SIhNU9dmHFu0tvHBdkg== 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)(346002)(136003)(366004)(376002)(396003)(451199015)(44832011)(5660300002)(66946007)(8676002)(66556008)(4326008)(2906002)(8936002)(41300700001)(36756003)(107886003)(86362001)(66476007)(6512007)(26005)(6666004)(6506007)(83380400001)(186003)(316002)(6916009)(38100700002)(6486002)(478600001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H34hmt3mYC53SlKea1cks2zi857u3g4Ibo8+ZH2DEgKe9skMCwxCC0AvjHAU?= =?us-ascii?Q?rk63j84ZCUmfqz22ix5Ah+V4TgiVywnewFuE04zHkD44scvdIwnU1/PPtSAw?= =?us-ascii?Q?qo78cThEUJHXgq+HzRYiLHhh7FBh3a8KIhaxImoqrMeQAuCNadmARfZh/TGg?= =?us-ascii?Q?dsn8ppSnWABHykZ0OP7DkaZXh010kmo6LVEbldzeYfrem7inophPDBf/cQut?= =?us-ascii?Q?LsdXdzr7NJp6a+ShW9wvsdWRZ3ek7k+vXsNa3E55WiTEQKrs7wcy1fv1GGjW?= =?us-ascii?Q?M03zFB0/38yLY7UmS7BO+5L5WEvdjp73bP3+eakYlKLBG9zhDT3k5MS1aioz?= =?us-ascii?Q?MgeaJuqqUjGFI08pQjW4vGwP8xsJUZFWtc9PJKqXP677NYl19T74O7BMjPKg?= =?us-ascii?Q?GR61KfSW4VKNtOML7OoYDxfUemjtj6FMZPrC0mVfPUEkoL4G7Db6/56yIHmQ?= =?us-ascii?Q?/iBtMZvNR9iza3Sub0L69Vo3M6kdEMXidEyEAJJQQmpqMH/cmWSgKd2+phXV?= =?us-ascii?Q?Q/2GlKu4Skc79gsxNxMeh71ydyl1xg0wnwLLuCKM+69+RtGOz0jdwOfZTuyh?= =?us-ascii?Q?P5esA9NxbgX+8dlCaq+YKX8ZqOpC0Owp1PhWTYlSjLocN/aJpbugvjT9nn8T?= =?us-ascii?Q?ziVY57XnufqNfpRPsSneQXJe5rP2VHhuBJyAVEGh73QyoLhrx5SA6XwnXl+K?= =?us-ascii?Q?XZXpshhKNSf7gOfq10nQdVnbPtUESISPjN+Q0g1zDzxs2muKCjfigSbV4sqm?= =?us-ascii?Q?JJL01siGTWW79wL9iPn8Qh2HtUklMb/a/wLumYK1eiymwRWF1SRk6uw1Wshc?= =?us-ascii?Q?GyNyMMExmyCAdZ0Yo0Q68Pz9HJANZ85gTezEtMf8FHB/EdrJHh4fqMQ9gxzq?= =?us-ascii?Q?YVVV7Oj4bjMiCicdWd9IfwHVzk1XFUbLGluVyWKp2XAhZFYJ3wL7ersiO8mt?= =?us-ascii?Q?xezmyiAbg+8LjevFo1wJSSYMRRGs3itQtdDhvlKkOAYRHjWIH7sQ+cbC9cwA?= =?us-ascii?Q?Sp9ONgvBzIE07NOx8yDbBezJymA1VoLXSQg6umwSWnL7VoHB8E1XmjHrwFQz?= =?us-ascii?Q?WYToMWyaWaMHdye1SxIFe6D097n4r3TigraRrlsQKGL71dmj1wXUl2e5Cl0l?= =?us-ascii?Q?cHeHP8pSgBI/iBZ5rPj69oZFXAA7ZQ+Qc5QGO/lwVAkvXt9lse6W4UsOcIgK?= =?us-ascii?Q?qNqU+xzPm7ckel5rIwAJjNofJhmEBMhq/0omdiSEeJ6/cx2Ya5f8zBukIr7p?= =?us-ascii?Q?8ThWWVUnEzEVt9k5OBDiKJcNouaaX6uICfgMKJpJhIADhBKg5qYIBfcSRXz+?= =?us-ascii?Q?sCBG46LsxQnKVXuXQS7679792utgSzYr1B/rt8IWV6OozDseYRX1hcnbIDq6?= =?us-ascii?Q?G6WLXics9rRUkf6g+FVQyfakZK43f5+ZiuTf6vEt89q/YyVVXXMWqz0mE/Ms?= =?us-ascii?Q?fgx59pda3XP7WWA0rDyAnRsRBSTRfKFEfAfzDEdOUrdHhNDkYemdqY+CPcPg?= =?us-ascii?Q?Er313ykb+lPCcF6gB+VbEoVqkZ3FDf6a++MWUk7Ksu2zx2lH0Fw3eoaCcQV7?= =?us-ascii?Q?PdHvmLCVGRQDCLTGXqsiL0F8oW5aOt/5fBR0ovRbepQ7qDjRdltXsD3ULvyt?= =?us-ascii?Q?yw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c42173a-403f-46a3-04b1-08dac3b921cb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:33.0603 (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: CTlh54C1i1kjQQV9hcj3x2iTbe6/LZGF6uosJCgvyX9egI1froswrbUtzbiZbKGcx/FvYueyNnM08y/KYBfCxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7214 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 Reviewed-by: Mat Martineau --- 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 Fri Apr 19 22:29:49 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2072.outbound.protection.outlook.com [40.107.105.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACE55652 for ; Fri, 11 Nov 2022 07:48:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=erMtyDxEbk3IbzNc7ZZg8mVooP8KJNGfx2F+Ehsmvv8TwCfYIPZRoMxdAqEpKfaFt/ct4EoVjc+AwbQ39xnENV6HJ/c2Qz3gh2dS6mNEvr7u8eFCrzXmDTx5SzYEGgXzikUXPbefTxB2c+FN1HC39istl062kHVEFmhU5mnWo3hTntiNbBNMOuWP80zjfFsaFfUzXx0TbXLc/OLTdEYuq9dxecwpzkyOw8vU0V5aEy3erPbKdts3pDKV4GbN9+TOiImuf9eOG016AgYllIJ3lfC28Yczwi0kZle6haDpnTiqXs2IFdrA9T5DZDfL3hmsMfheO9idnHXmmEoNZQIdsA== 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=e/sOmK9SrSef7Vx9/OyeV4m81/Q3xVFU1DLpVK+O0pLDift8OQSNPjUjVOFqOvG51OBJ7LPi1ujjLuGkq9JkhsfsnfV0/eVNdI+8VuNPjUMEuriey/A8Mgz7S6V6aoqdlbjYCGSDfPQ+TkX/JL/E2MmtIFuh7hj+MRI1raAqWhYpmjQM19BIDqTtEzn0PLFksd3gZou7dTrpPIkT7dJIHqYjBprvqvXMxWzgEl11TreEKwRFNsWaWj6ZuAqaoFsuoMwrfrShUDKEcbLgVHIGkIQewqe8q6584yq+clHofgS5GObJcLll4qrIYFd/lwHqZLg04lb1e9JlvpQs4cTMEw== 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=p9zRdMqeXze6MQPa39wuBQ+OJw4lu09khcGfYUI/Q5CAflt0BJfQQAzC9w4XMFoitoWfhuTf7BhtTsu/Aucv82bv7EdP5ZDQ5OFwjkmK/iEJ4IXvPQg+sWF8xVEmLiKFDWDINc4LZjDeArgzgDDiYZWdKwLqBv7mClxrKGTyLFvvUoCt1rFoNohxJreTQfoh6YemwAcHfjo6hi1ZVsBpgcBZ1Kbpoz2gph2ZNSBK0I9mV/RAZynWJTvkKdxYQlBdwWeLr53F27T73j2m0C0bB2MA9uWYB2Vtw0tPq/Gbp8d5XxQFPAJ5SOEynCnzUZPr4+0Oaf+7RAimcEXCI5FiXg== 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 AM9PR04MB7521.eurprd04.prod.outlook.com (2603:10a6:20b:2df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12; Fri, 11 Nov 2022 07:48:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 5/9] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Fri, 11 Nov 2022 15:48:00 +0800 Message-Id: <79113cb8d3e8377d997b9da9e595256397916aeb.1668151131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) 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_|AM9PR04MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: c515a765-f01c-445f-fc19-08dac3b925c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vunZnGhqNl+n5x5Jsq/M9MYqVSN5zF5zkPiShWBB0kEl4aRghb8FMNSlgzbbeb454jfgJ7bo5beJ6A1ubTwzwUDvDbH0ta1VO9IzRY0IOJDDuJl/kpjXans6VPiH7Gv+/G3SpFeRKp+sJFRSTxwDEz5LhCtohGxOqx2Mcz3Y69YceNolqpqGAoHmEfng/W/QYiu9ZjXT05oX4Gr4ZjHMPpYGETKseV0FTQL4yimp1AfjWZ4/65Jv5LheOLk5vMdK1BpngTl1KP+wXojYl2nFRDK841aHto8fIXX2L7F6cnKBfQnHOSfRuqUvmYKl6Dyd0NReQPFeMPERVgCFN/YsFjFqxudwadv/ius8WVAO2UuhgcbZX0ivpKWoxW8x/gZA93cDUAyaneAsGkksACujM3Yu2DlZW+Dyqs/0EUZnS6ODjUHa6FvWQuVprJNaIPtVTdN2zk7Mlp3zBcZB3Lwh6m65e7rbQEQYqoVcGlpKD/uqJyru0B8DmH/V0V4gZj1AgmA90of1XGjFoa0pFLhtEqSKoeok1BU7+/pz0DtMerT5J5AJE9mfE0Y8j/Lv4noGpHCHULcZ4nlKO1YBKZDjYgpPF8Z2P45/mIoQ15EXC5vrRoETumT6isIGpabbB4YD3dvYMY1he1+r9k/TCNQ4wpoNVEDQ8xRtA9XFY9ZNvinGzJgMApM3MyF1JS6p6yozyQman4HJ2jgmNYFh2im4Vw== 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)(346002)(366004)(396003)(136003)(39860400002)(451199015)(2906002)(86362001)(83380400001)(38100700002)(186003)(44832011)(4326008)(8936002)(6666004)(5660300002)(107886003)(478600001)(6512007)(66946007)(41300700001)(26005)(2616005)(66476007)(8676002)(6486002)(6506007)(316002)(6916009)(66556008)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cOiaQjivXJSOw1kE4ABn4UYiZOfgAIMbE7LIfhfJI9mchUuROknUwqW3i8Xg?= =?us-ascii?Q?rP0+j4ORc0kNUn3DEybAjN7ROf/du6Upv9VJPHBk1jQokOJkjvDmnXG5CL/z?= =?us-ascii?Q?AZRoYULSsqpbO16KHMovV4mvjaxPLWRqG24ZmyBM7X1tPL9V3vH52ZrlvKST?= =?us-ascii?Q?KAIIPS+1dsZarQ8YJdWU+RoA+Sabc35/Fr4X6gSFzl0LphY4rIv0V/t9vZpO?= =?us-ascii?Q?VMmhOHf8PN26h1ZYV1Cl3VDRCWVBbsHTAZ/3jDmKfnfhnU994zmoDZkWuYxm?= =?us-ascii?Q?8FUZCHLtuXW2m7qWQ9WfUN5dWdg58dC9aqY1EgZFUrCrExpEGaGYjnKP4KB9?= =?us-ascii?Q?uhqkGXjKGUzzUJCmzMYs50gmwOPfvMf9sFQJU3fLBqTP8uqmWOyVCJnSnCLB?= =?us-ascii?Q?4iozrz4/bH+rf2K5YPLovwt4bLS8DYhB+cLk+IEcf5Vbrx+aWuKNS6D2K7F0?= =?us-ascii?Q?mW8zm8fJy6zR8bJMO/w6Qe6CKd1+R6zeCJNfPjsS/LYKvQrJ1CedCr27mfnC?= =?us-ascii?Q?OaLzUAkIyRJNYD3BFRvnTMIkJd9wEtteNkzu9PUIQWTWf2IJdrIja8GVrf+3?= =?us-ascii?Q?NT9AGq/H5DQBSO9r++fdfTOuPNQl6dpqIcN2n+uquQxptruJVmKGEYcGWCC/?= =?us-ascii?Q?rzLmd/fJ8v8H0XD4ty4w7/JeK7BA3Sro2ilDk4f94Zqwtq7nzCMSW8NT+3S2?= =?us-ascii?Q?qL7HsHzGkrOfh/m5l9Pch5V+fx+V5d2JF9y4E74aVzdx0EChkAKpke0/2ki6?= =?us-ascii?Q?5st6ctsbwZUoublGQH3D92cKzund95YD0f3pR7FL7Hg5nvuGc9WUocpN8ITG?= =?us-ascii?Q?JNzXB2glqUaAD8OcfiKcYpO4fCHSlt8O/dKAYhcWctnfdMf9If+kCl/Yw1Jt?= =?us-ascii?Q?b3G/ZWP8YmkoJV+Y6kSxg6Twjizqwn2PH2WtmXFVqiWEJHKO0CNOR4bGbGp+?= =?us-ascii?Q?YzI5JBNrwyLiVGx5jUGBTfi61nIBKS/8cJUkm3TiTF57cLj/KVTk6QWMjZox?= =?us-ascii?Q?iA6SnWBYjz4HksL0AMvm0rf0u01S9S/dDeV9qDAxX7+lgBope1HhGOFPn60i?= =?us-ascii?Q?YwJ7gQQcr4hyjEyBxtSgRzW0EUBeciCPsJn6/TmoulaPxXkmro66Pe6z5QEJ?= =?us-ascii?Q?Ncu04Bc9WSYXmTnepqRJDzA1jYy+e5120S/3NlWYMmrP4nf2VhlIqUIyA/hY?= =?us-ascii?Q?cbcFbSEsMmFRXalrxfy74ZOuw+B3jCx5AQK+e2n5F9wXNY88HO29t9fd8NoU?= =?us-ascii?Q?lgSHd0dqe8Ypfm3MajE7F2YhRvsV79jc1mnk6+neJlSafr92bUjZNu3lnWt6?= =?us-ascii?Q?mbuHXo0xWLJ0INj5yCc7tF5fq3Kr/V3O239TagmAJgxwHFYSUFkXt7p6wBPi?= =?us-ascii?Q?gJTk0tc0FR5pOlgCUIbd1OPjntaFDTU6aXpxFkp59W05GbIjdkhHXO1rAUax?= =?us-ascii?Q?9zG+Kvoi/H4mwkgKir8HCZRwvjJj6Ew7myxRua0uO13/3Ux/OJK9td/YV/AB?= =?us-ascii?Q?f130OUX8Ev0WsFvBWfj8jBneE/bAo0DT/XTzBALJfyyakhZCCTBU/HeQ5fun?= =?us-ascii?Q?mlO7n0h3peQDTZmYl/KF39vT9ukm50H1XyT3pQIzSA3R/DGbpapmOlajrg/4?= =?us-ascii?Q?0g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c515a765-f01c-445f-fc19-08dac3b925c4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:39.7004 (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: iWgWlvwFZudc9cvo9ZO4BT6KHH+ECCFZtyb5wXn4c2CgVVWOh7jGhm3bWxhPumKXB9iUsaPoiVpI9QjZLkXf5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7521 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- 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 Fri Apr 19 22:29:49 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2087.outbound.protection.outlook.com [40.107.105.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C34C6652 for ; Fri, 11 Nov 2022 07:48:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C0ZUUMnF4W8iKbYyz4/tx7LYKHWvviC3esi1sBUCS8AVvbHzzqkkr8Y8tL3RlbVzHIUuLwaHt/H4yGCDlXxDZgSDYl9qTSbVBnaetyHqmcTA87lor1aVQn03nXZ4jMbP6edlm60+l9hbslS6/h8kmTbX7v1ve7D6ItjpPYqnj63yNC3v0eUfyLl8AkxReBFa4/rVljKSuEpQA5tXgGOWmRIEJ5hprkLwbE3yuqIRhT0XACY/iwdz1N9s4CRwMJT5SBItO9Bn0zAldQ/DEwl3IB3p0u6xMfhhLxCyTMbdXoG3f5yzxJGV9nPd6yTsLJIp0aRGVUn6VEaE7gyN0ix4hQ== 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=TLUBN7L47pAq/BSzYpFKa/3g7WQCA6IO1KQQRSx2kojkOIC0yisfiVE657pMfSnGw2RKuKSwo4ce3NfaM4tgeyWasCGKGcZNvsQBN/weHp2s/hZvAaXMrmBk6tlIZVp8zAa1hl26SMhedllCL4nmtmH4wY2u83UzO3Ve63xII2fOJ1ZKsER6+NhLdRBUSrsRwlK1q8V1VWmXNTJagh/ljF/Y194nBzL8/a0r1mqxUD2QHNmxKo1QXcYvUNBtiRw9ifjQCEQRip7/nCjqMfVL/wCUMl2HJjB/U+QHgncnu0F5+g/Bxr6ZZrVLkWeiqXpYQlOsOm0q6sNESmjMODcgSg== 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=Sf/BZRbPwBBCoD/Iy0RD6a6Or5nQxaWmKMRfqikT7Ya+Xkeju5+ZEGpUKsInrI9gCz1ViYS+MZzHzpyoP5sklTpEC9IteOnkGC+o80M6MqaHDvq+T3T6ttzyAIPyuHk5GkylWSCDmr0X3O1pc6G0vANqfy+Ggt8NjSmyAut6bhfon4CeUb/FmiVwzD2mDcDFAxY7vm8sycSHw27HGF52oARKYxJVq54eFo0wSF0FJujyIoBAMKK663T3VRLx9gwDBVQe2ZMNUCQ7LDTMilVncUiq2zgYRFljCTVHgKpHnf7j5ijKBYKvuqq3HSrOUWbdNbe1S++YscLhcc0JNRM4pg== 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 AM9PR04MB7521.eurprd04.prod.outlook.com (2603:10a6:20b:2df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12; Fri, 11 Nov 2022 07:48:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 6/9] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Fri, 11 Nov 2022 15:48:01 +0800 Message-Id: <0be28f60c266629f8bd9ce0f54a26d45caa9db3f.1668151131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0038.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::7) 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_|AM9PR04MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e72d1ba-2411-4a59-416e-08dac3b929cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7jVcg3LFaPPSc9zpkbSfnMUeKl7PYqbwTgohUJBR4dqMfJXXAKRb/0sfK6flZSYztf9TZpIun0ILojIwGkqh7k+3G8ByPRvp5AnKNseOD70oqt6kS/7LsvzcLcGMsYw1iREKp/3ofQlGFr4Apov4cZ5EVDMs5faaOvgXDm+fgkqr3VHbbKAmVXaL5YhnGoU2GqbYdgXpQYSgs51hcJxVIfQ+FRu5LZsXvleRDBC73gs5tOO9v56tcQrmfQhOnKovbNEWt9HJyINn9ZuEdCH8or03ZTfYwadziIBJQUfZKm8GR5FZReIHK4Jp8Ck//6JdnH5Bufa6F2thm+DThIoNPD6GsnKBFOfn+8IJcEg0Qj0wzcjqoijiBQN+1VRtIrQvPFUzYaYcwKsmdtxm9P23ciptfOFfoeav7K2PHjrUk2mYHV/ef+KVAFwJSW/QfmCAQpiwb2JK18gnbST1HoVixR9yAQLAjX6UxRtmrqWOl9Dw59iN4eTm6R3y4htJOmc5xiiJW75eOk5kQTmrY5kMoR3Xe3mbtZwBltANDDhct8rMp6hAQDsBElHGhPuUsIwoIh7fQv0jRZv9ZWZl8fQzR949rnA02eihU+9kNIuZC/WemXGOVfOKY7ysxMXDrWDTETQ/y4zQsCMVhE+OAJIw7fJRHVcrFZMQneMbMe+cTXEB2m+/Cnkc3Bo+Dnr/FAJ2+XS0rFPru+elLYg9mkeFIQ== 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)(346002)(366004)(396003)(136003)(39860400002)(451199015)(2906002)(86362001)(38100700002)(186003)(44832011)(4326008)(8936002)(6666004)(5660300002)(107886003)(478600001)(4744005)(6512007)(66946007)(41300700001)(26005)(2616005)(66476007)(8676002)(6486002)(6506007)(316002)(6916009)(66556008)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kEVSdyWEnEKACIlGzJvX2TV/pGBNYqL9MGSYwW/GxPPMX8fVD8stKBrNtaUC?= =?us-ascii?Q?l0fhoQldXP0KXIfwsfI45+4Rmt0ZpES0eciNhnLsMKqHEtDsdjSND3TyOx9G?= =?us-ascii?Q?t9IDWttWedjquoJ2f4obdl/Wbidr5rmOPOe2SOPJ2sx/cUblsORuHwyqBdFK?= =?us-ascii?Q?nWnuJNo4NU+ZX8U1vDow7HFYCaRDOEf4LOFJ63CvC47YqJM5O1abJ9TYLdnf?= =?us-ascii?Q?jMXpH1XEbrVWKGjSnxcN9NADdKXQg9LftJ+3GuQ6ZYv2MsOjqxEfuqoTEkNA?= =?us-ascii?Q?O2QZuTBn/w/B627DB/1LJ0yxYeG0s8gKYQn3+RIXrOzrvTwr7P4PKN2UECTo?= =?us-ascii?Q?jGXbHjk38i1haMYPc96mnCmpFo+UCKbGIPGJXaWK6Ufx8GqH6R130izY4KoC?= =?us-ascii?Q?kld695vphEB156Txf2vzxc3KBTzsqw5mYa4yReMMAUQDJWnu0zRXyIL0PQsK?= =?us-ascii?Q?dBUv8aPG4aG2avmqGPKgfuIpr8Um4T4ePesH6WgA0wU0FNm6OQ/QNnh0Kk3J?= =?us-ascii?Q?+9Qfc2WgAeOocj09TxUf8wTOVHwr5N190i6f8MIwAdF2IDTaNAUvtMe1CQMp?= =?us-ascii?Q?pD5H8oobu8SXWV/Iz8T/7pquuQ7wYI3aqOv13i9KsybmOHFgDH/SHR+O9q6u?= =?us-ascii?Q?2WKvYa/y7ubmT/MXn4QTGu6neFuVkfLUs4akmMO8inbSqDWIaI9sbEjULRut?= =?us-ascii?Q?Iw/hre9Pavy/eoez4evJdYOD4RclPdT+x2//M1QO3c/wsV5osbOU0ckmgzZF?= =?us-ascii?Q?6ioXdN90BoOOOM2MKtNsB4s5Kb6bw56nrd692LfrQMUlV7hex0Ir9+uBOiS8?= =?us-ascii?Q?JoO0ApcYM9GRbvN8gy9MvKjyltQ3GPCMpLfsOiBu3AURJCiTj+kT1qwBMH15?= =?us-ascii?Q?AI4LMkM4jCGhavTNpNbrVPIHRF4PXUVDK3GGREj4p3D2AWekENn4rIr9tVDh?= =?us-ascii?Q?W1dexMG6+BKS16yTWWmNo2e6qAiFZ3NfC+nuWLdPts5n2MuwWN2P3+RAyouB?= =?us-ascii?Q?n0MXtMskuDdwwiwW5lOQVI4XH45/p1uICp9fx/4jyYdeu+QncKXS4OWvELfJ?= =?us-ascii?Q?cMXYj0iWluEN2gjTDZ/axZ2p7BHGMx8UWtHFQOy1i+aNcSNcxwEF4S8ANPeN?= =?us-ascii?Q?o38KggqO+fmsd2w70LspXVVArGH512G7aW+HStEAi7Zkrh4uyD/+vSfc3tx9?= =?us-ascii?Q?dby7gJEH3GM/bsGImDX8wzibaFGJhWX5awtPRveyf8xC0shESLa0XaeLYC6U?= =?us-ascii?Q?lb+zsOXFYsyjEcExtizwN9Ng60CL4d8fPHRukRfAqGIhGsNj0CcXbedx1hbG?= =?us-ascii?Q?ZuViTirumHXAVR/sRcDAjLhs4fIYnLLB3Qz0ms+7Nu3JMQdIoOQ2g9VfKyx8?= =?us-ascii?Q?LU12Xe57T5utbgylucACBug99iR1eSdWogfaQvbBJ/qu5/RN3N080yvnQ2CF?= =?us-ascii?Q?E6P3l+x5SceoEreTKYhR5pXjlKSr+lbZeuKrL2IJAP+29+nKFnK98O/WaSa/?= =?us-ascii?Q?FRMCCmZL2S1kCiRM7jIv2eV31yRQTdopfrqZ1tC9mZnlW7DqQnuZb1BktBdi?= =?us-ascii?Q?thycLknpwM8SxSNR9gaMBechLZ/7ARZup6MRMqkiJ9TQl061as24jYmIwwCe?= =?us-ascii?Q?hw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e72d1ba-2411-4a59-416e-08dac3b929cd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:46.4811 (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: YMi36PiSHGcvoFFg7etGae1addqJhChp5rkDCKrIa2q2RQkAZAXmf7C1WU5gOsta680rjdA74w8Ss/RRJbvh9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7521 Content-Type: text/plain; charset="utf-8" Add mptcp_sched_data_set_contexts in kfunc_set. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/bpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 0a768898990f..03decb05755f 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -164,6 +164,7 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { =20 BTF_SET8_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) +BTF_ID_FLAGS(func, mptcp_sched_data_set_contexts) BTF_SET8_END(bpf_mptcp_sched_kfunc_ids) =20 static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set =3D { --=20 2.35.3 From nobody Fri Apr 19 22:29:49 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2046.outbound.protection.outlook.com [40.107.105.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B23B652 for ; Fri, 11 Nov 2022 07:48:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jeMLFIV2bA5hdxFMOkDQ9M/7wYznxBvpHIDwJToqnj6ehEhHSGAw+UpWMU/yEtAlPROzFgwPnJWf5uoK6bXteLN92vBE1wsjigNu6qMgMs9Hwd7NHid/HZhxkoF23AkIKwqwCHE4XAvDP5YjT1DunclYPy/fKTmJvPfCjDbImf5GANH6lnSbaRurl9G/ZyFloYcBT2TgzJ+mHi/RlHM7/RIkbyuE0ibJQLs2CVtrNeVkSNT272dQInV4dMk6v5K4Uf9NMXWRRLocm71MW9dTNn/83ifhKafULHY4CYH1Kl+8c6gUWhJT6C/vZeypHKx+UNCjyoVsFMwDtSv1XUe3Tg== 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=ZCigGwpNize5yQHqu7506eQcfX2TnALlp+bNzLyvQEbTRgAReIH8t/LLfXt2rx5zKfmElP16nlvJJ/YOd158z4KeFQhmgFTxPnLuFDVCSJKvl2gMnhHiO66bc6L+hst+GsItm4nXiF5SZJCw4IuaijG4roPcmXkGtzvlhYpxWGi02B07Rd1SsqcuZ/TVJDNJ8+kj3GX9wCBYrsfv5sbe1dZOhvmDvbrbu+YJcsbQMBNOiOuWVtonVIk8/1M7aB0ci2zE0cPvB0uZQKimTPKAAhJBpprLJBxQToUhphCo3s+CfizKxqJLVmGbsh5Q6R+VXhS8MGgarxx1opqa4Qdgwg== 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=l63iqs3Kqc6aFlD9rorfAErMipsBsEe7YaZ3G4POoTey+YS/6y0mbURn8/r1yPXaD5g9Rtl0fgHEmLpNLOMJkYYE8G44OUyyuG8mLim6Y6kcoMMfvqYjOCcrJGuxpby9oRdRN5xqoXQ9psWV0IbtdHTTMEzPLENAjcKO16OJssRaGNJQZwdTkWvJpFVLz0Z8WeeanZbOb0zXrEL9koxaEmrLeF7x2/qguLdpOCRvby7PuLzVnOAqXSXT8SgcIcmUefpNcuAsVerc3cWjPR+g2ozEwSauSvzvBYe8OU/n5GMWX1k2am+TU6MkOrE8pe12tIWbSYgm0Iwk/0av8kbC+w== 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 AM9PR04MB7521.eurprd04.prod.outlook.com (2603:10a6:20b:2df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12; Fri, 11 Nov 2022 07:48:52 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 7/9] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Fri, 11 Nov 2022 15:48:02 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0014.apcprd06.prod.outlook.com (2603:1096:4:186::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM9PR04MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a79ce4e-4eb9-4bdc-90e2-08dac3b92d3a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aHriwd+cOTCGGinms1RLstelYkHCcwQT59EuE76hU8Lpcbqhm7CvWxdBb5ZqUNDj54k3Uz2xs8kd3ERzpPC1mG9eP/TtnWr+dAHMcCBlPaeddZfudfnvfVh8s1WtGhbeIXlO5qk+vnULNltcEBso9xh1LhKBpqQ2ATLnz3bJ3DN/3QIryQIgT8I5mLpqaMc/kggLZieBE95YCFwHTNzak9eUTSyN6CaU+YMbjNpvWayB9zrWxbAF1ywTagWGnSriGKcG9kFAS0G0ayQGOdpZE9cbJ/RrH/apDcrjTaGZ41PvqrA5VtqfVISeXI7fg/dQvJ8GUToZGmrqdVTaB1eDGKw4DpktEIjIF9T6TWmJSrHmGcGLNOaUhtE+qygkEczphbZ0htYIB1LHonzfn3OrVktZUKnDqsrSn4g1Y5LcPo7TVgxAE/5i2ha5LD8bxyMXWcKdQarKpHX1NJPCdx+ERgZqgbYoDNHcGpT9dgKWO9BeH7xPk9wZ0ZbdQYZOcXi3VytE8vUpyRYl3N/akpCB48ljQjM1XvmHWJ7rtFMNVRMEkwNdtU1ewDUB/Z3KE1/vlByeT0dvvtilT+N/LAB+nOAaHG+3opvz6B37ZzszwtSZ/OHWIs9izUuj8FIdycbbnyhKKvBNrjglWmLNVRegzOmmgbudaZpiEdJ/wsECAlCgyfJZfZ7lCOIje3e4Awxn7VUm03Td6EtWNiwZmcdRAQ== 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)(346002)(366004)(396003)(136003)(39860400002)(451199015)(2906002)(86362001)(83380400001)(38100700002)(186003)(44832011)(4326008)(8936002)(6666004)(5660300002)(107886003)(478600001)(6512007)(66946007)(41300700001)(26005)(2616005)(66476007)(8676002)(6486002)(6506007)(316002)(6916009)(66556008)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d+fqqtD56FhGJGQAXNQxw8FDw7QvR7vofWPfvhSlWjNxYY6uL2mN6c0xi4Uu?= =?us-ascii?Q?JapSCmCkHymcENr9uboyzzMAPJEYI2eqPWK1sujKEjJMMksvWhw0SafSIoLp?= =?us-ascii?Q?ts2VmeBLmuswOl5P5uf9WfxxQ0lsrttSjmPdY7yEnTlRxctl74JSGOVXjDUd?= =?us-ascii?Q?PEP1MoPkhi5nn9NEFuxuNDqXJj9BGvyQbiL7wjcgsRtXiIBTlaAMwUB+1p6F?= =?us-ascii?Q?jRz/wdx9w6dXCmBPLlihv76R/1qnqCG/Ni4DR2XSsaFIGQLdl5sPtEl2FsGB?= =?us-ascii?Q?MCyyhlyqK5febkSoK+Ih61AIBRInKQ1wVpzfb4dYZjBtqcj/it5Cx8y0hbJ9?= =?us-ascii?Q?PXWR6Rx1IrRg/5djFzglZAx18ucqi33DiXfqvzc/Rs2V50gGdy+4OAcQrPZd?= =?us-ascii?Q?RQTiofSzavcRzq/qv/gsI4w93gAtsy5eDK/+m2zkXAlR1oQpfec87ScHS4mJ?= =?us-ascii?Q?bEHns1lSGr2bLMf05X5lmKYVtHlK8ONO0IqWgYZ3wRj3wdQZA2LPFtxrwZxg?= =?us-ascii?Q?3fFVvrARadNzvB8iLsEsumTqDtVARd6izKslVPfPvmcIaJ6oheUr7mS5MQSi?= =?us-ascii?Q?GiUgwPC5dwpf7D0STVz/mbB7Wu84BLHJoF0e4B/kH/hKO3iQuLsYWlTMf+HC?= =?us-ascii?Q?S+hab07tlFLYnHwXrBowz090IYMVVSi1ro6PIfOMwEGzaHv+mV22LYowANki?= =?us-ascii?Q?mrcrgvoFpGpp1yri/HHtht0xWThXoD3Bgu8buhywEWsKFtnq95fsuhSPyUrL?= =?us-ascii?Q?9hXH6EGwK9KHDm9l8XHaH1EFlgxmVVw4Gni3+4EJH1hMb9h9DIc64AqMYsN8?= =?us-ascii?Q?EwhyQku1ln8523FF8tr6EkJDRlLnW653tDh4BvC4/X9OEoHPeTTIwkJWo8TG?= =?us-ascii?Q?Sblimkql6PoLJDWXm3khCY6LrCu4ZrHiulZvNuhVcI4d4dOm+xt4QkYDjdgi?= =?us-ascii?Q?2TmtBI+I1/qcI2m/KpxMaQZJBF1Bo6/h0CWBCyWXxGfvIC/fMIGetACRqakq?= =?us-ascii?Q?LsbS/jg606MwgttagRE2oUx4xa4fXT29xYhpTE2IiKLgyH5yUUy7ep5qPaRb?= =?us-ascii?Q?cnQWOzmiAON45TD8Kw9WfvZigBjrwSFMWAHR4o8Fx0eGFUYvkDA/HgU4Ok6B?= =?us-ascii?Q?yvVR2HjpkGRQOQOpv4s3AOuOldvc1LMi2gBXWLIVzMak2WfktqBiD63YcyiE?= =?us-ascii?Q?p4MTVRyOh3Zq+0tRCaK3Nlk29d2qOtJHVf3FxRoGDGb4vEQDpVlfOOi2uwqQ?= =?us-ascii?Q?tI8dv/RF4t/YKduNx35NkDsjL2jlAllZBF70RNMJL/2ckFa81s1NpIHUxojD?= =?us-ascii?Q?2lQ3hGY2CKDC7dmrN4Vr3TZ3sHEd89+9E1VRgORbbh/5v1fhbDon/Qu4/f1B?= =?us-ascii?Q?gPoLbvmjUfMAR9EW/fw5+n0ShrKhb4/V6MEyy+R35YOA3CX8pZxaw9ZtHiDI?= =?us-ascii?Q?Uw7ck+1znC/PEdImugWalJZSreI3tkC2DtXUugb+IflmJvH65yym2o8HZPAP?= =?us-ascii?Q?E3F6NKLQkoN50MrKxWsFaC1i7HlAWyWa0hUm1Vp1mYSO4DLDT90o1M+1YLlh?= =?us-ascii?Q?ZpM0ycqV4pEWS9Dh0rF13jPomKTeHMZdgf9IIGDZb43cCvc4yCBaKIS/uKcl?= =?us-ascii?Q?BQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a79ce4e-4eb9-4bdc-90e2-08dac3b92d3a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:52.2462 (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: S39elio04JC2lKX5BvsHvCfa+4EsP1TPOmDXKCyG5PTJHiMvjcwBP9ZIob2o+v/4UEeQT9xxvVhqXpE+JKvxbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7521 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c index fcd733e88b02..e4caa2dd8c6f 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -16,16 +16,24 @@ void BPF_PROG(mptcp_sched_first_release, const struct m= ptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_first_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { mptcp_subflow_set_scheduled(data->contexts[0], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops first =3D { .init =3D (void *)mptcp_sched_first_init, .release =3D (void *)mptcp_sched_first_release, + .data_init =3D (void *)bpf_first_data_init, .get_subflow =3D (void *)bpf_first_get_subflow, .name =3D "bpf_first", }; --=20 2.35.3 From nobody Fri Apr 19 22:29:49 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2089.outbound.protection.outlook.com [40.107.105.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 408B6652 for ; Fri, 11 Nov 2022 07:49:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ax6wsqmOoMkdDsjA4NXxEHSqWvLuAJiJ9LUZD+ExObIiJqHd0rCQUo0ov9eV/WGfVSiXVJxTUYlVQc7Zz0PsWwVe1g1Is1m8do5EKsdAufU6A/2gHh4xsQdGNDA7NLg55SrZMN0u7CQ6lEsGFMDbUfCAWSH0reyQNRR0UdqW6K9BH8KySYTd2ar79Rm86gcTSgFD9zn7C09efHO2nY5XFArB8NB1/s/0fGxU6m984AD/vP6GEJOc2BNc9tCKVC/VI/0eMxmP5KARrg949O2cjeIugw8MJf30W/gDNcSDJK0tDVdjkai4pT/nO2k5zhcw0BCLWQzgmMB2Vh2+7qiXrg== 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=bJOZsiMxiAGu6SyDaxe0ZiF84EfKm1lc2FybJQWuAq4jUeiowlmxr7MPAtv9rjGNunJ9MmgiR6D6/au6IgY+hh4Sw5Xs/jK4K21THTPOZunC6SHkVeYYSQSAcyrvSlXUuGImcIpGEdGB2eTm8vhsa4m5CQPOVFjtlWdiKc0DR+6gT/otwdSuurcEYgr2JaRrm49qhbKzxQRH5goShTFEE+TQSEjwctDsOqZ8Gh8uVH8/fSJ9u7ShH0Ix7FHx4QxTUZQNah9WQzNtgXBkg3sqojYk1pU4aQQOYRfNfIT16KdxXjp3ZmzQqSqjdM3cM9/fuVxCfwSR3nkNCDAvKiS3Ew== 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=I+8PVLpF/VIcgMc1bgURISPCqlcpw1BAv3XaBXEFcOncvcTjrEevQWUleE9BhbBUCd0XuxSAyEOySd8gPLW1bHh47hP7t66Qx3Exq57IAo3bWqfsOAvBkCieV3xfPbmFLfcHZC2n/DOr7scNarqCOuLX7Z9hghPEVZlBUUNxEEpI/jD9DhlVCgc9StK+/M/9LBaHPXS0/Y6OoRQO6HjU+1yWjqicCmJGCqC2IQEPmdNs6TMO6p4e2MDLWqZO3bhhhuNzwNUih2q55LMAlwWO3Sq6J4ctAT7V22R0rEbXTplzQTbG925RHDwd5Iz3YF+KpvSzl+ApvbwcoKmREIa16Q== 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 AM9PR04MB7521.eurprd04.prod.outlook.com (2603:10a6:20b:2df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12; Fri, 11 Nov 2022 07:48:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:48:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 8/9] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Fri, 11 Nov 2022 15:48:03 +0800 Message-Id: <47738a71d94c64b7c2da82aed472521b9dabc700.1668151131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0011.apcprd06.prod.outlook.com (2603:1096:4:186::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_|AM9PR04MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: a572b3c9-f9e6-4233-42c7-08dac3b930aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lembgTut8C2nuBC6cmF9c7SEWX5rm71Ov+HFrPM4cgGRnShyg8dTvkXHVCQlIFYYJyxiGWQZPYY+HOShLfXyGm87CWIL/Cl8FwPVgzKC51o/FBaiDXrGWv/NlV0OfqDIYgg53hgUK6pnbAzcnNoRzpstjq3cBrYkeKO/C5WlDg2/+jvs3mHnQUpfar1b4yZKUY0lpIDTp7o2b9VI7T+WjReZIRo0UP7Md1PLCIqpzbo9OMyeml1V0m3eLQmql1GfttmpDpLWSsOSNxGvHs6u4QzKB85rfbgzHKG4A+FzsZ6MI2EgP9aH5IpIu+z07iAvbupYntUcGsayYSElx0m2G+b6umaD24awM6agM8IqNd1pTAJNoB88TVmuQ7JcTLbZ+y+xv+IXxeBisOJf8e8ksEPizrJEVHQfsE8z5mz7+bxjC66KI1Zbx2IfKv7iDx25+lUgwRGvmwmCGJlf0UtCggx9RhVRCduKs4TjPHsfv7jjgwUpF0Aqx4f38O2HL/gIbf2OytLor24b1imEwywKc2/gjuE8tS3bs3A7uO7AzB1z0X9I2hpTexXWh6+hVWfSudmAnXIMhidqVPlCZiY0dJSFBB2uDMLJJ9yy+KD4/b905VYMdhW7dMir5CZPPIhE4XLGJVvvSVEu+8xCVdYEu5mF5Y/6vRryXAbIluJ+feNEyw3LoWeX4tgNocP+TjKRdLlS2V4IeYVH5XjCHEnZ0Q== 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)(346002)(366004)(396003)(136003)(39860400002)(451199015)(2906002)(86362001)(83380400001)(38100700002)(186003)(44832011)(4326008)(8936002)(6666004)(5660300002)(107886003)(478600001)(6512007)(66946007)(41300700001)(26005)(2616005)(66476007)(8676002)(6486002)(6506007)(316002)(6916009)(66556008)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tU9D2Lx18bUzhKLlxON7UBRZjeyJbciQ0hcugRcclNQoNuorCK6TvZirX322?= =?us-ascii?Q?VgiKb9ln0ml5bCOr8Ka5GZfa+9wLOAJqUXhQOWflM7JwmZ1xNOb3bfIFvpYt?= =?us-ascii?Q?MmI3dY9GdFFev8zfy13qda80TaeDGZof3hlhk9L97+v6/ty+WiRrHX2hfUIC?= =?us-ascii?Q?ygcuB9j9b7ecSComiTVhVxROG2AcVgBdY+pxjdei8eb+M28ag0gjQ0PaeUK6?= =?us-ascii?Q?5Fwe9xdTZLdtkmMSgYheiOWVOo/PDSS9y9fq4Co5Fa9foeIB+tgjVNZM7VgF?= =?us-ascii?Q?vkxnrS+IS+5L5zIpd90EhzfUSEg2MWg2N0Pt3D29d0ps9FTUel6QtiKMEdc4?= =?us-ascii?Q?xN0D9flK+g4k8bdeeEMEjxFE/c9IAgqkvt0lfVX12x4htRDNECAL2VEDAUFK?= =?us-ascii?Q?NXM8YPKsiHoMycWJQVNgafAolJHU2C7XAYpfuHecaj8nqDhhyKhp0nYAFCTB?= =?us-ascii?Q?jZsnkQAr9bFg9OZupgBSpQ6N78n+QkFRNNe0fYmRDwhSnso0+h/80ydKJexN?= =?us-ascii?Q?bhujtofrYXl9P5kbgw/4vcw8+BJ2WbttI36DAi9+FvBZXOUPJMXP4S5IDoGj?= =?us-ascii?Q?Q5SfcjxhbsEPOpEiGBwiEZeUqDLFZKRlAnGYhx2v1CWE5oRk4rMCAJZqboWh?= =?us-ascii?Q?2i7y7tCXnpVatMWl4sODtDHBYlPR9cWKRThdNVJWraVCUWawoVTxXMVBG7pE?= =?us-ascii?Q?xDtCHzj55JJSu5NQEd6zH9edmQmhmmhNIWj9+U9GeMaYcnjLcErzzpXolsq0?= =?us-ascii?Q?E1pDulBHzMoqflvFe9gO0U9xju6tL1v1hHpSwhLg2nsw6jJJ0c57CI1mp+e+?= =?us-ascii?Q?Bp11WDpBmgdFKjtQDLUABi3UbzAyer5cpFuHIwjOxPcRhhvdBYwHOyTqtjUS?= =?us-ascii?Q?2LN+pW3EKCP8nJbA5dT7AR465LGaHyqW35cBqNaQNvarGr/sg48vC/IF/1d7?= =?us-ascii?Q?13troYUgcdUFjGWVWjRy9z5sTcorIXoJlFd0+h1MHW5Ine+0dnaPG6Gm+CT9?= =?us-ascii?Q?wxfvYs+zogW4lcM/IOfYNQVRHirmyHoRolSCezx/5hNbQfZS5qlMBYTavECQ?= =?us-ascii?Q?WKFpgsZYkwcsj1VsUznqp8ODFo5eWaalgpAreAOkgUBD/5uYAtWcjkFFYvEF?= =?us-ascii?Q?zgtXgy4sGTNlyq86vQ7XgNvFk592yi9HnsoxglRbViKPFSBtNJFbTjdOlFaj?= =?us-ascii?Q?ekrWKXvcn3RmC7a7paaZlnNxt030QwYoKgT58/r5E6rH1ZS7ajf0Lthv8Isl?= =?us-ascii?Q?CNlzN7T3ssEYk/Nv2XuAcoFfvZ0FQLkZbKod9MvFDx/ndVTTKx2ix7pU7/pT?= =?us-ascii?Q?W97AITndU0BEzFhFDXDf89wqG1FqXSMiTn3G3d+La/AR12TYgYhCq59r9gTz?= =?us-ascii?Q?2QqPRCMpEqi38awMNf7V+tjG+rtauat1J3IqsUjGrHyNmE1Hgg7qH9a0wFtN?= =?us-ascii?Q?M87YRNF+0tbVQ9eFzrqYEreuPzs3jXS2REvfh1ISNdUmXjgvIkc5euVTEKbB?= =?us-ascii?Q?6mc0TKQ5At03Z0KmgAoHar8naBA30a9sp+0iRjVyPdZhhkkI6WzNGD7KtZRj?= =?us-ascii?Q?kBoxuWx375E1F3BQbROb+9xCl9FLqV9RC2+u7pSseUOf7BOTfHHDOnWhQQ2X?= =?us-ascii?Q?SA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a572b3c9-f9e6-4233-42c7-08dac3b930aa X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:48:58.0114 (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: ul2leXViyZiH87fHJ+fp+AX4R5y93YCbrLF5QXR4raITG22TsyhetOInuN8OkQQrfoBM0bUji4ddNLyonQL2Og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7521 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/tes= ting/selftests/bpf/progs/mptcp_bpf_bkup.c index 949e053e980c..b2724426676e 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -16,8 +16,14 @@ void BPF_PROG(mptcp_sched_bkup_release, const struct mpt= cp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_bkup_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { int nr =3D 0; =20 @@ -32,12 +38,14 @@ void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct = mptcp_sock *msk, } =20 mptcp_subflow_set_scheduled(data->contexts[nr], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops bkup =3D { .init =3D (void *)mptcp_sched_bkup_init, .release =3D (void *)mptcp_sched_bkup_release, + .data_init =3D (void *)bpf_bkup_data_init, .get_subflow =3D (void *)bpf_bkup_get_subflow, .name =3D "bpf_bkup", }; --=20 2.35.3 From nobody Fri Apr 19 22:29:49 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2040.outbound.protection.outlook.com [40.107.105.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C93C652 for ; Fri, 11 Nov 2022 07:49:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gCVYPuOpgFEKsBicegRnO5aafiIx9/B+LJ3wRvoaPH1CJlJkYBhuBOh02kG6HgMpCFg4z4SSrpDP43XkffqB6piyOJkoqTRmuArotSd4QwbD4gl9FX7obXDeXyBm+S4rwzYV7UaUTf44NTDsrmBl/NVKvAYXYml6M/NVZaxEUIcmU6pjH/PvU7ppv0IIMJ9NTgo5M86S0WBLnJpurX9TmannsTXDXg2i1VO944PMAvgMf8FQOIyg1Dvh561CWMi/2wBnfLyj9ouAAG+KUQTgDtAIFzHe4ItuMfpsQc+rj2jBKc4Afib0t7qCAgXQ8o2cB2/PT7Hbbliqk9QUjrtx5Q== 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=W9ZX6yK9yQbfnQIs13WaGoug1T3wo+7hCR3qkMbvBN0w40UmFUPB+7rLRRxiC32Xj/vaMAcW566xEPs+/3KDq8xNaS97A8FCW5yHb1teosG9FkkxFLiMYN5uJuiFAXUyKHwpPrit0Hc01AmMadRJoQdcS9ZCHPXpq1hZkEs3czAgvqPnU+8X1/+oyTnVfoiFGcNjWdIaUcAwK4JvfVqXvkWl/koONsbQPZe6RMEsK6sVPaSXDgrBNyvm++/3bl0Oh201NQFzxd+ArIKVQbYCskIxWdFYxH5OmqU2FQRKbkaS1LcoyqMfQVAJI1xELzpQH+ZaceGKBZYKLU+/xO8xTw== 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=sh3OVfNAA+ocZUlfgbDrOux3BOPwvvT6ktEN5DMPrx/bkUvJcnh5qB3NpYO7Cr6rR6QByzXEztj/+boSkCW0Kzk37/mvmLttqMSc1GA9squ4SSTBHfXWcb7YpwuQuCVWmxlo4vZAPdKfHIzM/UYl5TFBRTEuhi2872DgH3hHcTL6d3uxgdAoiE1LvWnk7Q+jZwpEb8fksU4njYou8MFFn6Q3uohbP7ZUGOM0TMJMF65XkEF12uqITblgksne+aDfOipH7IbU7vYrpbPsTi6pRpGmV8OCX+eFZLNZMBMEG+S7Q3DqKJsXfYP32sPEZeVlfKqg1m7esJu5jTRjWjB01w== 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 AM9PR04MB7521.eurprd04.prod.outlook.com (2603:10a6:20b:2df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12; Fri, 11 Nov 2022 07:49:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5791.027; Fri, 11 Nov 2022 07:49:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v19 9/9] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Fri, 11 Nov 2022 15:48:04 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0010.apcprd06.prod.outlook.com (2603:1096:4:186::6) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM9PR04MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: ffa161c0-91e3-4ad6-426c-08dac3b93428 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q2/T5ANAEDdo0p2oyhB59OUiEPanl0y30Dy9l8csA0SY3uaY5X8f1ZcbnbwII/pgfTsaXuz937F1JgFzPFnWPvPvDdyZoFB56w3tJLkpMJK0ITTQijBH58WctcJAW5nUJfsTKzvtN/4u7TRPS4Y5yPBMgSEPybbm/D+XLBHyYjcXxzawMUUYhDH3gWI/4RCeYaejJyJuG4cdPSgZ5oLGjC7j8G5k1/e4mOfw/qhxR+eZf4RKyzvMtZIGGU5fwUtCw0xge1jUwUXxrHc4JG5QFqufJvBGGtTijvOTuoGa2Bm871QV/9+QOq+7j9AN4F2Iw/mHAQb7hHhMiC19AO3/2+cQDS5u3AnMuJsMhFPRygAHqLTW5OIE7o11s+lfigaezpaSz35iOyT2ZjdmNvU5gvDy+gMDXVigzhtymQcNigcNjYCETCD6IEBfwIoPjzl1B4JDQBkkHCg6NyYofPmKrOw7XDt2pke2to/K4OmfNLpVRH7FtKSrB3SVXS1ojG3GEw+mpO+3fSDjWCg+2hu/sm60+sMmDuW/FWpNipNC/W9kPJRVvxwVEX9CSSK23P3F1WWeYw3vRdnA50bQ0MJ8GQIE3Tqa17XKwo7rHVcJ+YM9Piw4JbYqLlsXLU76nQnUX3nyg6xRhWTjt6DXiu3/HjOjeu8ks7/NYEz6MhiYlPxTO5AqnndbsIzkC5FCISFxXxEFGcR2otNKRdEVM8WAzA== 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)(346002)(366004)(396003)(136003)(39860400002)(451199015)(2906002)(86362001)(83380400001)(38100700002)(186003)(44832011)(4326008)(8936002)(5660300002)(107886003)(478600001)(6512007)(66946007)(41300700001)(26005)(2616005)(66476007)(8676002)(6486002)(6506007)(316002)(6916009)(66556008)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DYRAAurHp63PPU1L1KUwlkcPAKZoSIeQqClcJ9PpCXcFOWHom2cSAPghQ+iY?= =?us-ascii?Q?ybnHtzk9lJ24jFvBJ8QvFyNv0Rk36N5H67L9al8i0XQLNtUWM3+QdChgW0OE?= =?us-ascii?Q?nMu09gZKVICK8hK5o6hdtdSM3b0SBKdT3I5/YhzxifOdmxFytcBMmEGgARkW?= =?us-ascii?Q?e3oTIjRgVZ9+uOl6RMOepK9x2aCmbItDAP81zcGRfn71fh0i2Ll682VcJ277?= =?us-ascii?Q?Zsr3sHJa93VTPqqw81oSM+8WAbKs+VWAxN3cvb6APnEnfdykiDGUQlTTmyTx?= =?us-ascii?Q?cYXpG3NlqdfdID+ptl4JaOg3NrChNe+t4T9arfttFgc/rUfeHYrSX882rmsN?= =?us-ascii?Q?zCCB5Xpwd/87nx+ncmy1fi98uD7rIv7/2RJqcTnpnM+xBaU4PTZfYGtIfde2?= =?us-ascii?Q?CqvFussi63BZP4hwMbEGPAKkX5mLqoAwK2OAmAIcmT4PjIR81k5t/clzPRZc?= =?us-ascii?Q?LtK0cVst1v3W+L/cNdmB+m61nL7ENXWXcc9+SrWGOCPIuyyy7AYWnwtcAQx+?= =?us-ascii?Q?5AM4DRB71bjUEJSm01KiEUCKSB+h3YfBKyNZwD541flH2eXpamZtm9bFUmY0?= =?us-ascii?Q?nuKdPypbK8sz9lLo20Hk4z5r0wt3c63oEGwf1uoUb7utfAweXP56P3wmpngF?= =?us-ascii?Q?Tb/ItvA4vYqsgMzqQeVuHjz7vinplX/QMvVjlZjJPLOTlE/IDnl/JuxY9+T1?= =?us-ascii?Q?aAmLeyLqnSMabfB160+0yoPDzFHY1jD8fJ3nvaoAZF93E7JL70Laf7zbTRlO?= =?us-ascii?Q?d+2+SSLQ4LtZTg6Qp1YVs+WIRx7EpJdugVeZglITAaG1fvSPN7KOFA9m2xc9?= =?us-ascii?Q?CK5sjpgxTOcGOC+mOi3lwPra4OXOr0vkWioIzYKDNdV9uRfAC+0zEjcP9qTt?= =?us-ascii?Q?cnRA08ZZ2RHhTTL/dG3hGRbKAzKB3YMGxmW6DAiUs235jki5ZVJ7QUUFTq0l?= =?us-ascii?Q?EKC2/6jUIo1p0Xfuw2w+NZOzcdkNfoO/3VQ6Wdw0w2VtLrS8Fc6BAMCePyAW?= =?us-ascii?Q?4Mw3ViriAnNEQavcVEeL9r3m3ThQUE3MQQ8yxyALTAoRgc6vsvZyMHmDjBH6?= =?us-ascii?Q?csd0i3wZQ34jCwuWDsGra8XQWfx52ObUb8Pzt6Bzgg4WYMzEE/6rwHUi2K73?= =?us-ascii?Q?oh4ap3rhEVQ62yC7z1WOqVfoQrs4Hu0Crd3HbAdszgLpJTxQUvyj8v1A4D1b?= =?us-ascii?Q?fN4g8r4P3nDVlwoiPr8wIpRjGlkARylsJklkg2q0qcGSIM3g8Ps6jCNmX9oo?= =?us-ascii?Q?krtc487OhDMG/6cO0pvXwr27aAdjd3qpBgag3YAvpPkASCzNXq5xtqpXG0AX?= =?us-ascii?Q?7YjYxV2u2oaWtiudppj5ZF6txQRVZ7pChzRYK3CWTMptsarsdVHs3LIb1bP/?= =?us-ascii?Q?yDSiHjdltMr34/Y5jBhFaKrilFLU61w2G1Q9YCr7D1DDVlz/JMM0xdfHeatl?= =?us-ascii?Q?xPNvSGSvthlLJYPYvQzSZfQL0fopB4jcsLzXDKAViKD9SAG2dtyvccYltmoj?= =?us-ascii?Q?N7xdGpCmtfbMFo1bl9a9+GryBJ/IJFgeRa8vQWO/NXtT/tcEEbwVQCmtptGd?= =?us-ascii?Q?EG+2pK5OLeBJt3gW10EPB5bB7ITIhH6v0wqPlp0+8aLWUxiI2I0ipeW4UmMt?= =?us-ascii?Q?EQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffa161c0-91e3-4ad6-426c-08dac3b93428 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 07:49:03.8703 (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: x3J/G/VCFPmPX+KZYcb0AVZ/yAYheFVx4bke+f801k8uMmGi3GtDn2ej4UkJQi/RrLuSpsnoEhpghgBV+l0nhw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7521 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- 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