From nobody Sun Feb 8 05:29:04 2026 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012041.outbound.protection.outlook.com [40.107.200.41]) (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 D1EA731A7F4; Thu, 25 Dec 2025 13:27:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669260; cv=fail; b=HllMv6gXydgld1qKb2ID+bxkbQFmTpQIJxBEPfBwc8pxWm6WuhA89d2heudiZ9CXl3Gu+r3a7cbl55vsmz7YsNI1v0wA4cwqk6AzhjrFw/lvI+DVTsYW4uQpNXHNtoFaZ+OlBckIXKJEOmNx9JxsNVzximBigrXN0MjN1Dl4hog= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669260; c=relaxed/simple; bh=FOVP8DFucsCcXOSzyAu+Wu/Q9SqEcHLxqfaKdJF9hzA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XGxqU2VxLOqRYS/QZjt4DodrnTCSdi2UuC0LJ02sjHJgkYFXOt9jX2kW+Qp+6xs8Y5nPvPjRdDh0eqtrZbp08pTKEdwwnD6r3QsKrop2s25Xt/3paUiB98LNFWfappGoXPWvIoSGrTsaOPjftcqRYuu2ziOtVtdBZ9dTsEC0xDQ= 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=laVc0HrI; arc=fail smtp.client-ip=40.107.200.41 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="laVc0HrI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AbA2oJOuoNrkgoa7/HlEVvrppnvMcA3+RMRF7GCLT9NuJE3Ew+F1jmEFEtUJAK9ZBB4qgG8FemwT9LlVUiSKuykqXbu3nHw9xKs+we4Sn5QaDHP8DfXjZdwGq2ujBUJsnNgmjbgAGSS+45OHQ+h9U/XK1YNBUNXvDQnHdlYJHQgfgof/QAIzFBob1zehzhz/IePLEwCYDhhh712CiCGkbGF4hTv+Y9qfjsRtN91JgADfZZWTLxnemf7IqpUc0ZK6TrSUMhUfFr5QgPCAG8Vsdt6nFnyh6PZFS7IuvTnz0sfMi6KQkS/Q/RkYm88axLOlGlai1tlDJHI66OvHxI97fA== 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=490ND+BKE3mkvzj8n11geCmruwEyx5eF1skcBzia23A=; b=F5Q0z2Cfp0/wCNkWeVFucZGpIwuzFIGTOIrpQ6XvDKs/5nhu/Oxp5KdDYZ4nNyzEyuaTw7GrNxF3tO19NnIhNX9bDzBFPTikqv9x8MhtvIMSD2aX9bnPg8MAlIiTWxvmdeHgKywXlYv6xNkcv8yVQ0l3DIuzxCpFnbWDlPp1UqfHxyteJOqQQs6dlHe5pCNq85DKwcvn4SO+C/kj9U7OyoZ9ku85J03TEuoV/7KcE64CeYV6GXdYmkIXi9kxfdprDPQUvS0keqjuc6K60fhhNLHFGs89TmESn/mr3FewwBL2F/xS5o/iPCQCKrpeVPd8GF1CSJhF1AoDtXpQzjyJwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=490ND+BKE3mkvzj8n11geCmruwEyx5eF1skcBzia23A=; b=laVc0HrI/yHsLZ+90DtnphJTCZxnvpTsOY+iE9deBg9z214yuFwZqv583TjJu4huRvOJ9yKZ2zjP+xqMl6B4lkdWxcTl711vsspoORaz0eWnPGzVQJHgrAkQF73IJLcEnolTATzavIYAmubhWwFI9/k14PG5skkVkm1TbXDn+pgD4ZFhVoRYk9Ie7YK/N7teaBJjg4TlCjECo0xRAO9+tcOAJeGNB17a7PX7SQ+YQa4xTSdHxi+lLXOXfzytOes1gmwhWGt0A6dTvgf4oqqWzz4ga8nxBnGCSdVk1RbXU/q0q37EXbr3LIkL/yULNsOgN0qeQbUupgYL8SrvsdICJg== Received: from BN9PR03CA0891.namprd03.prod.outlook.com (2603:10b6:408:13c::26) by MN0PR12MB6365.namprd12.prod.outlook.com (2603:10b6:208:3c2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.11; Thu, 25 Dec 2025 13:27:34 +0000 Received: from BN3PEPF0000B06C.namprd21.prod.outlook.com (2603:10b6:408:13c:cafe::6c) by BN9PR03CA0891.outlook.office365.com (2603:10b6:408:13c::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 13:27:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN3PEPF0000B06C.mail.protection.outlook.com (10.167.243.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9478.0 via Frontend Transport; Thu, 25 Dec 2025 13:27:32 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:31 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:31 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 05:27:27 -0800 From: Mark Bloch To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , "Patrisious Haddad" Subject: [PATCH net 1/5] net/mlx5: Lag, multipath, give priority for routes with smaller network prefix Date: Thu, 25 Dec 2025 15:27:13 +0200 Message-ID: <20251225132717.358820-2-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251225132717.358820-1-mbloch@nvidia.com> References: <20251225132717.358820-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B06C:EE_|MN0PR12MB6365:EE_ X-MS-Office365-Filtering-Correlation-Id: 15a18aa3-2a5a-43c4-9f45-08de43b95bf3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Kz2PBpaF7Xs110BRNW9CsGXyXIlFF5ksDw0CV3gj0Iexz1ftLLvJQkHjjNde?= =?us-ascii?Q?HKJIUJPjho7CQrcdh/IlDgMsITuktwSgicA4v/0DBcjbb+HNgpR4igoqEDsd?= =?us-ascii?Q?PcfVitbQIirr0e7oMFtZDN+ZzgduLGgzSe2e8usr3va+5eHCBd8XRr9cAJWl?= =?us-ascii?Q?GBwgUrklh/cp+xWERkkcSdJUOnKFOh+y9ZZceANBPn5FlC44Jr/G3gzeYmGM?= =?us-ascii?Q?h/kme6/CbXA8bMVafuH9jFTR9JwSXTB/MT6z2YJkciUCWw1+jnPRSgOoVqfy?= =?us-ascii?Q?75hiPbArxFbBsYHC8tFGb2Qq5RT+6og28sJzvQsXVFGbT6eUR2SX2tycFCAT?= =?us-ascii?Q?0WRRHf/nqQqFcYOxDnS3h55HF+tCkXjgdbIImxSsyBPAD5ECK2awle1XJGgz?= =?us-ascii?Q?x2KkInHwPyOjD32sGUj6zge3qgtmCXy7PUTSVAYuyQHBbUEtDPhCgg6Qnfs2?= =?us-ascii?Q?h25fE5xo7/zcZcwGMILXswSC12poQw6YcMx6Y0o8YDODka+1OVTrrtx/lXJ1?= =?us-ascii?Q?8F/+jGwpDl29JuttWEycJDrGYK3T2WNwKQdLTI/knh6gdNuIVm1qkrK3M0n5?= =?us-ascii?Q?Ti7z9xhh+LMVNoQ8B0sJAStkb+AGlgynqGMKn/LX50lbX/8ANlDficSHMfEZ?= =?us-ascii?Q?08RlK1su0aBK3HRfnmKhLt93MogTFSSq7KgNyYgJbhSodKBt/Iu++aNk3ds8?= =?us-ascii?Q?ew1bWeJhnvFg/8y5N7utCIP9WNTk2TA62mjGUTZCJIOVvj1YnD6tOptYAlok?= =?us-ascii?Q?jEHb9wA6PRqYFUlr2yIVOqjwwCL2+Ipg6TdTgn0MljGJO6ApqfLc++y9ZFbR?= =?us-ascii?Q?fh6+sTQdEnxN2i/We0ES0rvvptJ8u2q3Y1fzBgP3Qi01R4o8doOs8pOZ5uvk?= =?us-ascii?Q?4ZsiuqvR7um/ER5IWmmbDP96bDtv7LqETuEuooitJtK4VqO7hVpHEkJSn8ou?= =?us-ascii?Q?lLqs1xzkmV4qbhHfQO4hT5dTdOEh32pN8dP/Jg381aTrEe52dyBbPHH4hzjK?= =?us-ascii?Q?m5k2h0K867DR0udALa6I/Ac98RI5clXbvUGFxhLn+dkhrBs6d2/pxDDIQ31h?= =?us-ascii?Q?JWWMbQReUm2fs1YLkaB1iZpME6WAuKJ9BYQCj7HA8E4MXyKzJz+nV8n/WVf/?= =?us-ascii?Q?wxQ2eGA78NsBOj8xQL/x6ERWBslQEiD83YCyHHMcBNy8wFW60C3OGDDpyJ9I?= =?us-ascii?Q?Ho4rbGPQyExWgl51BF0sYi0ysl8zhlkPluL9V/pR1bLmRyjtJtre/sMoyF+O?= =?us-ascii?Q?U/k4lQotd0Rv9NS1T9B2FOqx9tEq7EmN5Ey5Fjs4O63DbniUguG6y8KJKQKt?= =?us-ascii?Q?z3JMVebRpCtqimZX1SJeMe+QGiLicXkqkaANa5IYzxH2/zSdhvnaqHC3yJU2?= =?us-ascii?Q?GLpf3vDuTLQ2V7ALIPz7maxo08S2dxVq01lO1auP9mW/UgK8vOZl6DMQGXKF?= =?us-ascii?Q?2INLQl+eicxrtlPbhpXHxGP4A62Cjh2/KUcazJn43R5dbYOPyBTGiso5qGt+?= =?us-ascii?Q?0iyfkz9mwkE6S2N9CEz3mG09tszvbwfAhm3rrBqVtMKi9kvOEDw6EjqYyrew?= =?us-ascii?Q?IBJrY0Zkbuukqfhr6Rw=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 13:27:32.2140 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15a18aa3-2a5a-43c4-9f45-08de43b95bf3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B06C.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6365 Content-Type: text/plain; charset="utf-8" From: Patrisious Haddad Today multipath offload is controlled by a single route and the route controlling is selected if it meets one of the following criteria: 1. No controlling route is set. 2. New route destination is the same as old one. 3. New route metric is lower than old route metric. This can cause unwanted behaviour in case a new route is added with a smaller network prefix which should get the priority. Fix this by adding a new criteria to give priority to new route with a smaller network prefix. Fixes: ad11c4f1d8fd ("net/mlx5e: Lag, Only handle events from highest prior= ity multipath entry") Signed-off-by: Patrisious Haddad Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c b/drivers/net= /ethernet/mellanox/mlx5/core/lag/mp.c index aee17fcf3b36..cdc99fe5c956 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c @@ -173,10 +173,15 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag = *ldev, unsigned long event, } =20 /* Handle multipath entry with lower priority value */ - if (mp->fib.mfi && mp->fib.mfi !=3D fi && + if (mp->fib.mfi && (mp->fib.dst !=3D fen_info->dst || mp->fib.dst_len !=3D fen_info->dst= _len) && - fi->fib_priority >=3D mp->fib.priority) + mp->fib.dst_len <=3D fen_info->dst_len && + !(mp->fib.dst_len =3D=3D fen_info->dst_len && + fi->fib_priority < mp->fib.priority)) { + mlx5_core_dbg(ldev->pf[idx].dev, + "Multipath entry with lower priority was rejected\n"); return; + } =20 nh_dev0 =3D mlx5_lag_get_next_fib_dev(ldev, fi, NULL); nh_dev1 =3D mlx5_lag_get_next_fib_dev(ldev, fi, nh_dev0); --=20 2.34.1 From nobody Sun Feb 8 05:29:04 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010070.outbound.protection.outlook.com [52.101.46.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2C1E1E572F; Thu, 25 Dec 2025 13:27:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669261; cv=fail; b=OwOSRrSagFeFhohpqHyFQWzbocIrDUfHjb7oe5vvykFeFZM7Rqw4Y5kDAsl8elvs/GIWg35zgWzwkiTvNg0BZ4kzs0Au7pK+F+JPfvWMu+QBzQQaYydzNLtaV1oU4xQJsR3eQRYyqjwbh9slFC+F7Dda8V6+SaBHSFsH8B6G4p4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669261; c=relaxed/simple; bh=w61YJGg9qT/yHkm0Q+e89KzKZBLP4xL25hiYtIHxTI0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aNDJbv0ED5lj1kYoCHF+ijo7kHDQk39gt/RTZXd0DfUzIxTHu85MST/0dITCxcDLOpRu9RaZYVMrxpLY60ucm4gK+hUBnoShBEMl4bYsGFsIk3HbjFwlolFFfp2mCyW+qIdW6MT6FoEleLUpNLzo4hIz4SXUPcC04WL/usuJS6E= 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=Mpx1gwKY; arc=fail smtp.client-ip=52.101.46.70 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="Mpx1gwKY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B8a4/zydoLVit5OZnw58SrMPRcONO5EzgPvZhYX3RnjrAR9Wu3irpvoxRY+YmySLLFVXrJ+jAl8B6fB0tXk986B6nSjZKzuMWLlFezMQo+fQpOmRyfX2LanysnQf6xVH5o7qRrxJK7h7/dAQcJyvMF64UE3uMupV2fq1cMqh8uwk05yqYrLEIamqY+kcZmzvtrsCzy9mpH2cJNhyAjtVk+rTomchQgt4vY5p3ERp2ATEb2kkix0HKNSxwek+mnoC3xbWQ0HG6VD+woCbnpOx9sylRlr5U68qboETmwWRsjSPjauGhpCWE3rhHtczyO5G/8cdQRlliqLYJfxqfTjICA== 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=fCnwP+qz/1C0+vp22e378RwuaEQ/BSBvAWEyFnx04Hw=; b=XTg2P+uqAhtFvxpF8ICMnFFYA84l2OJX6jleRiQu83GBe3upBgk7+bqGReZqpUGgBSiFF1drjl5OAddMPnTnJcdkgfL+XArLMqs5XydUzulmFXLzBng1pn5yCcTBGuSyAcfPz/RP2Ah7W5BV0TaDtdssENKb3Gv4w5oNjqAwUIa9wLOhaPUer4Ran0XHOUTTGPPjGLgEnITIV5i03u+K8oQIPif70s3wKRczURRj9w7APA/Qr30O+Bm7fXWjfJuXD0atGAt0a2awY7ZWvuT4+pl6dGQ8S0grcx7hpxvMMypYY9NPBJPMSjNJIzgnvx4NKrieDqTmmx0C5TyWe0KVEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=fCnwP+qz/1C0+vp22e378RwuaEQ/BSBvAWEyFnx04Hw=; b=Mpx1gwKY1E9VfdSOeRxm065qp0gaEUX7MUaUeLTZJfRJcJtwSwRTScZAJjM4dh2xDhw4etPKorOYCzoq6kfkeXLZh/Q8Dqrta4cW+e5SReglq0B6FXt9M7Y6mvvqKfTkrtDMZIZnTxSTjJW+FTdsi1WW7uJZmqO7Tf2V/tETa7c8mpLEBivizXqvhri334sGY3sHZVNmXWiN36Dg5+mjbConB1SBTIhY8ANxqHFvIJ/pPqqZ3P3OK1pORgOUGYWt3JhEqgKq7bmGFHzVNF56CaDd8vgEvjcHgdRLj4igmDiYKq5YLtDYdLush4gHtdO8gOsqp4yzR0d6afGuakilnA== Received: from SJ0PR03CA0230.namprd03.prod.outlook.com (2603:10b6:a03:39f::25) by DM4PR12MB7767.namprd12.prod.outlook.com (2603:10b6:8:100::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.12; Thu, 25 Dec 2025 13:27:36 +0000 Received: from SJ5PEPF000001D2.namprd05.prod.outlook.com (2603:10b6:a03:39f:cafe::79) by SJ0PR03CA0230.outlook.office365.com (2603:10b6:a03:39f::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 13:27:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by SJ5PEPF000001D2.mail.protection.outlook.com (10.167.242.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 13:27:36 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:36 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:35 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 05:27:31 -0800 From: Mark Bloch To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , Alexei Lazar Subject: [PATCH net 2/5] net/mlx5e: Don't gate FEC histograms on ppcnt_statistical_group Date: Thu, 25 Dec 2025 15:27:14 +0200 Message-ID: <20251225132717.358820-3-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251225132717.358820-1-mbloch@nvidia.com> References: <20251225132717.358820-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D2:EE_|DM4PR12MB7767:EE_ X-MS-Office365-Filtering-Correlation-Id: b4953cf0-8088-46e2-c399-08de43b95e71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?WYRMULzXtw7h5ErIV0z4uGwsVF8eFOfuAzwvmHZalNGGZDauM0WCxS8ix3bx?= =?us-ascii?Q?lece93zYk9xlwgHcS1pu/9VDKlelY1JFkzh9fgLpPHHvR/+jC2g8PE6p5Xvj?= =?us-ascii?Q?1TuegbGVg7fh5EFgk6iz6iT9d20HXHl4F8jJawvfu3oLH6mt7BCEQoypGr4b?= =?us-ascii?Q?YASz9aomT5QRCIEoBxjm3DBtX1gnaTLLkR3AWH0+DYVjsVqYnnEluF9K5ORC?= =?us-ascii?Q?aptmRXgt5M7wqorzHlTSS9CE3C2u55qZ+BxNw/mwEFjwsPsGrd25Feyy/m8A?= =?us-ascii?Q?CFncSkMfeuTicLxXHsmahnQXopBcBvSk9TogyMJNvhkDykCPov1d41AczmYf?= =?us-ascii?Q?Ngvf+8DCWN5S3dyK8Gu1hIyczFB5fpIMZ+r6CEyHybd+xnmzyGZuGbCUPRVz?= =?us-ascii?Q?V965luTTOy1SjUbIn9A/Ony1FwXND+nUuAkph5FOS1QULwHtKBj1XtklyY4C?= =?us-ascii?Q?lCGJd+4rTOv9fVgv5dEIW8b/XoABU8ZzDlXVfMC2w0CzFjGXmU9axHTVEsR1?= =?us-ascii?Q?SmV9Hc8ldpscUkQrmNnlm6UjzbE5VZaoXtygu6SwAGSQ/LsApiNEtFeG1Q/r?= =?us-ascii?Q?DUAea0KEanStb6esCfkxgR+RrKDFcWtScFLzIf+nSpcshzZ/wIDEk3TRk40Z?= =?us-ascii?Q?M/CZHaeplm9dQ19gteHFn2fXRki9+hyG4uG5xyvp79r8jFOnNHoLlGsiU1bl?= =?us-ascii?Q?3G167bA3pck+vqpYcaB0zbuFi0y2XL+7KVXcX1BVtcpLTZ/sFA304xg463PP?= =?us-ascii?Q?AcFvjP+tW7ZQcZevH7t33Vs3rawsF6hkU7uI6FRy/lOgifDHUkDjm5VKyVY1?= =?us-ascii?Q?uAp9ixV9QIYXA17HSohYRW1YjJGyFTKyQ7WTpw5LIUP24B9mSlByO4eBUn0d?= =?us-ascii?Q?za6PXJkY39b4tBUoaS7zTfJwAa5yn3zR5g/1YhGJoBAf+4eyOhLAEgRK5Ik8?= =?us-ascii?Q?9wU8UJDqumhyfwpuswMY1CexI2NTqAhPyierrQjP4lt1EgTrkwsJlbEx1Nc1?= =?us-ascii?Q?qI1m909DZTCmF/kNFZ/w84CeoX0BJA8JxiNALUhROwQ6JqTgm6QQ3+CW8ya7?= =?us-ascii?Q?yUp420aiKjUkY84II7SqIiSA/xpPjfJCPyb5LaOxi/etZusdeY9J0IPUcKpw?= =?us-ascii?Q?EHKOyNDKJtbJ60A26LQnktAP4Ch4k8PVIYXeSL3PJTRSkkn4bDT3Yo0k2CFN?= =?us-ascii?Q?L0+XTuVGNpw0YnpNeXD4Yw8ELBIYk31XFItZis7yX2gyvP59OQvI+032Ylqt?= =?us-ascii?Q?+Hjnaji+vdt5O+Sm1cn8Pjpjw5obmM3Hp2NCfuj2dlHGS2zymaNJq0FbbQQU?= =?us-ascii?Q?0wdaO3xNAAFL+mzFuYow+FC0GKgrExDF+jowMK+ygNhlE40/jR4uz7gYXYKe?= =?us-ascii?Q?vb5PP4XScmGLwgzhswolQONuny3210T789foTS5E3S67V1VK2YVdpZL4mTz1?= =?us-ascii?Q?kWPS2EaiDt2evdEJY111GqK6Dy/is80IkJ1uBaTrhoQNXhOFbjLAivYy+r9r?= =?us-ascii?Q?ACXrplRhKcWJs4874ZuTWDZguO3CkLVdgzeJ3lsnCQQZcjuWf82HuIDIBEj2?= =?us-ascii?Q?IwK3lqJb/iDep7PP2sg=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 13:27:36.5444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4953cf0-8088-46e2-c399-08de43b95e71 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7767 Content-Type: text/plain; charset="utf-8" From: Alexei Lazar Currently, the ppcnt_statistical_group capability check incorrectly gates access to FEC histogram statistics. This capability applies only to statistical and physical counter groups, not for histogram data. Restrict the ppcnt_statistical_group check to the Physical_Layer_Counters and Physical_Layer_Statistical_Counters groups. Histogram statistics access remains gated by the pphcr capability. The issue is harmless as of today, as it happens that ppcnt_statistical_group is set on all existing devices that have pphcr set. Fixes: 6b81b8a0b197 ("net/mlx5e: Don't query FEC statistics when FEC is dis= abled") Signed-off-by: Alexei Lazar Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/n= et/ethernet/mellanox/mlx5/core/en_stats.c index a2802cfc9b98..a8af84fc9763 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c @@ -1608,12 +1608,13 @@ void mlx5e_stats_fec_get(struct mlx5e_priv *priv, { int mode =3D fec_active_mode(priv->mdev); =20 - if (mode =3D=3D MLX5E_FEC_NOFEC || - !MLX5_CAP_PCAM_FEATURE(priv->mdev, ppcnt_statistical_group)) + if (mode =3D=3D MLX5E_FEC_NOFEC) return; =20 - fec_set_corrected_bits_total(priv, fec_stats); - fec_set_block_stats(priv, mode, fec_stats); + if (MLX5_CAP_PCAM_FEATURE(priv->mdev, ppcnt_statistical_group)) { + fec_set_corrected_bits_total(priv, fec_stats); + fec_set_block_stats(priv, mode, fec_stats); + } =20 if (MLX5_CAP_PCAM_REG(priv->mdev, pphcr)) fec_set_histograms_stats(priv, mode, hist); --=20 2.34.1 From nobody Sun Feb 8 05:29:04 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011068.outbound.protection.outlook.com [52.101.62.68]) (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 62145314B81; Thu, 25 Dec 2025 13:27:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669267; cv=fail; b=K7i89/LZWCFiQRm6dF2ZT/4VY3HC4DGdylt8cmKvCn4M+ZpAdXPEtXZI078y75PD23yPVc0/zSvX+eiIjSQuxIROUh4N14J9Pv7vc1doRpqajrR1dv27dYJ2tWMADHZK80obaCGG3/9wIoZF3WuqcTL0h7zD8B+kjdV76lwpFyc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669267; c=relaxed/simple; bh=PxFtC596I+NJFLBjC08M/6JcK9Q5BzOdT/BiC/fmggg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uyDnY9VHYKX/heVT3ThftGn+mmAGcQwMLjDyIxt8GbnVBvgnjUETYhPgRk8MuKno66sBVuINHSXUwq4PwWKdyxG7NHpeC6cUpTyYnurii2xruQQJFeE/Dlh99ewNm9FR77M0mV6d+LC9xoQvvmAVUxZg3wQx5f2+mJ1BmHZLEao= 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=I+/RtyT+; arc=fail smtp.client-ip=52.101.62.68 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="I+/RtyT+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=t7QctwQd3WYnrzVn13FGALbnCAf2fHnedD2KYVA8uYebmGJ/87iy2t/0Cg4NAdFrNrMVu1Owy5PXyMtuv73nmIouBDJI17vRe3rKHWnyyvpv2xfw5PNF9xNKmYE30zaUk4l0NR074cbGnR0hdfshvSgPeBlp1kuZ0pqiIgu6J+RLglycS3fDAMKuPZCt3WGT22vhdgOgq6HK/Mu++JZWnZMFkLQZfI6G1bGO5xC3Zmo0FOHrfT5cwTZ2n8WWWNWFj6VX7U4eS1sXWXvUXQ6hCFzZvORptemS3pxSBr8f446YMWRRESdc/SMUiPPiWacy70JgWZRhi6buRsHHXLD6NA== 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=L96GH+2QzzloARZdS/f0tx/37RhzTmW9LKHuN6JK3N0=; b=J2dpKF5jA/SPfQ6TnDcqL1WvVILH3pqCMameHeme/HPo46zAO4pDL14h9T7Iz7IgFgN7yQJ4e40DykYWSD4NqJvZ4LsPGGs6Vb0BAh3/+xf+QiHcgoIyc1Ict5dTJP/NoMon7vNCoe1tPKNpvhdl/f8T/2NJkXblWv4D80alUwDe60JiyQ1pX7ntrPK2anOlUzjBVzCmr+nIZF29+VLXJpwYt936izDiquqkmo2n1qGLQ4uwc6KpOwzqhzZmWzotqx+gXZUrw8CWj+OxpAcp7lG2+oRmHZOov6vJW/Ax33+E2RuaoR/CEsms7Rh7jqajSHdlBreUZdf6IzUPD+wacQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=L96GH+2QzzloARZdS/f0tx/37RhzTmW9LKHuN6JK3N0=; b=I+/RtyT+i1rgysrSzR8LNtPQETdrTIPQ/TS2FtcuHEDlltGjjXhd/ecTPqC7cIWhc2Zjbysup++NnbdJ4HJYL0GJEV2km6hiM6g3EM+P4qE2fZ2JUWzn4k6fPOu7SAgIHfpS96zKUWCRCmMs1rQg8tGf/jN28gdPyNXGkR+PMjlPszcsW/Yn6wvrms8ObSttByBvV8/sR7fXCDNwrhdg+LxZLXybvhn8NP2Ynl44vsYBFO/scOWNtBFuwvgmyTQsAgITkj6xEXA+yFw3cDw48zBa51rAP3i+pt2nWY+rv/S9YO48bdgzrv86/G4EmDyLtVMfc9xt0/6AA/2nGWsDHQ== Received: from CH0P223CA0016.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:116::34) by CH3PR12MB7667.namprd12.prod.outlook.com (2603:10b6:610:14f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.11; Thu, 25 Dec 2025 13:27:41 +0000 Received: from CH1PEPF0000AD81.namprd04.prod.outlook.com (2603:10b6:610:116:cafe::1) by CH0P223CA0016.outlook.office365.com (2603:10b6:610:116::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 13:27:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CH1PEPF0000AD81.mail.protection.outlook.com (10.167.244.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 13:27:41 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:40 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:39 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 05:27:36 -0800 From: Mark Bloch To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , Dragos Tatulea Subject: [PATCH net 3/5] net/mlx5e: Fix NULL pointer dereference in ioctl module EEPROM query Date: Thu, 25 Dec 2025 15:27:15 +0200 Message-ID: <20251225132717.358820-4-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251225132717.358820-1-mbloch@nvidia.com> References: <20251225132717.358820-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD81:EE_|CH3PR12MB7667:EE_ X-MS-Office365-Filtering-Correlation-Id: f10eaab2-2cf4-4e69-a13b-08de43b9617d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2KRIe+1+99s9QClxLwX1XMhIBaTboLRrsdMs0MMt/OMhuDAtWoagcoVF8ylP?= =?us-ascii?Q?nLOgi6e7CyFeM6WQavAMiXalwO9NpInTm1pV8gDhtuWSt73Yi4tV9Uj8vL2C?= =?us-ascii?Q?KTc18zWZ6RCDiFUiIlGATdYDi88oGOBPu9lOQn1dWsVfsENabCabfnqhn0dM?= =?us-ascii?Q?tNkQQL9+l6V/vnuvU2VNkbPgQ8COEt0uHlLZIWdtBFbP1wGexb2MzpTLdqSH?= =?us-ascii?Q?hqOyyM5Bezmjmh6eYMoQviut85hzNvRwlz/bGbmf0gkJqcqhoc8hEeUi/y6I?= =?us-ascii?Q?OYXrMrJ7gEyD12R7guzKy+u7cFxlCgkApPaGf289mlkkkl6hpCGIJNgSMyka?= =?us-ascii?Q?g0Xwl8MfjdKp++xev0aCPAI4ncmFzlbuGvU2/toJfiva1VffzC6ENQWZp8DS?= =?us-ascii?Q?cp0+VV71W5VExjnvBharFtH8U4XA2M7wuvgkJvQFK26QKo8YD+PL+cKwba7c?= =?us-ascii?Q?S3V3UYE4qLzhjWfkbMUIV44pd7PLk4g2amFDTsrCO4eMY8RIinIkr1laBDdW?= =?us-ascii?Q?TIUxPSIRtScuCSu0tfxMSqRcss8dkcweg7SrvQmLHCZ3Gezcu7r8Qsmr80ZH?= =?us-ascii?Q?VXG5yIQrVeUd5L5YDyazR9C13dKE1gX1CaaY+WV6XAObpYCHew+F92U+clXi?= =?us-ascii?Q?xfL/6uSD/DUiVgJqsX49p6x/sRhMPidGIBNCrtMdbaVMlqupsufr7il8lvWq?= =?us-ascii?Q?GO2ma9f6ygQMom2QxNy+GDTO1fTejHoMMARTU/0axbaER1ikm4xAQ4cKqpZe?= =?us-ascii?Q?3JzTRSA8hmQsMB8bOkUU1qLPsd0WUH7nklqzSvijOm8v2M2iIVV+8qDCTCKJ?= =?us-ascii?Q?Dh4Jzd8LHlY9ptb2Yl+2y/9MD5wnZFxoFT0ja3ir4iIpH1d7HGs/ISPGs5CM?= =?us-ascii?Q?RI5yAglgf9TesBusWgf8m1P/aKhHtpcrxdWFqpadHtd8PsSNmGaFsq/2aFdH?= =?us-ascii?Q?jec86acKcFlkFlIX3mP67wfWFDayftVl+oGdh65cSM9qelqAQ/d4QtqZBy8N?= =?us-ascii?Q?BzZMx/lTA3F7/eEGs5Fz/gwhGawedGoJyIBgBJBVS4tA60d2gxl+z7bVG/xu?= =?us-ascii?Q?vPU/TwEM1XTZE7DI15VLvKkHhWb4K8/XjKTtVWFsMme2MJBwC0N/ZhvlgPEq?= =?us-ascii?Q?gF+DmV9DQzKpYpSDL0vY2zjWr1M7vbUsp/wWbxheH2t91cyCHB6joYXrcoVm?= =?us-ascii?Q?tRaSH2o3FVkZixGUykYHVgP1MvIjhrAWPR9cqx+j95wHxmdBjc4X4xaPzSxk?= =?us-ascii?Q?POvhx+MSs9K9CDwIn05UFFwlKoGVlL2K0N6A4qmACP4jxSZ8vsjBqQmy+GQH?= =?us-ascii?Q?uyDzTWxpPireAT7rh/uaBIgW2c5VYYd0+wXa7kX6prScOzg548EI3fYA2cZ2?= =?us-ascii?Q?5u8566pjrP/VPBZHRaqrS0qwUdhZyqjUfsJ5jE3SF9LFAgdQ9j8QH8YmDgm0?= =?us-ascii?Q?lLQoWG3gbdr9g61x5pvz+nclNmZ3zk+UcHwNdJoHEH6KEOLyk4SAS4RDnfIj?= =?us-ascii?Q?8u6a1ifc2eo3l0EtcE9ZnXbecwU6Nl0iEkAXg+qcjD/rjIfWtyZEHK4Y4rqr?= =?us-ascii?Q?vA+iijeTupGKigQFqyI=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 13:27:41.4001 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f10eaab2-2cf4-4e69-a13b-08de43b9617d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD81.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7667 Content-Type: text/plain; charset="utf-8" From: Gal Pressman The mlx5_query_mcia() function unconditionally dereferences the status pointer to store the MCIA register status value. However, mlx5e_get_module_id() passes NULL since it doesn't need the status value. Add a NULL check before dereferencing the status pointer to prevent a NULL pointer dereference. Fixes: 2e4c44b12f4d ("net/mlx5: Refactor EEPROM query error handling to ret= urn status separately") Signed-off-by: Gal Pressman Reviewed-by: Tariq Toukan Reviewed-by: Dragos Tatulea Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/port.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/e= thernet/mellanox/mlx5/core/port.c index 85a9e534f442..8f36454dd196 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c @@ -393,9 +393,11 @@ static int mlx5_query_mcia(struct mlx5_core_dev *dev, if (err) return err; =20 - *status =3D MLX5_GET(mcia_reg, out, status); - if (*status) + if (MLX5_GET(mcia_reg, out, status)) { + if (status) + *status =3D MLX5_GET(mcia_reg, out, status); return -EIO; + } =20 ptr =3D MLX5_ADDR_OF(mcia_reg, out, dword_0); memcpy(data, ptr, size); --=20 2.34.1 From nobody Sun Feb 8 05:29:04 2026 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012062.outbound.protection.outlook.com [40.93.195.62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B74B53203AB; Thu, 25 Dec 2025 13:27:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669272; cv=fail; b=ZpT9bteK46CQ/VSs/4tq2bK3lYGPc2TTI4rihzfZ5ZqiL2BRZ0fpFnEBywZ7EhAHOKqRiz4Rc/sKT/zN+DyRsOMknjoIJxHt5qBRociqePxaBtMc/T73asLoxeDwlSDPnSKfaho1ercdalbtGZGk4W0l5E+m4FkQBKABR2CT/SE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669272; c=relaxed/simple; bh=9Y6m3OcioX1jiPTBEU7CkYIu2sA2XLX4khZO8yndbVA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RQTLv7E+F0Lbr8DnwI/ZjhK02ADf70UQTboNVpL7ooU73ZWHdJLRg5N4OsHCEnbyuivNzhsCmn5fSJj5xTyr9SBRya/H2D7WQwFwZnCNoFoud5FuHJ+8uI8QWw4h/d7AkxSgFcs/5a6Ixnhtx5c613yU7+8aajV4eLHmo0J9fas= 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=TnE6Dw1s; arc=fail smtp.client-ip=40.93.195.62 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="TnE6Dw1s" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K8sR0wArtb8zvkrahxZbRMAxRDL/ety8oS+GHG3zk0yd+WrL2vmz1zo8GI4zLKlI44bQqLT5s/PaUVBtcUmaObApEHKtCZBK1YuClxkCYYFuIcotP5bfw0zQ7Ed9E4ME9E+n1TydLbWEADaeCkqX6x4E9+c6Re3EUs6Ab/BKkykxJ1uk+KvQRYb7HfvUvXkvf8bE14dRBZ7n7D87CNdnF9MI0YvPCZW4WXMHoqtgelkiFCs/yKwmOoingRvOJQwIjWGBZoO4a6j93pF2Lc/U88uGxHXLym2EtZBdHjjT95TT9MIWYJTokwXXknmsvYTE9JQnstQnzi7IPVc4U08oeQ== 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=hPsQqZeHZuWoSfJVHPWlhgmuQ/A7YSAlx+N3Juf7JT4=; b=XnFgWqDKHOI46fsiHDLDgWDV72ahd/GCRR7scQeKAynq6H/Qvw6p2jQczPVfkR0MSZlzt5ZHLP7hx0QakPBZA41BYp58HIukDi2tPFaLYL2cmyO5hDPxecm9OnKNheiy1yIK/Oj/iRkpLtHXFYtUc8Q6LfIDolceOhBYFUjgbtgUIS35cZBoTynqUJsU6c+ZQIeS7J4tZASEWVq6XyS5e1STFPNHmMgnohAxNnCNKsCkCfcFBJNZtrn2nkroCBy4fQLUNroRfgcjXV/SEU32thsz90sEX21DtPownGEPhg2bbun7CaPTi0Pvp6PGOQeRXGIG9VEXxUBf3AjRsYMD6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=hPsQqZeHZuWoSfJVHPWlhgmuQ/A7YSAlx+N3Juf7JT4=; b=TnE6Dw1sJ4orhIqTrZIvb7Kyt/olvihkW7ViKFN9xrVEpO8rtf3HMSHbbkZ3yPjE/0dObmyUL+FAmtKxNBZXirV2J7tDHsUTJ9oyYDU9EWCjc2r9uR1C2oST4RUHdWrV1wqXEHMCFa6Y+wgGqi0VLmyW4ZmeEwetc9FbQv+gh/tFcUR9Dg5zWMv+e5FtFZ+B0OBb2HvWVgERqAOp1ZvII8X7XpHL/4vw3g+CTfJxOjPa1oWvBmeK/+6Ububs/5T54OxxJa63rW1iC2MDGOcAvlSBAqiSUpVj5LMxxK27oDBUUgW2StjTzTt5J6VMhVaswPdKw2uKSpv2Dnbxqhtx/A== Received: from SJ0PR05CA0068.namprd05.prod.outlook.com (2603:10b6:a03:332::13) by PH8PR12MB6697.namprd12.prod.outlook.com (2603:10b6:510:1cc::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 13:27:45 +0000 Received: from SJ5PEPF000001D4.namprd05.prod.outlook.com (2603:10b6:a03:332:cafe::36) by SJ0PR05CA0068.outlook.office365.com (2603:10b6:a03:332::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9478.2 via Frontend Transport; Thu, 25 Dec 2025 13:27:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by SJ5PEPF000001D4.mail.protection.outlook.com (10.167.242.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 13:27:44 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:44 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:43 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 05:27:40 -0800 From: Mark Bloch To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman Subject: [PATCH net 4/5] net/mlx5e: Don't print error message due to invalid module Date: Thu, 25 Dec 2025 15:27:16 +0200 Message-ID: <20251225132717.358820-5-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251225132717.358820-1-mbloch@nvidia.com> References: <20251225132717.358820-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D4:EE_|PH8PR12MB6697:EE_ X-MS-Office365-Filtering-Correlation-Id: 82bf4540-f1b9-47bb-f430-08de43b96375 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?FfPObQQ8abtq+u/fGCSm6XQbzourzI+cBNMsRzdq/R/Tn+5RLB9fZPqfSSMy?= =?us-ascii?Q?pr1DBYABBqwkAkgid1qQpQQ/KCgZxypYcApHtk3sXSyku1Dsdkp6z3h1T77k?= =?us-ascii?Q?ca8QAxsxngMFVYW+99XXcE88/azlfoEQttNrqWNNHp8o/O9d3deAY8dmgwao?= =?us-ascii?Q?Nnf0gkmKXubER5DEkBbP8/r9ARe4JEPDKSXmcLkp/Jon0UgqTyQWCYtVBNdL?= =?us-ascii?Q?oYv8LGPO7IUgRC8c/LQnoeR30m1SkIIry307N6SxjNeYdrtnHpBgxap0d/YZ?= =?us-ascii?Q?RoYAontWpxSHmTHlFRQJ+QFiwD1cuG3ErdXvecxbYLLYsoitwqzMJ3LozG22?= =?us-ascii?Q?/weYsQys9r3arb55lvFhzM03bQ/LAlRIcY4aw9TphFY4zRE3viRkqgXPysv+?= =?us-ascii?Q?oLlDsA17nw59m+Qme4kb9VKpjsYXnG6jqv0nopQ0+JT7abnr2u+/5NlYOxPu?= =?us-ascii?Q?I3ZN2c+Np2KLXuJUaQnPzdR6PClQJtrk7LS2xpobD1Q/ZM/c0LQz1xSxE/Qc?= =?us-ascii?Q?z+pycwk5KXhvs52kgYrmn76X9KF/bmHYe+3ewhp5JKg24YjAIzim6xDsQIk9?= =?us-ascii?Q?3xuiGJSSwmUZgB4OZO9UORkbwa1HlA6B0JTmOYoMma2fKaOIkjI8+fAIF00S?= =?us-ascii?Q?gD2u1TvRlLc321ihM9AFX734g3gc7KwevH9uvewlk6Kbu0pgHd38+8vLq5F0?= =?us-ascii?Q?m8Ms7YAFzliYzgbRG6O7RRBMWQGs31ZS4suI3x21+WRQJlJmC/EP5cCc/dKd?= =?us-ascii?Q?cJpcdIrDwswNZHHLb9JrurWLz/hwvgClxnn/C03Sk0JV/cP3hsds3roCELBi?= =?us-ascii?Q?Zk7bvEi4irmgLD/bsJpQjVDNnvZRR7Ffj1nlAMxXqwKOBeJEP4TmG1ufCJmy?= =?us-ascii?Q?R5johPelSjZubupHPBmeexzJUhAzPlwqUmRjonSKKRl65cLWSvdO8ZWJsjSt?= =?us-ascii?Q?Xk0JjlkQyUyagOLF5SmxI85oAGxYJz224qO5WQ13B03dm6u49NagVBg0yj3x?= =?us-ascii?Q?utCLBZXbX3qmVMGOSQeJDFzdcbT2/NiMe2EzqnPbggIIId1apcV0jTAzh+bB?= =?us-ascii?Q?Ko3uMemh66cV1YYmtK6zZzV377MBGOclnSZrnwH4+p9n1EESGgr0CcAKateX?= =?us-ascii?Q?6Q3cXz/J+vHX+Na5I0EXICnUwMWfIc9RvrlhbAvYhJHGOPIOJxyH3nR7sjGV?= =?us-ascii?Q?yJS3UK55WY4JeEdlAjOLUvWk3G/8MgpM7cvOuvDEGnBryv26EXh6xXIRMHWR?= =?us-ascii?Q?jom+0/NFpHCmWry23F7gyauB9uOT+DhvfXQzbMKkutD4N87d7U+lfDVQCyHw?= =?us-ascii?Q?eipAFlRXng85LBaX+rfINUtDAf/qTiYJjqdAnpaTJxU4/JAN1VoaH/zHIQhA?= =?us-ascii?Q?7DpqBQD+5Oy5kriVHlasHAMYooXS6Eb6KAXmSCWutqIHdgCQlGn8Tlk55rwg?= =?us-ascii?Q?YG10VCNZ0dr4Dm2f/vfqkdo3m7E0AxHI3URwoBrScUxNX02MV2mB4ZUMDN/d?= =?us-ascii?Q?7rPhYx7KUGK8qPESzRRKS58SNjYj8YIzj+aHF5monTjjJrX0hGMdypyQ3bOi?= =?us-ascii?Q?z4i3oF+E6cPd8aQw9K4=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 13:27:44.9156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82bf4540-f1b9-47bb-f430-08de43b96375 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6697 Content-Type: text/plain; charset="utf-8" From: Gal Pressman Dumping module EEPROM on newer modules is supported through the netlink interface only. Querying with old userspace ethtool (or other tools, such as 'lshw') which still uses the ioctl interface results in an error message that could flood dmesg (in addition to the expected error return value). The original message was added under the assumption that the driver should be able to handle all module types, but now that such flows are easily triggered from userspace, it doesn't serve its purpose. Change the log level of the print in mlx5_query_module_eeprom() to debug. Fixes: bb64143eee8c ("net/mlx5e: Add ethtool support for dump module EEPROM= ") Signed-off-by: Gal Pressman Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/port.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/e= thernet/mellanox/mlx5/core/port.c index 8f36454dd196..7f8bed353e67 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c @@ -431,7 +431,8 @@ int mlx5_query_module_eeprom(struct mlx5_core_dev *dev, mlx5_qsfp_eeprom_params_set(&query.i2c_address, &query.page, &offset); break; default: - mlx5_core_err(dev, "Module ID not recognized: 0x%x\n", module_id); + mlx5_core_dbg(dev, "Module ID not recognized: 0x%x\n", + module_id); return -EINVAL; } =20 --=20 2.34.1 From nobody Sun Feb 8 05:29:04 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011066.outbound.protection.outlook.com [52.101.62.66]) (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 2275D320A05; Thu, 25 Dec 2025 13:27:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669275; cv=fail; b=iDmbk9h4DQmxrj/OWGCaWdeOKNatg/XXMaszPN99gbl+y7hebep9AYDX1QclfMPIloFa6pr/H9eUm0q2oQyJQ6Ocu7d4ZkrAU/ON+idW6cf51U7PPDM6BB0KywaH5mySkPMpTj8ZrG29eCNivCUPhb2z7AGdaschRckQLj1qmas= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766669275; c=relaxed/simple; bh=Eim1fB6I/KB8Ze4Ux2b+MmpNsdqK9kLROI/5KesV+PU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RiLChX0zlJEGpKWdv9+gWtwOcdLWk89wAhP5TFXGuG0b2r0XUPkQxVzIrcem99cFW1kHJhNP7yej/3tDnYRvrPN6OrBM7G7acTPQOSbqiwHx72qXIUUGeNDEpOazI+AFdbrEwv/afoUuzTV6R5dbbLc6qbyEd5xD2cjJ7FL3QdM= 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=KpN3PP2v; arc=fail smtp.client-ip=52.101.62.66 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="KpN3PP2v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=V0qzHMzcuWP2kXkX/QV9kznnFexKqK9v7UJQNq6MNSKCR5Wc0kqXD5T8/4TaAsah3HT7QLFepsBRHgZULjRtUPG6NHx4EbsAmoPXpwPcGzqwbFBMsJBfaxkd9jwUe2mTP2vsnRax/JlUxYp2ssViBIPHDcZImUQuWsPPXUy3ZK+OCti18ae9flfO9P4dy42yFS/cfZNqhmqEQTbY7vxHEnUDBCpuEaAHYf5WnlTZ5j7So94H1c7VhIqIts4ENma9icZ94/j0b257N+EhoOle4BqQEtnutLwu9IIg4/N8NUkSkskYi7fDSooMYlzBGyhHC8IH+WTE3K2Fcft+QcjBqA== 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=oPvOUvuoMeetqKQ/veluv4TVKg2T3Hak1djtNiKOfo4=; b=bF/jpmpDx+w4CKuvmqL2WiJMaS7fz7SpPLxyyDEdLGFf+AIZzQJ8OG8hPHkCXOdgQSWHZnSRF6o/KT/ro8SMc4EKZT0sI5WldTKWoCIbg7drVzbGXdao76sWMH4gXv0h3/ebhZB6+oa38ZfIBvhf9peim++QOi/lyo4Jm1M+0Y3wH2axNSff+j+0VfZr93yojvZKIRX3ZeGG0i5Qtf/CBHYIp4TnSQsexJ/Jb8o7uFWf2snOZbigEAv1ibhOm3ay7LAJfEwSRmCcsk6RrkpI6WeeMX8GOqELtWpeQ5xarqXirfVD2TeGfBYMqn/L3ZbPZHi4kCgwU1ugqikdwEAPnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=oPvOUvuoMeetqKQ/veluv4TVKg2T3Hak1djtNiKOfo4=; b=KpN3PP2vYA17iTczdC/wHZYQpHbYXm5swTJrweWAItFXS4/vhB//R9e0Ucwzb5RcPfU84UiA5Ibo5PrcMNz/I8AJInCM0PR2B3NtnS1aX7bsPOrM1U8v8dvnXdpe+UfXdTViBrMTUP4d5IxKmoPcQivr1EY9oVo+Pm37c1ux8b+uFN7hvbqa4jwRW8g6bPWzM6JfQOKDPaliBl2Qc0GhyJbF22VC9aWa+snoR5ETqRrnvHnjCpagE1iNuZm8YAEz3KYealY1Dew84vTlaT80PANJtQ8Vb39X9r35f7KJ59dPMx9NCoIkX5py6GL2qIO34JOaLWGC13g48KSCrdrpng== Received: from BYAPR06CA0052.namprd06.prod.outlook.com (2603:10b6:a03:14b::29) by PH7PR12MB6465.namprd12.prod.outlook.com (2603:10b6:510:1f7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 13:27:49 +0000 Received: from SJ5PEPF000001D6.namprd05.prod.outlook.com (2603:10b6:a03:14b:cafe::6b) by BYAPR06CA0052.outlook.office365.com (2603:10b6:a03:14b::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.12 via Frontend Transport; Thu, 25 Dec 2025 13:27:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by SJ5PEPF000001D6.mail.protection.outlook.com (10.167.242.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 13:27:49 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:48 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 05:27:48 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 05:27:44 -0800 From: Mark Bloch To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Gal Pressman , Cosmin Ratiu , Dragos Tatulea Subject: [PATCH net 5/5] net/mlx5e: Dealloc forgotten PSP RX modify header Date: Thu, 25 Dec 2025 15:27:17 +0200 Message-ID: <20251225132717.358820-6-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251225132717.358820-1-mbloch@nvidia.com> References: <20251225132717.358820-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D6:EE_|PH7PR12MB6465:EE_ X-MS-Office365-Filtering-Correlation-Id: 26bc61bb-a288-474d-20d3-08de43b965f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Kos5ih2FJyAp/b9iF2W6Jmb/eJT+U9MNUOZOS9RtIpZELi+E24k27rjGS14l?= =?us-ascii?Q?buwEjv8tB7g6sdnLePhvrul1qbicpYeCoKiGDHNYc3hW31wXDR88i+Wr4GgN?= =?us-ascii?Q?HoU3rDx06/vzgMm5RrUQnCaLqoyg8XUO2nptch32in2xTHoDtsUZJMav1Rum?= =?us-ascii?Q?xxi8k+Caq2m7AMWZ8GbnQ/qaVy7hb/QkJ2vn4ETvqKM0FTZlaqZGTJcq1z+G?= =?us-ascii?Q?gVTMNvN7kC+JYtREqrXRJcP9u6OwjjMKsbkAW2rc79XTkTtyQFwREwEXy4d0?= =?us-ascii?Q?dYRiqye29n/03qnh83ofNmYxCofxcAbPAJK/Q5Dn2AEYigRf7G5qlXn+2QNx?= =?us-ascii?Q?GArJ87WTWpXDEfjkIQ/8f4kr+AFGJqvFpMbcff/urFftM7f2I446PQpgsW1s?= =?us-ascii?Q?suGYc3kyW0YN7eMReyXt6vtkFhN3Jen81QBBVKIe271VsuT1JXh1FER9P4DO?= =?us-ascii?Q?VykZSTXPo/pEfwjAKE89RsXu1FI9AxSN95+0HaUzJDngXMJMXaW3fJCpvXsF?= =?us-ascii?Q?6R5jq1Pv2Elv4VyWXx01Xw0oAD+MG67zoO7oJGdcDMrYDexSZFxprmlJ8eVO?= =?us-ascii?Q?gMTrud81Aj9AkzOovvWaYL3OiLuq9OMwXd0hdwxhKNqm5Lqip+pTwO/BpPW3?= =?us-ascii?Q?AtBiXH/Wl/0haEGR4K2I5SA/HPoq6HkKNC8HMIW9iKqcKdszPO2/9jfNh9ex?= =?us-ascii?Q?YFo1qqoJZ13uBOx2ELEK5QTbFQuXpMilskDfswFqktlw2DUdvfXBk5xDI0Op?= =?us-ascii?Q?LnBLjCnnDEmm+0WQzBuuJCrlrv/Dufwn+xZtp6Im9w7Pn2XeTNDOUl5SfmIV?= =?us-ascii?Q?Fnav4Zz8wluXiqTUu3Dl/4xhB/0H9RvWQoEtNr6D+a/kmiDn5+tMvyjayIdj?= =?us-ascii?Q?5S9qILkpbBs+3PFGJGg0YqlZ0A6cep+2X1AVHtTVnQTe5MYw1sKdA1GjXAu+?= =?us-ascii?Q?UyFdgFMojlmIF3C7ZOi2E/beHjRQ0nlVe/s2LFsxZDwbSJG2mXG/oIf9/Jea?= =?us-ascii?Q?f5IeywiDqt1v55101yfPUWvmwpy1OSmo8VQmhgFweTyIrMAhPKpGTih20sFU?= =?us-ascii?Q?hZk/sDpe+YSiDlu79sj8pkDjUkMZJWM4l14PY1PQ/gicVJI2s+uv/T+ffoZm?= =?us-ascii?Q?vaZAx8ymelEcf1bDAU38HNvsyu8ARugh6VYHQcYS1EqKaBNp6dKazx6BI4AA?= =?us-ascii?Q?Uh/Dr2EYnAK7laZBdABUUJ+V4Z1gBngtw/vt1mDt3VdHZ3qeCdHaqxm7+J4x?= =?us-ascii?Q?ga0wAmjwkkDT7Fvl8U3BuZSxCqqIXcKuAm3IsKfg4uWIzgql4zhAqEJ40vH3?= =?us-ascii?Q?ClLsjLHCVYGwIlcn56lEMzZR1t9dGPRfx6KRW1GxYGL9DQn9/iUJBVOqfCqO?= =?us-ascii?Q?kzp0s5EzuMVFGmmulRwkYKJoJVZXhKPNMdu0TDVVDdh9773UeALd/Mk4eVKI?= =?us-ascii?Q?36MmlPKXA7BBJ5A7pOMP+tQd3MLysHmvsR/oG4LJePGkxi4kbZdZ9m+uaN5X?= =?us-ascii?Q?Icr+pLfsczr55YPZAnAVh3Qb8EMG8206Lps9WBRrfIJz3jjMrja3No8wBU6o?= =?us-ascii?Q?ZBOhSRYlT+8t5KQmkYQ=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 13:27:49.1204 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26bc61bb-a288-474d-20d3-08de43b965f1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6465 Content-Type: text/plain; charset="utf-8" From: Cosmin Ratiu The commit which added RX steering rules for PSP forgot to free a modify header HW object on the cleanup path, which lead to health errors when reloading the driver and uninitializing the device: mlx5_core 0000:08:00.0: poll_health:803:(pid 3021): Fatal error 3 detected Fix that by saving the modify header pointer in the PSP steering struct and deallocating it after freeing the rule which references it. Fixes: 9536fbe10c9d ("net/mlx5e: Add PSP steering in local NIC RX") Signed-off-by: Cosmin Ratiu Reviewed-by: Dragos Tatulea Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- .../net/ethernet/mellanox/mlx5/core/en_accel/psp.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c b/drive= rs/net/ethernet/mellanox/mlx5/core/en_accel/psp.c index 38e7c77cc851..9a74438ce10a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c @@ -44,6 +44,7 @@ struct mlx5e_accel_fs_psp_prot { struct mlx5_flow_table *ft; struct mlx5_flow_group *miss_group; struct mlx5_flow_handle *miss_rule; + struct mlx5_modify_hdr *rx_modify_hdr; struct mlx5_flow_destination default_dest; struct mlx5e_psp_rx_err rx_err; u32 refcnt; @@ -286,13 +287,19 @@ static int accel_psp_fs_rx_err_create_ft(struct mlx5e= _psp_fs *fs, return err; } =20 -static void accel_psp_fs_rx_fs_destroy(struct mlx5e_accel_fs_psp_prot *fs_= prot) +static void accel_psp_fs_rx_fs_destroy(struct mlx5e_psp_fs *fs, + struct mlx5e_accel_fs_psp_prot *fs_prot) { if (fs_prot->def_rule) { mlx5_del_flow_rules(fs_prot->def_rule); fs_prot->def_rule =3D NULL; } =20 + if (fs_prot->rx_modify_hdr) { + mlx5_modify_header_dealloc(fs->mdev, fs_prot->rx_modify_hdr); + fs_prot->rx_modify_hdr =3D NULL; + } + if (fs_prot->miss_rule) { mlx5_del_flow_rules(fs_prot->miss_rule); fs_prot->miss_rule =3D NULL; @@ -396,6 +403,7 @@ static int accel_psp_fs_rx_create_ft(struct mlx5e_psp_f= s *fs, modify_hdr =3D NULL; goto out_err; } + fs_prot->rx_modify_hdr =3D modify_hdr; =20 flow_act.action =3D MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | MLX5_FLOW_CONTEXT_ACTION_CRYPTO_DECRYPT | @@ -416,7 +424,7 @@ static int accel_psp_fs_rx_create_ft(struct mlx5e_psp_f= s *fs, goto out; =20 out_err: - accel_psp_fs_rx_fs_destroy(fs_prot); + accel_psp_fs_rx_fs_destroy(fs, fs_prot); out: kvfree(flow_group_in); kvfree(spec); @@ -433,7 +441,7 @@ static int accel_psp_fs_rx_destroy(struct mlx5e_psp_fs = *fs, enum accel_fs_psp_ty /* The netdev unreg already happened, so all offloaded rule are already r= emoved */ fs_prot =3D &accel_psp->fs_prot[type]; =20 - accel_psp_fs_rx_fs_destroy(fs_prot); + accel_psp_fs_rx_fs_destroy(fs, fs_prot); =20 accel_psp_fs_rx_err_destroy_ft(fs, &fs_prot->rx_err); =20 --=20 2.34.1