From nobody Sun Apr 28 22:49:02 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2087.outbound.protection.outlook.com [40.107.22.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 A5072468F for ; Fri, 7 Oct 2022 15:02:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ky1HqqudGasIGEsTILiWuWO1BaooWJgOEQ2HJEVqp4tcEfg/mcNtD6PSkrJ+1TYsIJ06EA5hVjTneZhVTpwQma6L9I6mdsR18IrYjRmyVys3YcTh3ByGxhh3PrxKsClCFt//mt+lJyEkHSUEBXmFccKH/frn+QbveOAPQPMnAvmsY7GGtmUT35U13dLHnvwtRQHlnE56HREw2ycot7uMlxAy7dt2xv0gUKPXqu+gprmGvqmUCr93YBuVJNikHlAPnv1TwxP0bnZd1R/a+SMKecnIKQ5EcOlJ7dFXFjHSagN/DKStxJVFM7Ll2Fd2l4ikncqG4eMRBQBER+Y1Ll2RnQ== 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=VCEYA0PnN+0FzykuFC65UBPyVRnhXc/paJo7eYADJXg=; b=LHx/f+cj7Dw0tyOka35OAcjg7SUDdQy8X+oqrGw5b/Y3od9lpmH6uFeRfvT8ZAk17occVAh6H4Q3sO01Og0gN5kkdDW9/QetwTu8z/3YWzZLPoE82oIDJbm8UQKg6W3cmXFFM3RYxBDnFySPpXoLHg130xv7MbGC/T/ktpPzhduw2S564WK+3qn4STnOIShLiLZ5R2DrscrahK3FpDTjaDWKAuDf+m81WjTk5L/nHXkKQTc6h/f53K9EjzTqeZUbxWG6Ti0z4MioMQ9ikv4yQVDHwPJvF4aKnX0ZWgdIJCXe52gu1ZAvk7WxZ796I/AYEAgV0eOngO20rvkdKjtZew== 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=VCEYA0PnN+0FzykuFC65UBPyVRnhXc/paJo7eYADJXg=; b=qvHHmqvvnaXt3PVlBEI7MKb4Gr+YuBF+29xSy+bOFh4fchz5jCd0bfEdPWRVKHQnQQ9qKCKe3OnWvqQ6R/YgVTne7tNvnW6Ti9f57JXPQWIaBTY91hWOstSIzMdxHKZV1CRG+hTISLMYV1f10PWpVfmYtmScr/5KKIUMUxfUR9vl3yYpUerAjcJ8OdbeGsqDXf7gww2qgOAEmZHMdrL0Fr30qEhrdANKIWIrDW3giB0VxP6+AOVWW7lJH0O5EzmMfg8AB2gPeL1s0bfVKUE9bH/VKqAD0h5ryAVf6gZuU/eqtWhI4FQNEzP4FaMer01WI5ItpCejEXLtM1QZxbeprg== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 01/10] Squash to "mptcp: add struct mptcp_sched_ops" Date: Fri, 7 Oct 2022 23:02:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:196::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bfebc44-bb0c-4be3-e086-08daa874e354 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oWejPMh5nUljB9iGstoToH1TaL94bwASEmDN/TEy0JsE9o4nlC0Ev0kDYS80KxHl4Xeo6xiYgjrUFgnDDOAGCa6JiI2Qg0nlZIBHC9IrxWmrSc7OTsCyEgrzdJw+LfWaPQJ4gnRYCuNzWrz5HjY66+WQR9AfciMoGqCAT1C7NEK9DEnP76o4EnODSElb6q6qHGIlk/+1a96O6jCklnurbU+n7oGzBxK6sKLjGAqTA/TPH1fmlE8ThZVaE/muydl9RaZrZ5qfvStOA6E8+XQFRBYiCjI8k6LIyCaqli5o+ru7vdvt/sFAgVkDW8ACfBoQ+XjBbvxsibjoUqKSGN2lg2UqyK+7DEmu3M+/ZaBrMACZ9ln65YvL6ySA4ciCrOgpSSZm+gioTlPwQdPnZP/mH8qzcgCcf97GFORGy95C4szqQwp3n23kCot3cbJ8U8ITF7dhirrrAOAs/26/n6bIK8MqTdJciuF71mnN14aQb68DrnHWe63x3LolGGASmFY0+TgmC+7CZfRoE9kVQ7hGQHsD9W+UMhT2Dtg1d66ujVPMNFUMqccE85bD3sHE6pPsHVGVXm/zbxC9eWothSeEb8Ucer19uCjKw8KJMYFBhUIYESmiDpTyGm706QREKvF0pnwYSEtlwdMNhzCh2QexvwRTlDatGjC3nbN23pIb/QFGABDnkd/Aoy4tRyYyj7AOeSppGUDZYwc3c8LQR1NrnKuyoBRAr5flttrTwVzeAu+doddfsotBTptLve3har5T 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?S+iaueEvKDKbGrAxF8bAHWkhmQXOlwibIx7XvgsaaB0oKtb49JVGeGevD+2H?= =?us-ascii?Q?GmdzktVsqhOFOScDDkjtacBM8GHTBZm72xxKIAo9cmsf6H4WRZ6wTppkGvWe?= =?us-ascii?Q?PWO8A3Qyp5fLP58JvklzI7Q2Lj9e9dnTtLviwRsojA1r7ZyIwAyh5HEldPJv?= =?us-ascii?Q?7q4yr5/qRhOAdBFbg6dN3VrJjo2OWkoYND0PP6eu5oWkhBVxHpPi3skqL5cI?= =?us-ascii?Q?9PB6DbTossYJMrosTH96qxcc/HeBrEAJDesLnn4JaaUXjYBttBt7k2pkozT4?= =?us-ascii?Q?oc45y42AfglOPop5oPaitUIjPrDeSpdjlFqGtMUqTofVXjOeDPDuhLEFVIY3?= =?us-ascii?Q?qZF8M8+EpTaJtW04m0gGcGE97IDoceaXqlbw8sAajv8c+i0sVGiwPIl9pdzZ?= =?us-ascii?Q?HcNWS84l6eJBZcPQ/9ur4Lo2SLy2SgFU3db4V1RC3Bt6e2AL0Dk+2qvCZB9Q?= =?us-ascii?Q?RhGp4M6Dj8wf6MrfZHwIXv94aCk0nNZcOlELTUK7UonLtVcUx+36sqKGtVdY?= =?us-ascii?Q?gI4JKIkMEyc0qrE68dbIhsd8iANOGKsSu44Q4XHr32zyKYK1byTkIamqc4t6?= =?us-ascii?Q?hJSnLJSTYt1aTXggz51opL6n2hSf3rfyVERaKwjD+VdtOSc4xw0bW1vaMgAY?= =?us-ascii?Q?WlD7XoCcquz+J40rdEoslmdyhqIXDnwKHupTZgapDUuaTkKjsj6ISPIIp+qm?= =?us-ascii?Q?MO90q/pla0A2+RaQA2Q7bfIwmxxMO8Udp0BES2ZOQW6esMYzQgU4VAxpxjJx?= =?us-ascii?Q?d84K5OMB/TCaLv3LmLNdrvntOiK90FPPrfINVU5Kz4RPxlFsorgERCRjJ1zG?= =?us-ascii?Q?ZtFoZijVzsdisyQArYSaPcgOpnNHGAQMEJ4u9eIBRvyAHqywyyf+O/yfxON5?= =?us-ascii?Q?bCZgGaW6ACrhDs0sQlJKMqx8jk5waqCrKPaK9ZpRhEMpoBaau38kW67uh09p?= =?us-ascii?Q?oilGvg7EKsqpXkFBhe9XaVenwMQgXRd7+W48fda84Td+y1LBpBrqQCyWpxw5?= =?us-ascii?Q?BkXD0KdES2s3PAJoygNlYdCEsm6B2i1P5rHFVNdaglCv4Q3vuTP2GEqcirIh?= =?us-ascii?Q?Aq07z4wNCAP8n2yyrsCX7r604UsikFGtEmbTvZz5u8j5qeh3H27pFZR1uBAc?= =?us-ascii?Q?bHxRjZaKIe9gu3EmTyIs4Umk36APkRgKJ9y5b8nAPWttQB1b3clsqxeR+dpX?= =?us-ascii?Q?v8cdbtRHUaQmtM2v4Sih6X0+j0dgixMDliqnO5J+chL9JFTCoV8zkRMwgUKP?= =?us-ascii?Q?txIH4VKhegTufDyJVIK6pKs0AdF6W42S4dTE45qFKQV8Ctce2Gi36uNxbg0F?= =?us-ascii?Q?DqnS1h/q261/AViBMrD5mvH4dPQ5KI7ac6Dpx/IKULi5QBz/cW+Qyu6mVvw6?= =?us-ascii?Q?LLiF46BuxoRnF2wCxTj1TIZ4lkpoDCXv0yxrN2M0bhh/gDXQk7R9qmcLd50b?= =?us-ascii?Q?tdaKMkC5HM99pL/JhSq7TqI48vIdSZjrqQ861ogQ9nEB4aUvCZvoI5K7YBDQ?= =?us-ascii?Q?7V7e7UnI4/iSqb4K+PCXlCLueuovcgOzzYJgz1TXHs4y+7PzNKKPyymv3wrY?= =?us-ascii?Q?c+2iZhfA/hUa3B2SH+zQT8mYzQEIujTJfkW6wsWQD8qgSaAL3kfOygencUlW?= =?us-ascii?Q?TA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bfebc44-bb0c-4be3-e086-08daa874e354 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:01.1259 (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: GGn4uiYiAR+Kgxu+T5/jzXRBJr+scFYpD7OWqp2cP034lV8bhI2Mj+EU0bOw+a6ND68iqnFbK/4UFtxB25+cGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 Content-Type: text/plain; charset="utf-8" New api: - add new data_init - add snd_burst in mptcp_sched_data - add an int return value for get_subflow Signed-off-by: Geliang Tang --- include/net/mptcp.h | 7 +++++-- net/mptcp/sched.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index c25939b2af68..cac5b0d512fd 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -101,12 +101,15 @@ struct mptcp_out_options { =20 struct mptcp_sched_data { bool reinject; + int snd_burst; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =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 3d805760ae99..52b734e696a6 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 Sun Apr 28 22:49:02 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80081.outbound.protection.outlook.com [40.107.8.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 E80FE468F for ; Fri, 7 Oct 2022 15:02:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QeD5i7JgOMDamMCc2Wa8OyBeifvUC4ZRi1OCYi5YMFIMwoS8cdD3L6QtEh5ULnX4tkwgSf4pcPa3vNwqwcQNWdBuNSpuxryg72Tv55aDR56Fj9RjibqF0NjnxnZnsEiRvFLnybpbMnjQx0+wtML1nfkiy0rMA9HcwXITcoeT+phkovMsKmdiEVFR8DGr2gIyV/tCMHDtomuCgghAotQboxKtAFHdZUc6ZbV1Im5qssLSvJ3AH6eI3X70uusQfjXoZVgIynUqc0zFPHnaQZm3GBCLDvd3snW5oNxeAxk7KApYx+xHvw+RZ2mlDfaemjpZN/5dJWcbxy+RPf+1xZRDBA== 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=/UAGZceGo/z5fKHoLJ69QG0hidL0LQn/DL4oMzrmGZ8=; b=hfI22cDN8VB6PY08BaLmylAhTqnC9pdUcVT54tMPyATlljdQgWeW+tK2vr6aXgyRtnSvhgU5YcQPaP76IdnGkYUnEZRQdhnLl+XunGZHxqRco7wIqq7ez9oeH7Q8oUf0KtouuW4QXqEeERm0ha6KL2FNkK+mXkMIhbkygKem2cQz1OsP5LIBtdFNpB6oqzIn/L2v4joyABeYi6ME4tvNz7phWY717I5lp8OOAL2KBIfEkyGDFQE+HH3JphafCTi9QgvJa9LQflbiX97VgDUcmcdVJ87uPrwmbXWeEljVbd0DSwiuNync7NzoRpp9DRIuXY16dOV02grm9a0J1sSAGQ== 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=/UAGZceGo/z5fKHoLJ69QG0hidL0LQn/DL4oMzrmGZ8=; b=K1tNqfTVA3OP5mwRtxcs3kLVUsGE2nOCjD5+QZDjEhFTDZj7a9AwQNdEOMIpqNNGWb51tzE3itn2ImublvIbpp2X6z+mWCLNy4d+eEpCzOTBhEPy6baZO9hRPqsJfqcuyhcmIPHYPztqM8sbhd5NLJG8/1dFVt6NzAbYi36wTi98iUZ2exQ5RJM7aCZRjg9OwGslhTzuEjVbD7vpD8R62O8wH3CxDoij+KBFouQaOGoVUeBjDKkcwOaOW4O6r2i2vbNxQfjWnILYljCUn7rJ0jdzL9FuNGKo1genW29x92jnof5Z0bbN10fjZ3iNE2Qt6rJxDAtpnulKXcokKA4JPw== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 02/10] Squash to "mptcp: add get_subflow wrappers" II Date: Fri, 7 Oct 2022 23:02:26 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:196::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: dc65dbf9-98fd-4d8a-905b-08daa874e6e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UYsfMC8oLXMctIPxpM8BrixMFIdTWlgYrnNRE+tjv32D9VSJDyYMl9CeLhOiL7qcw36gGCqxwKUhqB6LIuQ5Gpj/PcsQOINZIeFeE+FU1ZfL4leRhLTm4j7T2Nc7pvrjvFmMWnjGbVjWtVN5PICbM6xFjPTGqGRTKTasqLMRwZOANYlIzOJePPx+YisJbUYRMnXBktLg8nWHlDMxq7K4xYf/l8UIKQguzu3E808lXsMwSkWLAvnzruCnmpERPDFW7z0lNYKoRtXXJWKmumjNyvR7y8zT0XMNdLECKkjvhu38AY/vbkFjYiVzFnYUx6bSMfzvFe+L8UR0VszUcC/jYVYjAu7gP74u+NHEHvTcKgS/0gfT8HVlZg3QtuuYPEmPdQYdnkHsxdYoJmmSLXFSrhWCn4n/vq2FJk6lxjFcm7c76kZl6nKk2cIQzRw5xFOc0LX5e0F34LkuYNBWhNW0Ih9pym5EE2UFqT4zUkds+1O+s/HCEBvNZg5tJuEXSqF7WoJDMwnml3+0QcjtZoefFKA7si83jwPnUfQDLLbYGJBlts+W8K+AKKcF8tzE4X35gcS2FErDABDSBV6CkpUDEmTmaBJSyxPi3/+lXxrjDfGlliA5dbNtK1cOfhRw2Kdsu6M25aFSHCc/fqMlUGS8w7Bjs3OMjdylHx0xVjGttnzaHYEEX3QlwLbaIOcMF3dWDN7KlhbB7kbDTG30ant1GXPHoMtds0ZlP/8aexxOxqJq5WBdeQV7l2h56ms+JNH1 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+iQZCXflhK0dd/rQMT4IRi9pXt0n3GNajmUWcf6u6CnOH3m6/q7peILg97SF?= =?us-ascii?Q?k0FXUq5MG8dErILDwAcAeF6mRul7jxlckAN3bNAEqOLeOfL2nyq7o44ID7pM?= =?us-ascii?Q?VwsU9bhZS/NFvEh+C2aavS46g87uUgwWhw2Jaj2oWpYlBgJNDmBOT9gPFXp+?= =?us-ascii?Q?tFqCmOt9U8CDv9n3INWsJvGhrfuL+f/AoVKMcppP+VPyeB26ay1q95YoDiP5?= =?us-ascii?Q?O0WZEZE3ZDp1q+hyb7JH7zE0Ki3O2vBVBP2LMOf9R9cplNbbioZN5vsAtDOe?= =?us-ascii?Q?2uQwR7eI/G5hWrQNRbOO1nTDSTYpB1Jivayl6m0nGlIkgzRmvv7UVUiGLjHx?= =?us-ascii?Q?5RwE5co4DQW7eDventagZ4iEElvrgXNaE+tc89mtdfgZe677zdVb7aJanC4Q?= =?us-ascii?Q?tMmmguvIdTYT/ugKNUEia5K3dtOnTxNMqV+led+929Ykm7kTdrwAF0Z1I5IC?= =?us-ascii?Q?yanJWEVn8TWtWy/ocDbTEo2Xh4Hgl614y+UZSC0GZwt46o2f5XpAy8xkqTgt?= =?us-ascii?Q?nA05/oOCB+vbtZY3ILWygk4d/slMvOK3KQxNRiQsF07VsmHhs+Zf42/Dwsqh?= =?us-ascii?Q?3/cMmJFmQ0J1SV1HhJNk0EUqvv4Aye3j5RTPNyMpLgLHzLUREMb0no9Z+WTS?= =?us-ascii?Q?eQu6FFJVO0U4GoSP6nwe2rcwucWdeQS5qr2uQ8BDIabaQclFk4xYOVdpBjCH?= =?us-ascii?Q?jByGXsAr6gXJSshvkeRV/IVb3Pgrq04cxMzGTqJc6cktmhvpk+scbW7oH9tL?= =?us-ascii?Q?wU16WYlkygDiZTHOotSXWDkoq5ocZTKzsLQ8tera32/XdeTrkG3ShbvVsfU7?= =?us-ascii?Q?Wrf8WnLNqOtHS9RqpTRO+t9EAF2Qq2LqO7BgX5T5EdCA+DPYInAIGXw3v91C?= =?us-ascii?Q?yCvWBAC+ngAg3CTIyx97VX+t3u6pqV0SUWd0Izf49Gk5Za5jzjsedqXUGk0/?= =?us-ascii?Q?gcr2rn65kwaQ/N7aji2q1TCh1aLSf2FrUBOWBuJkA3oD2sB6P7rrLxY2kD5U?= =?us-ascii?Q?NGyn+wQHjtcFzy8HGNJzPxRAMBML6kKnYRb8cLXFdRUpAnHq7BK2OjA5DmpS?= =?us-ascii?Q?8M3tb2OrZVcNxNaybtBUh/E2d/4uyGJPNqZDJZRFo+I0uCEcd6s4inJsDCvF?= =?us-ascii?Q?cj/yd4Sn6vXvhj9XUyMh6FghuOEJbp9Pr3/6vDsfT8W8OfUm5mCzu62aNGgc?= =?us-ascii?Q?NY/k+ojre0SHV9XU4HON+TxhjB8bgGJA/5LDBmg6fiWIsrn+0xbai0BwzJsI?= =?us-ascii?Q?DnDW6lfYXeg7tNr0KR+Cq+QOGBfYoef5absFlWlX0g49VZkG/0aJaAh3ZfVF?= =?us-ascii?Q?cVMEoFTbQptmhkp3kFYskBzxX3ZmUT1WPtteYexbQXNlXNy4YgEDxAFnp2jf?= =?us-ascii?Q?6iuiCq9RRnTnmKx8erY02Sy0izesja5O98m+w7o2AO6TU7VZF3LImV58FyyE?= =?us-ascii?Q?82DzL5j9mpsubPVU+uUU2gTtTKymsPPMJboOc+GF/O6tWIcFJBjhMzvUoKvE?= =?us-ascii?Q?LhDVXIIvNaRaSl3g0FbHej3I0/4S1iuVPHnIeRa8cYY8HZVtFdEOBCVFBDIK?= =?us-ascii?Q?DGZgJuDtTuxTve6IroIHscHBEdLsliPBlpOCmM1Unj+1z+2di6yPmkgQugML?= =?us-ascii?Q?Kg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc65dbf9-98fd-4d8a-905b-08daa874e6e3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:07.2504 (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: Ch2w3Poqif61+9FzLeeD15CC2aSWgBmz3vurrSjDrxjuqX00ni+/KIBDfKXcuNNy0S0tHTvUFRgmKZFwEx/Ylg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 Content-Type: text/plain; charset="utf-8" Use new api, use the return value of get_subflow. Some cleanups. Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 52b734e696a6..cabcb34d8af7 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -116,8 +116,6 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk= , bool reinject, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; =20 - msk->snd_burst =3D 0; - return 0; } =20 @@ -126,7 +124,7 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 - sock_owned_by_me((struct sock *)msk); + sock_owned_by_me((const struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ if (__mptcp_check_fallback(msk)) { @@ -148,9 +146,7 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) } =20 mptcp_sched_data_init(msk, false, &data); - msk->sched->get_subflow(msk, &data); - - return 0; + return msk->sched->get_subflow(msk, &data); } =20 int mptcp_sched_get_retrans(struct mptcp_sock *msk) @@ -173,7 +169,5 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) } =20 mptcp_sched_data_init(msk, true, &data); - msk->sched->get_subflow(msk, &data); - - return 0; + return msk->sched->get_subflow(msk, &data); } --=20 2.35.3 From nobody Sun Apr 28 22:49:02 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80052.outbound.protection.outlook.com [40.107.8.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 28F48468F for ; Fri, 7 Oct 2022 15:02:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRxqkZoFCpPaeooNO3EvLEs78BYMw6tFSBIHWk21piFCzinjweShtW7/8Yqzz4fvPFUwBQ7Aa4AiSGqaDiqkf2kPI3/1n62hOoUG3BhCMqZ3JFh4eDoCWMZNoZcd77uUCNHVVfF/eU9zCxMMgOk/fYouVugY1qPKyDZzRnaSMS7kMZeKsMFnnsSE0GuKRcQYP+m/OzldTEkKPXIVmYogaiGfm3tEK5Ocq2oaS5tpqmQMnbCUj6IAXnNTYoI4FH9VGy0jv1DQaE9+68YxHsWGTAezMUsbFrXVVW9Mj7DNkllG7889+d7cFU83cNcmDlpqqvIoNF8fzfy/WTlHzd2s4g== 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=t7FwW3+QYUMg2//uT/VcVWVxTW4TBHoOkXwxeQQusrg=; b=MMEEBVryabjumXTqyuhdxfEF2yXP3e8cZXYnNzdDtwhKFnyj7lkT8b+odCZxAIp070Szl9RLza68raBljWVAhg5RjzovPn0HJohM6WeCErWfbhyAoontSulqPfjJDCBPJeCAxHLJcbZIp3Enm2wfjzrmLixZiwzT2Fm9TdIRc+g7hbJdFGSCoo2HlnuJPneg0vc4zKPF6Aq82fcmWuy3kL6c3A4Vu77oSEx6KDS05PLKHCxC2YQkb7kYXdi4mQY+4B/JulbVo2qoGmjxzg+6VmkMkmq9EP+f1ojTCIJKcMmSpKb3k+M9rXtjztv3r4bJwSkDARZM29BNjIYdNA1CfQ== 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=t7FwW3+QYUMg2//uT/VcVWVxTW4TBHoOkXwxeQQusrg=; b=Mfq2+ctLbtab9LLM/oOr0iM57vJdpPJ2DX4clgQqc1i9RQih57nOvDGH1AqNcbKh31FU588FlyDkInQU43VgYdd80inVOhO8Z42oi2Y/BS/CLo5Um13X5DECxa484w8vCn3AXIxL/2Yp2Vyl5SbjIiFYpojRLw5++Vq9thyuu6A5/XfOXgIb7zUA5MEVk3TXhwYywWRYN/HxDDt4d4X1ufOvTsgXDpxdqi3O8O9l5I86eRxjQbyFTsl9LqbsDFgmp2b3VSZMnf1CFjBNe9tdgsF//k2bZCQpAwKVMN/LGwYbRe7ugiLCMLppNmKn5VtXxvjygWlap4fxEX3dnACUxQ== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 03/10] mptcp: add mptcp_sched_data_set_contexts helper Date: Fri, 7 Oct 2022 23:02:27 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0002.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: e7b87783-58cd-4694-bd32-08daa874eb35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rd8lUM6GOlGkQ0nW/g+6zrgjc0eRiu+KzWbvje9rlRdOv40cvy3cZC3JfbRtw6I2rMxz8ROo+nJ+AMdgyrMW7nY6GYZ2vVTI1fLls1CGxrQLHnwI7atmoO2P0qvdE861R/kS7kxFNhYiWVhhAb7zTkAPWOmroxQbRXeH7wlTPYUFBB/4paik7ZYOCNqm0ySOljaxw3rsL0RdqeJo3SgdULH71Y52RhE2fKH6mEhC8ic9fEjqfUT+tRDPmNtPUzHLA8K/gofcJljXaVQAPROtkLHEtXBVpzxPz03LdapqboGiu2Ada+OY4IHCRPb1x9XKj8fqmI+wBYKrxgPELe8y6YK69LaNFcUqIK4MWqyHO5+DrdJQM9XYXC4Kw8+YPXHJxQYghdYv9XIUzsCqVA0mPbImve/n7o72aH9QpvytdnQSvq/I//IQNvV74AF4ktURZddKSJbDCnFelGklQM8/kbffPpMng9nwRMoJUQahnQDRMyWm91HuB96VjVG+7ovwkudjXPSHymY+a73SUfRd3qI9L5JVRHB9IrOTM8nSY2j2frBq5f9RX5RyMp53Bq/4X8gUjMaYxvKcgxj3BQHv6eWkC9W8S6KOGAzqz/gYOab3ySklGEFSg5vNEau+Ny2/0nD6YJWdx1DQBxnh7z3qfiZ4GLz2B0+59AkWE+utut1dsARxQv+9yA7aLwz4/GOe4Lk9K6g6tpi5RqA4itKoahpKE26jNxuBFtaKFKSp7uc66Pp7foe0V7d/SVq0/IS4 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kkYl4l/c5RoCrPw8/65YaP1fqqbhmPOMZUfJX7qlwIK0dszFII/VfC1wU+97?= =?us-ascii?Q?t6/sp3F0XPcvaJYVTbcv+W0V4WDgKv4G4jJPfJA1qN8NA/5QNr9L3k5yV5jA?= =?us-ascii?Q?BL2TW9C209F23I8LXE9JzkUNNJn/5L2jDtaovPszAfMw3mxZk/WPGSFUrM6R?= =?us-ascii?Q?eidApCmJXFwnP+sbQY/8JPMrxEg7uiSJjZNG6IYJMFYcongS1fb6CEiPqVQI?= =?us-ascii?Q?kNxGOAMT87+8JnL9tEaQgfrCLA/XxoAnG9/Ad+91o7uEl+CpeF74Wcbxhd7N?= =?us-ascii?Q?EutsOOTunkdhZOgV6/G3VxMfFoRJ+ZAGEr4WPkrS5auLlgz/0du8Wc/m8V0D?= =?us-ascii?Q?ZPPR+MP76pkLmbrI5U0lxWWYLGAhBynOJR7Q5OosKk9/v4NEaqbEEVTJBO3F?= =?us-ascii?Q?iwrKGKTwXArIhAOpmyoY9AqRDbc5V8KhZl631nrkKWM7fC/zYoI+gAnVZUHx?= =?us-ascii?Q?R2N9v4Nyo460ALNjMRrrJqdAw7uAuKrv/+MLT+SPH8Lx8rW6mdPz1fbrmc6O?= =?us-ascii?Q?UKODVsYnw9IBUdDC4+2Fy2jbUubawK1QHL9Z9EfK39uWYLwwqf3PiLJnpFqZ?= =?us-ascii?Q?kJ11a6vkOkd9xLmHHaNhU0THAImO4UrZy+uCy/WOBT8KWUE9M3XOFZF7jyrk?= =?us-ascii?Q?Ud56QHdTNIVvEmhuAcqOkYFPzdqZL6wgpm/J58hF9KevYR6yPAOQY0pC1pS0?= =?us-ascii?Q?PZo7edVZGrXkD/jlNC94nyml2s1xZ29n2LYFpJgkyLHJ/3zEJP86yJLB5wQH?= =?us-ascii?Q?Tq1cuiP2hj7mgT8UBwmBr0m+vKCMUwSejwD2n+PhPyfsz11WXHuOuHt4B8Bf?= =?us-ascii?Q?TijOVo5iq2vRhkyY5eAo25inQTcgvoeLrwyvvrLiQ70HPA5z4iu0VHY2uknm?= =?us-ascii?Q?kSt5UQm6V/28qlUT3ybbTXcRIOGCsk+KlQ1wK/1m+s0hHXqjakDRShMCRrSK?= =?us-ascii?Q?uOFwI9QgnN4tH+gYqEJiQgF2ZMbTxyCE1XIBTQDsVV+smMhKlgblDmF4A+KN?= =?us-ascii?Q?gXOGV3i+A0ZsHfXuJQCycLEIVrNjzmhm5+qYTMlexru9O6cr/6My7dKSGlki?= =?us-ascii?Q?svM8xa44nZjdfn0cyaEkxd5rI7wkPfSVwObhAACfUipMem3iAlv0RNYfvyx2?= =?us-ascii?Q?OVjkoy2F9lC5TX/NwTHjHxnO/HVH/w3gKi78692voighfUAWXeAc2LPG4HVw?= =?us-ascii?Q?MUYKcEMyud/FgHDbiOWqwZUjrFb2LAy129C1328cXw9YKrPmkY8owNLQuiMU?= =?us-ascii?Q?xndsQU7Dlrdv+nzfn5apP6KNuhG8YTjPjkRf1CclsUMeTCuAKrnTXJbf6hum?= =?us-ascii?Q?JResOzBY1eN/xbEsAwvTSj8vOdgIyPZy2cfpEeFmndt4nxx/ZWqvkUSF14Xl?= =?us-ascii?Q?r4o5fNVX3dDQhzJc3eNSo1EZmOIMg6a3qBUvjRG0SYG4PrMcoH0iEhtSu+v9?= =?us-ascii?Q?PhcUboEkRyEXPavbzca9yD9tZ+fHCRITqjAvDjjBFxkvwkZ4aNGgjJiEqXz3?= =?us-ascii?Q?lU+3TKdtn002Qmjs6UhObBr8A1YQ9xy0moy/WFCA7NuT3kXndTX4RXAR7ZXF?= =?us-ascii?Q?vaEskqyDYk0S4xYCgUGo3Hd3zzsLcaHOnslhJI7dJhxR3Qy40bESu7SfOdT+?= =?us-ascii?Q?Zw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7b87783-58cd-4694-bd32-08daa874eb35 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:14.3280 (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: uEisn39UO9WnEn+LB6xgHq1r2qGkPiL0Ss7k/6LZDvYyinYXDLaS/znQ3itFR42eBHkp+1Sz8ZtOPYzbHkrPAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 Content-Type: text/plain; charset="utf-8" Drop mptcp_sched_data_init, use sched->data_init() instead. Add a new helper mptcp_sched_data_set_contexts(), it will be used in the BPF contexts. Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index cabcb34d8af7..126cc7fe0b5a 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -96,14 +96,12 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, WRITE_ONCE(subflow->scheduled, scheduled); } =20 -static int mptcp_sched_data_init(struct mptcp_sock *msk, bool reinject, - struct mptcp_sched_data *data) +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; =20 - data->reinject =3D reinject; - mptcp_for_each_subflow(msk, subflow) { if (i =3D=3D MPTCP_SUBFLOWS_MAX) { pr_warn_once("too many subflows"); @@ -115,8 +113,6 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk= , bool reinject, =20 for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; - - return 0; } =20 int mptcp_sched_get_send(struct mptcp_sock *msk) @@ -145,7 +141,8 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) return 0; } =20 - mptcp_sched_data_init(msk, false, &data); + data.reinject =3D false; + msk->sched->data_init(msk, &data); return msk->sched->get_subflow(msk, &data); } =20 @@ -168,6 +165,7 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) return 0; } =20 - mptcp_sched_data_init(msk, true, &data); + data.reinject =3D true; + msk->sched->data_init(msk, &data); return msk->sched->get_subflow(msk, &data); } --=20 2.35.3 From nobody Sun Apr 28 22:49:02 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2056.outbound.protection.outlook.com [40.107.22.56]) (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 053A2468F for ; Fri, 7 Oct 2022 15:02:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k5Z1SbVugmG0L4li4C2KRQ4iZ1FWjNo/cGudawymV7Uw9O7Jwq0DqgGrNyfGHnh5bw80QDVPWwZprSUWVHBcszcbvn6VRFQUofE7Xp8O+RWkThmiIw5Jr3vKKseX/DyjqlB9oXdHtOh7LWR78GC7hBwl9GZTRcD6aCZlB0Xtq2dmEZYDWmmLBqnl/m//YN4Uk1NoqsEmKi1AKgVSHIJtiZf4InbrHqPccEIKvFZ5zFlta7e6adxw740vcGf/Q9XlZ6i0ZPFm/+kGyJ0iRvexSq7SUjRurwd1gVOVfP6M4eptlbah6+JK2fNqENMSEhvDK8zYTs7NZHg59/hcH0S7WA== 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=HJQHC/2Srjn3q3a+zMBqmfAWiZhT3hw4ikWNeBu57UM=; b=mXw9xwnme8xm7SJ+fai2eV1oZUXA1xltoxM0Txj6eKBcFMdr5jUrq1A86dFG0WnTC1ywGO7a0Vtot3NGDu1VPfbfRpO8KvW/Nx+ZlwOm8PblEA73sM8frYFKIBLvqPC5bWr5saH/zpgWHy0pxJP+zNYNrO2kFj3I2fPNnpGPAUv70zxnsoPUt3fqUEhKoPTMdWpz0bW6J/h6dyXbUTbnoxz6Sp8sHXFzCc6SVNHxpKxI5B1xOPcs6wwYoM7sshiVMChiuNNEDIhmy01KNSDTwr1t+q9yHjKvXfP3wq9i3NnVJlDzydFoCgTKzsjBX8g9Bpru6lc85A2OvnlqbP/GNw== 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=HJQHC/2Srjn3q3a+zMBqmfAWiZhT3hw4ikWNeBu57UM=; b=nxwJyoeExcoT0HTYU8X3l/a/9lRdoARAWQHtG2Bf2+kIM91ym+ZxU2UGe0O9u4pp4lULjF7yldmCyhqGxfgeaDw6RoBXXjqvifWUw6cJhG2ugy/HoLaNTGGEErJLLMjij0EL5Le5pMwUOmqR2rZobixj6dO8ntIwTRFEpH/MMcoZVjCyL+LVRwXWQVM5ZVfexXuf5uNQ/CfBBB279ccQ9Q31gwJ56IfCbSGiimGwkmwJregTqxjKCMqTJoAh0CfsnmLy4vM/Wjsn/5PVu/4ZdAova61RgNiPzPLeU1ggbbj/7BojkfC/ajbvuuj9tP1ODedpgFgTzzpZbEnRYwkryw== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 04/10] mptcp: add mptcp_sched_data argument Date: Fri, 7 Oct 2022 23:02:28 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0018.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d472a76-dbe1-4479-5278-08daa874ef2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +4SGkGn6B/wgBhXyWhSBbRFjzjn+wQbGP6QQ/v34rvp0poif8ktQdq0n2qVzrCIJYG7tpdYNGFmt3uZukPcFMRQYDv9VnyTfHRxqLWKDXNPC4cfAHzG5+nQm0kKHIDjEXNFdhVS2LY5JKzer2fv8kWFlbt6jDciujYE/taabTwGFW1q4nJ9IteP1bpPyoeqMGVFBAfOT1qtfV1wWh+dnPa1r9r7qZdSGbZEYMgoWEpokytqYLEj+edxDAljUKU38PwNoNWOPmJ3ZiK5sQz8Ild/p/lVV3E2csy6ulxz29JoDtewk5QCwC3APRHj29Ax1HvQEXbzmaMmilUeTVtx/MZh3ZR8S6eBe9U9skW1/ulNq0bf0u63KQsmMK2c/fmJYlIN6SdVLTakWmlSGsrSKPXtIFB2+jTh93Trt/oFpKo+KZEv42CXQSCLCNGxE2Pvmfl7dtI5MmjxiBrOKIW82c8uC6SxGlUmS2TFXjmrvsanCyfPLSyspTKf0J+22tB+s1vFiNoC+8xNipU6IsE4vFnoXIkWDyd4r6+JqkU6ajiAolTjMaAmFWpoXj1Y+uOAdfLEdx15rahsrx6mZESakKsBDdWAJ+NuR/56SMlYD+jstk5t6mMcwfmV77MAFP58RE1t0Y5ntoFlnpzq55NjigwPAvD1PAo+rJylwkXi0Fx5u5XjUx5TNx+/timuhLRbiOWDbR1MHj9i/Hw4bSDOj6uFBC6yT0nEnwRTsmqwBsUBg+6tqNxROp/gLTwckRfs8 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g2MRmyXlEVKsRRV2YKcIRn0VMEq36JX4s2s0P9Prm81FkZDqEPltmPG2S00z?= =?us-ascii?Q?sUxNcJopGzaW2XxEkexAxiuIbdTGt3x4NPL1KxKFlCqbuAN/alcKH5/su7MT?= =?us-ascii?Q?aFCaVCl1IHViJlG4Yz4OLSu9WCS1fgSQNBPniG9/pyOZBnTGf+Q8cs3cCWdj?= =?us-ascii?Q?eDMDWV4rW7y6zBozZNR5/yDdZUk2N86e4NjgBZf1u1/cEp/g1au1V/FIO9nr?= =?us-ascii?Q?Pe52iTboPYwXbeYnrie5qP2zT4+HTwWKpLMfJ6bUdSpXUyc3a6vpSCXwxHIs?= =?us-ascii?Q?TQue3OBixZNw2iLfE0nUd3F2KFvcwfx0ByptMyW1K0RbBDXUAZ/cGehoDHuv?= =?us-ascii?Q?1CIFUjdIX83eAMfmF+CQVAasC7geo868twTRnAHh6BMF4b48OY+zUhzgLApX?= =?us-ascii?Q?th3ZF/wXtvIqj25jEcUi6MoOPbkKoLSwzCRUtVujG1GzNt28wF7xUI3CHDOh?= =?us-ascii?Q?cLTUZYfyW5ZJxKSZRLFav2UrP3/f7ZyoyJC+K4Shzslw3T8BNW5sCNpsvzso?= =?us-ascii?Q?JTsbPWX0J6UtqzJ9O5kfw41716vjwWrYwZny+arvQ3AsQ/zSxRDEFnz+dpzK?= =?us-ascii?Q?55M8345WvDBaAsXjTuKxrtAdo5ug7r2FAvGmRI2VZYcUwtzZrLyHRFOjqDJT?= =?us-ascii?Q?g+nhtoSdD7K+wl5TOVycCXA10c7Ki64hYdqUPc7LWtp5nVFASSJPUZYzsdx7?= =?us-ascii?Q?yqsHKwwCUZeqZy2asetiKho540dMG+QmNRWBU+Xfg4jtkRSPkcy/wXc5z5Hp?= =?us-ascii?Q?5Y/6h5+SkrM1g73xHxmnkbQo90Jz4KZHn2PXCOY5uIFz+H/WgNDQldY7iYOB?= =?us-ascii?Q?V8LD6veXuVFgL0sfbFvGEUj0L2kpdjLRbZkWXnUhPdq7/yrib4PUb2RdrJdR?= =?us-ascii?Q?hyzAHED8ZmAX4CuNq50mRBD7v06iGoUC94VkHt40tFG3rofI7v5OZwfNJL/v?= =?us-ascii?Q?XOdtCQHdPe0Hpl0fZKEy3LgnKrPJ91CA5dk2Nv/HNIVdA5iO44H3EryOT7Ix?= =?us-ascii?Q?90/YWvPEAwqSM0t2/+SxwiX2UUIfxVUYbqs0qkPP6AgqFkx2zR82jfONJ3OK?= =?us-ascii?Q?nyPL+w8lEpuHlo0NUf3SM5gghTMkgtow8WrwQWaMUW21mLrMS8VfXVfwkwYm?= =?us-ascii?Q?/nnz9rOVMOVW1NrwvC9imil/dGpW47K0RHCWc0LC4LyhaD6IdaTgVejHP5Ui?= =?us-ascii?Q?ZNoEc6gzT/Ey56J27Jg3XS7ojpglg9CKFxfYp4k00Kz+Z4Mnhea2U+JKoay8?= =?us-ascii?Q?RcvEoq8WK81Wy2PEpe8F7LLu5jGmEfUHGh6QUe/bcWYgAaL1SJpOmPosg3xf?= =?us-ascii?Q?i9Q0VKWykxzMn8v7EG/WhHNRaQ4KPeefJBXaUuJIQAZdZG3lc1TG3H5mh9Ge?= =?us-ascii?Q?ZC1S0lu59ll8q6Gtfyv10iuVVFsjMYkgBTBoSDduzwEmujPTmQa1YKgCYI67?= =?us-ascii?Q?4PENAzVmMf9pNJ6CkrdbOI/nU4S4xFDwcdoD7DHpxkluHb7DZ+AqA0lFzWq0?= =?us-ascii?Q?veBEI7yo0Tvfqwp6UOWbzXo3DUuUKkZr+Rpu5GscbB38xm4AA5yF7eqwGHmf?= =?us-ascii?Q?HXnxsBlmTM8BwxJp97jnaBSdW68NeV3zo0v0ySSh2W6wSDbmf0gdKXWigUNa?= =?us-ascii?Q?Ow=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d472a76-dbe1-4479-5278-08daa874ef2d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:21.4524 (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: IkHa17HAlnlu3465ZM7jg98aNgMO2or6czVlo3YpSWaRwbmgADmobhcPxeLkCpKiZ4OUV9codkoi/+q6rwxJ7Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 Content-Type: text/plain; charset="utf-8" This patch passes struct mptcp_sched_data argument to get_subflow() functions. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 18 +++++++++++------- net/mptcp/protocol.h | 6 ++++-- net/mptcp/sched.c | 20 ++++++++++---------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 23c62779e410..1154bc746148 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1512,7 +1512,8 @@ void mptcp_check_and_set_pending(struct sock *sk) } =20 static int __subflow_push_pending(struct sock *sk, struct sock *ssk, - struct mptcp_sendmsg_info *info) + struct mptcp_sendmsg_info *info, + struct mptcp_sched_data *data) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_data_frag *dfrag; @@ -1561,10 +1562,11 @@ static int __subflow_push_pending(struct sock *sk, = struct sock *ssk, void __mptcp_push_pending(struct sock *sk, unsigned int flags) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_sched_data data; int ret =3D 0; =20 again: - while (mptcp_send_head(sk) && !mptcp_sched_get_send(msk)) { + while (mptcp_send_head(sk) && !mptcp_sched_get_send(msk, &data)) { struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .flags =3D flags, @@ -1575,7 +1577,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 lock_sock(ssk); - ret =3D __subflow_push_pending(sk, ssk, &info); + ret =3D __subflow_push_pending(sk, ssk, &info, &data); release_sock(ssk); =20 if (ret <=3D 0) { @@ -1605,6 +1607,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; + struct mptcp_sched_data data; int ret =3D 0; =20 again: @@ -1614,7 +1617,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, * spooling the first chunk of data */ if (first) { - ret =3D __subflow_push_pending(sk, ssk, &info); + ret =3D __subflow_push_pending(sk, ssk, &info, &data); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) goto again; @@ -1625,7 +1628,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, continue; } =20 - if (mptcp_sched_get_send(msk)) + if (mptcp_sched_get_send(msk, &data)) goto out; =20 mptcp_for_each_subflow(msk, subflow) { @@ -1642,7 +1645,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, continue; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); + ret =3D __subflow_push_pending(sk, ssk, &info, &data); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) goto again; @@ -2482,6 +2485,7 @@ static void __mptcp_retrans(struct sock *sk) struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D {}; struct mptcp_data_frag *dfrag; + struct mptcp_sched_data data; struct sock *ssk; int ret, err; u16 len =3D 0; @@ -2489,7 +2493,7 @@ static void __mptcp_retrans(struct sock *sk) mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - err =3D mptcp_sched_get_retrans(msk); + err =3D mptcp_sched_get_retrans(msk, &data); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 05f4c6fd0cd8..ffcb9d02896b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -639,8 +639,10 @@ 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); +int mptcp_sched_get_send(struct mptcp_sock *msk, + struct mptcp_sched_data *data); +int mptcp_sched_get_retrans(struct mptcp_sock *msk, + struct mptcp_sched_data *data); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 126cc7fe0b5a..ab4683e15868 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -115,9 +115,9 @@ void mptcp_sched_data_set_contexts(const struct mptcp_s= ock *msk, data->contexts[i] =3D NULL; } =20 -int mptcp_sched_get_send(struct mptcp_sock *msk) +int mptcp_sched_get_send(struct mptcp_sock *msk, + struct mptcp_sched_data *data) { - struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 sock_owned_by_me((const struct sock *)msk); @@ -141,14 +141,14 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) return 0; } =20 - data.reinject =3D false; - msk->sched->data_init(msk, &data); - return msk->sched->get_subflow(msk, &data); + data->reinject =3D false; + msk->sched->data_init(msk, data); + return msk->sched->get_subflow(msk, data); } =20 -int mptcp_sched_get_retrans(struct mptcp_sock *msk) +int mptcp_sched_get_retrans(struct mptcp_sock *msk, + struct mptcp_sched_data *data) { - struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 sock_owned_by_me((const struct sock *)msk); @@ -165,7 +165,7 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) return 0; } =20 - data.reinject =3D true; - msk->sched->data_init(msk, &data); - return msk->sched->get_subflow(msk, &data); + data->reinject =3D true; + msk->sched->data_init(msk, data); + return msk->sched->get_subflow(msk, data); } --=20 2.35.3 From nobody Sun Apr 28 22:49:02 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80053.outbound.protection.outlook.com [40.107.8.53]) (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 31445468F for ; Fri, 7 Oct 2022 15:02:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X9VmWbrnk6jVYfoiqNa5snCf1aOe/7i8S2VT7+vr/AOWFtubgtt4PU64zgOeBXhjyifKAwDhgHgQP7ifn6QIBboikvt6dIz7vicXYnydcnXzjH2hUQttL7MVvm1HReJGX8sV8Yo0A4xL4beznZniNAqlRwab0MOKzUU4BIoMKYQ/+2lTTXHorQYibESXNceasdbUpJCymxCsQB4nQ1/JIV/LLCR7B1ggNHhlu0mWRe9v0itdaOUS5sSMTsUn0bqPam/PnrWEdq2ffUkJlwISKtafN2DsU+yyBmmzvbZNx8ZMh+bvIHRD6i5iGR2ScDGxE31Cd4nkzLbZjOM0NIOTLw== 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=JT4x1IZBdUMfB0jobqHpAmG8pXvflI91n65VhMEyAMU=; b=lvP/aRtHIAzwg9PTbwnx7GNazgzQYJSgRncgyvC7P/U7nX0+zDCZPpbmeeo9p6tQihbskBRJnUovdkbJsrHT+RfzfenGGGJDT0Bl2T9O1i8sK7i7Jz0jdNXVHvpGLvLriXwF5s/B+6/SUuaMzA40l8DrsH0QSTHnJN/ceWFP8/8sNemI1ijIWh2TYyMDfmC5VqlWpT/wdA7i24tLB/tSawKxjS0lAJ61P7MV/wujHS/DuJEcBkNv/lUr/uUXGfj1v5fouXecOGk41mjl95USbpBWNmmoBC2kVtEJyR909two1JehR4gw9OE1uopRb/ZBk3fwDjZt3ilZwr/XSMe26g== 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=JT4x1IZBdUMfB0jobqHpAmG8pXvflI91n65VhMEyAMU=; b=iJGjPI9NECbLJSf8oaCPBVShLlckYsD7UWBrLy5r4y2+jHVgAsqfkffkqGlh8vpah77FVtflvdStjW1vIi6XOYkgDXeVJ+8jpM/tXe7MuIguAsg2Xuo7QisQrmNcv24+V4/QU9aP5T2hyIRK0tBtvc+O3mwxdyArl6b/AmS1Pn+UC+VUdjtGwg+HsSt5SvBsRyeb7TR+TTnXZD4Y0P7LM2LIEHVes7XYrzF5CDtwzR7x71uMCRYmxPxcdcntDWuDcH/YDK1xO7vzPQefNPw1g/Pe7Odw3FuwupengE4bx+WnBIXO2DYVjUSP34VH7O6bHvuYflegO+jU/6UCGUbOkg== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 05/10] mptcp: register default scheduler Date: Fri, 7 Oct 2022 23:02:29 +0800 Message-Id: <244277cc5822c3df401c7f6b5fdb5b233ed89e1c.1665154582.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:194::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: 3da0171e-b334-4beb-1cdd-08daa874f37d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yI3Pa9VO9CQn0EeckApkUfojkeLBsJx8i2XIiBrhOgT7AAXcxizavTe5zD6l+xWqHqZLvIKbi6fy7jJMe6/+zHmDZ05sJJYEkwn4boA3yCpz3RyPcrRGZEeFRl7OOJHJeLKkxE46Uy4wIHrjQqO5dARm8+NzAZYPlU9FtUEDqj3zRFJXtrSXh2iQdLXNRdYjGBROmN2sW17KgSnHiNKAaaJf38FvjLEtYzTscHuCPwwLHnWYLAATlXgwYB4h2p7rz0ObV8leZDos04YyQKmby6Nnv9b8Y0n1orxxNJt2luTxky2s1VWxAl95FmF2vPiElLRxuJ2sTSpUh3Vj52ymkB0tv0+z0+ZGYQouSyID0RnYetwpeBNoIeuVCxuA2y1tZb2QOckB476tqLNRbOUiruPP9lY/tzlACQQYHIDtvErGRzzvGKegz6TISwfnYpUC6ZcWHKU+Rkw8jzFgEU9EKzWVCq3ZiOg6tPa5EnCd29fIwmkz+QvQBMtcK1sT3FFUbpy61Azeo9M/jck9UrmiP4slRyaYP6OB5bg32LjJNLQLNRSD434ODXLX2bu2/FnNPu+oYcZEGuwI1lATRwHkI5ZA1STlM4+U3HKtSZ78qq5z4cLXq1awsDEnR31rKOT1xc/u27OPTZxHQ8pIsotTq+TT2z6Qdt1LiOYxRZiKp6fLvhZ09LEFCm1Peder5cNmIgUO6QOaDjC8fKerqvYoUAD9VfjX2DJCWw4+03JQUkwR6x5rc4t2nrjnetYxEhw6 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WEHLu36TuEfsKH/fX6bq2/Qd6HGLT6OBIu0nUz2Fa3G2jYOG/ahCfiIFc2Us?= =?us-ascii?Q?9KCo1QaMfxDERbShPfWnykE1Xdh1QHTdiNLyw3Wll0OGd/C/hOu9UZ3zV8Oz?= =?us-ascii?Q?a0KPP75eWssQGSDD1XEmzfAeAQbwehfEi1eALMXHq+PkZ7GnltRAgUAIVkWa?= =?us-ascii?Q?ar3+XILP1I11iCmS6Ejyc+RL2nVFjmweYPg8vxiTuFu9cl68jMdvogKZh0Fg?= =?us-ascii?Q?zhrw+cxX3qla5kk/5pyxaJovNg/TpGI0fSMFBSG9rk8cSjzkFlZZIpQI1xQX?= =?us-ascii?Q?TBucUZhuayjIP4XhZeBABbJwGJ1Tj7waq0hvbfBvIL5gVX8LjLwsFo2P6+BH?= =?us-ascii?Q?L8ujmv0drDNWMj9Jr6zJf+NaIh+DKdelErvTNLlMYH9Zoxwm1s3P76g1H6Iq?= =?us-ascii?Q?L96hKDYmKC785TWIgihTyjL7hbmkGiuNEskvANCki4bwFQTl6niUWep+Cn09?= =?us-ascii?Q?zeLz+SgWRefraUYXvklXoosZVVL4p31xr8kQOwDidt3O/UzqoljSj0zYWlEG?= =?us-ascii?Q?h30MfOK6TgpaplrBSTAJcedjvpMDm+opKlNQ1kHLUa6MwzIHAzNL4cVoq/X1?= =?us-ascii?Q?m1g3B34WvOpHUcbuTgyYEkSIrOjmHG+HRXWrz2jlxsxheifKIsedJ0fHu+5k?= =?us-ascii?Q?ll79cFbQqqlk2QY8ITbvGZNHQ44kTZvTxtSAkKyC+0CkZ+TIR2KyeIQ/r5eI?= =?us-ascii?Q?NK4zdxCs0UmwUIeid9byXaSGwUgn9iYbUsR1R78bkqYyIJVNjD9iG87/of6K?= =?us-ascii?Q?oJSPlVWv3Toh8paapCNnU970mbd6klvpNV4hdYnBhZTtrClapCllrHqGZqzB?= =?us-ascii?Q?k8VJKLo5Nzod7vPdmDcBthM2TGnqfWIUPGzl7doVvUeZAXljC75slylG2PGi?= =?us-ascii?Q?XgVGXP3kaQ3Km0bKlPEMcdg/Pr2CTFHE3hApKQ9w8DQByhWtpTfjFbcBcslv?= =?us-ascii?Q?nUQJ4GNfX9NRDHjcTMgyRFSdmjaATiULS9jLfA41oY5DIKTSzK9qw9nImuIU?= =?us-ascii?Q?bBZ/GAXCyztqzDqRdlM/laAtca70sLcQVIR82hcEXPdqaRCZSXLE06T3EPeX?= =?us-ascii?Q?G+hgCygle97yZGb7m8MkUkU0vm6cniG9lb0yPoMXuPxxV+LgSiVvNiI3M7Hh?= =?us-ascii?Q?fZ3QMsW+7PM9vfOf6AqDZeBpA9TLPWdOR3UzKDpa5EjjobgNBrbijR7zViWc?= =?us-ascii?Q?XxLMkH553dApDTvMInxAus3PpOdmDP2vLzM8cwphlCFF69TwWsa4l7F8d/e9?= =?us-ascii?Q?favs5R/Wf+HINAoStGUx8ArqR8FxN7OS66KA7QOJjvrqMxzMjoj0LTIA4QfX?= =?us-ascii?Q?KYXWC2J/KnRRucPT1ryMlVMqWPDOPvIZ1pIqlNsVABa5EPgA98BRWFsNf7a3?= =?us-ascii?Q?S/SQ69u/fZJB/amIvBrpV8/qoPzSwiisNXxJouwTKl5U2UyX/ZV3/QQuePZb?= =?us-ascii?Q?/ibj+q0opTV99nckY0qLfeGHsVVu6iVihFoPe03LhMdsc+8rGwxFG+gL5jX8?= =?us-ascii?Q?bI5vqT2k7K/cz1n7Ig+cIJe7gNCW5BYEdhZ06wp+KOnAoqY3nubqPrCWweow?= =?us-ascii?Q?AdfzVzUEd7If9GHq1AtvEcMCnCKv2lzkwDStxVGqm/TyjahG6mbZy42P34yg?= =?us-ascii?Q?zQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3da0171e-b334-4beb-1cdd-08daa874f37d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:28.3113 (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: I6OElDGHikL7jce4tcjUNox0UKKu0SIuNBOGlcLonNICz62QtAT7Ren7793Uic63nlIZlTnOcKc3Kb3Eag8rvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 Content-Type: text/plain; charset="utf-8" This patch defines the default packet scheduler mptcp_sched_default, register it in mptcp_sched_init(), which is invoked in mptcp_proto_init(). Skip deleting this default scheduler in mptcp_unregister_scheduler(). Use data->snd_burst instead of msk->snd_burst. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 15 ++++++------ net/mptcp/protocol.h | 7 +++--- net/mptcp/sched.c | 55 ++++++++++++++++++++++++++++---------------- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1154bc746148..d99a09ada0d4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1406,7 +1406,8 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -1476,7 +1477,7 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock= *msk) subflow->avg_pacing_rate =3D div_u64((u64)subflow->avg_pacing_rate * wmem= + READ_ONCE(ssk->sk_pacing_rate) * burst, burst + wmem); - msk->snd_burst =3D burst; + data->snd_burst =3D burst; return ssk; } =20 @@ -1488,8 +1489,6 @@ static void mptcp_update_post_push(struct mptcp_sock = *msk, =20 dfrag->already_sent +=3D sent; =20 - msk->snd_burst -=3D sent; - snd_nxt_new +=3D dfrag->already_sent; =20 /* snd_nxt_new can be smaller than snd_nxt in case mptcp @@ -1535,12 +1534,13 @@ static int __subflow_push_pending(struct sock *sk, = struct sock *ssk, info->sent +=3D ret; copied +=3D ret; len -=3D ret; + data->snd_burst -=3D ret; =20 mptcp_update_post_push(msk, dfrag, ret); } WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); =20 - if (msk->snd_burst <=3D 0 || + if (data->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || !mptcp_subflow_active(mptcp_subflow_ctx(ssk))) { err =3D -EAGAIN; @@ -1617,6 +1617,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, * spooling the first chunk of data */ if (first) { + data.snd_burst =3D 0; ret =3D __subflow_push_pending(sk, ssk, &info, &data); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) @@ -2206,7 +2207,7 @@ static void mptcp_timeout_timer(struct timer_list *t) * * A backup subflow is returned only if that is the only kind available. */ -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; @@ -2278,7 +2279,6 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) mptcp_data_unlock(sk); =20 msk->first_pending =3D rtx_head; - msk->snd_burst =3D 0; =20 /* be sure to clear the "sent status" on all re-injected fragments */ list_for_each_entry(cur, &msk->rtx_queue, list) { @@ -3886,6 +3886,7 @@ void __init mptcp_proto_init(void) =20 mptcp_subflow_init(); mptcp_pm_init(); + mptcp_sched_init(); mptcp_token_init(); =20 if (proto_register(&mptcp_prot, MPTCP_USE_SLAB) !=3D 0) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ffcb9d02896b..fd0f41bf090c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -258,7 +258,6 @@ struct mptcp_sock { u64 rcv_data_fin_seq; int rmem_fwd_alloc; struct sock *last_snd; - int snd_burst; int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; * recovery related fields are under data_lock @@ -632,13 +631,15 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info= *info, struct mptcp_sched_ops *mptcp_sched_find(const char *name); int mptcp_register_scheduler(struct mptcp_sched_ops *sched); void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); +void mptcp_sched_init(void); int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched); void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); -struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); +struct sock *mptcp_subflow_get_send(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); +struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk); int mptcp_sched_get_send(struct mptcp_sock *msk, struct mptcp_sched_data *data); int mptcp_sched_get_retrans(struct mptcp_sock *msk, diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index ab4683e15868..8ee6e15b6534 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -16,6 +16,33 @@ static DEFINE_SPINLOCK(mptcp_sched_list_lock); static LIST_HEAD(mptcp_sched_list); =20 +static void mptcp_sched_default_data_init(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + data->snd_burst =3D 0; +} + +static int mptcp_sched_default_get_subflow(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct sock *ssk; + + ssk =3D data->reinject ? mptcp_subflow_get_retrans(msk) : + mptcp_subflow_get_send(msk, data); + if (!ssk) + return -EINVAL; + + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; +} + +static struct mptcp_sched_ops mptcp_sched_default =3D { + .data_init =3D mptcp_sched_default_data_init, + .get_subflow =3D mptcp_sched_default_get_subflow, + .name =3D "default", + .owner =3D THIS_MODULE, +}; + /* Must be called with rcu read lock held */ struct mptcp_sched_ops *mptcp_sched_find(const char *name) { @@ -50,11 +77,19 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sc= hed) =20 void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) { + if (sched =3D=3D &mptcp_sched_default) + return; + spin_lock(&mptcp_sched_list_lock); list_del_rcu(&sched->list); spin_unlock(&mptcp_sched_list_lock); } =20 +void mptcp_sched_init(void) +{ + mptcp_register_scheduler(&mptcp_sched_default); +} + int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched) { @@ -118,8 +153,6 @@ void mptcp_sched_data_set_contexts(const struct mptcp_s= ock *msk, int mptcp_sched_get_send(struct mptcp_sock *msk, struct mptcp_sched_data *data) { - struct sock *ssk =3D NULL; - sock_owned_by_me((const struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ @@ -133,14 +166,6 @@ int mptcp_sched_get_send(struct mptcp_sock *msk, return -EINVAL; } =20 - 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); @@ -149,22 +174,12 @@ int mptcp_sched_get_send(struct mptcp_sock *msk, int mptcp_sched_get_retrans(struct mptcp_sock *msk, struct mptcp_sched_data *data) { - struct sock *ssk =3D NULL; - sock_owned_by_me((const struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_retrans */ if (__mptcp_check_fallback(msk)) return -EINVAL; =20 - 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 Sun Apr 28 22:49:02 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80053.outbound.protection.outlook.com [40.107.8.53]) (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 BDF48468F for ; Fri, 7 Oct 2022 15:02:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XpxDuZLRCIM4pCRbkdG3fntKmW3lq9djfqynRCkwr0CjPb3v0GcJNSUU2vAGWJpoMNSyRIqxoNk5/ROn9NtjIaVgwvoYTeMsqxsLGVrJOuUhCp10Z8/AFXtXxehN7ba36xOZgPHh0A/Nn1wPK9sMUkh+TKiNIK1EBS7h1I3Sy/gNk1QlSUeq6y9jp4jgsSEXDqEFAb+HsmekLoucBHNXXsuaLwvuD9Vk7MQZcQDS3vfmht9Uuz0zECqlyqFvwE6gft7Aw53SkhdgbNbZ3J+2ihw1wINoVUjcgbW8P55I82M9ZJm2SGK7Hb4QUhu+D08izqJZCaHgIsshCbymGnP0dw== 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=30U1osd3bNjh6lpo4MPEY/Z2QOyeQNh0RWxy1ieaTQc=; b=aWLqbIZavupLKFdN5SspeuWbowXBR+nvl7IuXxKeCO4dhLPPxcGRTgE1UoDRjPAF2WkzWekx+rfLnJbBkGdPhy0Rz+RUKgi9qrzefYKicX7q6pPS0kAZAMNIG2bx14eUuQg0G4v7bAjrzrGi14Fu9CWSFScgJRPldfa1jFyBkgE0ovGkIa5FvJQ3PyLM3AclyYloptR0mpz/RKIiSfsJS3qygnm0Tz30rFT13EyKqZLNaYxZhSTJ4IYjmYmTz7KUXdg9GySWekg5tyYfxwBvon7DqCIEZrEYA7RJDrsiky8fQ0QtRUg1UORCICHJNdjePG9DbgPQprEa9J0zJ35Oww== 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=30U1osd3bNjh6lpo4MPEY/Z2QOyeQNh0RWxy1ieaTQc=; b=sNwDOYT6rfXpmMZ56DkdDL8wSD3R5gn8Ho1mBpTcEzlwLoMcywDiixA3VAD5iZKqH5YrQYnjOB/3RiHKu8M7osw9qcamvzggrFlPnxrx0FndBlxn+fRiQisLOH7E/Nz4MEBx62RRYbL2elWLWOLzQxGnh3smTdNMKhnu6xzy0jMLPeA/R++EToosHLPm2XEfU0t71i42CI7pcRv/VAuEot2TLHamUl3naWC3FgtNn/pNIzFC4U9lIQ/l3zIvBN6p4hLsCnUwRShNJH7iBuWo7Se9tVubU8h+/UTmaXcFpp6Z7q9bvWRjwJB4UYsbJ7acMbwhSvRPgq2rx3vZl5rJ6Q== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 06/10] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Fri, 7 Oct 2022 23:02:30 +0800 Message-Id: <6a221174bc73a6ef0488dc2096f5ad92d3433e51.1665154582.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0012.apcprd02.prod.outlook.com (2603:1096:4:194::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: f9a5adbf-91e4-4a7a-1a98-08daa874f71a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i4rVTKgunWQnL+W8wD+RpBtx+FsfH2S8fdQ+BaBBk2YSZzUvsq0WTt+5Qd8cfNtiBAWjWlMqT0+95hlNm4zgOHDlWflXqsQCF3nFZ7eqT1iL+w6P82buOAQ4ila7ACDuxkTPxB84rUrMnRrV215NzAzqcUs98D5N8oaWTR5f8udRGf/ovtqbJf1WTued8K9KH5+5kIa5OIpWvoYSePIPfU9tlSrUAqaBar34OQIBJxFQiodWTMsSMiZk5QCcldBRVboD2vMRAppEhWDNJFo0TAFBSN2tvYXlGoBa31yU60vB3tcouwskQT90/SLJMfIZ/tk2WcusHlmEIM8ritqgI/oW7BbsEFgeDBHmjclLaOLkEtJwQJSSozudeXL5LhtrtsSbCvMSPCpfOWkXn4CqPVVvRvyMf18HUecokytammtCMmYkHwg05e8exxXz77e64R4ttN5nSdv8w3j9sOXfePYvIu+GnUIcR2QzUK2XAVKQeUyj4cXxQV/R7rqvidmwoh/jqpQ8HS1PqVq0LJLsLl4CdOs1KiI8k8rBmfLgC//zEPLTuo9HgkhPq0S1EPsbITp/P8RagxopCNzQirtH/YY2GKUyHz1Xvz/vXuVQEZ5mlzasRpDrGxxC8RFJc4IznCF8NwQX3946DQc7Lq9X/sTattvmM2G+ZwL6oux2q5e9qMCknkFMeNNHWunkU0pUgPiRSFfyyeJniuDla5zhIcTA65Zo6peyIUY8K6K46D9UOKet3Tu4O6dgtRJSXB7o 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HPlgEcM2ZiNWU4xcPaiIfKvNAuyKsSoJKySP9Av0qx3vaT1teu8KWxWxyy0+?= =?us-ascii?Q?0ekmhknej0LAhjN/saquTG1qvqYuVF+kcVjdlGp4k9IRQnK9tT7BoXrKHt0s?= =?us-ascii?Q?hyX/yFFIUKvNifsmIxNR/yCs/wNuy3rKZ38xOFHCwBF74XlA1hO1xqmh8Lv4?= =?us-ascii?Q?IbmXE06AyjLqosb69T1fjb5xe4JW3WqYKTtP9m0CooDby6m5LdISw326Yif4?= =?us-ascii?Q?USTfCn2kRsV0VFId3n/Shso9nxEAeVRklyBqjG0lEB34gos5UxdBLlVP2sOr?= =?us-ascii?Q?siz462/qW/KtbpaQRwy16AQ20s4ncKPqwpSgGYV5qwr7Z91Jpn/XwZAjogLc?= =?us-ascii?Q?QBYM0xlD4vf7m3sPceE9LA1VIfUxZkrptUj5QAlx0o5QfPnmM93keSuzdTDh?= =?us-ascii?Q?fQE7D5Y2YRt2y0vNKWQ1OIzEGnmOEu8kjEGrufoAoO77/PklHRxQXtTNvxWn?= =?us-ascii?Q?9mZjgrCAvA0mlWNLk6MSDayUOzTtovCv4t/VG2r7F8aWGHZB8SHr6xhFzyXY?= =?us-ascii?Q?xGIxWxk473f3tgj/OXhBfzdos30M2l/oK8NOM2e/o5pUa4xhfNT5pfsbtiP5?= =?us-ascii?Q?XHrkxeMdjWMpkOFgncR45jpAHqKiflWbg28cfurTB23LEudZVXvJC0DbkJNf?= =?us-ascii?Q?q0XS3ATZfEiST36RYvLuQ+r8TXajJs+QhAhvfrY4DPh0dhYr9S4PQrrkmXk8?= =?us-ascii?Q?N0fJbZz+DMpTXRvw/k0vh7CVv8t0BipcLb3JaENSBMyufD2CtfoF/3utirL3?= =?us-ascii?Q?tXcpuvbHOI/PMOi7rBFUUbRCdyHDMbNSFpnKU7KfWeowmcheWSwJ0bIURpHv?= =?us-ascii?Q?374RPXz6NScZiM1hB/Z/BJM5VuPMXOheNA5JnpcTCfWLFaE1dEBbirrY0HZQ?= =?us-ascii?Q?XRiLL0TjFjZQoWh5ICPsyfLtcKLnkn3njjh25LdJ7QDOxHdhWOhR/9uK10ua?= =?us-ascii?Q?bXYh7cfJuaN3Z1npdW2FqpDzh/6JeuU2bBtDucYGNkDtnb/qgQJctCmRfQ5N?= =?us-ascii?Q?sIALtFrN47UpcKZpncgMYTxfyPA9RJW+oS/1mJdnQMUY/XtSjGyzxBcn32le?= =?us-ascii?Q?e/cwk1be73qhiiGDsWnrA0vuuE37mo3CSj+hRysIMRFYmStaiklJDM0jbcZP?= =?us-ascii?Q?rdMJs1Wdyd133KyriiTwLpIs1B7qIg7DN8FVBhOutgzqH547dQXMrHSdqmff?= =?us-ascii?Q?GpZNlCH8f564JJBN9eWnSbZNzGu4XTHiJyyggEB4WnKrxDmysS/Bxkh+OfQA?= =?us-ascii?Q?ZWLg6d23mO/zCPvi1NHKJ+ToC85yBJw5d4JAalEvcnDlKbVznvSJ8Zp4/Cbx?= =?us-ascii?Q?7PpMKPxaCXJrqSwMFPZRx/LFxfjB6OpefA0i0t/HsY69AQun6/RPDKBlIER8?= =?us-ascii?Q?IYnW8nOfo/UYpYM0+Yit+TPpQKfxQrhBBwy5WSTB3VddUCA3oIxoNIu7CHI8?= =?us-ascii?Q?YaIO0sNRNxV/4o4d3qvJtxXpNUIU7sD0hTUHsZBGQYED0tXKEZQXI5NuB38z?= =?us-ascii?Q?+U9Jjp7S3sm7vkxO78F8TvNCDLGqfU8T7xNt9mVH6gQQ2j4evlYnu0i17/LX?= =?us-ascii?Q?Ma7g2XE+mQGESrdIshwLswXp6Ci8m/URAAzjcBEDNj4yYbLvUhUE2mQRsal/?= =?us-ascii?Q?4g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9a5adbf-91e4-4a7a-1a98-08daa874f71a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:34.7483 (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: 7UHcoW9LJQTup5DxQdLIKFnKi/aYvDI3TQmui9gdyn8qvEdBAgTAZbbk3QcNh/m4vBd7dOBaYhrNgcqtOpauSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 9 +++++++-- 1 file changed, 7 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..701cc31359d3 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -240,6 +240,7 @@ struct mptcp_subflow_context { =20 struct mptcp_sched_data { bool reinject; + int snd_burst; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; } __attribute__((preserve_access_index)); =20 @@ -249,8 +250,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 +268,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 Sun Apr 28 22:49:02 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80048.outbound.protection.outlook.com [40.107.8.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 9E849468F for ; Fri, 7 Oct 2022 15:02:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RdNgH7Xcll7POZZNx1U0qoBGpKIyqtnPNk4oF4F5AxaX10TADW7YpwaRkUrz5ss2s//gzAer8p0sjl2wJBfyPPoLHFux21BGwxJmRewUeRKUQySS+uDzZcydUPE5ZzSVY9Vt5DsoH/B6nFVQNWp17liotiUQznunCF01HuTS5W6qtez/qUPkDmMxSwb7g1kKN66gw3esqCeO8MJOWWLQorjwtNj9zLRFveECnWHqO4bFnSCSuN9uFUfJu1JSzj7YXJn5TrPPxkhPDYJ5/8oypD36kmKZQxJOcwPXSuHxcmUa01isWQCuB0LufvnDvs7GNEst8pwaZ5wIzhO73bbaIQ== 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=J4tKCipU7UJYatYWlBVEtGCTpEiLLtU6U0EHINiz2ZT/lt6PuNKSywHEhfw15YpTnIOCsBeEDlPt1Ho9IOe96wwQKYefy1ER3Nx3+9ZeR7oS5ywnpO606esOIDeNnGwPdsyo5jOkQS/dd5zttV5qZzuOFpi+Mq1+wYKLJ+waxkm4yv523JXzXH3kiBZGfFj6hsGgqV9X+LRdRy+Ik48R4thDkdunkmuT3L7k7CB/jyvQbYfdlrGMttnOKgxHc8q8QpD+ZW0UCOGbbftgFj7Wl2KNroJ0y17V03hvRnM0c7jfN5EAWuSK8tuFvVA5ycJxTeIeVZQ8sy95JwSVJmC51w== 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=oycPB1naoBjcYUm3nc2fa9VL3+dxI4UM1IMmckcSXieQSwHIER/elIXgKiXuGfsMnBuKeSGYvub+EDlXFXG28+/IDp7Wh2LBg+io6XvtydejUtuUZUTqVRuntygd+e/7TyA8kjoURaWMOnpbMLLpMk8WEAsNiJIjFFvG9L53XCgfH2L5GYgcSW1CbwcaEE6/lWVO+maCUZnmHjZ06Ex6LxfpgV7EkDn6iJ5jtfmL5gZqf8s1VyUqQRwDdpYLCW23QSiAVpjyF79+2qu/ZwYHUv1IzKrTyj+XBY6XnKf0DUS8eK+oZcRDkDFsJOdd1ZgfvsnFygstbMrfl2WUm1PRpg== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 07/10] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Fri, 7 Oct 2022 23:02:31 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0013.apcprd04.prod.outlook.com (2603:1096:4:197::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: 931cd00a-c5e4-47e8-c246-08daa874fb24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gDhcZYIaKstcO+9SWylqGmkyrUKBzeN47GbBbTpnIiiCa5iFaD78kd1Wh9z3loF9Nh7HKUzUlktZpHYtsdL8pJ67EXp+XRq66KGlSgPQ2Hg+gkBR2jAmye8UR/EcM/SlaQoXRpqLnwsBERvMN5GAYwx+Q3Q/KyP0XmVEWHwtISDa0tsmiVzf6Q4TXOqxJVwgoKM4J08Rlcrtm+/cSBUQGZDuPVF60YaSMxuvu9mfxYoXBefvzBw2ZTv4QMdgC10Pim1jX+UC56M9CnAPwnCrahFwBxI0Nztx56sHitgyLfc9og33KVeDhzmf5peQG46B72RQLH752JuFPIBzowDtCNALA+uo8q3eYAXua9/WzkczuJYRPvwubS3vkftjwT+amKiAub5fuywsnzHUxZMjYPSQZ67aE/ETDlcNx3u5Ao+dX3P8rprx1Ueg6r0AcfypKMJMljtchK/GRSXSA2tv6qUq/UAmvKpTxuNkd0IaNNjoA2VnpymVhaORtUIRrxpBS8orCAk9l23orqln209WF34UnYFrMHTRIZqLyR4xgO+2RDz3eMIsvzc9EXPTsVYsSPY4+nEDJ626mGUgjYjXoSZWkqkLRA/BMXJPNHrytjmsG2bF9s/y41rTlNQ5ntAq0BS1nirc1N3MW2Bd0MuLY16aDl+p3XqnZp/VNcOkv3qSeolTUSZjisku7Peu9TziYZFtHGI+Vmbm6cuvJHFydkVupmItX7mwl4RG50gzI0v/FS3wc2O/D+RoHc8P0kTZ 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(4744005)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Fgtd0XE3aHPe+niI5ggix6D0ap8e54mGgD//sEm2GdvmxxpD3Tjxcp+rUfKh?= =?us-ascii?Q?Z7b573UXioD1PLbbeCoXetj7UdNEVJy1EaE9So27xQw2weUG+muzxNmKtKhy?= =?us-ascii?Q?lHKKD17E915/rsYNImtUZuR6zBh5NZW7qqkE+Xydq4M+Hjf5ghZ3xZiGvJfo?= =?us-ascii?Q?1p5wWaB3Ci/jTR+Fmij+JAU2+HJID3Z/40znBJSkhNeGac6Cfv4KL6REafb7?= =?us-ascii?Q?s0CL2NIJoQxu7QJU/cPxfuGZAop97AsPbv0mZ4jYSUHy+QAtcwve9lgOBhWb?= =?us-ascii?Q?VKy6xuRx7it02W/f6o9e5ymFxj5u6f0RpFMb+8X/u0jiMsywYau5izgWwQ3e?= =?us-ascii?Q?94S1On7+nzeLYsek/E4sYXP0cdLs3NClLldi5eUJbiGcTCGvdUJ+BTtSjtwP?= =?us-ascii?Q?OhmhUpLFv9hd6bqOc5k2itNQYiTa/9zPpcUUbfvu3ZaBso4f3giPTZJQnQjh?= =?us-ascii?Q?rihBB8gI+VQSCVMdid3bX7FrEUNknDhtWgrHL/3oREdnOrnXnTnYifeoO8pn?= =?us-ascii?Q?g4UXn+y4KWmahEKkr+w77HbMKkQB+f75xUTSgYNJK79NThU79Oqd8ySN+I3H?= =?us-ascii?Q?cBfFNHsJIxXyVlRpyMSUNgkVPfhISsHA+OQeXGzklmLOA12TKHOFwx6hf+xF?= =?us-ascii?Q?YYke+8G6hZ/c18f0LaCc8K/RmcoSbCVxGWfrBA3/xXU7C7BZgRsAnw2xEwQv?= =?us-ascii?Q?Xw2e9SIaMrGWyRJ8/fpaUm/LdF3X6NCUKHuo55okGYyN18yehJ6Cf4UICsbA?= =?us-ascii?Q?sULVnjmJfKJO3rE5KD4EQg0gXZ/vQNRjamjK6uRBVo9M1TSRs+5Z81K0PRfH?= =?us-ascii?Q?wutF4Uk8hrAlBlMLn7CB/WVbR6w8Wti2vBl3qo6zo9D0o0oSWaPL50m22MdB?= =?us-ascii?Q?ktL1tKsEhGojzFAWOcEFVuuAn+XMI/FuooYY4h6O6K6SCSaTUm+L2GVS8ciM?= =?us-ascii?Q?wGJJ8y60iTotDAwW+Z3fV2UW+MZCwhlBpKVmPaqV++H8/ve/BKItUSxUhLfx?= =?us-ascii?Q?o9lmdvuojB3T80JN2eyT1rXsCgveYijD2km8AFTfCQdAmtdqb92V+SU+xm/1?= =?us-ascii?Q?D0k6qpkHYbG3t7CnP+z6CaqRShwv+GMtHabQaNu5K5SEgqkvnAJKwwSopHKL?= =?us-ascii?Q?Hj7YNIb7dJ/DyzbyiRY4j/cw901ZeQ7veJnlW6BGVJaevnNYKJDwtrCsJY2W?= =?us-ascii?Q?31Cz7htm1WarQFk+etiGTqGgTT7kSKEB0cjmb6NtUuPkdTKKlNojJkRN6S5b?= =?us-ascii?Q?lTYcO+s205O/O5+0j8d/iFGxlePtpVgHeR6enyiQSf1AdTi7iIex4CoQGxvQ?= =?us-ascii?Q?shPHqQBZreLlJ4bOm7QPE0dEUjoDlZXV4t+jMRsIuYaVtgHTQVgJcKsfSwVq?= =?us-ascii?Q?ebGWX3S4FXJA7CK1PO8T6aCc5b8lq9K60PteUxg0qWcRj9lDvCCaZC+5PzU7?= =?us-ascii?Q?gP4f2uRjRCyAGyZtri+Uo5GRwG1IkB5EoPyNG8I+19FESLCEZoCSHNsqC9RL?= =?us-ascii?Q?MuB9a8MtF9zMpEHUPpOmDTfkW7z+DfNZnmv+iv/7mPecLFtX4Tp3jSFf0oBv?= =?us-ascii?Q?zjNQxDE8cVjjBfDuUfmBMA1CbsORJo7vdCjrH0CQt+tmudo6HN7IYlb8b5nl?= =?us-ascii?Q?JQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 931cd00a-c5e4-47e8-c246-08daa874fb24 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:41.1071 (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: 2yNSjUK21J7EQ9Pk40kwBbHUGisn31j6BKOtHCrtwtn5vSuB4xxwY1GXN7SiPtZ3Tw0dYjajyJKmgoUTO4IcTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 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 Sun Apr 28 22:49:02 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80075.outbound.protection.outlook.com [40.107.8.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 2A9C0468F for ; Fri, 7 Oct 2022 15:02:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RNJfLVA8+R6kqdaTQxIekK6QvwJL5O8epDsRSiTtp01kjIc+CFN1eVdIr0mWSDxdY5VCrTCy6o0oVxzQy8RUi9HCjTzH5QBIGZ+W1H1voplVKyzUzoPcETuDbMC89HeWWxGdIgq49kfASt3yFkFqc8R7VZ9ufzz4m/iW8vvmXgwC/3R/9d4ElPmeyP/JzjRdvWSbOoOTdsPF6PFcbJ6KVdW6Ocl1N8unb89fItIhBhv6Bej9OxUZ1oaAzcetgNzY8Kof63z1TXmNsn+Z76pgvDzHqueJz8e4Z/4MY2YFMpQS3ek4YCQSj7q90+wSpSaAfIPF9OkhYooD0evL1Uhp2w== 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=kho10VROJ1e73xrRlJ0erTJOxzTS1gXr0alyykuB3qJFDefSGAG/2hNs5zEluB/REPDYCrHu2aKkaRK+PfUMgdyPi6N0x/EDxEu7GxbnbEcBp/4N2RekUSSaGCUw7tcC9As6csV/Hgw07HpsPys10JDx819IYTCIeTEC0d0dJXqjUCQ3qrQgvu9vqwoBmLMu/NdP8zWVGE6JIJD7coEvK5hdMs58m4t4o+WQ9V2u0hnvaLbL6t9Ty2gbgm/ecNxwtj8eMSFumgS0ps7t3ZRkEggOY1ZF3WRBTrlaYEe2tSsn7bfNPhRXvNe8EiRMkkmrOC3x/fEL5RMcdUP4FZ34nQ== 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=jT33ShexrUZR5Qo2PWuR2qmKlQapGP4BaF2rI2112EA7Sjqb0WshhvMLzcpyuwrYQp78Ha7e5Tb5ljVve1M/kt/q1n4lKnfFF5rz+V1GcfRPmjPIGTycAbO0ZlTxZEe4+FWmf8F5xVECVEa850aOrux80wR6MJINg0WAP5LHTc3DooxgiM3I9KohGjua2K5jYgRAG6VtllhHWiEVZBZW5lusS8pOauiMuClLFeVjiHpArGyjAKNSStTockv2ZX50rDS4McfExCukLehCRn19dP0N3TOuwtz7dMiwH5tZERm40F+y6XXDmXmyKFvbWksnuwee+ntabtC7TQdTxgk/bQ== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 08/10] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Fri, 7 Oct 2022 23:02:32 +0800 Message-Id: <86bdc0acc11573f720fcfb4e6d55b2826f5995d5.1665154582.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0013.apcprd04.prod.outlook.com (2603:1096:4:197::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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: 480e784f-21cd-4b84-f94e-08daa874fedb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pZ14Ibq43VvWB5ZYEQjgvniulzlo+oDqtfWmcMXRCcrEMPtcAmBvM8cebarHkcHgFXe4HnO37cApcw0noTWsQU8Dwcm0yr4D6RbvxONBMPK+a9pRt3RbXcZeQvZGyR8Sm1UyVe5az5WLFil0RmfS0O3f2BRh6cz6XBIC9ntDx5nbON3VCUZk1Xt5utEWFiSKKEYuB9NjC+i1ZTIGI6eUudXB+CUBioKucJNCYQhVKlnYiGeF/2D0QtwDpvCDFmWyAAVI+5nelzwwStOBgDXKfh59CHvii6cLxHVoGLDKL73Hob8VixI+INug37dPsyq42aC/RAloW4C8XnjNluJ8RpDFZjdkb9nRC3zQ82e1hrcwy2tiy3kJnHbi0jFlPS7WbheWGdaJMNpgWqrKpsBJ53gBZBu4mHXkt12WonLObskBNaCBpgJpUZ2bMdi+QXEp0KrybgJoaAyxyPB8MPBra0vA3/R77IQ/S6+8IpBA+3nk46xzabGOHSOv1BJ9pWXCU3E6hhwzyg6SiXnGEOz9QFmUCiknoxlGwLrWhq8lkE7kPXxHD9Fv/5/yM0TPo2SJ1bEmLQx1Hx9AkE+AeqW3qWanTe8kTh3GRLTZxSoijniZWN6Q2Y0PFAuiEb0X72pDsKmdo1zUa8f+fB2I+DVvNj4yqfadVpeM0hgxU4mXZkslG4S8nviLMdHw9EONO1r5XrVe4D6DtUZ3g3O7sXHW7RiPMFmT+mKjrWsuE27YMEFrwJtJw0CpJjE59PuLB5Aq 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?txlE6C9tr+k+Kenp4ob81r6UpyVBWmXvwSinE11Ix25ZEMKoeuZ9OY3BOKhY?= =?us-ascii?Q?IMgIdfYO0ckFCyzh9pNlJw+fdkX60pc2P51SwL42B3TMuCYIRRCTEBdxiSH9?= =?us-ascii?Q?l2Z0TezTszgQpIDxGaRomIOdbGm+SZDjDGk6JGI9vz3uZWX5Bz5ev3szWxGS?= =?us-ascii?Q?eChmBB6ViHRdLHljaZ+pzTkJOpJ3MizohcsxO5IvZpwh3URZT7BTPYYc0eu4?= =?us-ascii?Q?rBSNyRkg9ngYzwVSM30VhJCcwDUoS6fy9VwSRdXYVcABH0S0/0Qk3a6ZwPqN?= =?us-ascii?Q?xGNArzpU2hs8WgGu3J5YY2Eg01ZZ/Q3gAjk99iZmrJSJTWy7d44mLL4rcxz7?= =?us-ascii?Q?pVTMvkhAk9TNo7PPPKyHDfptTNA4FyDN90J9orV2kau/ITOBt/N0cx+oK36T?= =?us-ascii?Q?hfcEBLpmD9BECshkDve/ylwKLzHQ1SVl+qMf5IpTori7fnHXvh6W4qZIcL/J?= =?us-ascii?Q?VpKuAGMAC5/7EZeovjQbK9VBXm7LOR80hQIJPSucp6+L5di+v+Q1ORXNWtoR?= =?us-ascii?Q?xglj1IfISKthQn4rwjoFOSiRFnon20N9pKbBjIMBhhHCmIv2vbkSM0lZzYjZ?= =?us-ascii?Q?lxwvW5G07Hdk/S1UVSzbPmFl7ew5eTeRvgYbPgM7l2aFjpSIAPDfJGfLtGm9?= =?us-ascii?Q?xK/gyy6+0zYyqZ4j8eI80+WHMgPHnkpsd1Sr05Cyqrm0m0I3ERL8D5ed1XUh?= =?us-ascii?Q?pyCZ6ewJsE5p8Bi6LvgGk2ROBxz9Q9CoDRhOhC0go8xeMU2dejtt3qxLNDz5?= =?us-ascii?Q?i/XoaTBf3y8Yvbaeq0TOW5ch1lLfx3oDzywJrXeMndZ76sw9rBNFBaCjKtwE?= =?us-ascii?Q?G012Fyf6cy59H9h8WWOCFoeu8LipcHeXA+Thz9GHy9MV7uYNpl0fffhSu+Cr?= =?us-ascii?Q?H7ESaGVeeoBeCBsrWo5tRXWP/s8jvTtjgamNSJ5J45e4c4CS1+2/Z6whrP7R?= =?us-ascii?Q?C8tKLrG9q2P4wMuIjFzm1VW6Lpj+2TcqBowK2PkRZwH1xucl6ThRxysHW40i?= =?us-ascii?Q?y4LfFw0K3evd+hPGXEIQEWYd1JaZ7D1MOVBKYtvyI3YSKC3r6ydzlG+C5sEg?= =?us-ascii?Q?UV0518V7Vs30hcVVCCuews3ca5yqzY/5omAyhW8pReRXHMC75mxzw4E9Dctv?= =?us-ascii?Q?8dQu4HrA2bb1MltO2E+9p8h77Ld7wIN18RAVYkgf05SoT0mMjA85v4jJTPZW?= =?us-ascii?Q?xRjgX8ZythB79zZt2mGV/94lqJuiEvP7lFdr22Q+8T9VDz9Zc9/NRXIGc5vy?= =?us-ascii?Q?KHWy8nE4pHGl3GlHO5O0AvZxlKmVx4PgCe6Ij9Y16v16/ncxt4Y1yGPZ3gtN?= =?us-ascii?Q?owzPhVBm3BO13db4GIuMifXkYDhRZPIYnSwFvp3kA2bp2vUjJKebMEUyARKR?= =?us-ascii?Q?abdIdxQu/T5OXghlNkdfl3P2W+ui8GD5AylarmM7PpDucnXGKTa1p3lvrR21?= =?us-ascii?Q?jyW00KvWY/nre0puN+d5OqiWa8lyi6Jva1HMU7DeufmqYIIepWXitModcOkr?= =?us-ascii?Q?Ym0urID1s7ukpKzTDip4vKAKiuvr9VxP9T6Q+lR/gtgi2BVFS1kh37bXxW1l?= =?us-ascii?Q?K/IbvteFbZic9lVPVff5c192AuWmw5pKHoWDjzBM0NFJKlrgsfbCA6thYD8m?= =?us-ascii?Q?yw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 480e784f-21cd-4b84-f94e-08daa874fedb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:47.5441 (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: y6sbBUarXJT0Y5HjzhMmK8pZa6DuntmEAo1Bm0xumZl9nftI3spizViQGe8U5cR1ZoEtN+CKu5ETFVlqUZcYDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 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 Sun Apr 28 22:49:02 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 9AD9A468F for ; Fri, 7 Oct 2022 15:02:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WQXmCE9KwMoWqsaVuNvy+6BTP2lSwmMg6IWGz7poViVnWTYYK3/tYFFvnRLK/iDLcL+JHz51F1lwBJN5Iy4jJQrcAfpe8qp02HC1OtjVMMt3LWl6MGQpvgzuVxlKsKWu/QT7J645CN+1zJtqqBUJ7xPjD15OgGU1M5jKOgbIWcX1NdBMolZryVwM/2YAvyXwKd2ESDO0lCmhAR8jgOow9xG8mswulL1wghAOvW+OELP5ADnmDQepZSizEhvTNLmZGdGx4c6Z0OCxYv5eO46/qTprgBlqI66Akg65U1nuvwjvmTA14g2z6JBU9RuaW/NT10AYKkjXIIJmgslXho81jQ== 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=ioyUoHAWaCRXCDRFPwWrmb5MjsFWyNSL5Mo4CaQXomhG8hl1lFwFRqfYXIRv14N+m4fL60gwl8khmb/EaxOhrSz2PTs556vCRFjf3BAD8dCWWr9KSiewUaSAg9nQoDm29ui8i9eP3AOkO1MC/cwCK/u+nzg/m5ljWBJR6XRCPaZg5iy8J8Oe40bquUJbeAtFmQ84Xi0I2KaZc6O6ewqklY3VaocPa1rSDDVp30WUIYynYPhJgKv1IfXKzQKVIiBVR1Jyf2sl6aUqGMZmA/YQqGUzQJIbY9D6zy2qnbKHyu0+Y0aQMRA7BageU/iIw4mpzewCc3e4Fpco2HZQn4gmeQ== 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=dtTSoGIEfgTKgTElxaNW5aTrL29lxlzlNaL675fiPbpUJ8s5gt7hVdUknUW9JxI68Db5UWRrETuECUkcMEoOXgVEeBrRGwIO2NdQCUzJxri/53bKt2IuZRvMUh3nIHWldWrRvDEJz8H/P7Ly5ns08gI0uKBivR0Idct6nTdrSY6B1+1SV0hfLPxHIf6jtAGj6RTuN71n7MIPFASWSg9sEVDES2xZR76dZOKUMShsiTJIDITF0IBltBy6JzuOABH5X8Ku3r+rISAsPALRjjpAqHUwYpqo8lMkZkK4v2cAKY4S7tQOR6YRTtNEcYyBTphjk8CVKTaN/z2JNIM7nDlDUQ== 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 AS8PR04MB8295.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:02:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:02:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 09/10] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Fri, 7 Oct 2022 23:02:33 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0012.apcprd04.prod.outlook.com (2603:1096:4:197::14) 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_|AS8PR04MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: b2b6850e-6b6a-4e7d-8c8a-08daa87502f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JjomWeuS4AF1qTj413Hwc8MvKrxQ50zDY0ApPNW5Gcob1UJ5QNuSa9NsU9sQSXZIiEDzLFoXkLI7/6mj4iBhj13BK1aTDWr82UwofD9Z7RPBnuh0vXOpC/ysQP+alw4Us2gd80745RnV+3AcKX5l2D84khOv3ZZCsWiFQp3vdfeZf+nHBlWgZe90vVYdJ2bsBnnJBEUqRzkD55/Q6SV+b6dGyXbnR/fl/43oLYDcQCTcPN6b5JDxxibm3GcaeJfg/GRMzDQ2BENpA29vnauDY5xskxC0DKOwSmd+ppesFxVldVUapf9GWnwiIJsFngWAjfO/4hWeZsOy28hl7rNraHGB7bCj/ckrIrZt/QtBKHhW3Y/KNHgqSinz/xorpcttcJ8H75P8PXXFkGqHYeKqF8G3v80DwD71EVw/t+qA8B/oqw4Yfvqam4rlcSIoM+xZr+PMc7DH8DjfNHOuMRlu3m9MlrD3NCemw6igBRaTstfjYLyWofpT+cKBCpZFUrnvxmlWtY6BZxsCILihzAl0XzLBw6u7rwBYjl3fNvlaKHBBUm+EmjSXYFKbmF55FDf0Uk3B+VqYtAAvAVPGXVPK0+Q4ayc0vstWkP5/cDi0cT80oY/sjPkqu8gM8AWxGqr099WtGIrqBZF3aTVcL72PLSAjaWLcHe2/+WAaQGd2RoVyV6IE6191vjEVdlyULOZOGV4vOLGFFLChM0NqFfX/w+lNiEbJm0TdBYFNGMbfGacq9intPN7jcLiMZ8bRcBJh 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)(346002)(366004)(396003)(39860400002)(376002)(451199015)(5660300002)(41300700001)(8936002)(6506007)(26005)(6512007)(36756003)(83380400001)(2906002)(44832011)(2616005)(186003)(38100700002)(478600001)(6486002)(6916009)(6666004)(8676002)(86362001)(107886003)(4326008)(66556008)(66476007)(66946007)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mMOhKExud8BwpcLTNM23Rfrj4jtV5gztmW9GX6mbjueHnGRsjvrXFPqYJzC1?= =?us-ascii?Q?nmjsuQja+jhlwcXJK/Y1rcp9nyScZmvQ1xbdBdfwTEvwHYvGkM8tcQIou/El?= =?us-ascii?Q?T2a1SYTNcKqp+4TV+bLusNxDcP7DpP2c81MwwbneNY2wbwys+w7aUQj6ovZV?= =?us-ascii?Q?U2fj/qA0XgYM3kMLwAOtODHUaA6n+9EDI3Q/FKSBaTuEiwLytIp6Q7Bc8mUs?= =?us-ascii?Q?LCU1LgjNJMzdGbhEEgT58+QnJ6o5p6RXzOrsNkGaUrCJLLQCFd+W136l/ohL?= =?us-ascii?Q?B+Zj60QmdV/omIxCK1U1Gq9gzd4FwwYb/DhnjpTkwDharDDzXq6rb7HKrUUz?= =?us-ascii?Q?9j/4pZFGWmyfAPjmRxtc1B3OIWIJSEs53KPHGdNcXJ+8QQAZK3gbTmkD4NiC?= =?us-ascii?Q?VIgzSxnVMcW+pLhVV+bxNrtOM/3dpFDG805FygtWm5wrWhG8MaL55r/NRQ2G?= =?us-ascii?Q?VAybg43KPWuu5IdyrnkAWoTlJWqAXDDPE9bLFHFTTkUgi9mboY/bE2kHKAqR?= =?us-ascii?Q?Safbqm+y6WrYI5FTV8x9BnBGhPofQLG1sKecZIyW0kDbY3OQuVmssbJYoAA3?= =?us-ascii?Q?t5HgWEho7Z2d+XSEGkVYlCLhe7qhk4vb+G3hjNM6QBBggwkGYIiSAO4fJlAU?= =?us-ascii?Q?03/PS4ew7zF3QsF2o7xo6PM3P5MRSktG4ojiZ6Tp9lN20mYUQXBxA7psogh/?= =?us-ascii?Q?A3wjwurahgSV1G34me1tX8AqHZ/GiINSO0W3GWUbivuktiIRD9/Hh/pRgllj?= =?us-ascii?Q?/KbhK4V3e+2CpfYGGe5niXQgG9oQZPqgALjonW3On0z1RuoeYMBTQm1RLfYH?= =?us-ascii?Q?WIFzdcdN6eYYQh98Id3bosnwv5n3Wiafz2g1PW0IXrv7m9+/hWO+64vhw9hC?= =?us-ascii?Q?7MBHsFxGOpSYbRRaXamkxCGYCWeSpRnwWOzmXfAZL8H4FuQKb9sV+Eqw4c4w?= =?us-ascii?Q?qD0g+OSuWyJsUNYE7L+cZupsYERzzTfC5Uq2EXyK8RZU2GzP2srMij/1kGfa?= =?us-ascii?Q?s+mXcSwuG0KWSA2gcUfkcNgn/F/15JTaMcmjWR7ulCyYDfBku/utcPNjNpx6?= =?us-ascii?Q?/A58BTp0RYqBklHHREwxupmhLuzjrwE9QoAQwEy5Ssub66/643v2sMx7/UiH?= =?us-ascii?Q?zkKqJjYIZ5y/NTZt8yhphkCzkfogT3HMu83N/bJjOVuxV1tFxNQi7s9JONvw?= =?us-ascii?Q?eWDAzTgWHSfD2ySG/eR7RSUlyEqUO0wKprJbjLdde2pBe7qavAPaTfjhvjV/?= =?us-ascii?Q?4O2FeKnfpMAF3cePeeBOlVNUS8xU3nf277NK6SxgbVX2t3tK+ZrUbCRlMOFJ?= =?us-ascii?Q?Q02IWq6GKhk6yjzN2gWLbo2RjIP7vSfboS5QR7iz1v2xXc3jvre3/WnuV5hi?= =?us-ascii?Q?sO4d3G8vDFWecxoDRLdaYjaLiyxMXIuVhTkywpcF02K/ytrmbBjzJMpWxlpB?= =?us-ascii?Q?ykoBngRMabWiHvPosSMPT2+WEYkqpCW0SaCZ4khpjgL9RH+FSBH7qduBeXQg?= =?us-ascii?Q?5r/X+PWFOBii1ejIMwynk+1rVYwAdn+rivgQ3fQSAJj2+uRe+293m0A+YLA1?= =?us-ascii?Q?Ee9Abngcbpuz31c9SBfCHozidDUEfO6fTxBwQoo3fDyVww7u/zcZ8eg3wFhI?= =?us-ascii?Q?tQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2b6850e-6b6a-4e7d-8c8a-08daa87502f2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:02:54.1686 (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: vI95g2kx1OK749gW8afAXrXRDUNS/hY2DicLhzWCQFqVaaErF2GzWZrZ3XdUUuxbTc3hdfv2x/lXFct5+Z32+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8295 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 Sun Apr 28 22:49:02 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2074.outbound.protection.outlook.com [40.107.21.74]) (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 83BBA468F for ; Fri, 7 Oct 2022 15:03:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PdsbxOLUCMj5M973Af6nO0C8Bt6DEJjp70FA76+MhEkompnBLFcia/ChdKMOB6kc1uIwJlpjcnWzbF73xAOw4KSdDMcPfp3RH+/ajv7W+McPVTtDembqRTi27Y9y2eRxf19PddTXCsfdOS3Xq8OpPqBvC29+jqlqiDvBunJDRSD9M5fKMO+RJfQ9vNuDI/42SQvKET6VnoUqy4BPjjHEYECK0eIqokDr3BdK2H5nEUNNJqHVQZIx6ADZIQQ3IAIK1fKeSLYYDkjj4Kh/tGSeYwa96dUTi7pwnEoPVBl0jRaAuyeBidPh9yAQTSka5FaloFA4fxzEulylHGzk9OSyew== 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=naILf0S5w3gl0HKY4QnrVMWWrQXTgqCVm6o20CyMzgq3deJqAsgfQ5hdUbyJun2Jdxr/zJz4Ih1+ArNpc4MjfS11CeFoUMOBBoFOp2PontzweVtS7vPnnvQHXTFtxwzk2iZo7uOrtSmaoiQzQzE+SsgtFYStTmrrHyXEbwL9M2I9PvPPCpCTSBhkFYmHueiyj9jXiCR4BLHLxLK9q5bF2DzFNny6d4ufGkurPrr0NggdgNbTww85Z0t2YefvXtQUXoazV+iiNwnP45GUDTQcBM4iCvVL8ZCBuh9GCb25GResg9UMU3EhlvsrzG+fVacc1aW51zuVbz9dbD4RjrHDRA== 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=1vM/y39f8QMjdxwz2aaA5FHHRceQmm4kjgJSGIJKdO7ne3J07JXylB6tjSd4Tc/1hS5fCoej0jve3I1mmfYu3YVIU+COC3H9pY+eBafgFZe0si1PgIydGg1vyoUtg+mcmI6BqZ35yX8aEr/KJoBTT2/h9znLI7/Rcgd2VqBvdly91q3WWpqQKi7fKTS/vO2mUhYym6s7l0TydM5z32s8noAhQ6MkaVQTkupiJ4SuWU1K9UQA/BmMxxosDocmsBchpcmX85+R++onsS3sKrWSPpvQ/g9AbCZ21DCAkXTTuzGrVkNPURxisTzUWrV3RvqXaPnFWq3JgC0UTplBGEmxaQ== 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 DBBPR04MB7609.eurprd04.prod.outlook.com (2603:10a6:10:1f7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 15:03:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c5ff:965f:506f:6770%4]) with mapi id 15.20.5676.034; Fri, 7 Oct 2022 15:03:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 10/10] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Fri, 7 Oct 2022 23:02:34 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0053.apcprd02.prod.outlook.com (2603:1096:4:1f5::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_|DBBPR04MB7609:EE_ X-MS-Office365-Filtering-Correlation-Id: a9ba7012-b428-4b29-ea72-08daa87506b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hm2xfYpYQglaS0s9BUFkeE/njMFuRnxiU844yMzfKjMGek0Hj7L621jbK2NObd1fWSoXnCSs55xWZFR4EEopTaJSyPGlR4L6vdoHb3z+vl7KUtdKuWRLniTkGMWpWNABO/pBDS1EnEsmpKQ9/X+34x/iUiM0224dpawdsQtkbYmCTqET8FlB9rgwlq1THhMrCEKB3c3Q0Q7ai+ZMtuFN+8nRczlsXusbUEs5uJiDbyZvNWyOFJYNza/Slc/kVpRi9e16wYEgK+R9ElErx4XMxsRS0q9QQKOmSmBKxl97wVZ6VWW7Z8Ww6Ubjupjs9ZiwJ3XjC9GLMO/H+CYdwOSfkj3pi3e1fxV6P7IvZ2mOs+BLxVSolbLosAXzMdu8xXBv+01aeLZOFbTUNF61PGH8gINbJZPlTI7goZiRxFpP09bSPZ96lMbz9j3mWJZQ8JymvnW4SutN2nduJfEJHkZl8OgnA2B/SROG+x973ivhKoiW7eDPpVcaFfjyfOkdueOz9ZfCCIFXKehxY/ZTbb+kbYOKZMCmkYg1DIdaKbNkhKRiYdQMCMw2dzOJJCoi1+S8iRHRgQKAFm1QShF/hmBQ5MR1n/9E63wE4kfzJcBCkAOy0qx/2xP3UE5Yc71TOjtKGhyiusD4XBYsVtgxqGk7EK2kL23kDcM9isUsFuyTNfMsNdKd0dIgiIdeNdFhNLfPUy1Sd/URgbUhoIC9id6/rzfPlwRCkFAnsU5gt0Uxsh/XRLBAxqCNHUS7owWEHp9e 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)(396003)(136003)(346002)(366004)(39860400002)(451199015)(36756003)(66476007)(66556008)(66946007)(478600001)(6512007)(44832011)(2906002)(26005)(41300700001)(8676002)(4326008)(86362001)(5660300002)(38100700002)(8936002)(316002)(83380400001)(6916009)(6486002)(6666004)(186003)(107886003)(2616005)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?R8m0vdPsDq5TjtSA1K62vgfFUEv26JbQc3UyDvU407Z3dsMgcwGKLnJID53t?= =?us-ascii?Q?+Sk0xYXQJiNQbcHJU/ITA+pdSWYHkF2OQZU1G5LYiZMsRkBZ1AyVAR4AS1HO?= =?us-ascii?Q?5a0Q9LghJwEO84g4H9fCy0+HuofNcKpZsSK8baNWkjdfiJcxjIWTE7cKyJDQ?= =?us-ascii?Q?U4pnqz8G34Xw6ycNbzd/4EKR97dTTYnep1LlR88ywKTuoEkO+oarrICcwU4d?= =?us-ascii?Q?GGu+xwAnOX/CCu37gI2X3nBrGq8J2bt7iUTF5W9doyUkXV/Jr2DUdtcc8ksq?= =?us-ascii?Q?wcw+Y/+im1Ynb2Ywl22u/RhZtJZumKUIUNI7hC6DPaY58bXVrrySIzamwMwu?= =?us-ascii?Q?X/5cBpevUIzgoNC4zk0BV3C3C5SQoerk/sK4TGwM5f7Em86oYDzcrtUxxHfH?= =?us-ascii?Q?J1Q4tdvPYMpaZaGMANyyx6f/Kejw62HlBdnXCIIhcWAzx941t3cbzVKJywBI?= =?us-ascii?Q?iHrGlWhMOad6lnXlQB8v2mQOYhYnxlqkiBK0olLnMlSo+KWQFJ8rtNv25mdw?= =?us-ascii?Q?baw3T7hqPWEkKn/ZaiK1gxj+BYw3RG2nUY5r1fGm4FuDlEaIR/zCRI9wvKbE?= =?us-ascii?Q?3pLY9pJZHx0Gvx8pq+gGFJkNeZlCd6WzRCiHQPNaGmgkB1z3bZhTce7MYRJd?= =?us-ascii?Q?9gBUFemNqkrxIZwzUslqH2Hn0HZ0h0fwEoRtyzDwgA+I+3wN73WDWs4XGF7n?= =?us-ascii?Q?JZc0AKfTSu8pa3PHQclxCnHIq2uCmc8KgyB7wTixCcXkPpjJPJI8N0Lkb5wI?= =?us-ascii?Q?DL1GCxJkhvbjTdFF054/WPfZblKs6NX7NMPb2WM9AxOqy9IB+dG7HmTA34jT?= =?us-ascii?Q?5Xwjk+oNRlvHZsJt7ndSGStA3DAV1SbqzEo1iqQrhFxVjByHafMzUPAmvHUK?= =?us-ascii?Q?Nte2umklTFh5zOiXJNbT4sxpBhNoH1qfuINDetimd5GCUIOgUGhcO91id7zn?= =?us-ascii?Q?Ll4+qJY0wBQGUh/HuKRwYZp74sT2v/JHYpGc1KbUsMp1+fa38z7MkMunU1Tm?= =?us-ascii?Q?QvekRI3TE24+oUvSVD/ci9OHmGKrZ7GY17214GXi3oXRRu6wXZjdwtZ6fMGg?= =?us-ascii?Q?hhuT9kkW6EOpoMsw/9+IOW8evM4SrYd/lMhnc0DBibzHTPQqkP4czBoepIUt?= =?us-ascii?Q?dfx05dM37KFkH4UtorSOTbfmgjShAeZAobFMb+Pix4AS8cGlILnVQQy8tcBU?= =?us-ascii?Q?lmq8To7TzlWo9K2dfkujB5rYk9BQP33afXBWO9P4vAl+GGUCynJw3k2aTkWX?= =?us-ascii?Q?B8LcmHDUw7UIWbSueK4SYdZKkJyR8aZW9xLNUAViivPqQvJ5iFpv/p1j0Lnb?= =?us-ascii?Q?GqZfejUjpi8wBqv8XWCiu1lAcoykR3LDFMB0psRdbRYwdr4ClbQbdiMk9NxN?= =?us-ascii?Q?51t1vjJTdj6gnsy+LpXGzD6uvwmPVE5jMCgRXg5dKtUyxgUZ4vhEkB12sh8f?= =?us-ascii?Q?n5enBo8959UY7UP6QpoPev7Sn3nj2BEzS1GnLxGsaTV+sSejKhWO1M1sOSJh?= =?us-ascii?Q?5PYVt/iOQhS5YKp3gm67Ep4AwuZW0744ZKHtgEbCYHJQjV0X1gm4Fd/fG9ys?= =?us-ascii?Q?mnyj43+CQlDzH/JmCELtxeloy1bUkwPEfA6owNwnfAUAQrwvAO56xbd5wPJW?= =?us-ascii?Q?wA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9ba7012-b428-4b29-ea72-08daa87506b0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 15:03:00.5119 (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: ksk2LLRvG+ylMCT9GO7fr6wryokpW8qf6MT7Ym3VzTa9V7OFrvFC4AaFLlAWWUEvD9O7BTKyMByoJN0NoC3ZSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7609 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