From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2059.outbound.protection.outlook.com [40.107.7.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 355F97E for ; Mon, 4 Sep 2023 09:39:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ckP2lIzYf74edVPpWi8QBeI+d35cLkrXcgft57RZGYsrq2of6pzIzLd66S4QbLjvthwzJ/P5VeyAE6uJvddyxwrlOpSRy57x/4h/8s/pgYps+MbRgRvfGoLTgdLl/DOdGw+MJYIlec3WqH1dI0Sm8e3BELMlqrykvOv9d4UPcujjkgiTzOeHhrfd0Q5yMA7vC/BdnhyXphAG0S7C1/KYo9DEtwiI0B5QEwHsRu6h499Nw2PgpfhJ+xhAPO2EIVRoKpXDvWJcJGBzm8OgROnaf66oMVIngy64+49Su9q5WxV5gQn3HtdQsAJkYj6HQmziEkdsihDOhT9LnmB7icev5g== 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=KGEAOZYqr/YZj7QkWssZCGW7YeWMA99bxlXzTQcvMgY=; b=NLMb6+Q/aPxn7DL7w08snGCfIv7bB+8/WApLZfy1UrMJRFqAB6RFxri8d9fiM0fvAIWh15181F07K9y/tLMIbOu8brWfowYApWGp8YR+vcPoLYYitHomvnUdRvpMQ3U3IkN4ISGrBECitfbZBfGKk05CmP9WpRQKk4m1YYT/qRfIaJcH9N/mF7Jh2Gxit3u9m2oDyWssWIzcezaUqjhypPx1EoHIRphIuQ/UH2eADUE9Wx/P6iw0vqxbZn1POYSlx82+zw/9/CPYD/5cb3Im62hBqFu9mWUfkjOx9Ni/QYGgXuhez/KZCtMeJHwrwSQwgoypIadI10tiLqAOEMd82Q== 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=KGEAOZYqr/YZj7QkWssZCGW7YeWMA99bxlXzTQcvMgY=; b=5LbpAxLLBaVMtBJDqPs3k1BUmCd3sgymwIt93fV5I6f0ZI7bs1Rz69EydhhEFqlAOI2q8l7X3BMTaxCNmPvSS/Pkyi7794aNyAunOUvyUSU5xoykgEgz15aGi3w5jgdRgdjbw+EHGO5LxzjpkNEaYzxoBpLWSUeOUGWbOYOc/X93jN0RMnuszbA/eUn/KlAzfRXg8cik++5c+aEG4IB9QAv5EqQCS9AMtYW/XYKVbCd8GlFAWyZXbyjgWf8VBMZpDl9Csfn/7jiEBJ+9SxikFQovTKqmRVu564Va1gLfEnGj+glEqxWZjcZoDaVzA4Dgq18cqyB0xZ3B6oUTi46WzQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:39:08 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:39:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 1/9] Squash to "bpf: Export more bpf_burst related functions" Date: Mon, 4 Sep 2023 17:39:20 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0163.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::10) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: fd7d0da3-2d7f-4c5e-088e-08dbad2ac9ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6oKCoQBGz2bF8yMk/sWiId/mqaFxUXqChE02Q2cvGexKMHkxJE7wIYlwtDwSWKxp2vw3opPtZxCYIqLk0iZk2eVagwZGBgAFMjrFG/gASYA0YjBJJ1rDF4xEUVwCAfNihRjMeI9+a3fH9W5pals/+vSikHVXfG2dweDYZKWkiopHfRoAj/Ej4Zwr3Y7aj0C0Cfjb5bTtQgeC0lMaHJ3r5F7xoD/jie1JLZyARlznzb7C+bYVk3VjKCzkMnrAYS+K2knNRsDanlGbWTQRcYNx+EYslGXcD39te2OlGxYgX0pFFkraloeKJPc+SiYprV5gFEAh/x4fTs3gAwtJaGUZBJHXnx6LkP0w5RIS69v4IafyaRRG47wC/h17OeEwFVYnsjYycFmbliiSujYwsXmGXKnrkPkfQTDMUHG/rab1WxDfVa4lX7PxH+3PyzrJOmXuY354TMzQM/iNqTbL0PyAqRcxcxELPWrwa7N4x5lQfUoYnhccREPRXXmhUudPfvNlJm+KA+VTcriHD65FWv3tHIz8TXd0y8sjEWgnEEzOrzI5TEPeO6dZbKU58OvEA2vj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(4744005)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iLjei59FCU3czWaP3dZmDYIi3OOoFE/car6ykP6SYAEPB0hI/XxNZb9rE/g+?= =?us-ascii?Q?dttfXcHBYAk9s0KiyLfh6cC7YPPYsQloKuurkRCMILeoiFmSrYLYvIIgLMnM?= =?us-ascii?Q?P4U7H1DaG8nUrAiUPbeQndHC69Gp5EFp/+D+oz8wHRdLUinmRcwRosE1Po50?= =?us-ascii?Q?B31xCW/bVVuFKsZPEoJWmdmyW790/kUkjou+0KmukevxPTx0mVGtnskZdJg5?= =?us-ascii?Q?cxhLJTOBFWcHei2jFC+ysLueusB4sveOpLFcTDm1TeOo8wHwoNF/zTJXB7qM?= =?us-ascii?Q?1UvhiwEWt/HdJ2v65YqC76DBQOhMvlbylW1PI55bfH4GRW1CH8ptNXyQIavR?= =?us-ascii?Q?bC6jZgso/GbBks+7kq27XuRXRWfNTJpfNwXiNZA8D2pKF+12PQAS1+idGIPp?= =?us-ascii?Q?qO3NrZ/+q32/DsqFLvTDSXvRZ3UfNgUMLLCf19W+ZjhFFgBeEGBbCmo+Y0bQ?= =?us-ascii?Q?u1pGn8DVXcDHEwMrnIBPo69a0osPKH8h6n5a7xMztEAEoBu6tj2KVj1RtEZn?= =?us-ascii?Q?/iBCAYSmD6f9Aij/UcAPi6oUXsoP0yO/2Xd//lTFrqa48tfMIigECTHVRxOA?= =?us-ascii?Q?afBHayoZhgNmlNq+rdsmnoK/rOsfLKU12FzYTLK3A/LoqYInbT14F9nyBX1v?= =?us-ascii?Q?7gAVL/eA9G+LZpu3UBBwFUtxSOqG3e3BsyFWoe3D/OaMCR7IkiF6UjQc8SGI?= =?us-ascii?Q?TqDtbvEmyk69Rl+f1eNhib5uZaFutd/FtpJd/gyxBE6j0wWKKGBpZVuDvuF3?= =?us-ascii?Q?+ZwgEK4sZ8+OP4P+GAampp3u5jOonmNZrMHptumn9hnCD7zzonDLQfB95mI2?= =?us-ascii?Q?OyZ6j0JYoFO/mCGqC37QoamGuv3yBnA9CNlIdUUnaXzx0w11JfN2jJnjAsZj?= =?us-ascii?Q?G5fj/FiSOJu6D8y5wUqLyzmJ1yPe1/LKpNtgQZfXef0axeytoPaICTFlFm0Z?= =?us-ascii?Q?oijMTO6xD7AVxb6Jjy043x9fiUZsrYDnCoCDruEgR6aX8MSsyfTARLkCgxUT?= =?us-ascii?Q?pJkCiOC5OafYR9ITrrcqdVwOIhR1Q5QgdY7H13K0ctpTKbKUxD+TCC5ogH5G?= =?us-ascii?Q?wcnw51mQrfSspWtULWRXIGvbsLoHkYd6lt2xUFPzoTRJEp3hXtHrNGV/D/NV?= =?us-ascii?Q?757YuP+OCTsTQ569Fvo/uSrNbJ8qB9V99FnGNzzqvBVnsKTWncfyI8eKfFJL?= =?us-ascii?Q?jdJ32Ipu9wA6nz9aXQmmiTsAJ5oRP7gZS4/6uzpIdtEUyHhV7aCbLHwnVTeo?= =?us-ascii?Q?zw9WiwSu8POQa2lDqfbgAbQY6wcmJgcx7yPaq1RKXb2tTF0MlAvDyj6214OY?= =?us-ascii?Q?oDp2EtQJXLxyo6YanHnIJJQJe/hX0NmoWMVFmHcjP/yNyJf7Bks3mswXJJ1/?= =?us-ascii?Q?vSdymHVOLoqhTCiA/2ZN7MJumMr6OosCKtTYtgLcRIk9TfFqH0Dm79UC9/5L?= =?us-ascii?Q?+hxdo31+0FRV5vso9b1avD8asaaWH9qGBLaUVFtQF/CEeaZstgmpXHxpfCy7?= =?us-ascii?Q?ev5oQflh3H8ph7fo1FFUuMPZ9yBOVJQRaNbquJYjqgHoQOtbkk02HSN9zsoe?= =?us-ascii?Q?NKSQiKGQObCfE0h6ylNlp055afs7uEwj+Rkq0S9ZIHg9/KeS+BZXkTPrOtU+?= =?us-ascii?Q?F2sy71FMUpokwm+F5GAmlPtsURlfeQSaVHpxXyYNUQg3FyxsbI/tLcZOMepp?= =?us-ascii?Q?tHVy2Q=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd7d0da3-2d7f-4c5e-088e-08dbad2ac9ab X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:39:08.7456 (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: 01oMD7r9/7zAGuozES54utPsOzZ8zxDTa4hl1UlpkmnH+W581RMNmzFDd7XT5Rvle2JVClD8qPHSgEm2ULbP4w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Add __bpf_kfunc before bpf_mptcp_subflow_queues_empty(), drop __diag_*, it will be added in the next patch. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 3c29718156df..8109d9dfaf5e 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -163,17 +163,11 @@ static const struct btf_kfunc_id_set bpf_mptcp_fmodre= t_set =3D { .set =3D &bpf_mptcp_fmodret_ids, }; =20 -__diag_push(); -__diag_ignore_all("-Wmissing-prototypes", - "kfuncs which will be used in BPF programs"); - -bool bpf_mptcp_subflow_queues_empty(struct sock *sk) +__bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk) { return tcp_rtx_queue_empty(sk); } =20 -__diag_pop(); - 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) --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2044.outbound.protection.outlook.com [40.107.7.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF8D97E for ; Mon, 4 Sep 2023 09:39:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YDnOnjVSIqgYWtKc6igHan3VzxCrJPemSpsFaXxs7LHANLSJNmD3boslCXajPmrB8AhcUDdE/VlqiO8DQeec6xXowVZjE8yxa2slYd/nKTXu48fvGtKR96xNWP0wQNEYAmSuTMoMHz36+5zXzw6MBAMhm+DAS1TlhENeHQ3yBU6if/DHDhFj2QaqOhO3SI+dmsE3lv8R1bJ/qPOJ1eKSwCFjUD+ZVBrolLOMtMdwIR6HMusxrev94iCOaR9p443QUGshbJKONmG6VAYymcBRIKLFuSiDyYB7lTA8gP+KdcJWiq4W0EtbCE7anR1Ke8z0CZJbesSE6uMsj6c86xWAIA== 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=cZqvXTL5u2sNltPB+zWCVB303+8dgtQH+TObBp5Pgzw=; b=BgceU6bcnuNIBTZWTHQG/EJR7f1RiqlrUjExBSjr/9ZvuqXAS6kJV8nTAtf11jVJ1O7WeQ//vEmk9FM4FffbfIxAwowIia9BVOIypP6j7qGGOHg28XIfN9d/anP4JqlT5816qZ946ZjWY2QM29jT3vaYOXwZMZwXHLDdLh+DkBsEyF79NqopG6Wtv+uBhb+3uhX3PCZvXrAB++lvXK5X+4LiI7XOrrWf1SmAKJh+IbOngdEzP1/2HvUQ8CHG/zBU/QWYYtUSblfjeUub5Fx0L3Qa+Cg/7fy51+ygM16Nef7c+X7IadGf99qPKl2CWeA8FoGwzvM0udkSJS0Wtm/gIQ== 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=cZqvXTL5u2sNltPB+zWCVB303+8dgtQH+TObBp5Pgzw=; b=51dhX6bVRbb6O1zz9rRWFQ8TsjZRLpxRQ7ksnE7CLEI13vT1gbbsdQS/AuxUlLQ26JGNIv0hgvaeW0YQsVLT0SxxIk5wsurYb6jhpB14RVfg8qyPH/rMvFY48YI2CgzDp0Je4E3dxC9SBGwIMbKU6lOQULfiysAvoIlUZPt/OB8k+KFy75wGIUobgteAyJbMfMEbLyHpZN1G+QSYLk6a1af52Q6P32EUtW2F453BfZQRTsNiNkEmZWVHeb7xO4FYOYhnMFTaoCEqywCC10fvokn12UsaVLCe3M1hSZjC51tGrw/bsBS+577dMQlH/SPQZ2ZeblDjo663dC+DnWuxUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:39:24 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:39:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 2/9] Squash to "mptcp: add sched_data helpers" Date: Mon, 4 Sep 2023 17:39:21 +0800 Message-Id: <400680aec9d85527f5c8e26b69e5f3bfb48685b4.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0155.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::13) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: 77328c78-4ca3-422f-8d20-08dbad2ad294 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZUSslVrXgj2TLX1CNJbxnkiLH4N1+GjBM17zOCmqvyKcb/GDzrNzhPkgrKjkZ1FydECddIKHjTGMuzOpsaNuDvAc3bEEvTCJXadLF/IB9RG+4A8Uz3vZEmGlq0g8eFNMRsVAXdpBJnhTzuZAQVmGfv/yoL6NMePnIwV3iZhk5fqZESU2pQXnT01w7aHxSGR+qtKbG+Mq5BIb8wFxG97PFTBW3wkicsQJaBgbsWbYl1ck5iZAoG8MJuGS7r+RsTlgUzP51DyLhA+ACBZrkcdBi5EOmfhcMq4dwtYRdR1Xg77GwaS3t9Ll+cTp7IuRRnHRer1e8iFWovXzlBaE+RqYYwK7/H2RGBIn3x4Jl07uZ9FlkhhlmYehotE+l+QkP8W0Ne5nEkSAjRB05rkDW6t8xugnrYy/1Tzt5XvBDvjGPHtU7Xj0eiH/bsRI5X+1ht6L0USjQpzv8FKh2iQprMtimFJeHccTq3uzkIEGxLhpOC3SszD/kEeaxrLU9wMqqvWgYq3lNoWT8OZbGCijbMj79OhklE6QqPl0Zpp8ckjXkkUc5CySUa/fix6qkZ2wA/XM X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DLfxYyOkSxUvuAouNiPn2ryFCBcvBGVaq2FYO3TUlCb2nESD+wIva8Orp5ED?= =?us-ascii?Q?yEna7AE17u3RkJmAgJpzHohwjn52NXlyWo9mhR5Yrj4vpKPOc6eELFQMR/KK?= =?us-ascii?Q?4BeCQrPDjMQV16pptiSDk+UharR73vc4PShD6kP0g5tA0clRPy1sIyLSjKp0?= =?us-ascii?Q?+FWVNhrYNQXG2spNPJC76fVRAPa0Omf1MVxG4IHt8yp2AiN/mP6e7m89ISMf?= =?us-ascii?Q?ZMnw/MfkoYoAojNWaSB046JWjvmvVRf/wDs5gjgXFCAtR0/kl8AWL8cPEg5v?= =?us-ascii?Q?7BzqCbgkCCC3z8l3O8fngU4UHIQnYIKCYxO1GOQG+fn4B/C2ThQIb20puoPy?= =?us-ascii?Q?QIFm8j56YwQny9okS1v3IseMjEHuSmEGtruIdsQEhcS5+o0Zz3X5t3NTtl+/?= =?us-ascii?Q?PSrT9UFqQfHehQ9dT2h93gpnqNJ6PYzJh/HDer+Q1L/by4fE+fFlJPwnbDW+?= =?us-ascii?Q?2XWnRFpGxKO7w9qlpEpt2swy/vo5/yVrpSIlKV99x64elQ8Kd+PFc1YIRsC+?= =?us-ascii?Q?oOYml+nvBn6IIz6tcHy395QbpAtYAoFDzpA/Hvz8rXqOZKjCrqgJVYXyR3RE?= =?us-ascii?Q?uE+8CaTs1EOnyMKhnJRdLCVarM24DSwFd2o/N1QeshGmt8h5MWbSlMB6DT/v?= =?us-ascii?Q?QdsheB1LqNTDDpUTELAc+C+2yNGGkYffHkJ0MO3wh+jfuX+NkS1u4LwmQRRI?= =?us-ascii?Q?K1TUtMsy0t2z4HnY3c3oWLd++7BPfMvkQzzbmZq0B8Rjrt+LBhiWwSQuRRj6?= =?us-ascii?Q?+xW24qZB6AAWyEGboGPCsRTHoCj8iN+a+eoVgGXJaoNnH8xaZhgjSjZCtiu2?= =?us-ascii?Q?EJvnZpo0SIxBTtUO0X3tBOEqVoqirI9uEBVksrW7m6O87ZqAUrWknolqq07T?= =?us-ascii?Q?Q20ZLEi9xpbBmaiXuLEnLXEUk1vzf1Uu+sffUZh4T8BuBGT92I/Nroc7D5yP?= =?us-ascii?Q?EVyGevVfuGzmCR2BVidiA5/3k1g/7fl35CL4+4IfW60E0XIPLYS6bSa+jp9b?= =?us-ascii?Q?ccOqfzYd9oS0RUmEtVku9sqV6crLfsD5wU9g1H+HZmGJgrcx+l8YCfe5PLp+?= =?us-ascii?Q?PXjwKmUPS9AnMEFXUcpL4mP6x45VFETBKsClSfUrSGWG5U4TneTElEEN5ONs?= =?us-ascii?Q?ZVnl8RTLmL6wJYPuE3fbflgBf0SExnnlzTTbM2s9jucQE4/pACJz9b8ixqmD?= =?us-ascii?Q?qjalyLt812kYuId6WyKTXWNguX1JY4kaw2rpZSu+G7eF9nR1kQhKeuYx49Oj?= =?us-ascii?Q?zhFl68vCAt8EFSx26ztl4ZzKS0BEbhXEu8XWbs7pZ3Gh+/t9dfH6pBCHLcHA?= =?us-ascii?Q?spCZsbcg3+kQRfoHoOKJS0c7Ay90txfTJJvOp7gEn6mIwmtUvFNQw3U5PtkN?= =?us-ascii?Q?4BEpcV4L8kAp/haPjX+n+QvsKb65rcAmszhqcWs7XOqbk6dyPklVPA9gDlcb?= =?us-ascii?Q?QJXHTRATaxHsPzSvM9EBOnnUqUP2EgGSrN+C2igtMced6KaS81d07g0rNTpl?= =?us-ascii?Q?AkS/qGZAyVPNxCs0FfAMJPe8Wnw2e32yi7b2HuWhcX9t2/4t1Myd8jKZzkWl?= =?us-ascii?Q?l3aT6JiyeGhI4knHhsO3Czzxs1swpmljACRKlZRS+RS2vVrkaBCDn61AEufT?= =?us-ascii?Q?TW3BvOXL5AgDDV9gmiDLcfhaaQ3jNW6UoQaE4Jbd+aPP79a6osHuyIe/ZZNy?= =?us-ascii?Q?2qk8cA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77328c78-4ca3-422f-8d20-08dbad2ad294 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:39:24.1490 (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: m5DH05fZ3lLXQm70fYh2YIMV7MyTfukbmJKCkONVKaNXILNooV4uNKu4SlX0IohyWgskb56zMnkybWeV0+0gPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Change mptcp_sched_data_set_contexts as static function. Rename mptcp_subflow_ctx_by_pos with bpf_ prefix, move it into bpf.c in __diag_* section. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 17 +++++++++++++-- net/mptcp/protocol.h | 6 ++---- net/mptcp/sched.c | 50 +++++++++++++++++++------------------------- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 8109d9dfaf5e..18ddbd36faf3 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -163,15 +163,28 @@ static const struct btf_kfunc_id_set bpf_mptcp_fmodre= t_set =3D { .set =3D &bpf_mptcp_fmodret_ids, }; =20 +__diag_push(); +__diag_ignore_all("-Wmissing-prototypes", + "kfuncs which will be used in BPF programs"); + +__bpf_kfunc struct mptcp_subflow_context * +bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned= int pos) +{ + if (pos >=3D MPTCP_SUBFLOWS_MAX) + return NULL; + return data->contexts[pos]; +} + __bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk) { return tcp_rtx_queue_empty(sk); } =20 +__diag_pop(); + 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_ID_FLAGS(func, mptcp_subflow_ctx_by_pos) +BTF_ID_FLAGS(func, bpf_mptcp_subflow_ctx_by_pos) BTF_ID_FLAGS(func, mptcp_subflow_active) BTF_ID_FLAGS(func, mptcp_set_timeout) BTF_ID_FLAGS(func, mptcp_wnd_end) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 12d70ce24843..ebf7566005c6 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -643,6 +643,8 @@ void mptcp_sock_graft(struct sock *sk, struct socket *p= arent); u64 mptcp_wnd_end(const struct mptcp_sock *msk); void mptcp_set_timeout(struct sock *sk); bool bpf_mptcp_subflow_queues_empty(struct sock *sk); +struct mptcp_subflow_context * +bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned= int pos); struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); void mptcp_cancel_work(struct sock *sk); @@ -674,10 +676,6 @@ 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); -void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); -struct mptcp_subflow_context * -mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 2ae3f33bd244..a7e1c10b1984 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -121,6 +121,26 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_= context *subflow, WRITE_ONCE(subflow->scheduled, scheduled); } =20 +static void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct mptcp_subflow_context *subflow; + int i =3D 0; + + mptcp_for_each_subflow(msk, subflow) { + if (i =3D=3D MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + mptcp_subflow_set_scheduled(subflow, false); + data->contexts[i++] =3D subflow; + } + data->subflows =3D i; + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i] =3D NULL; +} + int mptcp_sched_get_send(struct mptcp_sock *msk) { struct mptcp_subflow_context *subflow; @@ -147,6 +167,7 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) data.reinject =3D false; if (msk->sched =3D=3D &mptcp_sched_default || !msk->sched) return mptcp_sched_default_get_subflow(msk, &data); + mptcp_sched_data_set_contexts(msk, &data); return msk->sched->get_subflow(msk, &data); } =20 @@ -169,33 +190,6 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) data.reinject =3D true; if (msk->sched =3D=3D &mptcp_sched_default || !msk->sched) return mptcp_sched_default_get_subflow(msk, &data); + mptcp_sched_data_set_contexts(msk, &data); return msk->sched->get_subflow(msk, &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; - - mptcp_for_each_subflow(msk, subflow) { - if (i =3D=3D MPTCP_SUBFLOWS_MAX) { - pr_warn_once("too many subflows"); - break; - } - mptcp_subflow_set_scheduled(subflow, false); - data->contexts[i++] =3D subflow; - } - data->subflows =3D i; - - for (; i < MPTCP_SUBFLOWS_MAX; i++) - data->contexts[i] =3D NULL; -} - -struct mptcp_subflow_context * -mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos) -{ - if (pos >=3D MPTCP_SUBFLOWS_MAX) - return NULL; - return data->contexts[pos]; -} --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2059.outbound.protection.outlook.com [40.107.7.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75AE77E for ; Mon, 4 Sep 2023 09:39:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h1TRGpTskHY8KLSQHBclzILT4iVDxwG5f4T+6hIfy4/uX3GI4VyZtzSyn7ZHAcV5bOiPwIivnGfT78GMPTZOSrG01j8wOcWeiKxeDWTanjsBXf1Qba/LlD8fGkI6oGhIBhj6UM2TENOgtKLXDg6NY0h8qBipw0OJdUe3Q0jM7U1xGqFroR6h0JygvxEJj+U/DYqeZ0mmgvydlw9Ei6u4a7INi1CdyE0VYd+gZb/6fVlClgRfrCXWbv6YPlG+R/ZLzG9lYo1v3MsZ+7q+U0gL2zBb9PuvBCfhTZaT+dq9YY2IDP7bxioDFWWBX6UKO/qAgh/CnmFbOhOtX42y8PpXMg== 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=tk7Zm8GvHizeVmRaRIFyP/6ttyFVRxssFvdrVHvaPBU=; b=fnrfnxzypkqJDlErbenulTJIyIyYCTBDD5OQ4AtJoI30nRovE08vuZcGXdqPkrXvUarI7SUAuRmpar+cZSf3upIluHsc75lcXJsBC+xl0El6J3CtXS4Omyd0EpeC+aufVuoIoF7X8yWrTbhXwVzfoOm9kY+XnK0HVyaGqeUBuGLKj5Po/rhPJi1kTRnqjMuHseS0U9CzUusu/V3zbQdylBi9LaP1cqrb1ECs1KElKw1WLeUEmrFC1lV+541lHayqDvLjNqhh58CUAJBTxzdokwRAGGtYZG+aVdUoXmyg8/pbL0hba0E4WzLPMv/qHP/QbMlRgOvcKhwpBF+w/brdxA== 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=tk7Zm8GvHizeVmRaRIFyP/6ttyFVRxssFvdrVHvaPBU=; b=3LowjSZfvSBxEN5wQ4UiUHP8byzKUt51pHjrBbpRXnu/Nz1rLQuFvPJWBHtJOyrGgWnsLDifEON6ZbltMP29NEuDYqnDAwejXNhyMFWeTwfyH+93QNSu4Li+1IL68Ue5i37FalPlDRqOpwyOkhNV6UH5VkTIcJ4M2cNIkj6wRVqI7wZdGN5xvmAMIEvqTis6e5SEsaI2j7ynEVhg3QSIrKP4gEPTOxBYyp/inCVdHWAuqq6aMBenGi6ankPbazgzsqHHpiyOs/Nt9siSX4O824kv5TSDhOCwf2gOWzz+E6cxkRhvhjlxdbFFndIKwEBsueMjU8QeneJz1z/DZ/h9vA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:39:35 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:39:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 3/9] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Mon, 4 Sep 2023 17:39:22 +0800 Message-Id: <250c7f3417f35ac473f0d87072ba9792787da782.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYBP286CA0010.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:ce::22) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: 106726fb-ba46-497f-6e0a-08dbad2ad96a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1YRtyXlYn/X49cCT/EWPMLJHClI842iNvZr8YMUYoE8PRGSRwYnVRwIkU2jPdkDSP+6umP7ffGUrl1KR1ld5t86wwt4NsO2GLhqF6P/aslVXMCbeyK2CEk+7v8OMFW3IItptXkDqQ4wBdDlq/JF3sprTqzSQlaDYhrC5nk15lFfs0EABsI3PxWW7avQ+3ncz/8qAa0WwaFP5R5RUH0oN8kHhhUocnKnnsZ0FGk9WPbDFJmVWmdohP7kjmplbVDgPBPhnorMciDmsxj5/T6/Fga+3SJw+KlfZprkrwgexm1v+L0xFt7U6M2Cod7zHOTJW6R1Z+WBa8l7H1C6MkTazkjmGYYCj9uS7s1MQ9kkZ2qTiGMrOjGcJ9bU98efdqrJ68ops4V9b1kD1HFCFLLFDTmO4KLnGBb+K/BQESB+BSDUJyNV0VKjvjlzXiKmdnnRiy261rG+sD6HAV/RJtJTjCnHmWSmS1MYnBRucUfUf72HLjjMQ5TO+Ttbo5zdPH0ifcES3O/ZsoqU+mDAuzmEG/uewm4Z3Igl3jXa95jeDTCqEeXCh0d+gjMubUNIrvtMq X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cz/Dpwv0ykuE9/E48tJexRmqNmUuEOHHCBK4i5gz3Owluh2kvgcGYEI/Ndv7?= =?us-ascii?Q?mzjmj8e6phhw/u22Er+mBkNkHl5qfnX4fl0+W53J0HZjfc3+Jfpoyr4lQqd5?= =?us-ascii?Q?Q2vS9+BMxjYeOOKL4ZYpYvOoMltfnekChe4cIAOnZ9IMoxFP1QN1ZROfQVO4?= =?us-ascii?Q?qZ8PBpP3kOfpm4lhAlWlOpsuHCSCvNA2PWBJ6MoZHsMRFASrazCD7X5HJxZN?= =?us-ascii?Q?DopDFP+cQ+CNSI954hTp+cgtxEYr7vPq+71n2VN5zATEDR5IL/ei6aL3COSa?= =?us-ascii?Q?HGmZ7Mh5FBHMJ63Qs3wiur6HXmFdyG/Bi93aOZBsa6xsiXGK1TU71s9Pb7Hn?= =?us-ascii?Q?YJOaMLy46Eln2du91eLpkgQ3NLGLpsRwr+lpQ1WHbFYz3N3yJOhDo4bzDmvW?= =?us-ascii?Q?jzQ4z24qkECEhXpnKIPqbv6Cyr3nVTreDCgZnh0tQCbwdB6rhHHlI7Q0P/xH?= =?us-ascii?Q?xHagdaJAoFSiQpSyR7+2UFaaupnC/lHaGOv2qwhiPwSI4w37hUzcYk7Z+ZtU?= =?us-ascii?Q?2Lfc3kx0obopqf6OtAYdPV8QHuCeTZtrrDcPqnlcF/yNcim/h/pSJQg+1UG0?= =?us-ascii?Q?Zm7L+VfzpWt8jAbQzvkFYciEArgFKLzGNDzU9Km5DPbQUjeeDaZZ9D6GAZZO?= =?us-ascii?Q?w6u7Ifhm7Csln+dcU/1k9EodKtNZZfh7d16rF4tBPVy/zBe4ShrAaRUosNrw?= =?us-ascii?Q?05IMw7uiB10NrVXkymjXRxxNswFK+gb1LMawJsUZoWcI5t9UO4BwBlNkm1EZ?= =?us-ascii?Q?mmzD3fDxZlzP/JXfr0+GBT3vm/3sqEW4GTKgowbbvRd6ziqk0tWk7mmUlwAk?= =?us-ascii?Q?mMq9Hq4GU/IFsHQWbeD2HNaDRPj0NmITSV4f+S9RjnNYF2ccYdq1polhPNTT?= =?us-ascii?Q?nG0GLuBZelydeni+FFiGXh5eDHpdsVBe2hbSxFPPEhMikaa0xICgBhkjN5xC?= =?us-ascii?Q?RmEcJMiUsVRLBlcFQmuRB0hboTsWDAfsa9xXzs9L/YLndivDLw7C+efeXWsc?= =?us-ascii?Q?lEixVTK2jOghyIFJlXV6jtX6Fj0Qww+yEJaQeBWoBZxTSNXHsa0LHUQcgU4E?= =?us-ascii?Q?uGSO4/+B20QFmJBofjMMC1AlSE7i3k/fZjUaLXqEm6OmfBUyv5ZayzqGRaIN?= =?us-ascii?Q?DqgNHi4DojgZVgRydWbcZ9w18hrcNO5q5OqNXZZXYob6WGLgjtFsBQ8DwBmP?= =?us-ascii?Q?poSso7WKLjVxXRMqWrkJsZaJ11VN4HqE9B7l7t2yfK1Jcz0uTdO/ItDnb2kN?= =?us-ascii?Q?793JzKOq7FPU9gnC7IlHEvT2ec58A+Z8GLKifwkG+P0yh0tpcsxshxtbPigI?= =?us-ascii?Q?v1V4BxB44FqD9tI+UxyEavanbjFhUh097wFyNH2bLNJ8xOr9RXNUwbxEy1ou?= =?us-ascii?Q?V1mqzmRo2Yna+QHpKarJjeR1nil/SUN22w2zdxjU6jzjB9PCbztJUh/mLsvx?= =?us-ascii?Q?DRPNYT2kiNO3APCUBwNdkdX9Q3sHmSrN02mxTx29uRftSxxRgUgYgmy1EeEC?= =?us-ascii?Q?frYRVcXvwaTvwk56uZwRHDybY3K2I/5IXSglO+xaxoJftZPV6PSvtw+E3Hmd?= =?us-ascii?Q?RB/UGtDWx7lyf4A5XA/1onUZ2uFeAUDHFuMjlGRPTrS8Ccrlxuiq8lSQLYgm?= =?us-ascii?Q?UZxTnQt/1Ga1fqZILaxh0bheKg4O0VQvDpHENw9n3VBl?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 106726fb-ba46-497f-6e0a-08dbad2ad96a X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:39:35.4138 (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: 0QHu1y74rBx66ABTy2/sxq+yEK/oPhnF5PcPBuH32mJ/rBOzH7x6R8kH4OU4o2CBcD3CLw/3gnqW0XHJnJfLzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Add write acess to msk->snd_burst. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 18ddbd36faf3..b92c9014ac2c 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -18,8 +18,8 @@ =20 #ifdef CONFIG_BPF_JIT extern struct bpf_struct_ops bpf_mptcp_sched_ops; -static const struct btf_type *mptcp_sched_type __read_mostly; -static u32 mptcp_sched_id; +static const struct btf_type *mptcp_sock_type, *mptcp_subflow_type __read_= mostly; +static u32 mptcp_sock_id, mptcp_subflow_id; =20 static const struct bpf_func_proto * bpf_mptcp_sched_get_func_proto(enum bpf_func_id func_id, @@ -47,12 +47,15 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf= _verifier_log *log, size_t end; =20 t =3D btf_type_by_id(reg->btf, reg->btf_id); - if (t !=3D mptcp_sched_type) { - bpf_log(log, "only access to mptcp_subflow_context is supported\n"); + if (t !=3D mptcp_sock_type && t !=3D mptcp_subflow_type) { + bpf_log(log, "only access to mptcp sock or subflow is supported\n"); return -EACCES; } =20 switch (off) { + case offsetof(struct mptcp_sock, snd_burst): + end =3D offsetofend(struct mptcp_sock, snd_burst); + break; case offsetof(struct mptcp_subflow_context, scheduled): end =3D offsetofend(struct mptcp_subflow_context, scheduled); break; @@ -60,12 +63,14 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf= _verifier_log *log, end =3D offsetofend(struct mptcp_subflow_context, avg_pacing_rate); break; default: - bpf_log(log, "no write support to mptcp_subflow_context at off %d\n", of= f); + bpf_log(log, "no write support to %s at off %d\n", + t =3D=3D mptcp_sock_type ? "mptcp_sock" : "mptcp_subflow_context", off); return -EACCES; } =20 if (off + size > end) { - bpf_log(log, "access beyond mptcp_subflow_context at off %u size %u ende= d at %zu", + bpf_log(log, "access beyond %s at off %u size %u ended at %zu", + t =3D=3D mptcp_sock_type ? "mptcp_sock" : "mptcp_subflow_context", off, size, end); return -EACCES; } @@ -125,12 +130,19 @@ static int bpf_mptcp_sched_init(struct btf *btf) { s32 type_id; =20 + type_id =3D btf_find_by_name_kind(btf, "mptcp_sock", + BTF_KIND_STRUCT); + if (type_id < 0) + return -EINVAL; + mptcp_sock_id =3D type_id; + mptcp_sock_type =3D btf_type_by_id(btf, mptcp_sock_id); + type_id =3D btf_find_by_name_kind(btf, "mptcp_subflow_context", BTF_KIND_STRUCT); if (type_id < 0) return -EINVAL; - mptcp_sched_id =3D type_id; - mptcp_sched_type =3D btf_type_by_id(btf, mptcp_sched_id); + mptcp_subflow_id =3D type_id; + mptcp_subflow_type =3D btf_type_by_id(btf, mptcp_subflow_id); =20 return 0; } --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2075.outbound.protection.outlook.com [40.107.7.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 9A71D7E for ; Mon, 4 Sep 2023 09:39:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=emcLmXwoaJuiqd5gN3CvIkJL582+41FLgz7GjA6kxZnYZ7RpHPy0I7IcDh9zF55Qlyo5p3+w2YvIYAHn9YmKs5UFxcNoLyKX1azwtyCzBbWDLU3syDKHQVVvlXOwOIsTxhDyDrXB/kTLwlW74+iW9jph4x/wMn/49mkcoKW/EQhLiKFup9LlSsAD7Z9mgX+8J9SkdHAaRcSRGvWwXGIv6Fjsx9X6DLxmJGVFuLyCppHuoquPMBAVhgjKVFncOcwX1dptjrCc1mX1Ew4r1f+C5y6GJ/EhRhbxLdA/7Xp+3CaAbwNcz/UEqFSxT8yEVMUKpaYnt6utnZGr/gbi2M/Thw== 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=OvmKDzhXVlSVOzhIgE7tAribL+3XC6XK6HbcnqpVjkg=; b=JfWXzRK+fzVIJ8UqUL9a/vWqFTY9l0+BNXD8MeLCiD10qKkVbQ30jDY53j3Ukamrkv/9yTYmZTD+tZYhP53fmxUZCrlJ/v0xSfhSTnWVoH1jqXzI05G9cDGrWWqu5IcHR/wNGwgx6FaVPI0vt64d424J98Yi5j+6kBTT/NPsDHvzQ/0uHKlamkXsYdmDVRsV8vR3RierDVVryzE4z3gNYjYp7ZIxYa1b2xm6uZl1cM1S7bUBF5+VgnddydFQ0jJ4GWJZRfbkn5eMXWgdAdOJ2oN7oS/Q5op8ijxEyXCX2pvcKXn3p+p78vjgRkdjhZaBB56y49L1fLPCwPimX+8SkA== 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=OvmKDzhXVlSVOzhIgE7tAribL+3XC6XK6HbcnqpVjkg=; b=brB+ADfj0V78XDMFv19XSJ2CiwgrPFyhcSxyw/gxwiONrZT2UT3RZpoDy2daJt542lQmlGS19tnF75MGBB94EoYtcXbe+5To8Q2P8M8CjHPyP3wHJLLtgC22JamyLvy3FO8KtcbBbEV3I29z7Vo4HmVPHbY2PC0HHBnHv3Ed+Fglm8IWWKyHGco6d/XStuNtgdGjNs24NOHDJP0MTs5Rodws39/whxa44luFOIJEbQPdqECe2V4tOJXVP3/hc+yT5b/H/n1hkHhoqt9Eav88wUkwQG1iMSXaIwxZsVmLA+XpPFCTLLju85a+Q/uiEI4WWa4AGl55XQkUr0HwpXNYSw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:39:47 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:39:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 4/9] Squash to "selftests/bpf: Add mptcp sched structs" Date: Mon, 4 Sep 2023 17:39:23 +0800 Message-Id: <3cdd61879c23d5e02af0c2f5cec88430d00eedfa.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYBP286CA0009.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:ce::21) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: e94e5b48-1890-41e0-d64f-08dbad2ae068 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z03z0UShj0DofiRad3bH/JDc9yU1uhkAdX5LDZjiLzwcw4fukuTHzZ5LQIjgPMNFGg7hXQNqJxRxm6OL5PkHfvQIHRPddvB3sP5BKwrc60qALzK7GX4TpIb59ji7I0fku6kZb4KlG6YfR1XNytfh8Pf6SBGqC07X8iya+YicE+L4UAktn8odCGMqB+AF3eb22vShTOLw74TIIuaVmKTVuZx7IYvcXPWIL+ukuh3cOfeR++uer+vaAzNECpoiGSBQzGsqS86tS2ZVxVxmUCiKyY7buFrVsf3cGy9xQfa6NGbSF+ay70bf61g5RzUzyNUZX+wvRYrov+cbarkAfR+uUepZ71jp7IymrFdXK8BTUxgPhpVeE+ZHC9HZnY/jJaH50BEhsD7G045GSvAiC1a1Yev2TjJlHbBxLoKJylye8azrdjw0wc+8LreFgCVXUq+sxRmQ63pqxb5KaS9O5zypcbbsVW5Y13awQDO/QnB8Jjf1BT58yzBaZQo7lZ5zk6YnWvTlRtGo0Mo4RLj/Ad6wxwZSrxf2uLqj42XJEAqiajl6gcPWnakEsjF4S/vCjoaa X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oUbTxOuxYUbsf+d0WxzufV6u7abBvIJmPFuPVizujz1rEk39SKpWtX+wYvmd?= =?us-ascii?Q?ACgy9HQ1ZRbFnHG8Avx/SyG0XULBtFyZ6turQOzZ0HTXQ1WnaXskJIS6bjFY?= =?us-ascii?Q?LzntRI6uO+Z8YKyl3J2sN9cN3Tmk8wK1yBz7aS/wF8K0eqE2P7jlELo+QbHV?= =?us-ascii?Q?RinEoFDr7uIQ9kGW1fU/mFLH0d7c9pjwSOsOHVXdVUMveFjHPpglawUTbhzR?= =?us-ascii?Q?QJXq+oL+5vqVd3YO/wE5DWtBFhR0sv+/fd02btdZ9CraWq4/cICFegWIUqw7?= =?us-ascii?Q?2kIINf+QBp/yuwMDznOuf1mW3RwE0qkKsUeNxwL1vTM878VRcAvwEV5GAdcH?= =?us-ascii?Q?32bzKLhg8gnF0yfEx3QfAPwR2Fhv1Rh/0FV3EgIHQgjPm7iMKDK8i8CTZP5w?= =?us-ascii?Q?jRyOSB7510obzBUDK0Ze51hW5hlQEjbRP4osr7A28FCL6A2T1DDRZf2kEkWE?= =?us-ascii?Q?P6huH4s/mfU3icYd+T/U75huo0xLBZXB9QoW2hwt+LmchZrLoZbKfM7nsJtQ?= =?us-ascii?Q?GyoTGyqtmVBWSn0qqqE8pVFVsKRe17a7/SzwwNIWTqpRzYTC6JX0rE4r0hut?= =?us-ascii?Q?zUeyq5JxyW7F1t7w+PKsmJ6liGJA1mo2uobJ+H++Hi2ro/nOWXbzprlD4F9R?= =?us-ascii?Q?SyeV3jinLHG32Eo1QO7KjmO+NICPscv75LAZvZhdfMjyYf+JYZOqVxnR3iRO?= =?us-ascii?Q?7tYRmsmcNmVkJROi2lJzdW+rQJcm4p4ZfTcugD5qXj05ys/6zt/iapWXbt0/?= =?us-ascii?Q?7M+G8eEjRmsec+OTM0M8pwM5anQAE1LOUfAydvOxOs6uQDhD5rLDweAsr3p3?= =?us-ascii?Q?xHreIcKXPJt7PJWB9trUeQivfPG6oTeNUlPamownkML1Shm1uVjywTWkQWG/?= =?us-ascii?Q?Kb99NRDvKjoUX+Fvcp5k+0wkGP317tH4z7ozREcTnGL462QXRbVRuVl8NSL4?= =?us-ascii?Q?ZTpfKhB6gImxA8m2typLRCFTQ0+yDJaZHDNfIBHkrLzSAhj1BI3Sq8d5H7Me?= =?us-ascii?Q?4jPNHskMV7Hl5cx91WZDNLv8vY+rhRAS9l2EGzY9SqopFt+tmQVg1GxFkSEz?= =?us-ascii?Q?Wjj0vVUmhvLLfITZinPtwToZ7V7/jhTR3pPkrSv/w1Vlj9bhaPDe75ovjsBJ?= =?us-ascii?Q?5rhP6zROodYPDRQ8VGWmBZnNX6RASZS2BrSgaJNMkUVRUFs/PHb51bE2zXSA?= =?us-ascii?Q?t+LRkJ3ipdIiZNjl4k+RaPOpb4kNDymIetZOGQtpYKq19eWDgvSTivSv/1FY?= =?us-ascii?Q?D9btQ29gmq8F20ERf5ZRA0d1aLdUIW5baviTa0RJPK3rkx5PraDp0WRo7AKc?= =?us-ascii?Q?DTRCqoJCLrtxx7CU7rK3UbwIMWKNX73oXJEhoX4hh9mupBfWZHo4M760n7dE?= =?us-ascii?Q?o0ZGr0Ui2Ax8OH1lILyTWD/rn0eN+1/26NTxhLh9A3qmxgVxKRuB7v3TtXRV?= =?us-ascii?Q?aGsZAdXXVzosKlTLOGYcNQ9t4Ia7/TCMtP7XAKp2XWMB5PZRxXzNVo+0lzOT?= =?us-ascii?Q?cgje4yOYP9yUPFhAwatuXXo3rngKx334gUQvlb2LN/26wWq6HL1+QYupXDyM?= =?us-ascii?Q?d8QoFZMMzgb2oLKkkyjHHIJdM/BDpxpnCVYIWFIWUh595BUKdohg6Knpx5k8?= =?us-ascii?Q?YMQJ2txZRylQEuCuWycUsaLjc43cK5LGMRDFCuIt4IBA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e94e5b48-1890-41e0-d64f-08dbad2ae068 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:39:46.9120 (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: EhAxmcC9Rvc628lp2gVSU3tMrpoMEN+b3DxTjb7dZDQWnk5NWVtFWQISOyCEjNZMrw/pjsMXf0qH4gPby7I6ng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Update mptcp_sched_data_set_contexts and mptcp_subflow_ctx_by_pos. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index b687f91f2da8..36a53381a4c0 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -269,10 +269,8 @@ 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; extern struct mptcp_subflow_context * -mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos) __ksym; +bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned= int pos) __ksym; static __always_inline struct sock * mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) { --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2084.outbound.protection.outlook.com [40.107.7.84]) (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 8CEE87E for ; Mon, 4 Sep 2023 09:40:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PVxuGKL2lKBSK9tnWD93gXpyBbWWqDLKReDndIqtUk1n7Mp6MP2kuPUUow8ZVh+zjdraa3QT7pmVVgx+v/Q7ggOVRggNkfwXPnzSo45mNus9a/v9GScShamSVhWFyMzeOEvRgSihY8CaB7XZp5oK8mXwR7v94WNa9Kh72YPsol7lcu0hnUdAX6TqblVm5YiT3gtqwyTTmPbGq9MtVLWpxEFV91mE8tLWQtFnbz2Ds45ou/LfqVDW0mRN4zLg4EM66xmW3/BUYVSvkRxfvfxkdF6veY5mkJf+pa299QMhMHmWXBBWDHBCqKKCH+A/8f6irx6Oyv7694HjBOa5vW/yiQ== 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=DYqa9HZci0x/XAgz2JQmqwe8ZjdquiDBw+rW+RQ7sRw=; b=exK2lJT0OUETa6oaIXha/sdAY1b9UnU8fIe0kUXTkrH6EsFyWnIDsy0GKGKMzehYECouUDInNN+KfKeKcGEFfLs1+slt7Hh30Iw3XEuCPWngLTX98oWipqb3qA2TTTg58AymYjYVavsqGU+fUo1xnkaXZT2Bo9Z1L4zhdUi7BNqkM5oU2os0BIoh4lVyoqu4NI+ez8KsZs5WUO9UVhnaF1WuspIjDMYSsyWIKqMnmFmTnPblWlpcBBQ4vLgPqDdg2ChAIhXO5HmN86sAlxOFxHcs4w+YoGvtF1Ulnp376sTxvsVMWaSQRSNffll3IIwcIKy7QlaK4lhIDEreAOBNKQ== 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=DYqa9HZci0x/XAgz2JQmqwe8ZjdquiDBw+rW+RQ7sRw=; b=p0OKU9OcEvbTanFlNAymq9DnYn4Eb4w3w1d3V8EQSME0dLSDSGxVAp7Ig95BZI17kbm+t7FUoWDFYYoWvfCcKOjQU5NaIysOtHcQlcGgnW+lvZS/hgwvGU79UjMd9F+DDTRECpv8fYGM+D9KNJxOIkeKCIBvJekx2EFqlqRqGKLtJRzjFyrKEY2iksuo8RAGJ/tslXncv6IKURumI4rTuOIcQHeg6PLY5zo/eKHM3BgoAC8PdK+uofmwg97xL+/Ut8vNqRahJ5F7FFhNQQqL6A3a11/+7BEH0WK8B4EhQboQsvz4XrECdBNnZ1GZL48ahZC/xB3AWyyWQFHHmNowcg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:39:57 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:39:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 5/9] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Mon, 4 Sep 2023 17:39:24 +0800 Message-Id: <48b540697e7f8f68d5eb69d383bb719cd8111211.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0288.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: 575b6877-7381-4a0e-2165-08dbad2ae6c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cDIDzDu4zpn/PNs2XkjtFsMYnjXb3u+hW6CyailCn2/qfoR3luzPbxzt/4/5uCO3kJycYZwYtm/D5TbDxntg1zusm4r4WCglMbeL9kkzyTu6y1tcCxJMJt4/ibRiiTh0MeY6g1fue3D9m0dewFfZapdYBiQOvwi4UM8oqNdr6r4rPlJcQMCvc0pbxfSyUXrXiqVedf86/QSV0L6m8S5eOfhFTdOXjP6Kigx5ypRlxbuTja1XvZexqL+rH3pxVn7M/4X2IB71eKBiBja+VUT9Yj2/SzaChhX1wVAGM51wsJXPco3rmoAkyCKh31AnJzoP8hQMcLmiRk527xpD+uLGIKE7Sd2WvsbptgKWJ9UFSvyVSIUKvDGorIvicxZUsiXhewSJf+Zw3IeO4+cxmQnB4LzXcapsl8WK+WbnwB4yT1Z0kbbD5c2QqICvJTKbc93vB2oBgKDamLXK2PFmJtUMuwx3oVkYOB33P937KUCDfpmxrW1dVqU1FtLtM4w1Yfona9wBM5qg/63rE7jMWxd3o0p6ugEcaWt2mSbSfseznYXFtSf3IQJZzRxreia9UG/6 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(4744005)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZniP9gIu4y0n5o/KWxLjSZHV+sjxQAWnYlJcSFLOMOizeWH4EwDtIEQriFT5?= =?us-ascii?Q?fMFJ1mah6qz6PtAfYZCKACbT+s+fOOE1wUklBjYR3mtavYN7mgk+WwWA8nTy?= =?us-ascii?Q?kDl1EiqLbdOhsnMPrmMbKbY4G6GQAJ/Eg4bHpS1NezALr/ko8DtYTvtsUIs6?= =?us-ascii?Q?4SPHUPGYoNwJpxi86ID5vaakRZ7Lh7G31MZwBtFUeWZmDQxc3ti/iZGsnEf0?= =?us-ascii?Q?+BhTM9EewUvRt5jn4Lvkji9XIpwnKDKNmfOIW4dK7xuUI916B8vdRz4iEDAA?= =?us-ascii?Q?9cCXTiC6oLAcYqZLzwZJzeMOPT5V2dNvtijxs4xbwsvPryfL2JW9oLnNW/9N?= =?us-ascii?Q?PxCaX4TE+QVMvM3IWiySIw+7AFqvMQjDefxKdo6xJQvLm4c4XXRK8F91Spep?= =?us-ascii?Q?pbmoj+giTomzOaVPHQBGr7DjvauSjwZc4KYWYeNC8JwwW+i5rKMWIlb+NAay?= =?us-ascii?Q?Mlzp/1M6l+j4nFq0LrY7NvjAtiv+7JHziwGdcxrw845l00qZ0pnBKDAxbo/J?= =?us-ascii?Q?7zbW6HtMBlOZ1mG1NMG7rbLdr0Ru2vHCUZNfvxEzixjaZ8VqEwl9Pj5lIe7M?= =?us-ascii?Q?i5pdQqrxED/dzczaEAZ68yoaujI2/zBDG2m5eeFU7tQv8H6pn46DUBQPVtpP?= =?us-ascii?Q?OC2h1bt4JgcoY/F6eKCGTDgya+VRs/O+p7SWAQYFS4GUpbdj26+xpkjRQ8dI?= =?us-ascii?Q?ElbIL//Tk1C4ttUVFPLYJRippZjY/I0gJlHmX6DhJ+7vOtRbUQ/l+EQjwreX?= =?us-ascii?Q?OZ2hvkAjh/Rgt/YF0CGvcRyPcNN0dUowoPCPkKp3CY3MTi/+Vy8otPNRBG94?= =?us-ascii?Q?ruXAuK1FUjuzGql+G5LaVLm0Mm2lScbKcdzIRiaLFrKCeAykmVXqOwSry/71?= =?us-ascii?Q?M/0DV+BVEU12bpyY3PbbJPswvSJt6FRigOmkFVTN7sjvzw0NNo+ITkSccnWl?= =?us-ascii?Q?BoJ8PGx9TDIGc0q+POtAko+RaxzS0KmMtoNBuDs+Zl1gwFmxAjEuRfrHWP6b?= =?us-ascii?Q?xT7/O0nMhaqBBPaCC6fBQ8Tb1ZkJhUVYNS0Xf+ainUIHna4DDiL1ey9ctAqy?= =?us-ascii?Q?37pimQnobQ6Wz4Vm7jv8ErPM3LPcT/7/iRYO3NP3zIn1TgOrrvROHGfYqH3k?= =?us-ascii?Q?KE8uy5k3ehfqX4tNr6skeoyV46OoQr++qro3cFcxGNZ2fZmt3khRLGzFm1Ul?= =?us-ascii?Q?Ki8SllTaXgOWaIYfLn1DypEBhTmHWj3PRmLYsoljyUkn3fqsTC28h/2oHKsB?= =?us-ascii?Q?5rJsBmMderhh/kl9D9RIWoxUQ8X8NKfqxxWrEeZzd8uRE4gAqyflVvfZaB6A?= =?us-ascii?Q?gqMtB8DzB0hLUdV5T5GqfJAHSJZjDiUHhQDUkuXCTK1cgfYdYcRf3V/wv8JA?= =?us-ascii?Q?a8OYO3SOMbUBzuUJmBRWYAFdlqtQK1AS0p6irPNg3x5O0h7qYQxOQ2M1riNa?= =?us-ascii?Q?LxHFIxp0rkW1+eBwZlRz8a0GWoMr76mcpn5z3iNcFZxV3+Q+JeEtZcA6EHkF?= =?us-ascii?Q?gUwBbuBGtmzs9b09OA2dOBEjXLXgsotu2E6ABy5z4EmXclictNv1F0aPQnrq?= =?us-ascii?Q?BJWqVAvKv4I4mUtJc2e+cdSSwADrRsqe6nsLycNY2pDXlN6ZcShJVKvxs+xC?= =?us-ascii?Q?mCikA9/K2ntjqopgziUEvT4S8AaeFdaAFkfIiWnU3Win?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 575b6877-7381-4a0e-2165-08dbad2ae6c5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:39:57.5801 (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: 8XWt6N4avfv6SSvxwpL/F45bstcSnG8LerbQ9MS8XYZlOs2/QWWCwU8v1MlJ1ZrCNAfui0kxCzTJXY50/qCHJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Update mptcp_sched_data_set_contexts and mptcp_subflow_ctx_by_pos. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c index ae0eced5b91f..23a3e8e69e8f 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -19,8 +19,7 @@ void BPF_PROG(mptcp_sched_first_release, struct mptcp_soc= k *msk) int BPF_STRUCT_OPS(bpf_first_get_subflow, struct mptcp_sock *msk, struct mptcp_sched_data *data) { - mptcp_sched_data_set_contexts(msk, data); - mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, 0), true); + mptcp_subflow_set_scheduled(bpf_mptcp_subflow_ctx_by_pos(data, 0), true); return 0; } =20 --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2080.outbound.protection.outlook.com [40.107.7.80]) (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 7EA737E for ; Mon, 4 Sep 2023 09:40:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FtSQdoUG/TtIjIEDKwBtGWGEDfAmbmdy08VxIFgh0477QGhHdlfDbZjOVmbUFvpw4CBPjifOq1So7ioQXe4PVDmzca1uOmYjMcSPDwJSkpJVox9WOloLQ6XDlsplNpfjnVCWK+KpYAV3pl5NT214koONWW78ibki89aEFVhXSsSmZoxAooI87MwNBPKDdUAuyt44By5+DFtRWp52VbaRRRpsQr8/877p9XfViRjOtPiYW4KtSNQrKEAaBeT3dU8/+Wperu5CIOiYvANp5UaKUduvavzXvn6jB3QT+rKOnypD5xGLJtGJOjykCkcv6rzgrIcuyUUBwNLlW3TzRBk42Q== 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=MdP1NqKdWSbJ7zHbsBrj4GVOHNZH0mGBPLuWFbRAxI4=; b=OrjmulxON6h16cqHnwsjNQicOP/BmQmSHE8HQbax9VU8VcQc5XuIQn5refOa6NS5xITnGhtukgTXffa72vVdNS9fQC5vbyqnu2/PbJISJ6hpYiwIpByhk9bjeRIHVI2VS9iGS2wZfDM8mJ28Ckr1nJ5oGycsMirbrCH58LnXgAacKZzb3j3EzakwYGRkCErYEb8OoggL3dyt6JdRC2FVODncLptTG05HE2HkHvoNN9A2G17idszJJvA2YU1ioJ1Hmx9KoWoea86BLn5eUXFSGimfNlCIkcAXsg0g00f7/Iy+fMrl6K3M+TbpjrCDn9Ya55Tu5quAlSQdquD5BC2zOA== 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=MdP1NqKdWSbJ7zHbsBrj4GVOHNZH0mGBPLuWFbRAxI4=; b=a8Ov1YAXJfjiHdTvpIKAib1StMGG1cDmkMnt4fO6uvCE13tCe7/k3c2M5FyGgKPce5oHcm2XoWOet/Vf6V8lhExWszAzwHjY90GvJw+n0eMo6MgYeHJR0x+mejiJ0Bnwi1jAbi9aFc2nu7eMq6fwbbPzQ9e8NBUsjWkjVdtvdPbe5qSY1PGyixqjna99/Piju0zakehL9wEofNjQ7fVVR+x72WWNV64pii8xKi7zNMI70o1mxZBEVMvQ7Iv4VnZ3SAqrH8R8F4oZZ6hIaxyyUsxJ9Bj38bzkicDeZHjOy1AdybTvDhRerGkwh5S4ckGO15sE+RjACxs/smp7fa5keQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:40:08 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:40:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 6/9] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Mon, 4 Sep 2023 17:39:25 +0800 Message-Id: <77315648e218e021d96d8117fc11e52028a452a0.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0299.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::19) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: 86199977-2ee7-4438-a3f4-08dbad2aed5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bKtlyoHCibWbqOZqdR+MROk1Uww8D+KM999r7fwHrYC+XuM2efJ6sjD5PwGRK0qPosY2rQBY62CZ466kZlVw+zJxdwo4gxUSOcw6IzgnyAe3Q7xoRDA8V5hOKu682UI5+Npx9z1RlCut2wMRqDhq0Zw3ucYsYi1h73UimLW4FFiX1BiAJGqTVDrIx+Il4+mMXfBdD67MsrmqK13A2byvGKOgL3xeIDDX0tR7Nd9TIeYvV8tvJHTRCAV1yXmhTibDdrorAK9qxaXjebpZ4O2Pt09rjhbHxQUplfIIMKmmCabsS583f0XDxnSUEcnYLO8tBNPgrAP6IOa0i/drSxGT7/4stnvz7XG5DAiTCXazIG8LzkyMtUsSfz2KFu2ZUbuoLOgDigHCiFP1hmXv3Z8whZyNxBBkMUmeOetdppGeCbIaaEcqCfNHTTSRL5p2AzAfBlzNXqvhfPdWICD9ZOlNnIJW3K8zREvDqJ/mNpedXV3W84nrSh+xOA19FxN2nic/uumM89dd3zqxZIBVQRGY6j72iOxpVDSU/pU9KTJEk+NcCm9e1GTnmRhDZ5igb06B X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YFY/LV4G84NqbYxHVutufdRvMkD6NnQcORvA+4rhjhuKEoV/o/FRiol/Vwfn?= =?us-ascii?Q?mIP3XLa/FhNYasn0/LLrtYeEGDwcaIsv9cb3WTtAKVENZ73vZYrVjf5lPKW9?= =?us-ascii?Q?V05HtnnBDCm4gEvvpvAJoCqsOqoKpOftfjOMFbiUGTmOFM+lBp805ldFw9A1?= =?us-ascii?Q?AN1SgW3771XWpX5DYFK5lE8WR8KxZiYK1xBhBeZCHZ5Bnej4ZWN4gCUvg6PU?= =?us-ascii?Q?gAe2hhkyCkyKvvXDWu/KCi9YtpKo8g/LjnGK+YbTPRZ+E1CPzYb09jX1ZhfD?= =?us-ascii?Q?OiCZs5gpcPjk8dINoaU7FkiiB9+EH1VQ2TVxI/xMKNxqBiWwvSRAvFyzV3vz?= =?us-ascii?Q?09il7PhVypgVO9GC6rHd1jPtgAgQTHxgGPZMbOxrVcFzYzPmOkZ/tzcpi104?= =?us-ascii?Q?5ni1Pqgtmk1uZmW8z6fABgWnX32JrK/QDmNs2526f13709fNFovo81YmmyZp?= =?us-ascii?Q?YFE8XI6SKtmLMSJeiNdEp2i0oq+rqV33Vf+kiZ6ns/nrD/MeZNwIqgehJNUq?= =?us-ascii?Q?mpWz1SMRYyK5ZRm56jYaIR/O2Od47eDMnFH9FYivHQlf0A9k7NcqShFT9PW8?= =?us-ascii?Q?pmb4Dg++rShTOpKnv5rdkKq3vDTo9dzC7FKHaz/q3oCOZP8D8tFMCONsOtYX?= =?us-ascii?Q?bn2wqT7/xOjctrzDO7QUk1G6TeziYpAQeGFRJ9x+ieAFEB3avzXZyRL6wE4y?= =?us-ascii?Q?DDeN4vpHUGlJQVaXtTyZ2ZFZLXHt991IRk+I+XDEpz+gWciGIwWWHbqpAnMU?= =?us-ascii?Q?iuel0Zi19HNi8/klEvt1G9qxTtYcY9VBK1JjLAuU9dgvAqG5D3co9KuZPZ5z?= =?us-ascii?Q?8qJKCG5EYb1+aJFdKe2zoSTxpa+E7piDxEq1eUP27KIn+WbirR3eV/dCcjie?= =?us-ascii?Q?EbAfdBcsJWWtZ7WBxa3FsgLwVxrsIn1Ikz/WLSo40eb4HEvWAZ8ZJSpVxIAc?= =?us-ascii?Q?ex3GcAGBw86tGrz9nRQ0y4TS5Z1QC6JmMI/Jh6zD6/qNf4JF4NyUZw6yGiyK?= =?us-ascii?Q?CggR10pWiaPIFupGIjRgysjW0u3Vq+g4h9fGRLnq5eyBUAKMHFzO5oxJVZq4?= =?us-ascii?Q?RtsNOrAMblUEWiNyMWG5dTkt2e+uQTNr+pVqkfpb3Za2i2nVdaezpowO5Htr?= =?us-ascii?Q?miFn8qvedPujMN/x3jB/Le8IeD0q9Qd0g7Aov8PTJv+SkS0Y9EO/taxMYO7I?= =?us-ascii?Q?FSxaS37RKHjopHawYUayiLt6Ej0kxS89dInEeYYlFyTMM83ygq/J3IIHhuKa?= =?us-ascii?Q?9SlMzees6UfaeDOY5skmcrX30j+/LoXQsGnN4siT95hrYClnOSFo4+xsUF3O?= =?us-ascii?Q?xlVcbW0d46n8gDZXRa9ME0bVx53z1eliMxm2kpUTZ7NaNgd59vZrBzEkSJmO?= =?us-ascii?Q?F1HK9ZORxlKBuWsnxPuMowZmdJ/PGkIUsQzeIsS2/Rwyt9QJoS24Ik8W9qJX?= =?us-ascii?Q?5qgZwRbvhRzic1HBY4pmzv18mHZoiS5iw/hag2T/Egdfx96dtA+651VP14f2?= =?us-ascii?Q?VeVdCpBBl9uDj17kHkLSYaM0NOJq/I9QlUe0H8mN7xU80t54Tdosepeky77o?= =?us-ascii?Q?U+NHgEF/fxvrEdiv17iMxOruwMV7QSztFqQ7gDW30avW7CaaWZT8DxyVPtLX?= =?us-ascii?Q?R5xL8KpBntCjdrIlqXnSKmqJIrxXzgYGg9rNZIPLY5EY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86199977-2ee7-4438-a3f4-08dbad2aed5a X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:40:08.6237 (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: tv12vUT09h+jT7qa5T6jGiq5XFYH54y1hDetYyE+KiIbtP6a5jSAM7B8wvI7YeUCNW2FInRPaCactchZ5n5EPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Update mptcp_sched_data_set_contexts and mptcp_subflow_ctx_by_pos. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/tes= ting/selftests/bpf/progs/mptcp_bpf_bkup.c index 904186fb6750..bfd4644dd592 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -21,12 +21,10 @@ int BPF_STRUCT_OPS(bpf_bkup_get_subflow, struct mptcp_s= ock *msk, { int nr =3D -1; =20 - mptcp_sched_data_set_contexts(msk, data); - for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { struct mptcp_subflow_context *subflow; =20 - subflow =3D mptcp_subflow_ctx_by_pos(data, i); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, i); if (!subflow) break; =20 @@ -37,7 +35,7 @@ int BPF_STRUCT_OPS(bpf_bkup_get_subflow, struct mptcp_soc= k *msk, } =20 if (nr !=3D -1) { - mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, nr), true); + mptcp_subflow_set_scheduled(bpf_mptcp_subflow_ctx_by_pos(data, nr), true= ); return -1; } return 0; --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2049.outbound.protection.outlook.com [40.107.7.49]) (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 363FD7E for ; Mon, 4 Sep 2023 09:40:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lWc09Qus4OjeRu1DFWx2yWa9nZoeHFdWh1fPey1FgxHRP3y/CTQAfyOCmvmm6YM3qJ18TCmirra7sLc8qFpKu7fVB9P4mank9Pc7LIqi7IevYtqbZfZUDPiLl9GkshxPsbNRFPZIR/ta+Kotf2+lNVTbaljRcqJ6pULtBtTnWBJjnLrG29glcZBO7ASgNC7eGxDqf+MiZiRW94Cb0HbcEGSDp+SLDSXDqQSgNGWz/aSYbtMmRG+IVyc0l1joiUa96BlNeZJKc/+BMc5e13gwE89vr7H4t8T0S/elsifmc0wyXBj74z3fZwIa+P62xYgvLIDkWKQ6vXlTkW+5cwB/WQ== 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=bTxnsC9OtoWD844aAdlc4l/6YxnEHxQoxhA+tLThtJQ=; b=ZBAGKmSIU6WZ27cj5n6a/ysklOKyTRuk4auxuO9b87WuW1zj+c9Ww/PVrdDf3G+jKEpc1ONShfes8mP+Zgf8d2dBIaMQ4SDdYhE2Id6u9ScDypBQilDhNdaSpua7ob2cKTfh0G7LAe3yLPEXf4d9khP2sbD1W/LVzXipCugLE3evVPNxDigG6fC0g6ARxH9TfOZBCzufMFtaqMd5NNV2ksDw2Ml/BtX1O34atsPYBx+VyCo8tQl2RxZsqu98oI8H/EQmC6mfdla9ywMMWVL0WzRK5G7OhxrfLtiYDvFFTcyB/t924S+34jZhzNfuMZWJD0JhJ/PYre42bqj45EK5FQ== 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=bTxnsC9OtoWD844aAdlc4l/6YxnEHxQoxhA+tLThtJQ=; b=IlZHRJJlOIOlhnV99kNGA+jwX4LxXsggcY3Nd6LrJQZcfwengdglHJj9u9DBdsEJED6QBB+7mJ9X/IKiQ2Y51TCTcwZSXmzcrk99P9ZZpGfBOKcYYtaS3daFsJMKuOc3iteR5ewT7YEvoMoDSmLyISntpOSf6mOyMAa7yuNJS+ZElMnaGI7VO0lZ54d/P6nvjoqGh81I2B0mkvhQcdBlPSnKn1+N8LWTs3wzOwvYjCuWU5rHgK2nTN0s02zl7qnZfgYTRMzB01SxGN/tKOUfmiJLJ90wJL0Dzm/9t9tcPLa2eB7gTtXVZFdTNmTZXgeHvYzrGy+/UPVa/1b8HOAS4Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:40:18 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:40:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 7/9] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Mon, 4 Sep 2023 17:39:26 +0800 Message-Id: <34cdf57377b20cdd33473ae97b3ee71c4e4cea36.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0288.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: a88405b2-519e-427d-87c0-08dbad2af2c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wN+lJCJGLvzGJq2M8HkB47P50yd6RSLgDYZ6UaTXq4X0NR3ZhUMqCIZnWoqAB/TBmqD7hwrhph4e2rtSMyUHsvGASzw2YsHXkBedb61jJbgXWpB7vBNdUMwxLeO0zx9/AmSG1o4xNuhUgfa1qYm/Hu7ytxPMgcnNMfajDn6divofcqt/bbCcj/1g1YjxO6aFKhPAa3BNAU3N9lrLPROVzh7uAZanIQV/8e2p1xFfUnq9kGFLAbwHDn/ZPSS97+FJ2BQLjmiFzBAds0DwxF2YUODXKmXS2QH9vh17HevPYCJFYJHxh0bICGPk4INCnTk3AhKSU+lsYMQ/dRi800ElF91l1cgrRLfTM2Wnkvgx0GYbwIvyXPxw8lPgkcgs9bGH7I7MJxishnSo6fqsBBH7R8oOW4r370ZKM5KfQrt9ZEEh1VAIYolAhqQtnc8zuwz+5eZ0nu5ayG4agNweRjDBIl5Ziklji5+6m0Zh2gOXXKhXqSb+ltqhxHbvGIK+rlG3WGTaAEBdH8aypWlui8sAOyanjDJz02rc+MEWmUnA6NkvtYsfqanDP/4WRqDzvKwW X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?F7wJcDa3AtY29JKqoD++1w2xuG+lFvEEnAvXgQ5oqS0/A4C32QVQJCeWWAde?= =?us-ascii?Q?VLDHyn3tgS/c0r3xUH/Anku3yJUgInrWNUw5YIYHXOrncEhxUfidujmz5diQ?= =?us-ascii?Q?NxMfzVeFdHHIJkHqKlrQW4gasqSiFwROwo4SbrJe+70TTJcBuUIlyNh3FSKS?= =?us-ascii?Q?tFC5mPiU4KnUOY4LSJ9WPWyp1Y3DhkEy7/6NrWTJtXcZ7LSdebIrDZmwX7aE?= =?us-ascii?Q?v5toDpQ9RNOiged4YQVtppr+ACewYorGl23rrJdvIg8H3suH3Wce8Bcv6+3a?= =?us-ascii?Q?ejDy22UI8KJNzClUARM/Xm+z02hRJQGYBsXDb/1HNOC+sBxhzwyrruZojI5E?= =?us-ascii?Q?S1PHIfs0qhn0EbyBMgX0ZUwVfz7Hq6djmg/XkWup4MbSPAh9Wj2hyeE3qrMM?= =?us-ascii?Q?PxaYvwjbQ9iJFGgf9Ls7rWJe8yNQbZ9ijbiShXFSb9xtD53UGQZxDd4nhUsR?= =?us-ascii?Q?OCThy1pf3y+UL4PRnFsKe3iUxdX3dKYXl/Ch/rvixVNbCiFZpTbn/I/J0rAO?= =?us-ascii?Q?3YVhNoA4r0raGwYwtCvMljsJPTR/0JCGPBYn16ectGxq9snhG38BQVcnqpzH?= =?us-ascii?Q?EaBVMi+Q0AS7DDNz2ILfo5gXpHZbdpnn4dYduUCnu1s6D3NhoJR5DMqZ549N?= =?us-ascii?Q?LTbxI86Symm0Qq8+77sXFRAEeQXuCyLYZJD+XWYxTBImXdoft04kTWnoFjVR?= =?us-ascii?Q?vYjDv9AJeJN7dann09gCKNLovdaljqD9J2u2qlSY7Nu3rsi89PI/VMZFPSrR?= =?us-ascii?Q?MmBlpOhWLbPRSdFVdegiCOMTyUiieoBfugRqbUdwEICKQIg054nyt+JarFxO?= =?us-ascii?Q?3pubea4p86Q3U2450IxP/f41MrLpJPjtzBnyO5aFg9RG605ITtETVZO/WFIY?= =?us-ascii?Q?M/JH20P8r4sKFE8+h0aPFvVv165IWxati4NZpnQ4IMPpYZd/W0Ykml2j69a4?= =?us-ascii?Q?r5ym7BZ/92a1yO9TjUmXTeBpdbQRAojRerXUUXFYXxsaJT/nlpetU9mfP58V?= =?us-ascii?Q?vuwVEQkaCuVITy5yKpVAbYBjuDQ7G0YaRBAliuzXLZl8t660hB2DB5U1k7/A?= =?us-ascii?Q?0bGMrkunronX3lpFIXiqSGqJ8JGsxCPs5PGlHx6NbSr9WLTrYtuTpMAV+PsX?= =?us-ascii?Q?aygJOilCR9tWkpT1QfksjnjWDdZydAxVuV0G8ic+/xkCzzwjhl8yOqLGk3dD?= =?us-ascii?Q?Rg2iv4Gz1eQyyIJjzL+4QK29lgtZXH/pTRQWqNqGgsNfWMc/05uJgk+rWyux?= =?us-ascii?Q?Z2dYrYPJTFJTKd7w83RqRGkSZEVuEG4P9U/xvYTp8rwINnIBeR+UfMfWzaTx?= =?us-ascii?Q?KkKUYvEUYRnvYvCf+iYuq3ARvhJG2vj6tF26pUr2Uc3oPq6SYVWNiymAQvX1?= =?us-ascii?Q?yEJjwM4sUlwVuru4Sr6DdYxN6Nrl2OQ48rfB7pQFxpG8C4OsIal33zpTwrQ5?= =?us-ascii?Q?1ZqFhUMUCnOMfRDwNUsgEHgi49phs3JHEsOAuqqBv7i/fprDfK/kNSaoSUDO?= =?us-ascii?Q?r6pjvIiUKbi9FXfBXYk+TU3muCSal98ZylT1EYsOiIN3OlRMUbmvmEvj4QZx?= =?us-ascii?Q?HDtNelEkM53C5VWn0AImYGrJ2VYz92kSU9cV24aegP5zX6TJ9yoDyZKqFDv3?= =?us-ascii?Q?ekNr5paxjhmoNVUIkvKyiNCxVy6zKukcN/g7TFJ/1uGv?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a88405b2-519e-427d-87c0-08dbad2af2c8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:40:17.7692 (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: 3voi9DqjDBda7N7r0ne/KZyc9NxEZ7JTnPZ84+NKjStKrMSaULZMjCsy5F90gEzQcQMN5CU/cVdq8Nxqtb5E8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Update mptcp_sched_data_set_contexts and mptcp_subflow_ctx_by_pos. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c index 347ffad90860..39b7e1cfbbd5 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -45,15 +45,14 @@ int BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_soc= k *msk, =20 last_snd =3D ptr->last_snd; =20 - mptcp_sched_data_set_contexts(msk, data); - for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { - subflow =3D mptcp_subflow_ctx_by_pos(data, i); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, i); if (!last_snd || !subflow) break; =20 if (mptcp_subflow_tcp_sock(subflow) =3D=3D last_snd) { - if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !mptcp_subflow_ctx_by_pos(data, = i + 1)) + if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || + !bpf_mptcp_subflow_ctx_by_pos(data, i + 1)) break; =20 nr =3D i + 1; @@ -61,7 +60,7 @@ int BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock = *msk, } } =20 - subflow =3D mptcp_subflow_ctx_by_pos(data, nr); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, nr); if (!subflow) return -1; mptcp_subflow_set_scheduled(subflow, true); --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2048.outbound.protection.outlook.com [40.107.7.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 26ADD7E for ; Mon, 4 Sep 2023 09:40:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DLhPWMiKeB/G7jZeiH7iX7RjFk8aDt/4JdJ7vcpUKfEo2DQUmtFivwWAfaNbK2yPV0ESZYw1/c74/5h9ehVjNmfKjLuLLFL5DX5/RosXaD8XXH168jPUe+pJ6Rt9uuhKgXJ+ZPdeA9dOHtLV6u4iMqeKayySoiKA9RHimleA8S7kzmwJ+4xo1ie2LlFwR9qK41QQecUzoK7RreOFntFxQoXGJGKuk36LU1wxcnU3d6FH2DGcAPtvAtqSf8H80Yq6T1Fyc+XtxnBsz88E/utu8PoykpZB+n7nBvHi6hjg7Zv14Ve31bZl4Q091t33jTAP1KYbJ12hU9Yv8A5ZrlshCQ== 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=VQ55/f7UK6rn1dpkBFKFcwueq3VBXM9flqdDf1eB4M0=; b=Feq3Sxlhct0Ysyo4veJsVBb2QCG5Zw4j0ziuYzEFg8EySnUFHIBeRm6gh8YifFi5Cv1NfcIJuBUN36eLbQQRJlRF4k7MBQItGnRbXhQHjAoTEQvIjmJsD8KPi0nuJsTB7mNwunAS5yzbPHnAA9pQl3UUHBErKFbxp4xt01jTYe0yARiRLWz1iWREkQI/mHBpHfAC6ok1il0G3OFUWe4WdRRB42hVEAzv39d+OAW8rG30qDV9f08wPEur3SF1jpkfSi7NPiHUEKPq0/bSCW32AdePp6fmPDCcF/xqNUKay9ESm9YsHX+GYUZdQr3NQdg6KsK0Rpk2yHg6/3gminG8sQ== 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=VQ55/f7UK6rn1dpkBFKFcwueq3VBXM9flqdDf1eB4M0=; b=FX2qdVdjb1l6Wah4HWYgd8/ULLfG39XLIBW+k141Ku7dtvbQA7j6xwEggqhNiRCSKYt4iu2+ONhljcAg8/KcOH+mdu+ybuNf/C1G5JlOj0CF4IV9kE/1GHGd8EKb1uIx6Dcf8acVrCqqPIhhKlsN1q+0WTBAK/1hkjoaPrUlFS0N4yHwChE6/pZ2d9bksCZ8M4gXhEx8SnPkSCPzdQGM+hC5Q172X0M0BJqdY5CpwY9ZVnwygHWINeAwZHB96M0b4LbydglCpNhbmezEfu98M9HDwnOeh3OS10Fxl+Q94iYxAz2UCTDbcy9/lJewMX9Ftgm9pAD0UOoVuF9FjaeTIg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:40:29 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:40:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 8/9] Squash to "selftests/bpf: Add bpf_red scheduler" Date: Mon, 4 Sep 2023 17:39:27 +0800 Message-Id: <844b3b6b864b5dcd8f0fccd06735f33a6873ab29.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0295.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::10) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d1bd4f5-5e73-456e-16fc-08dbad2af9ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9i6ZhM571550ltO2ZzJXZVuGKVuJ4OKDBRetgWnmskryqzXj/JUyz6cSg+Lz+sYs+wIFlQ7aQmhhcTDcEQHdSLSOZL/TsVBiddx5e86WIr4LQirTANiJkLhaD4mqJxtPW2ok4bF8YJ83/lyKoDfGQqNv5iun2s+L4aBFG4D+gknR3l5iH3ACaCy6C2m5Grpzlyg+ualt4rBz3dH3DzCz/azsmBaJ46pSuGfxekJ5/CPpgTcfJ453Rb/ZRHFOpenkKiYcA4PXRZTLdZpsMxBtYup6pG5Iq56oo/Qx8hp/XThXnPp/RN4H5t3Odmgi/LJAuwDvImaJtI0563t/e+JRJ2jSDya5KIzbHSNPzwxb+U8HhNWoSRE0AJ1IUXB4kahQa9e6XaHx03HFlOAFUAq3j20ECcA4vhfif+5YspLwTnu+CsXS4t3gk3qG01KAhtakay24xzru7P4SwXjoVC+bG8PPsoPxtiTiwjYQP6e7WTwcPoeJ5zqGTKbGz//iLyljYfEuINYj6dnYY0a6k989MKrA+Sa7sB9HxudH+qsnBvGx00W6eEQg28URCA0mX/NB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pm4JZ+KmyYsipzMF/xN82fx9znr17QZv0oSjZulzvKDuFPOAMqvYOlnL+pZz?= =?us-ascii?Q?BOCazhwSzUo8svesltJ1I1UHkD9SbV4Srlz3eXpRRD9GzljUhKIovbQsKe5W?= =?us-ascii?Q?OgEDYUYyQm53ywdE5ZxJC4le961OFVGv5rVhzp0Ba2CkIukSgGYdv6jaHrXa?= =?us-ascii?Q?8tGsrnd0ftlR/dImPyorIGPHfdwN8IHFVLj/tm8O1UomF8JJOh9zitQGBXzq?= =?us-ascii?Q?6Y9xzdj416XXgdhNW/kqZqFpdKZ21XnPFEyMCv2JOd9m1K2/wDS1jjMptQKF?= =?us-ascii?Q?B+A94WE6tCYk2AciAKGyteJLgBdA62X8XMF8Son9kMGsZvG/WrXGGEN8jc+L?= =?us-ascii?Q?YwUkotzulKCyoXQtVvIlLtWzV39qMoxjmrbf6hpWyCBYII01veT9Z6AV2gRN?= =?us-ascii?Q?kKQxa8nfHuGCXNVCr7E9hlBxbMpo33Jzl+DR+rwy3LVIGln8qEYMI1H6bUKn?= =?us-ascii?Q?jcBfLGjC27Kuw9W3zFITYf2jOEJEy5U9nA7uByONv/UV2LOihooW2iwQDULG?= =?us-ascii?Q?qzoFRGbTcBJ9VIm1Fs29kNHzlWV0Dy0dax41nGJuLQNdk3y2BJ8BtCAlyKJD?= =?us-ascii?Q?U5qysXST7nAhXghq9oFieb71VzP/TxrzNuugJroCNN6KKDFkp5xqCJofCcyH?= =?us-ascii?Q?BxwaHdzRXvoV3AdkHOghZR/EHsOguQIEayfZM1fwnsnKnRf349FVPn+RBY8R?= =?us-ascii?Q?wHtze5G58gQaSohgcQQT+JODNfrobMIv5pGMe5d6PdNoFtBwjGXiRLWMaa+G?= =?us-ascii?Q?P7ZgSw8P6aZug+kcWtC3tQXEp/iPDnxL8yjPxgrCi+7j8p6p0k6uON63wZqU?= =?us-ascii?Q?4CBZRFRrPUGeg4Y4j49ceaU26LifIHZKdTbx10Jkj2RLB2qLsUJZODwmlOod?= =?us-ascii?Q?C4LYynrlvMDlM5D1i4m86Rcx7bL6iEim9ugaWWFvOd3BWcap1wY6DJ/Z53M8?= =?us-ascii?Q?guKbec5gPTSlrNqMGhahgL/SX+vcBf2qcIX8AIrare+8NY+Oi6IuVmv1WFGM?= =?us-ascii?Q?+OovcfuOcYBoaXjdCr7sQ/lo0c3bwpKe8ZY/BbiOWzh9h0fOOgdrcHEPFi7N?= =?us-ascii?Q?bnPjYH8fwDWI1RQXhe8Mownx921dxpAnwloOMH/VdDJ0Qhi/dVEqJtPq1hp4?= =?us-ascii?Q?I3yJXTJ1GDPpex5gmd7iNpWBsU8QtAnWfxpHIo9MmK++aE0Z7KusS98g6oqL?= =?us-ascii?Q?OO+q1gGpj5E7uzLcCG6ogy3o3mtp38sG2VBIEa0q4CSjf2YwGGpJqbwl8+nV?= =?us-ascii?Q?INe5K1oSrf4+HeD1Yj7U5u9131VG3VVkYGFNK268x1Ip2dNv71XxyH+CguG7?= =?us-ascii?Q?mG6d8e4eAr6pGoIIOQzd5OppR+dG+uWHVP9wWQCmKXmJfaPq90iWpaln0KG3?= =?us-ascii?Q?1miEieEgTVOgvPc/e9jDlGDm16+yd/IsvuUVQqfsbX8v6XiXV0CFYkQmjwIm?= =?us-ascii?Q?KnXuAj7XA1ne/y7go14Qg31qyzRiVaJnmyMdOYxFx2Xl1lvN5PxhyhUbjTr6?= =?us-ascii?Q?pThhKMudBXxTUbKzZkDbvDo2tK7rMjVCawzYegr4khQ47Ux8DlCBD/WjkkxN?= =?us-ascii?Q?rkcR/hJECFTY4+l0aL5LpE8flvlbtY0JZkhYhjTu/KQpGLUPWHnKuvoljsNE?= =?us-ascii?Q?hzWTG0aSDk1eVXMd88HcUGPQPpsSr0T9FRkWJcT2bGmz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d1bd4f5-5e73-456e-16fc-08dbad2af9ce X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:40:29.5405 (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: tSrUEyufsIa2X6qZahpEqfF3kqWuMChk45NN9+zHdI7iYrd1bwJUfx35SEFOdTKtW+Q9CZY/XyDROhvUrWr5MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Update mptcp_sched_data_set_contexts and mptcp_subflow_ctx_by_pos. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_red.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/test= ing/selftests/bpf/progs/mptcp_bpf_red.c index eeeec6250f64..a3f3e5ca5278 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -19,13 +19,11 @@ void BPF_PROG(mptcp_sched_red_release, struct mptcp_soc= k *msk) int BPF_STRUCT_OPS(bpf_red_get_subflow, struct mptcp_sock *msk, struct mptcp_sched_data *data) { - mptcp_sched_data_set_contexts(msk, data); - for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { - if (!mptcp_subflow_ctx_by_pos(data, i)) + if (!bpf_mptcp_subflow_ctx_by_pos(data, i)) break; =20 - mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, i), true); + mptcp_subflow_set_scheduled(bpf_mptcp_subflow_ctx_by_pos(data, i), true); } =20 return 0; --=20 2.35.3 From nobody Fri May 17 03:39:42 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2084.outbound.protection.outlook.com [40.107.7.84]) (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 439A47E for ; Mon, 4 Sep 2023 09:40:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O4UmHbvwNT/fc7Xs6EnbAR40nDo6uC4ITyF0Q1sNzl/MwRvriKyciwD2PnPpDpxWdWIddvEHRUIryr24lqECnc0BGT8il9QI07OFaiz/gIsZ/tqzaTYI953BlWjfleP8biQlibyJ4kQPkw9kdBIsOusV+QM+rDZPhtL3pWc9nEDnUk/+tQIbaQj3bD1JICBSpyHb20ZSLJyMfKgyJCGki14fJCuHbJfuhm4bUepuI6vSelXH4ZQ73Fu+YG6mkGaFg1aoEMRbSMTJwRre+eVzmjIKAPrhe8HH3nJFsgHbU9OlZ45g/adIlWl3UwIApOPnS+7cp4YKg6LWl+z4Pg/JJw== 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=QXCwTe6+YRvW0UnHaqQotfRMpMHy3KjM2V4plXFEg2Y=; b=dmlrZHP3smw6Jjy03g2np5xdIDjDQ6Mmpfs37UVXUlW3cPWiM/jChsbYkfAa1wHBBSlpSTBeclMEss/+d3JPhqyC/VN5IkLq9LO8b9EeAj4nEQTh+g/8fa/NusUetmviOrNBuO++K1n4zHjRT7PiWQiPcO1akb3Sy8nFmySj4mjzY5vE1LNUtaeRxWuU+B/15zBmRi0haw8Y1+hW5U1tcrK8xyJ7OyKqPoRSU0pGjjPMN6REkEi+nU+jfm/MAaL/u7kLSJOLxIBv38BBvLvz4XCZdpySXS7FcILqQihyplP0NDM29kbGkOclzX8sW1sOwZKemVTsJ9cA2LJMmp1xlQ== 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=QXCwTe6+YRvW0UnHaqQotfRMpMHy3KjM2V4plXFEg2Y=; b=AXZS8CbRHzM9VEPmHBhZhse5n/XZLC+MukLACO5g/LlZ2MG78LZm8Vge1TacnWUoDRc0c1wMB+Z365BG+T0JZjbtZkkZODd0oJvbAQ/8NBXnTEAEw5fmZHMXKCiVjUBx+0aNfMf/ewAXgzDT14M9ljP0G+FxddDxGpikivaro/IRZ8nJfQYVFA77PruTqkvTfANfCNnkdRiU+yFQvUI1BHEYwhDKxeMhwGmb9GHv+9AZXxJmJ6dptMDvvFguHHMT0EE0gXqe8eyGplMVrStwgH/U1VDFJCLOpT32/ZMsXDkQJ2uC3scyWPsZIwxqc9ak0l+duKNKMkFdgv0uLcm4jA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB7716.eurprd04.prod.outlook.com (2603:10a6:20b:280::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 09:40:41 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::a5bd:13d0:b0ae:59da%7]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 09:40:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 9/9] Squash to "selftests/bpf: Add bpf_burst scheduler" Date: Mon, 4 Sep 2023 17:39:28 +0800 Message-Id: <589720832d0408f7d3ff10a33e30b83217cf990a.1693820153.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0286.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::18) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|AM9PR04MB7716:EE_ X-MS-Office365-Filtering-Correlation-Id: 42b884a6-fab2-467b-cf10-08dbad2b00bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iT77OhRQq/vKtjrh75ttXzGHPtE4wGajMSZldPV2wapmLOfLzLeeXYtpiZF/ZUjlC2485P/aluIoh+YKIqKKtErstY2m2HTHZFIRXwu4QzES1snDjyJNPxWRE8NY0N9uaUUp8H0Hx6HNNhjPB9IpQmQ2QZp6Id/J2nwSATS0A+f6DRlsRTSWkJXLa0EsJNsaOzWQvmw5D3WyFKv5q1iDMUoNGXcvuriTH5ZeIvAJKa6CS80NuJiFW23IARuwGjYl6h0t15yt+L8mieJ4GXlW3CBPT3B0aEH/ofC3wHNfJOgLikTB6tN2ArXU7c273W6SeyrqK3OCxBy2Ut417XGFmPhz6C2YKhJVgjzDnPMpc0ApNy0xowL/yri8ufw9ANH+ZjhkXqFimkDIJCJ4slPJkI9T0UkESNWBVmrkxSnWFX3ML46RFGDb5lDVeY7p7Fs0ikiiDOmIdNfEX1KRqZL/ADDR3Sx3PbWkcN12uNyaiuzKGr9t0st6GEoABbp80MXJdTQObmYI0DhwgunCooG4OU+9BT4LaPPdVJcuZpCgtAscNOpxeQ5z0+n7y8oErsZN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(346002)(39860400002)(396003)(186009)(1800799009)(451199024)(41300700001)(6666004)(6506007)(6486002)(478600001)(38100700002)(83380400001)(2616005)(107886003)(6512007)(36756003)(2906002)(66556008)(316002)(66476007)(6916009)(86362001)(8936002)(66946007)(5660300002)(44832011)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i7MuRU/iJkZ0vGmuHfpkY6qdwkCt3QiuFq6tBuRQYtFv0IYOt0ej8AI06nLk?= =?us-ascii?Q?zVA/UrJYTYRd764r6sVKnhQnRDDgmrjgKRwMVgFOE2Z4tT7xULyYEqwuaCll?= =?us-ascii?Q?OLqBDQBTkkROJxmnouA1lpCLbmCi61i09Ww98fE4vQX27vJ7J1Hmfhlzgt2M?= =?us-ascii?Q?+HFwTyEUPk5FJjz3Lacfi5mtN+Tl4rURfwc2DgPp7gpZRI6VO61vfMLx5FPJ?= =?us-ascii?Q?e5Sg6WaSrrTtjkg4DG/tP7wTBGRbFx3CGwil577gjQB54tPBzooA13fAM7ds?= =?us-ascii?Q?D2lBbm508s2jdDJ698ThW2v3VZD4ZVIe9Q2m7kp7sZ2vJsrGydjiTaAYGKUz?= =?us-ascii?Q?6fuYNdw/5Xkeo1NwDpGHDSZT9UI7pFEiC/S3tlW3ybzjqeZCYuyClhibYzDf?= =?us-ascii?Q?GyOlsz+VndOZWxwcPUIh6P/lmudhvUKdR9QUPeGCNiVlVLu42w++YYT5Vd0x?= =?us-ascii?Q?6om+roMqhllM3DmlNXjFs0dVYbHC2Pg3WTY+FotE+vzlctbYuiNAPtlGoqnO?= =?us-ascii?Q?5+U6NqSXAsW15Fdw8Fjnk6J4ICFNNbnt8J6eMHDxKYh68DshepqGWXUbRMKb?= =?us-ascii?Q?C1pOaiYVH1RdyZp7mUTTxnrnVdUP0Gjd9cLz9WzFLnhr+duL8D3LDIa2QMSs?= =?us-ascii?Q?FlNY9k/4S8MOGlLIBQcirI6qiiTAKAtOkdmz26aZkDGfclUzRqW6cJljXfXE?= =?us-ascii?Q?gVwU0GyH/hgvgzeA/XPwFLGaY271yIJs10CbBsdBsWfOS5snpM5u/yHU/6++?= =?us-ascii?Q?+TD5fHduOgcf1HIWIDLAjpDVoYveKUcm5rO1dMoY+a6ZfJGQ2Nq8NuUfZRS3?= =?us-ascii?Q?+SvuYpvN2XGtVejy3boiMcCdE6ZEvUfhyacs2VYVl2v3DvcxCzhwgYccHhIU?= =?us-ascii?Q?2+gTNkLPznQK2am0O1LtvHwGJDWZAM8wE6JDVZBhVN4/rDwJpdd83at1IWma?= =?us-ascii?Q?5P2F2oytBZCY0UagOEXkfRBjQZZY0L0Abu5zu7U7bihjqcb9Z9M7XZHDeWyN?= =?us-ascii?Q?YsiLavhR01lLz9UZvYciB9zgWn+ayU+WMoxfJe5fO9C15t2zBXddAp80C4W0?= =?us-ascii?Q?eS/q+1bry6nkEKwPkyIyHpwDcjn5Iccn0Pbd41KYunnzFbpCSb2CjQj3vC+C?= =?us-ascii?Q?zvKBN2NhiakrcTTjdDdgQNKuf+1qOlOMFStdQdZ/OU1YhVhpnd/HZu5OgzwK?= =?us-ascii?Q?Pr3BlTGC7vWQ/wNzMT0qEwf0cZ7s4Sj4829ifSqypSoT+UiJ/if0200P3Rkc?= =?us-ascii?Q?W49oCnCa+c73+gDrq7wFCY7cwsYh/0e69GqqjUu88ROQUvTVncwpIpca9fuJ?= =?us-ascii?Q?sGTsGwtl0pc5dbc6wvwCx6OfuMwxTPEf+2aqN0J387or1uGuc0QQJTyX7vwt?= =?us-ascii?Q?iSWd1PG0X6Pl8mPu1jq5WP0KK0bhgCpma0Oozuw0DBWc2ww1+bd9Q8CmXGQb?= =?us-ascii?Q?FS3kfA16ODhr/s8h0eVcJTB4rTC6vjWPkkp8ZCoQ5Ljl7XUwveai9vjXvSFz?= =?us-ascii?Q?QXsTQlPZBGJXQkLFlVn9Ws6zVVpNYOpllbWiFpWd+n8K4ICg4h4K3s8VvyhY?= =?us-ascii?Q?2NJX+4W8V4W4qsy7fC1a5v1VwfPjU+UrV9pIwXSd9nNVsgKlep1UyxbQ2rm7?= =?us-ascii?Q?HPTnOlZ36dx7PYeWMIe3dmHHIAKnWTM4jb5Gql9TWZzwrVuD/xD5JJB3sw91?= =?us-ascii?Q?VY1JXQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42b884a6-fab2-467b-cf10-08dbad2b00bb X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 09:40:41.3592 (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: TTEMRy5cg2FRHWLjRu6Maq1XfKbDAnFAJ/etRpXhulfISIGXGReTubeEAadfErWtVopnEAEHkn0JcB0Z60XzWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7716 Content-Type: text/plain; charset="utf-8" Update mptcp_sched_data_set_contexts and mptcp_subflow_ctx_by_pos. Store burst in msk->snd_burst instead of in sk_storage. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 + .../selftests/bpf/progs/mptcp_bpf_burst.c | 30 ++++--------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 36a53381a4c0..6b43845f1234 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -262,6 +262,7 @@ struct mptcp_sock { struct inet_connection_sock sk; =20 __u64 snd_nxt; + int snd_burst; __u32 token; struct sock *first; char ca_name[TCP_CA_NAME_MAX]; diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_burst.c index b6a8a051741d..b3c811564866 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c @@ -7,17 +7,6 @@ =20 char _license[] SEC("license") =3D "GPL"; =20 -struct mptcp_burst_storage { - int snd_burst; -}; - -struct { - __uint(type, BPF_MAP_TYPE_SK_STORAGE); - __uint(map_flags, BPF_F_NO_PREALLOC); - __type(key, int); - __type(value, struct mptcp_burst_storage); -} mptcp_burst_map SEC(".maps"); - #define MPTCP_SEND_BURST_SIZE 65428 =20 struct subflow_send_info { @@ -69,14 +58,11 @@ static __always_inline bool sk_stream_memory_free(const= struct sock *sk) SEC("struct_ops/mptcp_sched_burst_init") void BPF_PROG(mptcp_sched_burst_init, struct mptcp_sock *msk) { - bpf_sk_storage_get(&mptcp_burst_map, msk, 0, - BPF_LOCAL_STORAGE_GET_F_CREATE); } =20 SEC("struct_ops/mptcp_sched_burst_release") void BPF_PROG(mptcp_sched_burst_release, struct mptcp_sock *msk) { - bpf_sk_storage_delete(&mptcp_burst_map, msk); } =20 static int bpf_burst_get_send(struct mptcp_sock *msk, @@ -85,7 +71,6 @@ static int bpf_burst_get_send(struct mptcp_sock *msk, struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; struct sock *sk =3D (struct sock *)msk; - struct mptcp_burst_storage *ptr; __u32 pace, burst, wmem; __u64 linger_time; struct sock *ssk; @@ -98,7 +83,7 @@ static int bpf_burst_get_send(struct mptcp_sock *msk, } =20 for (i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { - subflow =3D mptcp_subflow_ctx_by_pos(data, i); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, i); if (!subflow) break; =20 @@ -127,7 +112,7 @@ static int bpf_burst_get_send(struct mptcp_sock *msk, if (send_info[SSK_MODE_ACTIVE].subflow_id =3D=3D MPTCP_SUBFLOWS_MAX) send_info[SSK_MODE_ACTIVE].subflow_id =3D send_info[SSK_MODE_BACKUP].sub= flow_id; =20 - subflow =3D mptcp_subflow_ctx_by_pos(data, send_info[SSK_MODE_ACTIVE].sub= flow_id); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, send_info[SSK_MODE_ACTIVE]= .subflow_id); if (!subflow) return -1; ssk =3D mptcp_subflow_tcp_sock(subflow); @@ -142,10 +127,7 @@ static int bpf_burst_get_send(struct mptcp_sock *msk, subflow->avg_pacing_rate =3D div_u64((__u64)subflow->avg_pacing_rate * wm= em + ssk->sk_pacing_rate * burst, burst + wmem); - ptr =3D bpf_sk_storage_get(&mptcp_burst_map, msk, 0, - BPF_LOCAL_STORAGE_GET_F_CREATE); - if (ptr) - ptr->snd_burst =3D burst; + msk->snd_burst =3D burst; =20 out: mptcp_subflow_set_scheduled(subflow, true); @@ -161,7 +143,7 @@ static int bpf_burst_get_retrans(struct mptcp_sock *msk, struct sock *ssk; =20 for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { - subflow =3D mptcp_subflow_ctx_by_pos(data, i); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, i); if (!subflow) break; =20 @@ -193,7 +175,7 @@ static int bpf_burst_get_retrans(struct mptcp_sock *msk, subflow_id =3D min_stale_count > 1 ? backup : MPTCP_SUBFLOWS_MAX; =20 out: - subflow =3D mptcp_subflow_ctx_by_pos(data, subflow_id); + subflow =3D bpf_mptcp_subflow_ctx_by_pos(data, subflow_id); if (!subflow) return -1; mptcp_subflow_set_scheduled(subflow, true); @@ -203,8 +185,6 @@ static int bpf_burst_get_retrans(struct mptcp_sock *msk, int BPF_STRUCT_OPS(bpf_burst_get_subflow, struct mptcp_sock *msk, struct mptcp_sched_data *data) { - mptcp_sched_data_set_contexts(msk, data); - if (data->reinject) return bpf_burst_get_retrans(msk, data); return bpf_burst_get_send(msk, data); --=20 2.35.3