From nobody Sun Feb 8 00:49:34 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010055.outbound.protection.outlook.com [52.101.193.55]) (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 DA5AE34A3B0; Mon, 12 Jan 2026 09:41:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768210868; cv=fail; b=BiAY0Kuty9DQWahfGJExePQ+6xqoPi8d7z3DfIGL+LRPg73nsYHyHIbomdVBFof10WhoP012ahyxyVS0RBntLkOimmo2Js8h7tttZ4pUs9+myTRx9iW0bBv1u79Cs5GWXkDCiao7uDL4HDqD9XhmvqnblEXuOEsWKAyUm8U+ABs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768210868; c=relaxed/simple; bh=9aIipBAdtyPtbQpagEBpyWd3DLCS18Xv17wmZg4x/MM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hZzVOCscDQflFihk120zRjSThIJb0Wymr6Mr1z7vCa2/wHt3ej0ZNiHlmmDxfy5nEQI7zRjwjTMRMi6ciGnOSYr/D77PPojo3LMJoIvr/zWfjIWegGLb4WD/f/hYRz6YEg8Z4N/IQYJ4RahL35JCzs7Vl9vNbuMv4BY/tH2p3uI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=npaaYKEe; arc=fail smtp.client-ip=52.101.193.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="npaaYKEe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mViMyWnwN4prLAJH5iDE57Wi3t3oKgYMLzzS5TdQjv8Fttjcoxq6TptDU89BGStwpJA+J4A4CL/+J02DXLNwRFSWgueb8N//xuS5lnH7rrfJf8YLAChEB3pIc1XuIUVv0QKkj+3DyKI/SMoPExL9XutYfXKxwPHUW16TB4hgTnk5dxOxAGElbfl69Q/2ChBHJaWXppZzXZsxMnpL6J0jMGNKSecDlxRGDAeV9/IyE2Pgd959IkRfoeTFCQem9Rt7+HcapkheF43fdjvdKgy/YxIesh2ifa5WrYncYP9SpLLoKE2xFy780QTzO8W6QOfraxTgN015mLPHXg3Pxq9fsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=KGCt8mM+YwkUTVeCS1OtRC8AgjoybR+ed1L2JTGtSgE=; b=RLzQlgxaIQ7YuOcT+LQ1gl+Yp8f6VBxEu1OQygIRavydO5AzCT8rh1XZ5HlguHTqruh2V8o+L0ReXow/asG+ek/XbnqzzbOs7mG9xge8cQ0Z1PjdBIbEhXoxhOxnl3e0WiWBVYqkexENERk6RPRX1xRScOPX16YoLxshl0X0akIifqFGGqSZquSmHJLKBMo4sBw6tHGNue0B2VvwuhJDf+9XVa3/O2GAkQ+5YdScXdQAIr+fGuYS5eccPJzuvI+MS3qW/9s5ovZn/TADNIxhiO4o4tq6JaLqs0KADgBsbO/fdBFePUC0Yb8N80E2kgnbstOYdPccV54jUEZQpuBLDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=google.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KGCt8mM+YwkUTVeCS1OtRC8AgjoybR+ed1L2JTGtSgE=; b=npaaYKEeqiAt1uug3JxdnY4sjQSJaJw1tSR9l3Vn7vsT3jyMAQTjSfiDpDmtwdMRn4lCtEtnxiilvq/RfAA0GG4MiOXxX+GbNKbxW1BYQDCcq7vvZnJ8ClazlwIA+maffv8zh+5mJnzYmFJ37Sw4kvy5dk+HggtPTPq6rGTvCHaSpw5U34z0viYDf/mWpTQ+3556YDiSEuDfzzrPZBWnE5I6776sw+6ZPmLprttbZr+tDlIvrTEloeYmDDO8nLWshYH2rnIXfk2kA2FnDD8eeWNBpoTi3mog8dBan4LG0zgKcEN0fjLYXVMQ+6C+LZil0g1UmK3VlmAOg5AKbAmoSw== Received: from BL1PR13CA0323.namprd13.prod.outlook.com (2603:10b6:208:2c1::28) by CYXPR12MB9318.namprd12.prod.outlook.com (2603:10b6:930:de::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9499.6; Mon, 12 Jan 2026 09:41:02 +0000 Received: from BL02EPF00021F6F.namprd02.prod.outlook.com (2603:10b6:208:2c1:cafe::d6) by BL1PR13CA0323.outlook.office365.com (2603:10b6:208:2c1::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.4 via Frontend Transport; Mon, 12 Jan 2026 09:40:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF00021F6F.mail.protection.outlook.com (10.167.249.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.1 via Frontend Transport; Mon, 12 Jan 2026 09:41:01 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 12 Jan 2026 01:40:43 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 12 Jan 2026 01:40:43 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Mon, 12 Jan 2026 01:40:39 -0800 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , Moshe Shemesh , Yevgeny Kliteynik Subject: [PATCH net-next 1/3] net/mlx5: fs, factor out flow counter bulk init Date: Mon, 12 Jan 2026 11:40:23 +0200 Message-ID: <1768210825-1598472-2-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1768210825-1598472-1-git-send-email-tariqt@nvidia.com> References: <1768210825-1598472-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00021F6F:EE_|CYXPR12MB9318:EE_ X-MS-Office365-Filtering-Correlation-Id: 02860cbd-657f-409e-2720-08de51beb2b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MWLQFLqKsFnh7JfE/CyRohK7l8aVwhqPdDrbtiKz0NlQZYWXiGmozGUnF3nt?= =?us-ascii?Q?sTaijpVBYgX4MHO2aQguWczJPVIq7gDpcjIf4tmoMrlwXmervoIXc5KhEISw?= =?us-ascii?Q?6toi3n/DM/w8ZeUWwe8SYA+lI2CkOUY7Qaa/TKSruXQVLXiIcqJAm+FyP5Pc?= =?us-ascii?Q?gIEveOf5q/PtbhU+HjFeVvf6LzgPwpR2Ev9MVFdXmvUql3jYivwWf+uL76kb?= =?us-ascii?Q?be9tMZCRdDDlrtq68FjiHy2sf9rtrJMmYTV7eJDjNfSPNU6sX5d1+sVIsFh+?= =?us-ascii?Q?5sJeLMcBigsoa4bIJl00COYGZIzLZXNmFL//cJBm83cH7ctgQ/SQcV2TMwFz?= =?us-ascii?Q?+THZixNW8vs9RNBi0wweuNMKZSI3+GFKkPrS4k2ZwwDItdyx3OqzpY/kNer/?= =?us-ascii?Q?OvcwshjyH2ZPHZ1DaK3BTaoudc0D380iwJz39sRVGj68QK/2WRTAIL8BqnKr?= =?us-ascii?Q?qEgpAHB1asLjjqWDJVmUnK4hOwotApxMYF7yxU8F4HM4PIs920fNtqCz53zd?= =?us-ascii?Q?h6m8dftxiXa9F12kH1+uGBFuHD3As7JV8GsvUtgZk7IcEQZWBdq/1qYyF0IA?= =?us-ascii?Q?XoBDbJTbMrf5EK6ipzLcOTqhbyD20wdrgF8x8bCMfBSXwFppISsf4l1Bbiuv?= =?us-ascii?Q?aO42WOQ4amI5CWFUSk8Ov7Bmo9CLZbTKEqzP2OqX9ItyOP5H+d+BpoTwWWlw?= =?us-ascii?Q?bsk+SY9DJ+mGi/YSirgLexKvyOUdTNvpjm22ABZFATMFerVivoZXWtRwokAw?= =?us-ascii?Q?3KxWqYC2ZN0e+tyYGAGxYz8D2lCme5i6F5SP5aEXyJF3S4E4K0heHK+9eVU6?= =?us-ascii?Q?MiV8Hpkrh0n71kXFIN7j07s4YikqaycGJMToQkwZT6/RDMxLmj184UuRoiMP?= =?us-ascii?Q?n4zMO9Ss3l7HQ1tpLTvgti71GS8SuvyJlEOlpwHZ99/MV4YnM/zXeI+f+LNr?= =?us-ascii?Q?jMh43Iv9YYnF4K+v7Zi/bXIdeAPFMYlYlO5JDKD3pfsWWmaldi+Y5QshLnDv?= =?us-ascii?Q?mZzRyjcu7wO3ts5oNT/RMnV8abYBV5P8nritvxSBrDZLq/0dYy8FalBdM+hR?= =?us-ascii?Q?LaTSwMKbMWkyLWyCtxSLBxu7bHJpSrpiLO5+z6/KUhJGvlVjv0jtBjJW4grV?= =?us-ascii?Q?ERCC2C8396PJwPMfapNh/yDZkNyHfxhi2vh01liQ/ByCwJnUTxEzejsqaIeg?= =?us-ascii?Q?hpL2gfGZcehY13lmGGemapXOhKMcVFgEc1y+QDgHTW29wu0pml1vrj0P+eiU?= =?us-ascii?Q?jV0XTO/23XytsztHSzSqt2cpPlca3OqVXs1yTUSTomFGAStkEog2UbGGURrj?= =?us-ascii?Q?xVUkJvBrPOCb7HGIL7uGEzDfxVxIRy0l6/89wCZ03F5kJ9BbPXX3PHJIp1OU?= =?us-ascii?Q?rsyy9YM97JB2KXNgNhTv9k/WeDOQ9k4BNwPvE/15YuEqDu27ckYXgC+SK0lD?= =?us-ascii?Q?McVQDPZCkUJf0NWblheHsWqePTFN7hezg2QVXOWXwSxwa5jQpBpNCIBymPA4?= =?us-ascii?Q?9YHf/G5tOl3GsU4YqCzgRQMJwJSyGRE7cZZRKRWak8sHUDgef4ph1bG2ybaS?= =?us-ascii?Q?keYo3SAQutct21Vk+Q8=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2026 09:41:01.5027 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02860cbd-657f-409e-2720-08de51beb2b6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F6F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9318 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mark Bloch Add mlx5_fc_bulk_init() to handle bulk initialization of flow counters. This change does not alter any logic, but refactors the code to remove duplicate initialization logic by centralizing it in a single function. Signed-off-by: Mark Bloch Signed-off-by: Moshe Shemesh Reviewed-by: Yevgeny Kliteynik Signed-off-by: Tariq Toukan --- .../ethernet/mellanox/mlx5/core/fs_counters.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/driver= s/net/ethernet/mellanox/mlx5/core/fs_counters.c index 83001eda3884..e14570a3d492 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c @@ -421,6 +421,13 @@ static void mlx5_fc_init(struct mlx5_fc *counter, stru= ct mlx5_fc_bulk *bulk, counter->id =3D id; } =20 +static void mlx5_fc_bulk_init(struct mlx5_fc_bulk *fc_bulk, u32 base_id) +{ + fc_bulk->base_id =3D base_id; + refcount_set(&fc_bulk->hws_data.hws_action_refcount, 0); + mutex_init(&fc_bulk->hws_data.lock); +} + u32 mlx5_fc_get_base_id(struct mlx5_fc *counter) { return counter->bulk->base_id; @@ -447,12 +454,11 @@ static struct mlx5_fs_bulk *mlx5_fc_bulk_create(struc= t mlx5_core_dev *dev, =20 if (mlx5_cmd_fc_bulk_alloc(dev, alloc_bitmask, &base_id)) goto fs_bulk_cleanup; - fc_bulk->base_id =3D base_id; + + mlx5_fc_bulk_init(fc_bulk, base_id); for (i =3D 0; i < bulk_len; i++) mlx5_fc_init(&fc_bulk->fcs[i], fc_bulk, base_id + i); =20 - refcount_set(&fc_bulk->hws_data.hws_action_refcount, 0); - mutex_init(&fc_bulk->hws_data.lock); return &fc_bulk->fs_bulk; =20 fs_bulk_cleanup: @@ -560,10 +566,8 @@ mlx5_fc_local_create(u32 counter_id, u32 offset, u32 b= ulk_size) =20 counter->type =3D MLX5_FC_TYPE_LOCAL; counter->id =3D counter_id; - fc_bulk->base_id =3D counter_id - offset; fc_bulk->fs_bulk.bulk_len =3D bulk_size; - refcount_set(&fc_bulk->hws_data.hws_action_refcount, 0); - mutex_init(&fc_bulk->hws_data.lock); + mlx5_fc_bulk_init(fc_bulk, counter_id - offset); counter->bulk =3D fc_bulk; refcount_set(&counter->fc_local_refcount, 1); return counter; --=20 2.31.1 From nobody Sun Feb 8 00:49:34 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010001.outbound.protection.outlook.com [52.101.193.1]) (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 779DB34AB09; Mon, 12 Jan 2026 09:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.1 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768210880; cv=fail; b=JEJ6cP6pw9urld1cfL/KEQvqF1DmxM4rGvkZgyO3DZdY2PRJdU99HhZHp1YOyrywG7SgasmO1c8V0qgzM/UkVoEBe83xcaHL7plgxbDyrQXeEVU5Lf6jlTVlSueya5WjpMKYpAAmRJsVq6E1oLKHgSW51EmuwAE64V6cZBdPdbs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768210880; c=relaxed/simple; bh=M0dC8ftDo2ys1vt7Cl/ni4LEncLNXRMoo4qs/zB83WA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XgiqbkQGc29zxafVt8DostgA2LaKurfuewnws9QnfmJ54fD6m9AD8IvMSIBHMe/8BburXWvsW7FW820A3vKLLl89StTYtZNarHxxI0gNNqMZ6NgfgmHwyPH7d5kefxB2G+8JNW2RFLdhPpmch4KESBpoiKJS/E0w0oEsz7nJVSE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=aF3J+lwW; arc=fail smtp.client-ip=52.101.193.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="aF3J+lwW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PWgKb9GA1G6bjyDbjK+itjau7H+dHP4X7yKxPz2FGin4Sh8Al6VaTrsJIjNqPVmFMaKUn3TURml4wGczvejaTOLqRt2j2qVXYJ9QVutbcQLNndNfS1K9Ub7c9CkAVNppjaqaGP7gFCRYOCS7HjYfX3Bs0dm6O7xs22CRW463x8AimNpC+fyGsGZXk8a9yjU7SGtEVvJXQ3MKwxxzyOQ02lxEFOChuN5aSmMA1EnVWXwbqfy46Cuya+r05aDer7FLvUE+3jt/kKnYWFieI9WbReegWZzw7l3e7AbXna9yxI/dgMzIkIwGoGrC3aoUzRj5hIaSenXDox47FPXydWarzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ANjacQbri3PxJY8MiZJSO5BRqI0rp0n5/6XuLJyCEKU=; b=RZFVKzmhKDFeK91sTaxFgooZkkKLc+zcZMP8zDYP3SV1M+GY0sP0Z47Pm82taPVHBQR5WLVJzdJu4vwB1xRYPhpw94kmoQWDDQ+1v+J6xD2bYN/NNMm9cdWR5VnXVrFKYWcWzk8jYe3ZQAXHFYTZg3RgrhpGiXduDkpke41iUUQyyrIjYp7sX2tLqoIBr4i3pgoyWJFmFs7KSQeT1APdVsiGrstvyjw0H2/6BEyTll+UTBHR5hfJgS5f7gc4JUOLHsBA115DeHIa66DL/ZzGYlY8UkK/+d+OkKM9/oWSW+Ysm95gRnoXRe/KFV5GBZG/7e5DG7k/lcgO9GJvjUP3bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=google.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ANjacQbri3PxJY8MiZJSO5BRqI0rp0n5/6XuLJyCEKU=; b=aF3J+lwWbb9SXX14UVvlpY73Ils4UX+cR4RgCSSIKOLsrYsRq7+jcp/0+MyB7hzbCbjgNWKIHlBKzv8A0KC0glCZuSCUvMtmMNprHe6NERHLY8fkkpSx4d+omLQEbzP6mej+6b7S+eaHWCeGgidG42hhcKeY5idAOzUe0crkkM6gXNr7KQWNhrOySI9MHusIcmlW1wkgeFrRUAvbQ1aLyGMNQ6MsGFRFDUKvV1MPz96sZ7c6QWLhyrSe0aRrZdML3RCJqX4y++JzbvYq41mAwWDiFyP1Pzp7xHIn4D6zuVNYKJtNYAykmkYng1iwo8idJApUAQfcRimitlVDKw7Alw== Received: from CH0PR04CA0020.namprd04.prod.outlook.com (2603:10b6:610:76::25) by DS0PR12MB7536.namprd12.prod.outlook.com (2603:10b6:8:11c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9499.7; Mon, 12 Jan 2026 09:41:03 +0000 Received: from CH2PEPF00000144.namprd02.prod.outlook.com (2603:10b6:610:76:cafe::3) by CH0PR04CA0020.outlook.office365.com (2603:10b6:610:76::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9499.7 via Frontend Transport; Mon, 12 Jan 2026 09:41:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CH2PEPF00000144.mail.protection.outlook.com (10.167.244.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.1 via Frontend Transport; Mon, 12 Jan 2026 09:41:03 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 12 Jan 2026 01:40:47 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 12 Jan 2026 01:40:47 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Mon, 12 Jan 2026 01:40:43 -0800 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , Moshe Shemesh , Yevgeny Kliteynik Subject: [PATCH net-next 2/3] net/mlx5: fs, split bulk init Date: Mon, 12 Jan 2026 11:40:24 +0200 Message-ID: <1768210825-1598472-3-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1768210825-1598472-1-git-send-email-tariqt@nvidia.com> References: <1768210825-1598472-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000144:EE_|DS0PR12MB7536:EE_ X-MS-Office365-Filtering-Correlation-Id: 32d248e3-2d72-4e4a-1aba-08de51beb3a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ha7DwaZGNZolD5OXi4ZTLzrp5hCWecyOb9fwS4Sj0a7EJ2JZDf8RgEREp2rx?= =?us-ascii?Q?+AHUFOiejbTtScMR6uCgX2QR+nGqDD7NTV7OgsDWisE7Q2uC6mY363Z5VKa5?= =?us-ascii?Q?uCfEg7SD1sA2V1XPiGkFqTGhptbFKiJNyuNWmcuCRioQ522321/mKYdgXZ0w?= =?us-ascii?Q?bI69CcRy+nhFvxsfaHV2jlp+jBD9fjnREpbPPlZFV0EsPOcNtkF6ydZgeyAy?= =?us-ascii?Q?17XRldjYOypxwg1niypvnEeib0fE5j4FChsBE48XiRKnxRihDhcbZ7Q+oely?= =?us-ascii?Q?N0dE4uf8KV0J0NckrW8qe0bzVCrOh32idsLdL52BkOtSJnGU4JSg7pajtr6T?= =?us-ascii?Q?v5fEbqT0hzstXayHJp7mv0u46Hh7PgYCNaWgfvjHmtgJFARLpsJFObVD+auT?= =?us-ascii?Q?dMrpQBFZUl6pcqcqwVRJ5zE2GG9F6PX+aLGFwfIUr6yhk0q3Hl3k+z94CqF9?= =?us-ascii?Q?RgIq4vdSCDfN9IivUZ/85SuMYwOKW+mm1wB4aTPE+8tPweoXGSmIgZ6MutyO?= =?us-ascii?Q?7Z8S+qFQD8xvRrNeL859rV3lBL4Yc1xva10fCkZvj+027wtd+hCbCUiGcI/U?= =?us-ascii?Q?7vPou8PMNaLVUELzbOWKnoZ35YPv5sTy/JVB4sW0IbAZG6SJjRquAEUDkP40?= =?us-ascii?Q?QgOrP3UCNaL8ojf9t54qgICKmz9T7e7qk7K8EByAAMKRtiuJgXDh7/2wV/SD?= =?us-ascii?Q?XIUVauV8uJeVNdSANM1yVrKxZIlKS5dDNm6CZGTrRoLvfTAxscOKTeolx1yH?= =?us-ascii?Q?+QG4Zk0NjTi2lz7st4mlfjvY/lZZ7yaVzPRYBOURukqJOFgbnGmh+mup/s3A?= =?us-ascii?Q?KQpv6UBwYL2XS0HCcMgHpj/7nwQplmdyciprdPYIFa4Ks4z3Y9fITu6jdqLK?= =?us-ascii?Q?j5Kh4VL9LbNrIC1SMiovWErKiHp5lWojFfNkfP6WvefobPmRmQ95HLPDmkN1?= =?us-ascii?Q?wTvTxo/q1fopu7vngOQxksBEB+nw97YIzwp7EL9P/cFChO5x32PsVJC/bfZV?= =?us-ascii?Q?WvwnM8Ns5riYLD8u8v6wsjAIzTlzDGz1L6g2BPa6YrRyKu9A88E54ZO8CcER?= =?us-ascii?Q?uyNxIYVeV+/Hh7OqgX3J3XxMgplp3IBqnHsqsmehFgpagsNCXzKMx8KABYwk?= =?us-ascii?Q?FlrDz3l+P9gEpseRMYHD/kuI/bpjTzUv9Y3SlU+iDupLWTqN5CRskmK9OnEq?= =?us-ascii?Q?RksOWOsOvtSPA+wpuAmiR+vrd1DZ9oqLAEauAIySSLJ01oeKTkhVdgmtJIHp?= =?us-ascii?Q?6oWUYCsZyXMpzSXS1yOxjpU/sNn/ZYZBCPl5rGYADfnFw4lK9L1YOAQbDQql?= =?us-ascii?Q?7++dOzCgEzbOvEglK1+FhucdyRPqTokU0nlQphC+gQoJ/SWHHXNk5sLQdbec?= =?us-ascii?Q?/fL9AL7E3ycSkR2yOZlQcC55idLtgv91gIssTxBOXQ4gm5v9EVlD5oHL4rj/?= =?us-ascii?Q?nFFGzzq4y4I3P6aIzsaBJNAHBKnetiQrROxDZ4jCpngAH12ktEI3ho8Gt5HX?= =?us-ascii?Q?xuYlybYN1aojPixtuU/uCNDjzlOlOnk5HAGmcVLt18jhAf9HBJ5sXg+e/Q5x?= =?us-ascii?Q?N/WW1+aN0mlHDGls2qk=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2026 09:41:03.0314 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32d248e3-2d72-4e4a-1aba-08de51beb3a5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000144.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7536 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mark Bloch Refactor mlx5_fs_bulk_init() by moving bitmap allocation logic into a new helper function mlx5_fs_bulk_bitmap_alloc(). This change does not alter any logic. Signed-off-by: Mark Bloch Signed-off-by: Moshe Shemesh Reviewed-by: Yevgeny Kliteynik Signed-off-by: Tariq Toukan --- .../ethernet/mellanox/mlx5/core/fs_counters.c | 6 ++++-- .../net/ethernet/mellanox/mlx5/core/fs_pool.c | 16 ++++++++++------ .../net/ethernet/mellanox/mlx5/core/fs_pool.h | 5 +++-- .../mlx5/core/steering/hws/fs_hws_pools.c | 8 ++++++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/driver= s/net/ethernet/mellanox/mlx5/core/fs_counters.c index e14570a3d492..14539a20a60f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c @@ -449,7 +449,9 @@ static struct mlx5_fs_bulk *mlx5_fc_bulk_create(struct = mlx5_core_dev *dev, if (!fc_bulk) return NULL; =20 - if (mlx5_fs_bulk_init(dev, &fc_bulk->fs_bulk, bulk_len)) + mlx5_fs_bulk_init(&fc_bulk->fs_bulk, bulk_len); + + if (mlx5_fs_bulk_bitmap_alloc(dev, &fc_bulk->fs_bulk)) goto fc_bulk_free; =20 if (mlx5_cmd_fc_bulk_alloc(dev, alloc_bitmask, &base_id)) @@ -566,7 +568,7 @@ mlx5_fc_local_create(u32 counter_id, u32 offset, u32 bu= lk_size) =20 counter->type =3D MLX5_FC_TYPE_LOCAL; counter->id =3D counter_id; - fc_bulk->fs_bulk.bulk_len =3D bulk_size; + mlx5_fs_bulk_init(&fc_bulk->fs_bulk, bulk_size); mlx5_fc_bulk_init(fc_bulk, counter_id - offset); counter->bulk =3D fc_bulk; refcount_set(&counter->fc_local_refcount, 1); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/fs_pool.c index f6c226664602..faa519254316 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c @@ -4,23 +4,27 @@ #include #include "fs_pool.h" =20 -int mlx5_fs_bulk_init(struct mlx5_core_dev *dev, struct mlx5_fs_bulk *fs_b= ulk, - int bulk_len) +int mlx5_fs_bulk_bitmap_alloc(struct mlx5_core_dev *dev, + struct mlx5_fs_bulk *fs_bulk) { int i; =20 - fs_bulk->bitmask =3D kvcalloc(BITS_TO_LONGS(bulk_len), sizeof(unsigned lo= ng), - GFP_KERNEL); + fs_bulk->bitmask =3D kvcalloc(BITS_TO_LONGS(fs_bulk->bulk_len), + sizeof(unsigned long), GFP_KERNEL); if (!fs_bulk->bitmask) return -ENOMEM; =20 - fs_bulk->bulk_len =3D bulk_len; - for (i =3D 0; i < bulk_len; i++) + for (i =3D 0; i < fs_bulk->bulk_len; i++) set_bit(i, fs_bulk->bitmask); =20 return 0; } =20 +void mlx5_fs_bulk_init(struct mlx5_fs_bulk *fs_bulk, int bulk_len) +{ + fs_bulk->bulk_len =3D bulk_len; +} + void mlx5_fs_bulk_cleanup(struct mlx5_fs_bulk *fs_bulk) { kvfree(fs_bulk->bitmask); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h b/drivers/ne= t/ethernet/mellanox/mlx5/core/fs_pool.h index f04ec3107498..4deb66479d16 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h @@ -39,8 +39,9 @@ struct mlx5_fs_pool { int threshold; }; =20 -int mlx5_fs_bulk_init(struct mlx5_core_dev *dev, struct mlx5_fs_bulk *fs_b= ulk, - int bulk_len); +void mlx5_fs_bulk_init(struct mlx5_fs_bulk *fs_bulk, int bulk_len); +int mlx5_fs_bulk_bitmap_alloc(struct mlx5_core_dev *dev, + struct mlx5_fs_bulk *fs_bulk); void mlx5_fs_bulk_cleanup(struct mlx5_fs_bulk *fs_bulk); int mlx5_fs_bulk_get_free_amount(struct mlx5_fs_bulk *bulk); =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_po= ols.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c index 839d71bd4216..5bc8e97ecf1c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c @@ -121,7 +121,9 @@ mlx5_fs_hws_pr_bulk_create(struct mlx5_core_dev *dev, v= oid *pool_ctx) if (!pr_bulk) return NULL; =20 - if (mlx5_fs_bulk_init(dev, &pr_bulk->fs_bulk, bulk_len)) + mlx5_fs_bulk_init(&pr_bulk->fs_bulk, bulk_len); + + if (mlx5_fs_bulk_bitmap_alloc(dev, &pr_bulk->fs_bulk)) goto free_pr_bulk; =20 for (i =3D 0; i < bulk_len; i++) { @@ -275,7 +277,9 @@ mlx5_fs_hws_mh_bulk_create(struct mlx5_core_dev *dev, v= oid *pool_ctx) if (!mh_bulk) return NULL; =20 - if (mlx5_fs_bulk_init(dev, &mh_bulk->fs_bulk, bulk_len)) + mlx5_fs_bulk_init(&mh_bulk->fs_bulk, bulk_len); + + if (mlx5_fs_bulk_bitmap_alloc(dev, &mh_bulk->fs_bulk)) goto free_mh_bulk; =20 for (int i =3D 0; i < bulk_len; i++) { --=20 2.31.1 From nobody Sun Feb 8 00:49:34 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013004.outbound.protection.outlook.com [40.107.201.4]) (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 DF2FF34AB0B; Mon, 12 Jan 2026 09:41:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.4 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768210881; cv=fail; b=giCjMqj08HogYsm7iJdoYGJKroNhSEjbRau45fQK2nCT+kPzJu11nx1T8g6O/67gSOa6Xrco6LUSAhk6fz+YO7z3VWLHbinAn/xzM61uHjyBiV6PbJFEKy1XDlTiLcC53AlrFv0mbsN0ZSflTYJBA2ir3cWfTMABou9GWYuRhuE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768210881; c=relaxed/simple; bh=rbDubrL/IFp4o5g2XhEBE5XZo7tuvHQcuj9fQCIDEcY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BS7Jx+kOMy4RxtntfuFzAsJtRFrayqsXWpkjce3GBUu1LGA0ZqQOUAschzU/pBfnO1ckUFEAaqOWEBajDYukO66Ts7imw4hrF82PdlGRYKKdiaNXm+dsPIhRUyFZK/bspMsvEhzFX4mvL2xUgfyvl7B8ecU/jGtiKymr4CjOkII= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=AmPeYFva; arc=fail smtp.client-ip=40.107.201.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="AmPeYFva" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WPagAbSJJaVKVy1LvEKuC6fgvn+evIePxRiDEvOXlNGr3UyAEntrrrs39NAmQcXHsOxGP6/ezRrx/09AsiExbu2CW3mf0T5s7aAs3Z6qz+mI11IPIZZzv0m5KJnz1ZdwuijLCyuQgD3zof2nVK41/6Nkk3eUYK76zVu7hDDfw0AGiAAKlBZQ3ipTD9sqVYRuo7vRg5QKB+apJ1mBijerUThDBUg+VAhzRAHmMoFjIt5mLzQo9KPQT503KaV8sn6gNjS7/TDJviunqPsEZyCPRJKyMHG5Pndpm5FrWyYpopoiDaRNJgRuMzgq63Hd7DfayEwx09hfsQp3vHurnSaE9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=7vAIirAMJG7ZIz7/43kyjqKUfCFLUDsdgsu97uDMHl4=; b=ONT1EzYjG+mjX2voNkyyN0h2rJZ0lBBoVfu7L0ZroxbRtsG+E0TDL3M/r54FVluiPwp3RHYI+y1YAnqHqUI5zA/mtHusp/AaIq3AU2b2pkSTT36xfSCga28eiS8FBkydm2CamUV+0TYTkHY+vAPS89R5shhaCxL8O6x4vrhSGJlzSc02mmTY8SdNYeHRZ8AgqpGtEN2UzKB62g6MiSbCG7qGtraVfPU55aB+JllWmLAn9Ee3zNBv34B/WGcZtJmJ1414xVt9vZaCdbXJ99Ry3iKM9VHkFZy9EkmjDLdatf4gzaNNCqDe6l06n9j1CCDFz3LdCRoXMZBNN2a9btXSvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=google.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7vAIirAMJG7ZIz7/43kyjqKUfCFLUDsdgsu97uDMHl4=; b=AmPeYFvaIuhp+LErVX4HWpI2bxJHokBtvJPw+T1ltur1X3c78CO0U5OWSU9iRe9lioTRUA9T5wZeL38tZy+c5KkAtjLXlwbR0oRXJuoRt2SFiXtWK5l/Y9ReIhQSRPptiB+Raa1L2lSCQ/RzTo8g0WCuPR0LM9aK6GBf52xOmtUrCKPH4X98aMrjxlvF14OU3tbmUAKlBH0eMIQCtwPvPLYqphFLiKWy++D1hy2EeAX18Fy9zsD5XTbVly/YLje37EALgXgSt9Uv8OsP5oXIG5eYvt6iFm2QajxJG4dSw/uYSqawdHNSkkYFrE/PEQinLaw4sF6rvojA32K4CkrVOA== Received: from BLAPR05CA0016.namprd05.prod.outlook.com (2603:10b6:208:36e::22) by CYYPR12MB8892.namprd12.prod.outlook.com (2603:10b6:930:be::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9499.7; Mon, 12 Jan 2026 09:41:07 +0000 Received: from BL02EPF00021F6C.namprd02.prod.outlook.com (2603:10b6:208:36e:cafe::3b) by BLAPR05CA0016.outlook.office365.com (2603:10b6:208:36e::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.4 via Frontend Transport; Mon, 12 Jan 2026 09:41:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF00021F6C.mail.protection.outlook.com (10.167.249.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.1 via Frontend Transport; Mon, 12 Jan 2026 09:41:07 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 12 Jan 2026 01:40:52 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 12 Jan 2026 01:40:51 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Mon, 12 Jan 2026 01:40:47 -0800 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , Moshe Shemesh , Yevgeny Kliteynik Subject: [PATCH net-next 3/3] net/mlx5: Initialize bulk for single flow counters Date: Mon, 12 Jan 2026 11:40:25 +0200 Message-ID: <1768210825-1598472-4-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1768210825-1598472-1-git-send-email-tariqt@nvidia.com> References: <1768210825-1598472-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00021F6C:EE_|CYYPR12MB8892:EE_ X-MS-Office365-Filtering-Correlation-Id: 043d2753-c010-403a-47c8-08de51beb61f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?y2oOyEzFhUbeDuo/5xpYtwZPKL1l1wCw9AU3vRPK3tJRHtD2pIfK+YklNhMr?= =?us-ascii?Q?wL+2IBmjqO/AWj5Q01P0MMrv66lxtlSjb/ZcjANL4NOoLVGaviXk5R7U+qot?= =?us-ascii?Q?WjagnwBq3PmWB0AGbzdcBDp/XrgqkymBDlQeL123joKfj2Yt9Kp0jNva9SHW?= =?us-ascii?Q?qhNYJ6S8VxiivDYrsCrPxegfLcs5vXTNz7jRp6O5ItzCPmdZRpVNgwfzZ3bs?= =?us-ascii?Q?y8bFatBeBXTAZnwQDSic58ov1x3OjwnVe/vnKvwNY4IH7JNhlYhDH0VMU6Y7?= =?us-ascii?Q?yYxpPzoYni70CWfmiLi99Y2K7Ur0HeMTGHmNyQcRf9ugaGXPsUzYjyPWzYzn?= =?us-ascii?Q?wr6DKCPd+VZUM5oY/TKh1H5TUY5TyR3Et/m22/xixPV9cLE4SxzfYjv8SR8e?= =?us-ascii?Q?Bdb3XtqAci5OjmEaD47lKe6hHrQHnIHIlMw/mdY8fCNQbqywFTIYdnXTK1VM?= =?us-ascii?Q?YIOXzMI9JLqBDPmFbMGZRfih/9VGoatOoNsRUxsRxF/4sSgX42FR7xJDyk78?= =?us-ascii?Q?BXvOPnisYFJhfQI1RzI725fcO/MnRy0GBL8Jp5JIYBLcgqerzBQ1TQyHW+F1?= =?us-ascii?Q?SHfL3Pvas1EyhpOL4BKXj7BAaJODSDa2b9PFxR+yvp7z6fqKtx89dxMTRouY?= =?us-ascii?Q?iz+AOo/P4z7eLpuv8wuFNOjjXzdio4kQgUAJ9RWWZnhTZOLz2lkcwH5KokOI?= =?us-ascii?Q?3xfWpuZrKNaHyaDRQI/PQKXA1RgKHqBBHqIOEl50fVWxnFQKM06J1oKbPW2Z?= =?us-ascii?Q?CcO/GX7s6baCJ2QIs0mQJAO1pzvmg268YX0ve7B7fA8KS1e8I3j8KFFXYU3k?= =?us-ascii?Q?Dw1eLyLfk5efYz6Sb8D8TuGf0A5W7gsWraW5K5IHtVJc3GJ+AFLlpi8Gh4uv?= =?us-ascii?Q?0MwgXN6MFNLdgiDc0jkACPWLs1gHRltSKf9bAzBI5O2ppWXSOEf0CcQT+fpH?= =?us-ascii?Q?BS5NEomp6M+SuJFqFdl3DjMSzocPLjvlfYaIl2jrC0AtlDb8dG748aH4e7nM?= =?us-ascii?Q?2iP4F5XXaxMvEV/UdHEylfcBCLZl7g4p8obdnWFS/5IYjoSkH3vCF4uUXWyV?= =?us-ascii?Q?AD9gXeCWFrcT9TGhC3AjrzxSg15jtto89vBSEQF5paL9dNg5B6ThX3oZR5dV?= =?us-ascii?Q?Qlie6el0Ef9rm3AGH5u0ByPmGzI6J4CkV5yqXuW4pw5nTMorOGE2nN3UwnYf?= =?us-ascii?Q?iT3pd+rTHTFWXQ1ybi5PCuGIpTz0cCUmWYUVp3esGMrolqoI3P01kjgTi57q?= =?us-ascii?Q?VXIi4wngBgn3wQsb01heKS5H59Zxvv8M8RQ+RTx/EKHlg10YFdBiAUa9g7KY?= =?us-ascii?Q?n43as8WmwpVwuPzhbEJroIpa4v2Z+LTJs6Q0HbPFxeE2O5dTFASoQ883+tPg?= =?us-ascii?Q?qDjxcUCGVIuacsQ3f0ZMgONdqAJj+cpWSa47YwvVBEWvjxo4hIoyYrzH1kA/?= =?us-ascii?Q?rzMlJqM5gctXjZv/iHr/zAtTftM4BJCFqnnpR1mz2k+LfENjhyN6N7Y4HXbv?= =?us-ascii?Q?4RXGEJCHhKf+xA69Kif3gku4rgESiFCG5vomPlIOj7AYPpPEwAUE22SWebbN?= =?us-ascii?Q?jjjtiFakmiMM3L4sqCs=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2026 09:41:07.2074 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 043d2753-c010-403a-47c8-08de51beb61f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F6C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8892 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Moshe Shemesh Ensure that flow counters allocated with mlx5_fc_single_alloc() have bulk correctly initialized so they can safely be used in HWS rules. Signed-off-by: Moshe Shemesh Reviewed-by: Mark Bloch Reviewed-by: Yevgeny Kliteynik Signed-off-by: Tariq Toukan --- .../net/ethernet/mellanox/mlx5/core/fs_core.h | 3 +- .../ethernet/mellanox/mlx5/core/fs_counters.c | 39 +++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/ne= t/ethernet/mellanox/mlx5/core/fs_core.h index 1c6591425260..dbaf33b537f7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h @@ -308,7 +308,8 @@ struct mlx5_flow_root_namespace { }; =20 enum mlx5_fc_type { - MLX5_FC_TYPE_ACQUIRED =3D 0, + MLX5_FC_TYPE_POOL_ACQUIRED =3D 0, + MLX5_FC_TYPE_SINGLE, MLX5_FC_TYPE_LOCAL, }; =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/driver= s/net/ethernet/mellanox/mlx5/core/fs_counters.c index 14539a20a60f..fe7caa910219 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c @@ -153,6 +153,7 @@ static void mlx5_fc_stats_query_all_counters(struct mlx= 5_core_dev *dev) static void mlx5_fc_free(struct mlx5_core_dev *dev, struct mlx5_fc *counte= r) { mlx5_cmd_fc_free(dev, counter->id); + kfree(counter->bulk); kfree(counter); } =20 @@ -163,7 +164,7 @@ static void mlx5_fc_release(struct mlx5_core_dev *dev, = struct mlx5_fc *counter) if (WARN_ON(counter->type =3D=3D MLX5_FC_TYPE_LOCAL)) return; =20 - if (counter->bulk) + if (counter->type =3D=3D MLX5_FC_TYPE_POOL_ACQUIRED) mlx5_fc_pool_release_counter(&fc_stats->fc_pool, counter); else mlx5_fc_free(dev, counter); @@ -220,8 +221,16 @@ static void mlx5_fc_stats_work(struct work_struct *wor= k) mlx5_fc_stats_query_all_counters(dev); } =20 +static void mlx5_fc_bulk_init(struct mlx5_fc_bulk *fc_bulk, u32 base_id) +{ + fc_bulk->base_id =3D base_id; + refcount_set(&fc_bulk->hws_data.hws_action_refcount, 0); + mutex_init(&fc_bulk->hws_data.lock); +} + static struct mlx5_fc *mlx5_fc_single_alloc(struct mlx5_core_dev *dev) { + struct mlx5_fc_bulk *fc_bulk; struct mlx5_fc *counter; int err; =20 @@ -229,13 +238,26 @@ static struct mlx5_fc *mlx5_fc_single_alloc(struct ml= x5_core_dev *dev) if (!counter) return ERR_PTR(-ENOMEM); =20 - err =3D mlx5_cmd_fc_alloc(dev, &counter->id); - if (err) { - kfree(counter); - return ERR_PTR(err); + fc_bulk =3D kzalloc(sizeof(*fc_bulk), GFP_KERNEL); + if (!fc_bulk) { + err =3D -ENOMEM; + goto free_counter; } + err =3D mlx5_cmd_fc_alloc(dev, &counter->id); + if (err) + goto free_bulk; =20 + counter->type =3D MLX5_FC_TYPE_SINGLE; + mlx5_fs_bulk_init(&fc_bulk->fs_bulk, 1); + mlx5_fc_bulk_init(fc_bulk, counter->id); + counter->bulk =3D fc_bulk; return counter; + +free_bulk: + kfree(fc_bulk); +free_counter: + kfree(counter); + return ERR_PTR(err); } =20 static struct mlx5_fc *mlx5_fc_acquire(struct mlx5_core_dev *dev, bool agi= ng) @@ -421,13 +443,6 @@ static void mlx5_fc_init(struct mlx5_fc *counter, stru= ct mlx5_fc_bulk *bulk, counter->id =3D id; } =20 -static void mlx5_fc_bulk_init(struct mlx5_fc_bulk *fc_bulk, u32 base_id) -{ - fc_bulk->base_id =3D base_id; - refcount_set(&fc_bulk->hws_data.hws_action_refcount, 0); - mutex_init(&fc_bulk->hws_data.lock); -} - u32 mlx5_fc_get_base_id(struct mlx5_fc *counter) { return counter->bulk->base_id; --=20 2.31.1