From nobody Sun Feb 8 08:33:05 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2083.outbound.protection.outlook.com [40.107.237.83]) (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 1A0FB23816B; Tue, 10 Jun 2025 15:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568557; cv=fail; b=aMPi0enLvEZHWXOs4/M1Pmt5h7TE4Mez7JpLflIbwy7c1VHqqimoJiXbu0gL1EblCloHxgsWt6mg2St6qhdJ1g8vVOXUFzvZ78b5jkZeZyuXCLjVw/fpXBPfFn6AB/4L7Cv9bBavvXbZHXSZFgxL+5Wgio3oobphePRjSV8TTOs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568557; c=relaxed/simple; bh=TFICOknkcTvZ7zj0XAu13r6pz354AFf/qVtazl5vIcI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=F1B0oajBUG2771fKd7NVAC88pVnbiXXwJfGL1UbqaanZ1e8yCVCffw9UyYKwLqgEQ1JbpohJfq5/RPG91zrxx1fEOFnO/2HsnX4MIL6yvwVi9IGI0CJU0d0ziB3fcORyDukxke0uc+k07cOX0L6EJ+vVHGUC7V3S5nar2dwd4JU= 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=XCEEp8C6; arc=fail smtp.client-ip=40.107.237.83 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="XCEEp8C6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wL97OeRcmIO+CphOlTZW/wdTGELBIaFHpDo/OYOH/3WWEOQie/Ojv50cbV3oIDH4hfkyaN2z4zYzklnkt4LBO5NlFiDQf3Jonf9/EBCoXmHUdLujSgIyDuU0+lJthEcOVVWaQlGGBjrbBnkS/RTLo6Ugm3FsQhF+nohePsYBlt4FZAmBnbQTGjthOuTKNaijfKK4jcWrspdXIc7zvWg/6tksDAw+xQV9MksVvx7IsPFmHIT3w299GlIZPtBPNcaYirC/TM+UBoEEYpO9vq75Js63mmpJ2N81oclRZ/C/chkc70nWCNyjOHc67Kx7v6ffz0iBRsGm74tf42YnbGjbpA== 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=QXfbfprq0BBsdMz85X1XlSdeIMBG+oohlmaqeVJIWQg=; b=WAt/QQsoLeYQqvNNCqUGG9ZPRS3dyhAybAOIqpdk7XPtn3PYCXL/xTDOXYCu6kIY/Ui80ds/pDEocq5IIuMnJv/OAgvqF+ABR8grV+SjFaJsvRNtGuKs5Hqk0KxN8uBQudeZT9tb4yYSHTeqbAQAqH59nKT3mgmHe4PAok1O/pXlqo7qNCadUmunVLABHC09wWH/0GACwXOuqMUEp4NnT5Jf+JRPo7jOXfyZ2aUAcbVxqb6BmUDczYOgbwjg3js7FhEFSipBIPYEXiAqMimUfDgIIVVVwuhIGzlKzU2Z3ruoqWaS6wuZT1982ltaAJIwn0xfwL1EbozOtiCyaGw1Uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=QXfbfprq0BBsdMz85X1XlSdeIMBG+oohlmaqeVJIWQg=; b=XCEEp8C6cah2m64QsF/gD4O3mZgyrfuTM/j3qTb4HR4LKcxhVOkeOJeUtZkQMbUYDlHnyo+8zSI9jB20NeeXN59ISvv/ws/YTGr5Wrkd9thSw63y0uiWQrLzEzGz5WT6xzpitZihHceS4hL0EUw0OWCAuiAuDnYBcsA4oUAfsq1bvKVjDnSiU3KmKupEUV3mJoxlUz8lnO3ACCWJpjk84dEWFolZYvnF5dmssx+PcLC7Bq0KYpkf/IR23GnRsYupwhvvYDFwgdjxx/RvlYzpdBtF+mzGa6FOlO0F9ntPZs1vLThpslQ6+wlKhRJ+6DVLP6iLxF724zFDIsHHF4e8eQ== Received: from SJ0PR03CA0189.namprd03.prod.outlook.com (2603:10b6:a03:2ef::14) by SJ0PR12MB7034.namprd12.prod.outlook.com (2603:10b6:a03:449::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.19; Tue, 10 Jun 2025 15:15:52 +0000 Received: from CO1PEPF000066E7.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::33) by SJ0PR03CA0189.outlook.office365.com (2603:10b6:a03:2ef::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.34 via Frontend Transport; Tue, 10 Jun 2025 15:15:52 +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 CO1PEPF000066E7.mail.protection.outlook.com (10.167.249.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:15:52 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.1544.4; Tue, 10 Jun 2025 08:15:30 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 10 Jun 2025 08:15:29 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:15:25 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Moshe Shemesh , Mark Bloch Subject: [PATCH net 1/9] net/mlx5: Ensure fw pages are always allocated on same NUMA Date: Tue, 10 Jun 2025 18:15:06 +0300 Message-ID: <20250610151514.1094735-2-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E7:EE_|SJ0PR12MB7034:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c2d8d35-6e39-4346-38e6-08dda831b055 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?S8jni8dmqOXHXAnR70K/UpYRtL+RVuCKSPSibC4q8fJMyCLjB5t9AxRpxHIg?= =?us-ascii?Q?WlTvvv9g7yU53GIqhuj7EJ7f+xfIC6lqfDwTNMrqkn7vGta8Hv2vafy6TCZA?= =?us-ascii?Q?kVdd1MKUHUhfwiIRhQC6tJfy+i8ZcUXumRgHNorSnZW05AUKG/ueVEexT96J?= =?us-ascii?Q?+SqN4Op/fIUSUEJkfYZvxsVPUXIRtOIMeDbkdkNIBrAOO7vL1B67Op8NfYEA?= =?us-ascii?Q?gXU7Vol13gn47x/nd4YsRuhnkKLsEQ4BwRBrXz7LWG8YSb3DFeFdjPt6gsfA?= =?us-ascii?Q?olhqZSekdVGkR0F/V2uOWJtbdTEaMBDhrLowNSycOSsPYCD10mBU3KMxSwZF?= =?us-ascii?Q?YbvQKaAyZW1t50gp0QhEmbAJBUxPzcvtP2Bx1h+5tTuZAtT4yb5r1kaNBwMf?= =?us-ascii?Q?cdC4hpXGnIzwNiP2xrQ5PchWpzjCPpdnTY8KwtObtkBBvIUnOKvuCOajYhPS?= =?us-ascii?Q?rFnziqz4X7fUZeIQpzbyizc/OnnzlqyP8TJ2wf26uwz78Vd2hyn5i2ZXUHnc?= =?us-ascii?Q?uwKOUUyUdRlJ3AuebBOi1wbXxTj+mVZmJPEQncIFqzzVX4K9aSrTWdK3DPPy?= =?us-ascii?Q?Ke7jqWngBZRLaDJYp5L/w86RDpxf0QAWvrYpUrYbnnJgmxm1ZKmdtGLZxfb+?= =?us-ascii?Q?0HPWa+EoMX1YJqxZeR2iFQYEotFwhoS8YU4By7lG6Tb9HQp4GIXx2gzUJrrY?= =?us-ascii?Q?KCn9ChUSWP7BqlAASV7XxuoV+j8uYZ0fhRhgzS+uFbMUihTTlIxzFyVuWowI?= =?us-ascii?Q?X1YiBqwzU3sNeSTah+w8sSETqS8YvEF57qcFCgJa8CsWHlP71aPj3YQKQrRC?= =?us-ascii?Q?2gfJ//vBQ+GvulN8TQsdbKDKXagthIlVcSAK9JlSAzlPJcyNtWzjnls6Dorr?= =?us-ascii?Q?ZsMIZJsWzmD6JZPWv3oMwV0TkLYXBjHd9qnMifCUdoJAikF3hyMT/RZyqjTU?= =?us-ascii?Q?D4CL+bcobFxYFUnYIEqRngB0siChDB8iEhan7FUdhYRXNUiDAY+VI9CPJwk0?= =?us-ascii?Q?cO15z0SkE9cXyaZPUV/T7CXQP7KgUF6zjB11eFuT/r4OTEaNVtmelvtlVfHi?= =?us-ascii?Q?mol36lyGYyToSCAW60nqu2DUPvcEubUQ060sKHsNjblMUQPe7V3V4Z08Zmby?= =?us-ascii?Q?uYPACIXrcHLIr2qMn8eN9dBUAtuqp5okyK2GJJnogArqGivGyJvNe4e28r8i?= =?us-ascii?Q?qodDNEAZurJ5zNjAYsTs4qhRwxsHRD1qrj6E2ljxTMHfCTc0I+vok44K9b5O?= =?us-ascii?Q?7UTaF78iruhsBjFq1rr1RSNj2yQYalms/gHObgSiFYi5dljBf4jMhHYeiPSk?= =?us-ascii?Q?kya44uGnwQ72+97v8rMJCkbRAbAr16xJ2nuAzVd8SNXaonVUePSjce1OZRoB?= =?us-ascii?Q?rUF/r+z/PGuTu0kwDvxaEuicppYje2NcbI79fV/FzpdU330UvmO6udKjkxCh?= =?us-ascii?Q?pq2LOALwX/++FzRP1QD2cme3fia1JfNveh9Mrg2ja1GP3ipFCmdeFniPnSCY?= =?us-ascii?Q?C1vgFTswr4q8dwdWmdi/IDRnf8LxAOtBXhr1?= 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)(7416014)(376014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:15:52.0312 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c2d8d35-6e39-4346-38e6-08dda831b055 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: CO1PEPF000066E7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB7034 Content-Type: text/plain; charset="utf-8" From: Moshe Shemesh When firmware asks the driver to allocate more pages, using event of give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code uses dev_to_node() which can result in different NUMA as it is changed by other driver flows, such as mlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages. Fixes: 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUM= A node") Signed-off-by: Moshe Shemesh Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/= net/ethernet/mellanox/mlx5/core/pagealloc.c index 972e8e9df585..9bc9bd83c232 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c @@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr= , u32 function) static int alloc_system_page(struct mlx5_core_dev *dev, u32 function) { struct device *device =3D mlx5_core_dma_dev(dev); - int nid =3D dev_to_node(device); + int nid =3D dev->priv.numa_node; struct page *page; u64 zero_addr =3D 1; u64 addr; --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2075.outbound.protection.outlook.com [40.107.237.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEC5E23C4EB; Tue, 10 Jun 2025 15:16:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568563; cv=fail; b=Cao/rRKUePDmxHDGyy96pLgMcPY55z9xSucq8XmUM+napg9GHKFFlHjjVpd63BmY3WqWFpr/sN0tpgOuEpBZOVBaYI7eLRx7d63x6fHjs8jbH1nibWHp5GLNAVH1Sh6QN5U12AFLfcjGoXtkIq1Ru6Smq6HTF54Q5gsqj3j6D2g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568563; c=relaxed/simple; bh=TT7jTTdndzdj5IY+gBKze5WPALpW+um76NOQLydXA3o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VAo5DuYDp+NB4tiyHyLe5edsusToVBWDqqELX++gViipBtife/B+LGK8CS+T+36urot+VUuxm169Cq7B/fA9B1rjnnZKy0W/t3ZkGZdBasaOXRAkhqSfuaDCDzE1SS+H+9qumEiOlVuh0eGxNxfyiR97bLPkL+hovcNtnZk2GaQ= 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=fIrBEhnT; arc=fail smtp.client-ip=40.107.237.75 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="fIrBEhnT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rqWgR6TQjJaxibWmoGHVa0FvZilwzFQLu9Uup2pZW4ClSVWoEirkv5MT1j9YpHfb0Jm71cEXvjf2dR931oIIhUvgHwLw1yb5cNeyIvL/EvglaLbxZFQgTkUtWNShUg6ol+HgM0iuguwAgwWSkEB/tI8l0JXZI8ZoyNxuGe6yRKAZchzh90g8VXPV7yPKhxOQWj9N3d6NOuRLwcm0hjksQ7+XI6kd2Sa1BXU9hrLUoBHf8+GtEeGOu9fzprlsC/yzWf6LEy7bisWgM8WEIz0lCo1CBjKsChd7GUbWbSCdaAgH+Tf7yL7SiU3uFRv9w/jkfToDnEideGcW96HcwEitQA== 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=YXLWV/9gIQWNZAadpD4qltHWrehWLelshUNb1EH6Cyg=; b=kYOrDJoCd4cWM1lqkz8n1rC3ZCcg4TnVFtHLGsfjBTOxpl9gyy9D0Xq6n430dNFDP03m+cg6LfGtLA73bDO0zXDm1ymPDTPzJdvpjx8jhhdfE+JxG9RHaGp3tQ9bPt5xAsTth/efCdeSyQm9Qac2i/xCeRIFk+Z0fCPp0OHDj0Fdt0Kg+obyUmHL5wy15jwvTKvjs+TtKqh4XzpIV4FKjrXUpqbBj9oKfGlA6xU3bMPKUxO4WQDofhofVNUUVRccfeayQ8bkl3X8DrG7GCHNmPaP5i9TSAdtWIDcquEOhTFCE7UZ9dQyDOm4Izek0h28tf8LmziCx3YBVrS8AzzSoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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=YXLWV/9gIQWNZAadpD4qltHWrehWLelshUNb1EH6Cyg=; b=fIrBEhnTKzG49l6kgb/bho7o04VZoazzqbeMQ9rFYzgQtSwQwm3zB+OunKZ9PHiaXJttXAd0g6QTuLT3tN8lOWKDc1u2vW3r72mLu/6VOrWbRFCGHqiDu7lSo6Xw1YUnJ1RmiSXprtYMss4XI12hcjSa1aO3FFnBb1gJtqYE+s+AdUbsbYNbxxIOEhFYx+MtZIlYQ+E/C3QrBYTAX1eLwbKH+3fr81XxLMZ11Rk2JnjICSGyB15u8lHmD03Oztvy82gfmjVwsGjCsyhGOGT/cJ+hiqt5vL+aDrhdFBSjr4AK1+NvyXvxH7RqUmMBzm+D4Rkx52WzpLx+jZOJEaKWDg== Received: from BY3PR10CA0023.namprd10.prod.outlook.com (2603:10b6:a03:255::28) by MW4PR12MB6827.namprd12.prod.outlook.com (2603:10b6:303:20b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.34; Tue, 10 Jun 2025 15:15:58 +0000 Received: from MWH0EPF000971E2.namprd02.prod.outlook.com (2603:10b6:a03:255:cafe::33) by BY3PR10CA0023.outlook.office365.com (2603:10b6:a03:255::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.32 via Frontend Transport; Tue, 10 Jun 2025 15:15:58 +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 MWH0EPF000971E2.mail.protection.outlook.com (10.167.243.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:15:57 +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.1544.4; Tue, 10 Jun 2025 08:15:36 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.14; Tue, 10 Jun 2025 08:15:35 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:15:31 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Amir Tzin , Daniel Jurgens , Moshe Shemesh , Mark Bloch Subject: [PATCH net 2/9] net/mlx5: Fix ECVF vports unload on shutdown flow Date: Tue, 10 Jun 2025 18:15:07 +0300 Message-ID: <20250610151514.1094735-3-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E2:EE_|MW4PR12MB6827:EE_ X-MS-Office365-Filtering-Correlation-Id: 16c8fb54-2dd3-465b-a71b-08dda831b3a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|7416014|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6yPyuGotfCqQKcCfloUWqOfc/wyOacWYK1fRamhfRHjA3fubV/gncsvkfrB7?= =?us-ascii?Q?urHhjbt8LZA0N5SPINe+BPpetUcXZ/jC5GCe9cmoLjsUu07dtdgKZm3TTahZ?= =?us-ascii?Q?7HurVwVwfCnYcIhmFHmN01LmIoyisP7Yci0ps9kABVfmmdf6Ix0Eompsi1Tx?= =?us-ascii?Q?Cuzip33CDcl9Y5UnRK0/GPX6fRzWhA5S5xzYlCQmJgG0Tf+zsI+DoZwR3jvT?= =?us-ascii?Q?LNcmGsFwKYKnQmlHqBoMV/24zYGsWfc47MTl+/xY+Jwmm0gVKUQOmb8LYZGS?= =?us-ascii?Q?7IVcmxhyeEihAVajbd7gWxVzJ8teN9E6J9kS/T3PLHG7WItfHkOn9ZoGXEay?= =?us-ascii?Q?75aP3V0vHStdIpnb3YAkA1hIhClgX73I/9C2rTD7ZTvkAkbPkyovHrIvVpNV?= =?us-ascii?Q?5aGH+t+zI6B2ubRepG4Gd2bu5o+krUVrLWwij+gt6ckIBaXaPEC/CeedPSTR?= =?us-ascii?Q?ZJS22a/Jd9p9CUJyOaEbWzZUEALW0qADNOCDfmWzRT2fRj35e9+pcjxtK8i1?= =?us-ascii?Q?IE5h/sW3/+Z00cn++RxuH/UXMHaZ4szGnF6pH+viWAG6b+z/0pDRDP0fWKRQ?= =?us-ascii?Q?sfKXR3adr6Qv0rL19J9MNsrxe5I2n64xbhrYpq/fQQa5iYtcYpgZbFw19GON?= =?us-ascii?Q?iztB4Zqy1xJK4Mj3syjGjYejOFmFd2JdYEGgQfDF3vZIIWqJKAPoyjqoEz/v?= =?us-ascii?Q?uXCk3p2aKxvHQRwKSZSan43BdFkqyfabAgxV92zTCH2AQ5WRAD+T+Z1YJh9R?= =?us-ascii?Q?sN7ihcO/49OhwAN0um73EAIuKwYVvPfoRbjOsCdO8H+dzo6u9gi0N3LnHzvB?= =?us-ascii?Q?vSVKS8Q2neHskwvlJxMC54NSv2hsXbM7QyVE4zXbJRu82yea4Lj0VcjEykkq?= =?us-ascii?Q?bClmsdi9Pv+0xzhd5Ryuxxp6U1ZQGGsNXNy2yaUgbjFsKS8Co+AhHqf7xLqF?= =?us-ascii?Q?ZI3A3gWc4ptQDlRRubGXx0ZLzcdyKtmm+uREe72kuyt4zL7qhdnC/EUbxXYp?= =?us-ascii?Q?MlEhIVnJOyWtzt7/OjkTn02lDzkiW5PgYiZXsEIglG+ZLbaDBAh1ds49z6MO?= =?us-ascii?Q?UCOMOr1E0RdVDCcAw2c0Y5ZYL87s59KVCLtmLJBLyL2ABVTo8+BaSyST87iV?= =?us-ascii?Q?oG4JVJE8I/Ns5G3mcr9EWkybmm5Ycj+/WfBSnfmJeDC7Oj41Z2XHmgzl71Yu?= =?us-ascii?Q?JHdgF3oZBebvIj3fCkqto6ezztXJGGXQJqmsnvJrwa7wTuXGB9Ynl2U7wyex?= =?us-ascii?Q?1M88qcVS4261lUvJEr6bZQ246mZJvS9MR19VV0H7URMexkQeT6stzXbzZ98n?= =?us-ascii?Q?hAwJEZhMWnUJvQWuyaOm48tMnGsJBHfTJGze/Cc44Klh/sK6tW1IYi4JmAZg?= =?us-ascii?Q?pOEfRemjEbiXYXgrhKUl0Gyet1VoBikkCwKFwsvveksVY/DjJfWGGWd0UOSk?= =?us-ascii?Q?eD2TqhkVXKaQKFINzAKLff1gnyfqdwOBKGEKEGocgEpWxQmzVsdi3Qc6Mu2X?= =?us-ascii?Q?olH5cHYUhn61W7vBorec60vku65+ry3dhLct?= 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)(82310400026)(36860700013)(7416014)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:15:57.6117 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16c8fb54-2dd3-465b-a71b-08dda831b3a2 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: MWH0EPF000971E2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6827 Content-Type: text/plain; charset="utf-8" From: Amir Tzin Fix shutdown flow UAF when a virtual function is created on the embedded chip (ECVF) of a BlueField device. In such case the vport acl ingress table is not properly destroyed. ECVF functionality is independent of ecpf_vport_exists capability and thus functions mlx5_eswitch_(enable|disable)_pf_vf_vports() should not test it when enabling/disabling ECVF vports. kernel log: [] refcount_t: underflow; use-after-free. [] WARNING: CPU: 3 PID: 1 at lib/refcount.c:28 refcount_warn_saturate+0x124/0x220 Reviewed-by: Daniel Jurgens Reviewed-by: Moshe Shemesh ---------------- [] Call trace: [] refcount_warn_saturate+0x124/0x220 [] tree_put_node+0x164/0x1e0 [mlx5_core] [] mlx5_destroy_flow_table+0x98/0x2c0 [mlx5_core] [] esw_acl_ingress_table_destroy+0x28/0x40 [mlx5_core] [] esw_acl_ingress_lgcy_cleanup+0x80/0xf4 [mlx5_core] [] esw_legacy_vport_acl_cleanup+0x44/0x60 [mlx5_core] [] esw_vport_cleanup+0x64/0x90 [mlx5_core] [] mlx5_esw_vport_disable+0xc0/0x1d0 [mlx5_core] [] mlx5_eswitch_unload_ec_vf_vports+0xcc/0x150 [mlx5_core] [] mlx5_eswitch_disable_sriov+0x198/0x2a0 [mlx5_core] [] mlx5_device_disable_sriov+0xb8/0x1e0 [mlx5_core] [] mlx5_sriov_detach+0x40/0x50 [mlx5_core] [] mlx5_unload+0x40/0xc4 [mlx5_core] [] mlx5_unload_one_devl_locked+0x6c/0xe4 [mlx5_core] [] mlx5_unload_one+0x3c/0x60 [mlx5_core] [] shutdown+0x7c/0xa4 [mlx5_core] [] pci_device_shutdown+0x3c/0xa0 [] device_shutdown+0x170/0x340 [] __do_sys_reboot+0x1f4/0x2a0 [] __arm64_sys_reboot+0x2c/0x40 [] invoke_syscall+0x78/0x100 [] el0_svc_common.constprop.0+0x54/0x184 [] do_el0_svc+0x30/0xac [] el0_svc+0x48/0x160 [] el0t_64_sync_handler+0xa4/0x12c [] el0t_64_sync+0x1a4/0x1a8 [] --[ end trace 9c4601d68c70030e ]--- Fixes: a7719b29a821 ("net/mlx5: Add management of EC VF vports") Reviewed-by: Daniel Jurgens Reviewed-by: Moshe Shemesh Signed-off-by: Amir Tzin Signed-off-by: Mark Bloch --- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/eswitch.c index 7fb8a3381f84..4917d185d0c3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1295,12 +1295,15 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitc= h *esw, ret =3D mlx5_eswitch_load_pf_vf_vport(esw, MLX5_VPORT_ECPF, enabled_even= ts); if (ret) goto ecpf_err; - if (mlx5_core_ec_sriov_enabled(esw->dev)) { - ret =3D mlx5_eswitch_load_ec_vf_vports(esw, esw->esw_funcs.num_ec_vfs, - enabled_events); - if (ret) - goto ec_vf_err; - } + } + + /* Enable ECVF vports */ + if (mlx5_core_ec_sriov_enabled(esw->dev)) { + ret =3D mlx5_eswitch_load_ec_vf_vports(esw, + esw->esw_funcs.num_ec_vfs, + enabled_events); + if (ret) + goto ec_vf_err; } =20 /* Enable VF vports */ @@ -1331,9 +1334,11 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_e= switch *esw) { mlx5_eswitch_unload_vf_vports(esw, esw->esw_funcs.num_vfs); =20 + if (mlx5_core_ec_sriov_enabled(esw->dev)) + mlx5_eswitch_unload_ec_vf_vports(esw, + esw->esw_funcs.num_ec_vfs); + if (mlx5_ecpf_vport_exists(esw->dev)) { - if (mlx5_core_ec_sriov_enabled(esw->dev)) - mlx5_eswitch_unload_ec_vf_vports(esw, esw->esw_funcs.num_vfs); mlx5_eswitch_unload_pf_vf_vport(esw, MLX5_VPORT_ECPF); } =20 --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2070.outbound.protection.outlook.com [40.107.101.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 B9639241105; Tue, 10 Jun 2025 15:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568571; cv=fail; b=QcxE+lxnsaewT3nMXzPCm6eGo0Xajkv+DnnV2H5HnMcQfz5ywSZaERQ4ldqvcGeSPVVRZxszauV6/yOLrqkf59G8QI/BPI4SOwQqxGpL/BsweCbuxT6pzhHbsox4Qc+JKxbGfAFvvPknqljCAYJNfJtcxywNpKkE+gJS5WwhKJo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568571; c=relaxed/simple; bh=sCR8j7ypm60q5ZsaOUwN2B3tCEcKwbbH+JU7mmJgXtg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Xz3u++qRftCBJur756jCHNTbkbALTuet5PZrUxrxASgKsj5Pdm19AOxHTm7Ca/w1uReZc/gjqNmDXmrxj5K/nGWRF4eswuDT4DUaAfolujT/HeqDStphsuNQVDKwVTyXp9bk0qe0IVDECoyuHQ42XHijCTApQmkCovn2v5DfnHs= 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=gKveozQ2; arc=fail smtp.client-ip=40.107.101.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="gKveozQ2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JFMqjWDFvtuMExF0MEoHpLMkSiyS8jOBF85fK8EEcfLS2BlhhoZkNgdDunPnhgYTogP7lGG/Ny4XXBLWJKCzBjZeOD36jZzdPXYxyCWIbvJBLRzCZq0+TpTAAJ3md5qNBNrRLFsx2hwJHezsnq0Cebg0FgeVcd4tlF5DbAxGuN+WZExc0BSWutKYnaW/RzxaMD056VauzjaCgv3LeChvUnmULfW4VRl2/63kC2qzuY/sYfJk0Pgwolbh4un5iAxKgbox/I0rOSyDRKEp2+s6OoScJMpAwnBS6yQX0dAuYvn3Cq6XVz4f0mxFQZpSmRN/fa80I1EWWCju1DqLI/P7qg== 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=3gD5ukszi5/X6e2dSG4zLINF5n+5UjJrG7JHjh5mCBE=; b=de4mM0lzw/OstmNQ5XVSiXOqsCZfjUd0TQkkjFRlMVGA9pXrfseZ25CdV3xB92Sg0hur95yAR9cF9uHv8ONPpHlxe1H4/nYfiFi8xQMoVjvYYL0WwQg6cSYOotmyzC0otz6NFSBKioiT1kTVLXdkCQrXbpPTqqzdljJA43t320ZzZbUCG9MoXDMzDyrjTbOja4djo0BnQuZW9TL23tLH3/wXgFn5WYfy2xOBR/Of5/wqcOdUJymsnmpVmzpl36aNqQ985Xut6bC51GPUGzRopbJA7SzwffoAFFRC+HDIp+jONp+vqNL6dmPyLKzci0n/OknZghWaCS1aTdJOIWizpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=3gD5ukszi5/X6e2dSG4zLINF5n+5UjJrG7JHjh5mCBE=; b=gKveozQ2CXLkjY445eSV3Y2VHjg5VsuuT5jlm1iG7BPEoPEKKY7IJQO8Ydqcf1H71xW6QdfBy90IwnTOBwm/mSNIPxlxRjeQt6dcWhLGH5HUlWPHgC5hBCUX4gWvQJtVg6zmB7MotdVAgivGDs0Li58pXf2ZqUWCpv8VSb0+55X7AvXHVBI+T8PJ/EGdpzB3zloIN8O0V6sCxk+uwAaSyPy4yuLCAdjrKr0rD2I6uFb3Wr6Or4uKC5KnTDi9iNly4NstUNKNHyiIJhLlRUcs2PVVkHse5HQRMo6474Pi60Zy6RqA85iJCxEUyrDJL25a/g9gKDYyDInuBWlPsKgCfw== Received: from MW4PR04CA0355.namprd04.prod.outlook.com (2603:10b6:303:8a::30) by DM4PR12MB7576.namprd12.prod.outlook.com (2603:10b6:8:10c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.37; Tue, 10 Jun 2025 15:16:06 +0000 Received: from CO1PEPF000066EC.namprd05.prod.outlook.com (2603:10b6:303:8a:cafe::55) by MW4PR04CA0355.outlook.office365.com (2603:10b6:303:8a::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.35 via Frontend Transport; Tue, 10 Jun 2025 15:16:06 +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 CO1PEPF000066EC.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.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:05 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.1544.4; Tue, 10 Jun 2025 08:15:41 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.14; Tue, 10 Jun 2025 08:15:41 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:15:37 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Patrisious Haddad , "Gavi Teitz" , Roi Dayan , Mark Bloch Subject: [PATCH net 3/9] net/mlx5: Fix return value when searching for existing flow group Date: Tue, 10 Jun 2025 18:15:08 +0300 Message-ID: <20250610151514.1094735-4-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066EC:EE_|DM4PR12MB7576:EE_ X-MS-Office365-Filtering-Correlation-Id: 1be8bbe4-dded-487a-b538-08dda831b8a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?33v9hm0oi/my1Ew6xMgYz14NduEdbj5smOTglaf0yTWQ6Z9A/JHMGmA+IIDX?= =?us-ascii?Q?ojZVAW3sI1nBICC8+0XDIBFHxNFSBVZk5Lx86U6aqypozAnTEvt36CzFtSYF?= =?us-ascii?Q?MgBvnHmIZsivEEZiuTVFgegddNTrFeWSbqShPA+m+42iqJP1Lrfe/KigsjwT?= =?us-ascii?Q?1Qy+y4U+2Xo46ma+Qdizj8R5vyG0PwlSZvtbOBWtZQSciMl5G547vTIE5uLd?= =?us-ascii?Q?t+/x03iJXHK6aMuTtTwnS/1AMfTmwR/pTvfR1hJM+5fIMOn4/zbinz9gPt1n?= =?us-ascii?Q?7KH99fb/o5r66QKbdyCjw/13ZSbwoq9TR04rnyyoi7sfELpwaJE4JBptDWQW?= =?us-ascii?Q?b2myHVDMkWXQJJnxEjiVW+FDcQQdtQkhEyExansalerrJgZsKy7WGiA58LFa?= =?us-ascii?Q?FlAhX31OheKbx+HivPZlGmEhOZ1rqSJW1+pk360NWSmtk53LyOTrMLzP8S2I?= =?us-ascii?Q?PDIIWKckb17vs4tvcyG1C4uOSrx/nBwB+GIJ7z/lvvGuVn8P7pGDghdFQMXb?= =?us-ascii?Q?50MoN+cf/xuB6wycSy9Jw2evcsjaGeqqHV0ZiEKmyR5r1BSONx0/WeRlp8bq?= =?us-ascii?Q?QlD5ThX8eyB9ol4FjOQMNyltm+sfiVOw/5Rx/F0T/FUHh365q7h3eI4p+xeD?= =?us-ascii?Q?RYn7/tr0I0CgQfGan9SApZWwZX2Xg43G4UUL1+Iyv1uupPIAcBcqiQ+6x9A+?= =?us-ascii?Q?/XDcbPdB+zzBqvaZoDM+hbbz5scmwuALHHA+qL5uRk29SHmXJJXtNeQOHigD?= =?us-ascii?Q?M8z1ZB/nzvk5Oqs7+keh9w5pj4SlNP7QeEYO0Ytt8a8vtbd2cuQFMWUvT7mn?= =?us-ascii?Q?So9N4Q1V5FV2PppHy4rNQEDJguTHQ4EPtR32HZ2AdbaDw1k8GjGgzEsqysfa?= =?us-ascii?Q?FLK5b/RjCuaWFGuSnOG28ZGGO3E9EqecoLvYF5FzScV5Sl86pspFL4hOAJOW?= =?us-ascii?Q?kTDIEfQfJq+iR1Oq1OW4PuFd7H8TfU50fKuFtp+70l0Pc2iQP2TtAed2GbGs?= =?us-ascii?Q?KOYlUSOZM4b9CEtczHactGBWKfv6KXvSTbYByiP8p1clRuocru+gCzmp9bhY?= =?us-ascii?Q?14+1rzxbfK+vOcNqMGvFVsMUWvby+R8uDYdbQB+GsYYr0R7FN5CrTt3rhT06?= =?us-ascii?Q?L6dNiR5mDyyNcy1w70cZ/UoxLr4EiZiItjUBM+32+44lRB67IY8LNKw1pecu?= =?us-ascii?Q?2r2lXu6msx5Z1qXHoxNF7nj0i1q3uuDfiY/vukjg4/aouRxdouCqgrgfMLIh?= =?us-ascii?Q?K1nCFg4xcxTIY3ZUHayX0hUt4LLQbqT/d9z48SDIVecKbUR8nmfCW0AICQ4X?= =?us-ascii?Q?yg7s6pisTal/L+FUDsOU6gGMTSnwP905NFBaANexlClYrDKGzfB2pAZNRjB2?= =?us-ascii?Q?JzL/4mQNJ5BUWrGHEiiR8TLT1IIBr8LXpkxjaoMksu3Js4FqK9DxeiWMn4CR?= =?us-ascii?Q?gjiw/6DNKt5hGSsjBeVsWILAvUr34ZaSiwHhSYJoUi727ECDXcQmz1P0m/dT?= =?us-ascii?Q?9Z2ZxOKXqUkYTe3Lpe5NVIobG5DUcR7t8ld7?= 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)(36860700013)(82310400026)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:05.9461 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1be8bbe4-dded-487a-b538-08dda831b8a0 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: CO1PEPF000066EC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7576 Content-Type: text/plain; charset="utf-8" From: Patrisious Haddad When attempting to add a rule to an existing flow group, if a matching flow group exists but is not active, the error code returned should be EAGAIN, so that the rule can be added to the matching flow group once it is active, rather than ENOENT, which indicates that no matching flow group was found. Fixes: bd71b08ec2ee ("net/mlx5: Support multiple updates of steering rules = in parallel") Signed-off-by: Gavi Teitz Signed-off-by: Roi Dayan Signed-off-by: Patrisious Haddad Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/fs_core.c index 23a7e8e7adfa..a8046200d376 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -2228,6 +2228,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, struct mlx5_flow_handle *rule; struct match_list *iter; bool take_write =3D false; + bool try_again =3D false; struct fs_fte *fte; u64 version =3D 0; int err; @@ -2292,6 +2293,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, nested_down_write_ref_node(&g->node, FS_LOCK_PARENT); =20 if (!g->node.active) { + try_again =3D true; up_write_ref_node(&g->node, false); continue; } @@ -2313,7 +2315,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, tree_put_node(&fte->node, false); return rule; } - rule =3D ERR_PTR(-ENOENT); + err =3D try_again ? -EAGAIN : -ENOENT; + rule =3D ERR_PTR(err); out: kmem_cache_free(steering->ftes_cache, fte); return rule; --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39813236A88; Tue, 10 Jun 2025 15:16:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568580; cv=fail; b=spWP9tfRmC5cpr01ZQ5T8kwpvkB88qAQF+a2ZRH2EmA2lyz87aVD1gvVCrfZVzSp67Mv8wDRA30k5Xp5FV8K61Zv2wVkeJhMB1nUTv87SbPQM/Gxyuk6hw697ZF4WW5y80G0CSM2fdLIUuQtxFh50/055wjg5qX30FMHj1MiV34= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568580; c=relaxed/simple; bh=zsv2DLANkUPzkyHVDrYMcw4w+tsTZe9HjkO6CUj+4u4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ss/1ktj7M9yJIgsLr48ctQcFKA5DUQNq8OcJ1bgsTaSpUJqvH9Mg5sBqlbkbFOhz+7jPr/RIp6BC4RcT1kxMfw0m0EWeC0YTjxnAGYe4w9kMxsN3Gg69AYe0GWoJJvW5LS4MWmLM3tKlO8qCTRBCK2lTUGB2ESqLuGaKZ2o6c+s= 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=cnS4B0RN; arc=fail smtp.client-ip=40.107.244.56 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="cnS4B0RN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rYEvydFljqpyEoQeP/JwCq7ENugdWm0FZ9mD4zQHEox46Oj3YLOnMMxwp/COqg5/RgnVqnGq2nHpyGqpK9mzffRQICXsXubaNEzCwN7WrJRstw/xztKOqrXpUn/g+9AOC+uWRw5t8fnGIq5VbmyBXo5Sa8vftYBOchQU+r9ohDPbV48zSfAHPob9louDKubxGbyYOZFmMl8p7T2KkcCWf2slxylWepAQbqBECAJcP88nlJcpR4TfIeJhhSQsRrJnopwXEoBlcUcTX1mJQ2YYh4BpFbMKNMYb1ZBuGpQl6EW2hBHjM9kXiuk4iecis7/iTRC3Qsgk+mGSOGiMDHTNwQ== 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=/aS3N2bviCvyn6l0KmefJnmron8mNqEu/E839fvwTQU=; b=RQBm4HaulpYnILvGUV9TgVN5c5aCETTXE/eKh8PAiw5xbEHHvfX39tznnP/z3Co3+RTYopDnWf50pgs3FQ3z808hX0BLkJYvPDCQRbSEU/4U/E6s7PHXwhm89AKXDTysAtm1O2y7xzLfpUm3OVqJdKmWY1C9TnX3KWGNZA02Tff+DiOeJHuoGz/FRkGt5CW9nU3BV8qeeZA7XHNyFs/1lC7ZKd5T5V95Wi19ik+RB50w1dEhzYFh3oAtrcI8+HMdxEz4MftQ9VoD0/eVykgRa/i3M0p0S6jmYmHkIOP691I4VZV1nzcFOgqZ3S9TLpOr5iKxmxly/OKGgI8LkWWmIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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=/aS3N2bviCvyn6l0KmefJnmron8mNqEu/E839fvwTQU=; b=cnS4B0RN2fZh2c2SHiqdErD3S1W0JloMd//ejE3Hv2zGiCb9u+q9/C66Hthu6pab3WKgZdB6+bG8TYehz1UlZlxNFhEQ9hH7YV6EeWWWapVaslIZyLkCsIqZAHLNSBnmIYCHW/1osZx5+MBL1owskosrcowDsNqsIBCXMoaLTIO8fmLIuWQRXDBXT0G1IXQP2lybcFJN7UREAXVCLTzxJ5zL2w+R1sF7Iqz5xtn1Ax2fKe55m4YGcGKy5Xa85jyyvPZS6iXbLGmQMD9fIiD+T7X3Y/NYKgTYvNV1orqnE5en4BtPfezfQoPF2jK4LzhxtEg30DmfrX/HZt0t8XdODA== Received: from MW4PR04CA0119.namprd04.prod.outlook.com (2603:10b6:303:83::34) by IA1PR12MB7565.namprd12.prod.outlook.com (2603:10b6:208:42f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.35; Tue, 10 Jun 2025 15:16:16 +0000 Received: from MWH0EPF000971E8.namprd02.prod.outlook.com (2603:10b6:303:83:cafe::a1) by MW4PR04CA0119.outlook.office365.com (2603:10b6:303:83::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Tue, 10 Jun 2025 15:16:16 +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 MWH0EPF000971E8.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:15 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.1544.4; Tue, 10 Jun 2025 08:15:49 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 10 Jun 2025 08:15:49 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:15:45 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Vlad Dogaru , "Yevgeny Kliteynik" , Mark Bloch Subject: [PATCH net 4/9] net/mlx5: HWS, Init mutex on the correct path Date: Tue, 10 Jun 2025 18:15:09 +0300 Message-ID: <20250610151514.1094735-5-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E8:EE_|IA1PR12MB7565:EE_ X-MS-Office365-Filtering-Correlation-Id: 633d8c20-6419-4c81-a3b7-08dda831be91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6FYZaYDObpMVJaU5oPAEhUswR8J8Wk8mEvrn1wXsh97H5rAMAtPHmm1BknlG?= =?us-ascii?Q?oJ/UoV0os/ZysFrKEmV4lrSpO+NKcywGM0R53b1ISNKLatiPugkRZhHizL0A?= =?us-ascii?Q?XMitIx+oRxsqCbaqZI860/pB3kE9YOr5LNqvPxX1NHyI/oIfmivXKBThLkN8?= =?us-ascii?Q?YgIgiVS7Z+0BpWluEkG7pVa5gZxxt1zJFr4CkH1jyv7kl2f91Mfm3MALrKoX?= =?us-ascii?Q?SpE0xL7GixSuYxMU5Z9JxAPTBSXI2q3jcrffbRRwFzz+rTGw+Mq3wNg8MGkh?= =?us-ascii?Q?+RSCFUbGD9nD2tfePB4kHIsa/9wJoIvUllFNdU5g5BWAVXYdL2WC7iRVVER9?= =?us-ascii?Q?4BGwBKhydSK4AF+tisB0pPdnS/NuZpCUz6zTgEzuC84t2jqmTgCFLav9ehcK?= =?us-ascii?Q?LkUaBpSJ4k0ShXeJJbF7sffbu3hz4IEED/ZeSLb2Xbjt95cHIxDGpo9BHU3c?= =?us-ascii?Q?YS4icXq0MSIeHcEJA89HOtPCth5NljSdRMkr8zRrAZN083A8NO5YFAFlIS0J?= =?us-ascii?Q?b8eKvBM3w7mzCHToQfHp+iVwcRSSd2nrJ5b+CqtFzEgGj2ngGnpvB5UUcEKn?= =?us-ascii?Q?5YOmun40E7/KsmwbeFuR4KKqOn6w79CBZdBUcfeOdjhD/gg2Pcy3gfS3GgiQ?= =?us-ascii?Q?s1nkzl5TDFaW6ldiPJhN4zgCfvleH2uA+nUG4u8ffWK0LeOjgD9v9EQYVJ/3?= =?us-ascii?Q?q/jF2Ywhm5GbossxLrHB7kaHzMDVmyptQNfBlYYEglzdLCV3uH1aKEycjdtc?= =?us-ascii?Q?ehLABXSd1VcotIZdnkP0cwy4gYthIsfc1p8HUVJ17qhiEBmJm4Di8ax1rRLW?= =?us-ascii?Q?/KRdPfUW4k2iUCnUYVEvhtbCP6q7Mkw1j5RO8cpWDkb+sz0z+lElpnSDqxcs?= =?us-ascii?Q?gTcQv+Iv5UK4U/X8v8T90UaNHqZ+wEsGpsrPZpYt9Q6LSZgiyE5FsDucd+Tn?= =?us-ascii?Q?Lsl/dSqQFhUvUb2pMuvx/bmfvvBUpnKXwfv3xv2EXvnmhpm4l3w1p/Kh4K7E?= =?us-ascii?Q?CbnKw1R933GZmNS3Dk9oJL1tyU8Fq4X5Quc3vuhy7M5zS+5S2Ce34OQU9M/S?= =?us-ascii?Q?jP8UoQZi4Z9GH+SyqFEKE/1h3UuaDX6Yz7OqPmHmdDhC0fRcPWT6iFcIDiTH?= =?us-ascii?Q?udADgVGatzqwHyBlkUoJyXBnw+pyIsXXZ7DbxCZQ3vLJPd9/8xF3zf4bvHNz?= =?us-ascii?Q?1+E2DN+dRXggo+R0LdPWT29jOC4otoB4mS4dXMSJCySYVIHxEL4lFFc/QvAe?= =?us-ascii?Q?Dq/LPjVY3lzsfgbxQ/qoDC+M1MSAMgDyT+AZ62c4adoI3lq7cRqQ9UOlK7l4?= =?us-ascii?Q?c4gdnXfsVc6A/5gihrblFELVOEDuSATo8iYqoOJv38Ey6RNHlBP97t7dRIx9?= =?us-ascii?Q?HrNZes5HZOK52076XjgPhIzhn6PZxiy1XViKABCeJHBJP7fX3h161LMzj6zA?= =?us-ascii?Q?R8AHp4X3oW/aHqtnRC75/lzeM+FljBNazjHoGVt543MT608CXtmkLcDJxWaz?= =?us-ascii?Q?dFnvN1yYHTqazwnJefNqBnX48IiKHMP1nFQ4?= 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)(376014)(82310400026)(36860700013)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:15.9631 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 633d8c20-6419-4c81-a3b7-08dda831be91 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: MWH0EPF000971E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7565 Content-Type: text/plain; charset="utf-8" From: Vlad Dogaru The newly introduced mutex is only used for reformat actions, but it was initialized for modify header instead. The struct that contains the mutex is zero-initialized and an all-zero mutex is valid, so the issue only shows up with CONFIG_DEBUG_MUTEXES. Fixes: b206d9ec19df ("net/mlx5: HWS, register reformat actions with fw") Signed-off-by: Vlad Dogaru Reviewed-by: Yevgeny Kliteynik Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c = b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c index 9d1c0e4b224a..372e2be90706 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c @@ -1357,6 +1357,7 @@ mlx5_cmd_hws_packet_reformat_alloc(struct mlx5_flow_r= oot_namespace *ns, pkt_reformat->fs_hws_action.pr_data =3D pr_data; } =20 + mutex_init(&pkt_reformat->fs_hws_action.lock); pkt_reformat->owner =3D MLX5_FLOW_RESOURCE_OWNER_HWS; pkt_reformat->fs_hws_action.hws_action =3D hws_action; return 0; @@ -1503,7 +1504,6 @@ static int mlx5_cmd_hws_modify_header_alloc(struct ml= x5_flow_root_namespace *ns, err =3D -ENOMEM; goto release_mh; } - mutex_init(&modify_hdr->fs_hws_action.lock); modify_hdr->fs_hws_action.mh_data =3D mh_data; modify_hdr->fs_hws_action.fs_pool =3D pool; modify_hdr->owner =3D MLX5_FLOW_RESOURCE_OWNER_SW; --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A23824291B; Tue, 10 Jun 2025 15:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568591; cv=fail; b=CSzmH9eP8e4u7Km90kJp3wMEjV/n7pLfIaYn1YRSVNNWo/MZdAowqyuFx/TVELsdbd073FxY9jWodVmvfnXkveL9oObgcx5Dd7f7NVsSlXZ0UdV+iiFvuO8RIkJ6R2phmj9u2IzwbMqwtXjaVQHJ0+ubAg2IW1ebrUw1Tlz5t50= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568591; c=relaxed/simple; bh=OnJxPqoS73NLijJX9il3sKquXBepASg0F1XuW+DRT5s=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PeGc04p8GsJzYfI9gGGHRjYZbHX4HE4DqrWHZ04JuJNSQicWJ0WL+yu8pu+vRskX4GnM4gQ3t5ij/OjEFSeFsYb8U4XqyZ6ss7f+TwuKP64OzSX+eCAjcMKn/++3IygIVlple8kwFnQy8Vp70XTOYmZp0xq5SaeijkAIO9irOLM= 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=PALjwp57; arc=fail smtp.client-ip=40.107.243.56 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="PALjwp57" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NFLlr0tC0QlA9zDA4D6f/CiNm7uWdMw0hrdJFSJKDL67aKFrxZmze5aCiFk7ChMgohUviQDrfzbFX0rwWWuAbfu8kG8m7rAlgDSTCjZceyOh1KWht0krJ4KuD4+9iG1mImz2wEOt+lPtecqqDByVz62OP5qm68EKLOisna/Q5vpynPu97E5UaLx5PA/aeHtY0kI4C/cy0cvnOVAoiy2O/+cSaUnB3kcBdW888BTCne5cXirhmo/lhTE5QLvW9mPn5G7Nc+tAUE6alFh3a8p0fLqIGZpfYkj2Itq1IZBUGyK0hmgM05uIT/9GgB6Sxr50hc+niu0NsO/8DYj2BdasZw== 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=Dpa5FCmU6oKye7T2GJ8EViwW1vRPfM3b9fLkQbwqdQs=; b=AsJ5mFdGaclDYxGhBQXIMgHegAg1ZL1Iie6Xe+FLrMmjkNNeF6TulacsQ51gRpxqToSpKUmHpDJ4YjMEOHqVOY0Ms97JNUkhgKNA3u3fzAyzU07kabrrCnOxo+OKG3LskS1uAcoo2Ok19GD80s74QLBA+UoVPxiA3BkgAkRnCvVbuGizQE4B/NnEEnZq7EQkDGyDioFLPs1KTnfu9faiXkZ6wksBs8T2IC5WxZLyx0HdoosHf/dvax9xkuIrTOR0lZECcp9XotKbPS8rAkOo2dhVyIzQ6EmQcca/Ktvk7mlNB/GwMV+mSZJQrhs9dLAdPLpXv6fMChk63cdULaJ3Eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=Dpa5FCmU6oKye7T2GJ8EViwW1vRPfM3b9fLkQbwqdQs=; b=PALjwp57psccqnn1S2S2r4VcS35Gs/CwiTRfYNyFj47qIhOaNZwhWjNMh5y0tHjUsObp8yItrPbDEJb0IucBvwopsTXbQJ5g52bwaawlntxPIaqObp00hnRD6/hOfqi2E0B0Bsz99915PfKCX4pf+LA4/idiGVucMkAd5E5aKq1Qt4d4IiHyHIIc2QHGQKWurqQ3l21rCaGF0iXQwefzZhNUsPTDHLT3XW2M8gfDQr9WefiQxG+03IF8cDxqk3Lav0IvEjnsY1BTdz7baNRbYzvl2B9seMOO0yffc2Q/6duSJqAaVZwduTlNxXIvlcQFOgpIK2UxljA6feoGcy1xWQ== Received: from BYAPR07CA0021.namprd07.prod.outlook.com (2603:10b6:a02:bc::34) by MN0PR12MB6293.namprd12.prod.outlook.com (2603:10b6:208:3c2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.42; Tue, 10 Jun 2025 15:16:26 +0000 Received: from CO1PEPF000066ED.namprd05.prod.outlook.com (2603:10b6:a02:bc:cafe::86) by BYAPR07CA0021.outlook.office365.com (2603:10b6:a02:bc::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.22 via Frontend Transport; Tue, 10 Jun 2025 15:16:19 +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 CO1PEPF000066ED.mail.protection.outlook.com (10.167.249.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:19 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.1544.4; Tue, 10 Jun 2025 08:15:55 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 10 Jun 2025 08:15:55 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:15:51 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Yevgeny Kliteynik , "Mark Bloch" Subject: [PATCH net 5/9] net/mlx5: HWS, fix missing ip_version handling in definer Date: Tue, 10 Jun 2025 18:15:10 +0300 Message-ID: <20250610151514.1094735-6-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066ED:EE_|MN0PR12MB6293:EE_ X-MS-Office365-Filtering-Correlation-Id: 47768931-6bea-4c9c-fb3e-08dda831c06b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iysY89eMpAcffzUWHfWFvNjlF5wRI3v/HvQhQKUgFEy97d5eJa4oGEt3IpKL?= =?us-ascii?Q?r7b1QqPvKVBzCbEikE/rRczwEAvEX/6QpdRurN4n2T2KuotU/WAjw4RX8x5s?= =?us-ascii?Q?9DuwfUGMpI0CnPYHgERaf8g5M5ZE0rFTlyFHyfcYYW7H3mnAn5FxxSdYmIrx?= =?us-ascii?Q?+aX+x3jL+34otrYEaFympLUMJ6ThWZAwgf+hkB+PTWvZvyDo1c9uzUkqmwkk?= =?us-ascii?Q?Q9eC8XnBCFXqKv1jENwhHUy8Vta/EhSl136mDwxjnr+Yh+215l6gb0dJGVqh?= =?us-ascii?Q?EHa9x03Ij7ZKIJ53+xnDoU01j79vefYACNv8PT22RPX2dv+Jypfeczeua5qD?= =?us-ascii?Q?CkQj4DGr0zSmSO5RI8JKREtHqvwDZzjfoMepda7HhLIYW5/1EjtgPYU2yYny?= =?us-ascii?Q?ApIQCId+a5ZttSKloJrI3nHkb0zSMTrN8H68EL1VYEih/cz3Y9XByH9guzUr?= =?us-ascii?Q?J62g2kbeb7pkPh6qSdInig76tJvvTb1j8EZWzJHAf1vcIXM5umz+frUxITSN?= =?us-ascii?Q?Ti/dP/07gqgukKZcH98DznA+R+CoRRUUBjipgS4u2eSv25vc1dp+a7V+kFr2?= =?us-ascii?Q?sh81M5cpT6zd/ePiB+yiTh0Vj+mCB7ICOPLoQ7KucGqpT7iT36AmWOfmkV1E?= =?us-ascii?Q?TUXDGXShiiJqAAjSIkT/MppqQoNwWdKnsn4fQ/LYA1eCWNCGnkXi4+VDLRcW?= =?us-ascii?Q?3OJz84iVqJdIIvAW9c/rWIL+XSh0R2eKXKHTMT8VktOtCTWK9o5rXTXmcLry?= =?us-ascii?Q?eUCvSe7H6jvmjl0FiRZzDHkUepkiUHmvjtDSYakEFK+4K3LxxchFuq1gykK2?= =?us-ascii?Q?3hJYvwpCpLLyt42qN+3TTj3lRhf3tyul/Hw+B9cLR5gTYgxj1an0SNcq6hWt?= =?us-ascii?Q?FFVeWTeCZ92/BHiHNj2BodtlPWnKspg2c6Rc1yHaRhSca5dAlNw8Ee/nSW9B?= =?us-ascii?Q?ZjMXgf2sXjEYGfzhkf6Vj/hKfHIdoI1bXMMk7cIqop/rg05PQMg/lKILPP8/?= =?us-ascii?Q?ITLv5LlqiOPBzQl3IRUGm3USCqksiHe5D2VxvEw8/OrCpXpJfTmwLmqpXEUC?= =?us-ascii?Q?XncwWuGTbRYDnnH4Oo9z/TOZhG0QFhVy4yUfoYP+BX8lWEsASIblnyh9bRBU?= =?us-ascii?Q?T/4TOb9qjcMQfEHClQ/OONr5/7x1CnDFtryf14Df5as5QxA4zvosOycSkwKk?= =?us-ascii?Q?C6yIXkCGLNF1+iuY5IhixG2DI0Kq2dWTpobfvhU/KCdq+3vyKJq1t6VH0Ygh?= =?us-ascii?Q?HbsWX8SEap0FN8tqOzLySdNKOXBxSPRO1lDZ7JCQFMlavDn20fzQ1Otq5Usq?= =?us-ascii?Q?Cq298kSA7wRoPqXIAfrQGp9aWh8lSPmyMFM4CGoJVcwOBc5G+f0O3FwsUqon?= =?us-ascii?Q?/L4eZNY5ati4D74vq1gHPks1SPrPXd9p36qzRszRIjwupG3eZ9Tq9QMHSe/p?= =?us-ascii?Q?Pf+LQTfNtpzpNY8LiubpyBUrwDs+OXSnYPn1smyz3t2BLbydFld47DwOYM0d?= =?us-ascii?Q?wk/S2Wo7l6kSGdOiLkCfDQWGZLX+EBUws5g5?= 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)(7416014)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:19.0148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47768931-6bea-4c9c-fb3e-08dda831c06b 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: CO1PEPF000066ED.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6293 Content-Type: text/plain; charset="utf-8" From: Yevgeny Kliteynik Fix missing field handling in definer - outer IP version. Fixes: 74a778b4a63f ("net/mlx5: HWS, added definers handling") Signed-off-by: Yevgeny Kliteynik Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c= b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c index 5cc0dc002ac1..d45e1145d197 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c @@ -785,6 +785,9 @@ hws_definer_conv_outer(struct mlx5hws_definer_conv_data= *cd, HWS_SET_HDR(fc, match_param, IP_PROTOCOL_O, outer_headers.ip_protocol, eth_l3_outer.protocol_next_header); + HWS_SET_HDR(fc, match_param, IP_VERSION_O, + outer_headers.ip_version, + eth_l3_outer.ip_version); HWS_SET_HDR(fc, match_param, IP_TTL_O, outer_headers.ttl_hoplimit, eth_l3_outer.time_to_live_hop_limit); --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2074.outbound.protection.outlook.com [40.107.101.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F21B7236A88; Tue, 10 Jun 2025 15:16:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568587; cv=fail; b=o6Gkzqudgo+bfrGoMw6hiCUD+zoCnESih625oKZpyzPA0yx5H5ObWc6zoBaL3f6YMT1nwWa5oz86NvKDqsAVHGF1vAvBqamWbh5PONDcLekl4KpxKRJa4JT1R42x8iMTjF1KWVuB2vRh7Le0walOz9u9dCfvysEWsXbSv4Ut364= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568587; c=relaxed/simple; bh=7xUMCH1zjIEKI5OqTPYcBHrR8Z7SHWeBaI81PIq8PAw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Cv3XIlZZeg2Bvl7ROPsKRzWiQnUDdYWqmwxciuMc4CvcZPeh2gsjByK5HKo9q0pV1lLAJjgDM8JKLZqB+TrPCYOXwNxilyuQn22DhX+5qnVM9LoMdrfa5QCBzE4SGHhMIxtua3yyi+qHI4VQMazWTQ9LuoXafLd+NGYmGNt/05I= 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=nKP8vtL4; arc=fail smtp.client-ip=40.107.101.74 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="nKP8vtL4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G4Q696taML9KycMJaWkcP86rIL9koUryJTvOghHF7o5J7RON2HWbNx7S/FxPIMfFrGRRLegyBbbF8sLfOFqODZoqqNERPpm1rED54Na+1XSlg6eHA7dLesvj+qxmVj1qJsJW8QanvkHelmFlhB3j82ClRyTzDjZrc4SXA8l9HOZJanq+/q9DWP/Qm+OURrDhXbzhzR2Id/LHRB0GGtijpAKdcoH0p08XllzO+BdM+7iTNJwh5NqJtqlREQ80O0Bwl1A46i4H5TemXgn6WSDV+sYBaqj739BI2d90Vm921uxUoiENaW0nsZ1/olbqLlDnfwCfExkRkW/JQsZaKQIbXw== 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=o9ByInyZ6sBRqF7kzGTr9HCuEY1yjM6NuxVnPFokOmY=; b=cyIQytdPhFpyO1cScuSRJdMlMS5BKD7altRkldqq8jqorasdQjjJEGPYncPrx0CAagCHXWiRZuhrGfF1dQ80L32GiqPNkkBAA9jIT9lcNbTlEyGA1irzv9yjZID5Q9AfIZtGHJTAzuNBSRN2ZbwX7BCc3IUUMoYuyZUeVIJtt6eKPPtuQSWw7kvBNSWmVMmaR4Llooiex29vNMH94ZcvbV8KO67ITdcUddAMZEBQ3PAHZFkWRcDCSDvhMjwVWX7EMuIYwZ+AcYm4mwCy9bubayEGgfaqOWFhSECUxjJH1WxzkqlO09NnGhpogo2zdDtvRqotARee4R9bSut7j1vZPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=o9ByInyZ6sBRqF7kzGTr9HCuEY1yjM6NuxVnPFokOmY=; b=nKP8vtL4wLxX1WAm1Gq3A/BoumFfJO2cGfnegL2Vxba9fIHjQQqj5xW5WEInlI4OOWYoPkAPjp9oI825DMSzSNIfVtvXXWd6Y7zp1NSumCN75vpb2eRTaUtbn72Wqs+cF98xNTQf/5j2TPuieXA86ogByn2GPDIcrgYSmCHRqvmfDoEIy6uGgACFyo5hoSLNUkNV7goN74GqtNrKnHj8APFscPs8OuhcSNsJ2KtB69cAEHHum1mCPfdhT4Xf7HQWRMiTtqSpKzbgzWkPOKdAxkSlSbVWw9CqM8eyKoxll2laAeM/O/jnEW+tqkv/VGvH8SitrrrV814wh5eeMnr/ng== Received: from BY3PR05CA0032.namprd05.prod.outlook.com (2603:10b6:a03:39b::7) by PH8PR12MB6699.namprd12.prod.outlook.com (2603:10b6:510:1ce::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.36; Tue, 10 Jun 2025 15:16:23 +0000 Received: from CO1PEPF000066E8.namprd05.prod.outlook.com (2603:10b6:a03:39b:cafe::56) by BY3PR05CA0032.outlook.office365.com (2603:10b6:a03:39b::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.16 via Frontend Transport; Tue, 10 Jun 2025 15:16:23 +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 CO1PEPF000066E8.mail.protection.outlook.com (10.167.249.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:22 +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.1544.4; Tue, 10 Jun 2025 08:16:00 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.14; Tue, 10 Jun 2025 08:16:00 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:15:56 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Vlad Dogaru , "Yevgeny Kliteynik" , Mark Bloch Subject: [PATCH net 6/9] net/mlx5: HWS, make sure the uplink is the last destination Date: Tue, 10 Jun 2025 18:15:11 +0300 Message-ID: <20250610151514.1094735-7-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E8:EE_|PH8PR12MB6699:EE_ X-MS-Office365-Filtering-Correlation-Id: 67dc890d-ebb5-442a-f999-08dda831c25f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3gDB70v/NvdaFu+yf2GTlfwVV9UwJxlH8X0fMkJrppLaxkMbmKgLhhA8jIqh?= =?us-ascii?Q?XZEz/pjhznaXYYCtTv5poc4BWzQPIexEMAnE5BQWmzqfQoCgH85X1gjLKhZH?= =?us-ascii?Q?cnmHPcgxnzhX1Pxfydzusqp2E7VQMSTJ9lILDFb2S5OVzGMAgJSdyqq3tSY4?= =?us-ascii?Q?jGdwNWbVqsRZ9nYw6PVKpOTZGDXxbPO6nVxt6h5xQ6g2I3HPovgKFx2bWQfR?= =?us-ascii?Q?7ermPh8E+QjGqhO4O21GmRV5aeZrHJVMoc4G/v1OMsLoCRWa28emiN1wdl4a?= =?us-ascii?Q?xb6jViiLKwwHaDSPIkwh9ZBbIiUu/HnrXFSZJAtXkWFUNEnCY7ud12AX+0nw?= =?us-ascii?Q?a75MDxFaze9yxq25kHit7WNngK0J2t7Mvo9qBmEmajpN0nBCLzZiEWJGp8Bg?= =?us-ascii?Q?tq3AluwBxcVKMXNUqv4c2rcjWMzO11HgdVVA5VC7TIbmYESivR53+XeyvHP0?= =?us-ascii?Q?YDh3CMY9Pcn7z0XoZPGIMW26sMMENy2pasX0O+6KZHfoQwl2kZr+H61UV93N?= =?us-ascii?Q?L5OxWKZKMX1FhX4zGgUDkDQlxgNuzDI/r+VNqm8Vhg1OQGtYbm8gCGRjtxk0?= =?us-ascii?Q?K7GSYxDfObf+1fEpKvKNokqRJhVHfSA5PCdD3xS6VZ2ksQk4z0aKPHFN4zPo?= =?us-ascii?Q?cpjRTpmc3r0FlV5GPZF5NHfakzJpOSUtjHTvCFZWRuR2FdX6CW9IL0kirJlV?= =?us-ascii?Q?QtMKf7LFRV0pBQ2DodyhVOK603I+TBZ1os+E/jTBVluCTTzxb5Df2a6sx52c?= =?us-ascii?Q?Kor3sM0eEGiNWd1GsqXvzI8sGhjmo9MFVHCGHMNyBdw3kcQyJBzIFrhIYKB3?= =?us-ascii?Q?1Sxz5E2HBnAbivGG4LMnqe9OnIMXfRJZtl395F+8ImqLlZkqMDn9bgjPCUzD?= =?us-ascii?Q?3Ngpc3/ZNM1jA91NM6ORna6NYRRWysqpqhTJwaJXLOoBAR0la27HYHEOaxVK?= =?us-ascii?Q?0Ela+4BoaeX9NX8BzdZdnIACGSvOL3TRs5Au+nPezFrHjp6hVapSgDGoLNHk?= =?us-ascii?Q?n+jL0a41oxrV2bj/pXQlRx47EeeuX81gDMOVTsv0y/0nUc/1Od6GFHwq7plr?= =?us-ascii?Q?yzVW56UlIstXX9MKxM7pyn1FLFEZUeyQqsGWgTg1hfv1THT/a+1A+c7M8OFa?= =?us-ascii?Q?4Tylf6uWMliL+3YzabaO1r858qXukHEUFCeXbuzB6gxJLGFqE6EURD9fmDyr?= =?us-ascii?Q?d/jcOuRFQi3zIqE3A6ECNPV8OxadizR9GPnSFYfplozor9MJGC9LjdO/JvpQ?= =?us-ascii?Q?iLHQOvcX0ZFwMqC/ZJ5q28qQTY2jssc4QSz7E38P3FLraZGvN+H4vdWtPvZj?= =?us-ascii?Q?rJulhguLxyEA691TchzLY+LHD2wI002FFUEamf8i92GFwLPXYjlY29KdGFZ1?= =?us-ascii?Q?G8GJd1hY7TEirHOBrIJCyNjdXr7hcWhbD21IJ5OYVcHdMSOhg/5HobAcgbKd?= =?us-ascii?Q?13J/sn3T0Jfapzt/Hvyp/wZsIbZ5MIjj4+bgCPHhvDXT60WLViM/pVZB40FX?= =?us-ascii?Q?2PQQdDseLxu1rzpqYF5Yidvh8wd9iVfzkm+M?= 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)(36860700013)(7416014)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:22.2877 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67dc890d-ebb5-442a-f999-08dda831c25f 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: CO1PEPF000066E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6699 Content-Type: text/plain; charset="utf-8" From: Vlad Dogaru When there are more than one destinations, we create a FW flow table and provide it with all the destinations. FW requires to have wire as the last destination in the list (if it exists), otherwise the operation fails with FW syndrome. This patch fixes the destination array action creation: if it contains a wire destination, it is moved to the end. Fixes: 504e536d9010 ("net/mlx5: HWS, added actions handling") Signed-off-by: Vlad Dogaru Reviewed-by: Yevgeny Kliteynik Signed-off-by: Mark Bloch --- .../mellanox/mlx5/core/steering/hws/action.c | 14 +++++++------- .../mellanox/mlx5/core/steering/hws/fs_hws.c | 3 +++ .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c = b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c index fb62f3bc4bd4..447ea3f8722c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c @@ -1370,8 +1370,8 @@ mlx5hws_action_create_dest_array(struct mlx5hws_conte= xt *ctx, struct mlx5hws_cmd_set_fte_attr fte_attr =3D {0}; struct mlx5hws_cmd_forward_tbl *fw_island; struct mlx5hws_action *action; - u32 i /*, packet_reformat_id*/; - int ret; + int ret, last_dest_idx =3D -1; + u32 i; =20 if (num_dest <=3D 1) { mlx5hws_err(ctx, "Action must have multiple dests\n"); @@ -1401,11 +1401,8 @@ mlx5hws_action_create_dest_array(struct mlx5hws_cont= ext *ctx, dest_list[i].destination_id =3D dests[i].dest->dest_obj.obj_id; fte_attr.action_flags |=3D MLX5_FLOW_CONTEXT_ACTION_FWD_DEST; fte_attr.ignore_flow_level =3D ignore_flow_level; - /* ToDo: In SW steering we have a handling of 'go to WIRE' - * destination here by upper layer setting 'is_wire_ft' flag - * if the destination is wire. - * This is because uplink should be last dest in the list. - */ + if (dests[i].is_wire_ft) + last_dest_idx =3D i; break; case MLX5HWS_ACTION_TYP_VPORT: dest_list[i].destination_type =3D MLX5_FLOW_DESTINATION_TYPE_VPORT; @@ -1429,6 +1426,9 @@ mlx5hws_action_create_dest_array(struct mlx5hws_conte= xt *ctx, } } =20 + if (last_dest_idx !=3D -1) + swap(dest_list[last_dest_idx], dest_list[num_dest - 1]); + fte_attr.dests_num =3D num_dest; fte_attr.dests =3D dest_list; =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c = b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c index 372e2be90706..bf4643d0ce17 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c @@ -966,6 +966,9 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow= _root_namespace *ns, switch (attr->type) { case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE: dest_action =3D mlx5_fs_get_dest_action_ft(fs_ctx, dst); + if (dst->dest_attr.ft->flags & + MLX5_FLOW_TABLE_UPLINK_VPORT) + dest_actions[num_dest_actions].is_wire_ft =3D true; break; case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM: dest_action =3D mlx5_fs_get_dest_action_table_num(fs_ctx, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h= b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h index 9bbadc4d8a0b..d8ac6c196211 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h @@ -213,6 +213,7 @@ struct mlx5hws_action_dest_attr { struct mlx5hws_action *dest; /* Optional reformat action */ struct mlx5hws_action *reformat; + bool is_wire_ft; }; =20 /** --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2070.outbound.protection.outlook.com [40.107.236.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 85AD8242D89; Tue, 10 Jun 2025 15:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568595; cv=fail; b=M9jOfEWFma6fG1Lc7NTtk9Or0E/DrMmfCDqT9/dyCrx3lailq4C22O+od4+jU68CLXOuGSs7hfo6w5SQMiSZ0e1IXgU3HD8ja60iv9G1UOBQPe6LgTcj9wctiExFK5SxRxJUzyqSxJugy74QzEeul+B5icSnLOv/4FAMtK+8IlA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568595; c=relaxed/simple; bh=zazunoPr+20uX3Nn76oMGyt3LPRi8JTNOTXr4r0t+H8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=D9N9hdmYfBu/W5RvmesfBSwgOFhqIxd9K65CwQqroDOoJdIcgMrhUXN6U5YJ6J4czjESlEpsMjCDmvHuGePXWxF38GBhkY3l9TaHN8kpP9ndU3QB852eRIKPxO6ymC6LDufuBtj9AgYUN9+Z3gbVfNEEKu8aUeK5NwhvZWBa2wA= 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=ZaZSEnxh; arc=fail smtp.client-ip=40.107.236.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="ZaZSEnxh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=D2WWurGlkxhU3+a8Swed88GxkGn5+NGgiVOX1hGkWDkrvNh7wf1lor6dGEMupg0PVasncWK4mpKcgR1BMTPcmJ2AUeCziv3NhqFAhQaP4qf3JAIFD1ZxsodzbspV6vC+eK2rDJrgQJ6EPxq0iDznDVTFaT+scjacgqa2j7fNE/9Oi1m3+FQMDda/VWckBJiV6IwhPBi2usSq7l2VhPxD395qDaCXkvD1/ezKDNBltHSNZiUfb5zv3B4b9KIUWvs/ZUobiJi50/eTVhbqB6QQUQ+CR2xT16ddMwE3rlFlrOsEJKMplhUNxHxC28J4qVQWbJfscvlBOUbY44v3xWhr8Q== 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=JXqfNzb8S5GNSR4yvjkeEbUu4wz6LeALzMsuVTRqJng=; b=GwbibpO1LBSYVcbcTWQzF4HVEYKAMc9q8Lu0NqDScDtQ0ZuPTI10aCSxhGy/pxg5BQO2oxQe5sGi522bhmyk98I04OPxI2GQu17H8REiy2AE5MTqpdkFYBFzh2k6ijWfB/zUqzyQ6p8kxDgI9iYwu73cwtY01/FI/UsC08scSoDG1gO/HJPpbe9QKTaRgjjgTy0u2U5ZSC9PW6duloRKBgjhVG9+L+BIMs6nnx1MhF45sDzyku1Rcit7+YRyAt4BOeJaKbFp/kNGGSkeTu6TM5Yv/HeLNQHFPaK9ZOqiNdkt+vDeZezHltPUqXlfH/GZGkP6ucbU71gUp9kTQdf5Fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=JXqfNzb8S5GNSR4yvjkeEbUu4wz6LeALzMsuVTRqJng=; b=ZaZSEnxhWGyDbh4YfJqPYz6QIX4VeMorENEhcuVatyMpaLKPtByEvZfI7xNHc024u/AN+blx/ew5WMNl5k+5RIOUJIosJEyIz38QpOlw1qxekviG9HFjyBpxe+QDM5NZR5HNcnMJvv7jrTN9XWOv9u2Ns4Jm7jzo2XA0JWdfFE66yotURUKLkMK9XbAqYl25QDKjNPYfCe3I1QtXYNr9C9T7QoBrbNnmgnYVVk/IbiYhu7zgGtPvD4a5p4ugVBP8JTQXVOiVb2cYyrYxK0tE1QQKzMon9dJmsZTJyiwxhCJEe3DX1WsZhwgTWcLHyolSJrWXPJp16YbC7sNjscsApw== Received: from BYAPR07CA0017.namprd07.prod.outlook.com (2603:10b6:a02:bc::30) by PH7PR12MB8777.namprd12.prod.outlook.com (2603:10b6:510:26b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.41; Tue, 10 Jun 2025 15:16:27 +0000 Received: from CO1PEPF000066ED.namprd05.prod.outlook.com (2603:10b6:a02:bc:cafe::6d) by BYAPR07CA0017.outlook.office365.com (2603:10b6:a02:bc::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.19 via Frontend Transport; Tue, 10 Jun 2025 15:16:27 +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 CO1PEPF000066ED.mail.protection.outlook.com (10.167.249.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:27 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Tue, 10 Jun 2025 08:16:05 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 10 Jun 2025 08:16:05 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:16:01 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Mark Bloch Subject: [PATCH net 7/9] net/mlx5e: Properly access RCU protected qdisc_sleeping variable Date: Tue, 10 Jun 2025 18:15:12 +0300 Message-ID: <20250610151514.1094735-8-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066ED:EE_|PH7PR12MB8777:EE_ X-MS-Office365-Filtering-Correlation-Id: ed7bbf60-678f-4bce-6412-08dda831c574 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?c96DQtPM2ohJnYBt++9ouYPbksquCe3Zz+Xk42IuJtAk1BAiQ2095kqCT4Uw?= =?us-ascii?Q?CrGp1B7Zp1jejqBMWST8ygXSDN5qkZ/1eYWpGX30bSQ2MSeD8vyZc6Mn9sz5?= =?us-ascii?Q?a6LuxPyuRYLYON6/y6Xthn3VTd1crsPRRL9eUnBxiESuC5IfkJVRCxKVtJjM?= =?us-ascii?Q?Af+tZ2MFyTlwBu10Di7C/GY9uhDlTtin7oJ1mON7rhL/bQD0DRcSxagGVyt8?= =?us-ascii?Q?HNItW5GkLLbBb+FlWHck+DB+2kxNOnH67tB9QWj8y49HAo0FeIcc2/qk9DhM?= =?us-ascii?Q?C/Dxat0FTTgBuDJmUqHGglOhGdyc54zAsuTG1XKqnSjHTEPuNeEJopottsft?= =?us-ascii?Q?gZOC9DuejWz+R7x6ZyKX0vlxKwTnEwo1GtW3J67P/Lax2FonNOUaLl8xY2CI?= =?us-ascii?Q?V5D7VZDkPGB90RckKc6rLFvKZojuXk5qSM50b3q88CebkOOfXXFHAMtMQmKT?= =?us-ascii?Q?gemXdRvQw+hGiqXHCMJN8Yh8zqpZladYl/KrpzHn/dVjfvE40AbAEOVaeKm+?= =?us-ascii?Q?UapKRYrBZarEYgWU15GDJX6M0Hz1AS0Gxv4IghLgI8noaYZSNnqvKxullf6s?= =?us-ascii?Q?5BZmGxs0PMNfNF5IPLfGrI+m6IpbZloaoNCZSr0XhtWwkWF4PPbnuiUy7mkl?= =?us-ascii?Q?WSlicnhQJZXjai/NLJvDgI4u/4/LYDij+J1GcA2cu9dGEikzS286dkg2gXg+?= =?us-ascii?Q?7NozKdqPukyPUrEauYmEVdYdnL9tgyIL2sfZ4vfmnBEiEG3Jiv5eVwqiDC/T?= =?us-ascii?Q?sIs8S5IUeT3b/yphYiLUckFRfqERrb1rWUt9Oj00jLLOQRxhRltN6Rw3W6IE?= =?us-ascii?Q?4MOMRHqKH3IXyN09p5cZMXNgTLUoreieibkKPIyB4NlZPsjn6p1Cg/DjFI2Y?= =?us-ascii?Q?690haj/RVR07nDMIzWdENf3jfp8SfhEbxAm2LmXitxZCiUa9s+q69beTHKmV?= =?us-ascii?Q?dPau5+EpsYdgrrkUJdNT5McamoN0vaLar0LZbJcMgSFSX8RygkcoLD+tHIY3?= =?us-ascii?Q?y8rzQnQHcaJPO8Njio++afh7wjfd5Tre+VrrzpeVHbWD+XfjBj0ksgkcg0SI?= =?us-ascii?Q?CLXVbWURK3+Ki0HwIIJZCAOEr/8orE07x16HgMsmseB1iDRNnTyopNoHmR+w?= =?us-ascii?Q?f5GX+4MkVreOQLd5QqDqUUIKbF4Xiel5uXoH8vmNlvnIe8+m3SU/O8SXZff+?= =?us-ascii?Q?rFgT7qjTu1Cn/9ZlZec4X3nEhW/C0KiXSJEYwmESz4fYzTBiXFxGeZwnoCE2?= =?us-ascii?Q?hsHQ+CHcMstuticGUt99rfMKqK6QnT/cP9R24JyyyQ4+S7Ize9Gma+Kt6Ggu?= =?us-ascii?Q?10plYq+RGIdfZMvd20j45XeGONyP/N7GSK0E/blEt25nqPLNIykgdYucU9H0?= =?us-ascii?Q?NKDPgY95BWICvehBqFcjAwNiTmtjQUOqJ3c5HLAD9unKoJqrMNDVwmi3ZEc1?= =?us-ascii?Q?9/yLwIOoG4p+gznehirGHAO2I9dDLKG2YZGdQ5/gMCgAIas3gpJmrJprcSXa?= =?us-ascii?Q?iwXdR+6Ls2Z6p85hEGPVg4yiP3EtLwxd66GD?= 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)(376014)(7416014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:27.4681 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed7bbf60-678f-4bce-6412-08dda831c574 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: CO1PEPF000066ED.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8777 Content-Type: text/plain; charset="utf-8" From: Leon Romanovsky qdisc_sleeping variable is declared as "struct Qdisc __rcu" and as such needs proper annotation while accessing it. Without rtnl_dereference(), the following error is generated by smatch: drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning: incorrect type in initializer (different address spaces) drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected struct Qdisc *qdisc drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct Qdisc [noderef] __rcu *qdisc_sleeping Fixes: 214baf22870c ("net/mlx5e: Support HTB offload") Signed-off-by: Leon Romanovsky Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net= /ethernet/mellanox/mlx5/core/en/qos.c index f0744a45db92..2f32111210f8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c @@ -374,7 +374,9 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u= 16 qid, struct netdev_que void mlx5e_reset_qdisc(struct net_device *dev, u16 qid) { struct netdev_queue *dev_queue =3D netdev_get_tx_queue(dev, qid); - struct Qdisc *qdisc =3D dev_queue->qdisc_sleeping; + struct Qdisc *qdisc; + + qdisc =3D rtnl_dereference(dev_queue->qdisc_sleeping); =20 if (!qdisc) return; --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2070.outbound.protection.outlook.com [40.107.243.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 67BD323A564; Tue, 10 Jun 2025 15:16:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568600; cv=fail; b=QGbg+mAPpAEiupiXJlA0riHlxF4JsLH2F6d+Uj8bMcxcqgU+MbAByHANVqN2gmT5bqaaUSyhEi2pbxROweDo79nJmGuKNc4gOyJDPmbaKA1ycVeMCp09Iofy0pb9Ue2LRVNuYZJHQKPKei/2dFk85HhyUoerufCYMyENHYJcgTE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568600; c=relaxed/simple; bh=O/Q7yh26VkL2enrkoTFCG/FI5Fqy7ar0HP/asCuD+O8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VKuQe1pUGpKBoydQBOQynjBAMFflbBIym9xbGVafZJin6MzbyqUs50+usswUwPXjMtWYNROzFIP7kzSTMEfK2OOKjb2Drr1bgD5i6g/Qf4rCQU9cl8f7dC935b9xmjHWK+qo+IQ1R9Gwt039iUmfVZwSwFzMjCl5ufIkoUgEzGU= 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=AfDIAQ3l; arc=fail smtp.client-ip=40.107.243.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="AfDIAQ3l" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CVzzk2uwydLA/iXQ+SxoH5ml+7aZMnJa37w0yvgIeLMptFwuJxj4LJLnIcVt90COVkzxYXGPQq1eKGbZXaNy6hgfCqAt01w39TvXTfHajJ2/0IUSS7KCxbvhfdn4g6Om1aUY7zpBP9PUWJObDWhC8tXgbn2tWaIECVxT3vC3pXbWUjI2zWNSKS04eEE76Mbhu0SK1/VZYE1BAx31NCHH2KvKbS2qJQG8b1n4acNxHZorOr1avHIJRrEtRTCD89BkFEJGmeraIDDumrpLNL4fSgcE0lWvxDcqNIT44axRBHgOUap0dDGP9cAHJQ5iJutNjxqXXG62YrCztXhXdnUwig== 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=KrfnFn433HFVkAN/Lt9eGRL3fwghIk6ERrPrHa0CSqc=; b=aPuOUsOcNU0PFxou8uFS0nSZRF3oFsPhBDYi+6GWTLW+39AvjgJub73Y4qLyJKjqZCFdPtlM/xcBUxocW4Evyz9zHCdSUwvAnhQpj/3bnSgYBWHP4/huq5zUmTYCCY+MxW8bMR1RmK5oTcxURGHkIeUQ2IENX9+V9DFnnI7KVmdILTMq38FB24K8LQDm7qhZG64Xc3zzPSlrkLG1dFS5tsmgzfvAVbCUZmmphHIHAFwdYtq5JtqwsBKlu3C6b5xW6NJFcfKqan3h9ioF0H5t6Qnyiiw9R1Pt+mnmiUVkHALoeK8uTkwuNeC0Ct8igfQMNc+GxoZmwiXQlApTbKWc5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=KrfnFn433HFVkAN/Lt9eGRL3fwghIk6ERrPrHa0CSqc=; b=AfDIAQ3lyKUVw7S0/1666l5RyM/PTsXE+3v/wa2a6tk27vSLpfDSGhO9pony9KFY5+ejkqM1AJ2ITwi8+GuuDDKizn9dDYRnz4Ngy6OwcU8lDZMMn6FhphSkxl/CeJqtBYBgZzBj/2otc/8il5Nacr4EYi2yUXqwOJcTEkqY1bJ3jg63wU5TnTExLJAQnSY/OmvvzXkVvfXXS3ZxyQPlZWFLy2vUHMHqmWvHgh9VJRQneV5S3CEmTGTCYf9jZzHNGv4ueR43ArYb9kNbi3BLvNQsGxek+wqv1ZfcXdgNFU08aMOd2/uIknEA+oDXhWcZdzNO5HbP3Z+lzAJ1S1TpVw== Received: from MW4PR04CA0142.namprd04.prod.outlook.com (2603:10b6:303:84::27) by SA3PR12MB7829.namprd12.prod.outlook.com (2603:10b6:806:316::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.34; Tue, 10 Jun 2025 15:16:33 +0000 Received: from CO1PEPF000066E6.namprd05.prod.outlook.com (2603:10b6:303:84:cafe::3e) by MW4PR04CA0142.outlook.office365.com (2603:10b6:303:84::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.23 via Frontend Transport; Tue, 10 Jun 2025 15:16:33 +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 CO1PEPF000066E6.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.1544.4; Tue, 10 Jun 2025 08:16:11 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 10 Jun 2025 08:16:10 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:16:06 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Jianbo Liu , Alex Lazar , Mark Bloch Subject: [PATCH net 8/9] net/mlx5e: Fix leak of Geneve TLV option object Date: Tue, 10 Jun 2025 18:15:13 +0300 Message-ID: <20250610151514.1094735-9-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E6:EE_|SA3PR12MB7829:EE_ X-MS-Office365-Filtering-Correlation-Id: a76df46c-cc32-4936-2672-08dda831c8d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?39tbd5S9Jo2vPcetuHeAXFmo7pDxQ5YM/7t/m1+2oWlRrQkjyCuiWhElVC7t?= =?us-ascii?Q?1ZSZYqTBmUqk4fzcW8aZ1g6ixfzjWpyfrEGc7obxAVH8cYyqyhX0rJf2sZqo?= =?us-ascii?Q?07TCZuixl4XmySbVKhunugyC51rYlJGwfOAjYaI/uLH92uo8PbIO4sg2Np6H?= =?us-ascii?Q?elKfBQxoqsvYUP97+sh8+QJDCcKrNR1mCwDNa1paHt+LQ6o+GNCAwhP9NWU9?= =?us-ascii?Q?vA5xGxFU2jvtgtvGU2EhVofqXBNhnomppf+RKehKZoIMT53rc2pRRm83TJhq?= =?us-ascii?Q?ioAwOXCNbGsrMKjGZB/M80ocIl6E50urXgNPZ1z+ZPKis+rIbBH1Q99ndseJ?= =?us-ascii?Q?f2VE3kgak4Ef1IGCmrUsYAf2xr09CfxQ3fR1CdQf99uP4QfdHfFPwXBzM2Ky?= =?us-ascii?Q?dja1BxebIcdkMR/zonycQf+4Hpcs7fYz5rAEbsOLK98ryblHHaDHaubhOmBC?= =?us-ascii?Q?fe8MMYVv3sRZ8IOuuXzrnJp1gopa5mYg52CPQlgItNK5AALsLuSzx/XM4U1U?= =?us-ascii?Q?8p/55XU2J++Nhq4WnIq/ozYFMJzdZTpzC0pX7/UQ4RSTJdybc5WzjaUQ/6Id?= =?us-ascii?Q?ShDmNeN0gwHoDBI3i7tzwouS3srGHHddS2+e9v/AGJTeyaAaCw9bi1i9+J+m?= =?us-ascii?Q?L28xP0wSk/KY+RCDImWUSgR81iMdJk9VkzSdwQcQC2MExGksPPeowtaSNO2E?= =?us-ascii?Q?KTc1NI4RdF/tHxyNcNmTJ31/WKaXNVk/t7+ndLEGI6dh/SNWYfwKZ3w/HXSC?= =?us-ascii?Q?Vl05NpeON+vrEU9spAsx3iDe0HljCgnFcxlrxWREixaGbUWNK5qSvkxXOoyn?= =?us-ascii?Q?UxgNVn2LKIhyPTBlVXnlGavA27+GS4bP+h78/83oiMHuuqpT7ZO5VhKb3bxC?= =?us-ascii?Q?qcFdzYRxK34w2Eqrx30G3+2aJlE6Q/TGS8dF1nC3dDDvEjnOnMRw4xgevIpB?= =?us-ascii?Q?qBhY+V3BbAYSMphHQEV27JRXtHdlAmYWf8ExcmDFxZj9zNP4hlh4I2OmJC9c?= =?us-ascii?Q?QX/CDPJuu1CyfKtnjPMypP5SdwfgvRsWXmUBiNs+2kpofWx4SrQBMAXhUixG?= =?us-ascii?Q?C8XB2Jiw4fUB/sJmUgOet+lZNn1BUByrHpbGe0ow2WVnRhyHB7hnLFZybF2G?= =?us-ascii?Q?wxVPotWBr7Y0WIJstb7lQnq1uRWp120pfCui3ZHQO0FeKY0v/71upPe6Hyut?= =?us-ascii?Q?oknzXX6R3WQVd+zqiCclAhGocJt2fzxP+vnEKmx8YLt5RCpyzk7xtWObxMvB?= =?us-ascii?Q?kpRb2UoJQVURbfxbBpF+hCpDLtmf0K6dDfqcHtCtB5RWjv1AU3/P4InsGgMN?= =?us-ascii?Q?rdWq4cg0IQ4Ndtt0xp0eplnfq/GIOs0o3mxDnSaTquxtbEIcMpNssNUWdZEy?= =?us-ascii?Q?0X3USxdd5N4BtwCPACqpbpbvqdkU94s0Esvr7Wy/fU1yH3/NqiTiG1UKhx39?= =?us-ascii?Q?e7C+sp7nyXG7JdHxUgiFY9OjqVy4aUN+9YQd60VXaul7zyDm8x78OrE+HUYQ?= =?us-ascii?Q?ckKAF3U3+bCHQ0C+SbeoMAmDQPoMQin4yRmT?= 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)(36860700013)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:33.1418 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a76df46c-cc32-4936-2672-08dda831c8d7 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: CO1PEPF000066E6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7829 Content-Type: text/plain; charset="utf-8" From: Jianbo Liu Previously, a unique tunnel id was added for the matching on TC non-zero chains, to support inner header rewrite with goto action. Later, it was used to support VF tunnel offload for vxlan, then for Geneve and GRE. To support VF tunnel, a temporary mlx5_flow_spec is used to parse tunnel options. For Geneve, if there is TLV option, a object is created, or refcnt is added if already exists. But the temporary mlx5_flow_spec is directly freed after parsing, which causes the leak because no information regarding the object is saved in flow's mlx5_flow_spec, which is used to free the object when deleting the flow. To fix the leak, call mlx5_geneve_tlv_option_del() before free the temporary spec if it has TLV object. Fixes: 521933cdc4aa ("net/mlx5e: Support Geneve and GRE with VF tunnel offl= oad") Signed-off-by: Jianbo Liu Reviewed-by: Tariq Toukan Reviewed-by: Alex Lazar Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_tc.c index f1d908f61134..fef418e1ed1a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2028,9 +2028,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, return err; } =20 -static bool mlx5_flow_has_geneve_opt(struct mlx5e_tc_flow *flow) +static bool mlx5_flow_has_geneve_opt(struct mlx5_flow_spec *spec) { - struct mlx5_flow_spec *spec =3D &flow->attr->parse_attr->spec; void *headers_v =3D MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_parameters_3); @@ -2069,7 +2068,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *= priv, } complete_all(&flow->del_hw_done); =20 - if (mlx5_flow_has_geneve_opt(flow)) + if (mlx5_flow_has_geneve_opt(&attr->parse_attr->spec)) mlx5_geneve_tlv_option_del(priv->mdev->geneve); =20 if (flow->decap_route) @@ -2574,12 +2573,13 @@ static int parse_tunnel_attr(struct mlx5e_priv *pri= v, =20 err =3D mlx5e_tc_tun_parse(filter_dev, priv, tmp_spec, f, match_level); if (err) { - kvfree(tmp_spec); NL_SET_ERR_MSG_MOD(extack, "Failed to parse tunnel attributes"); netdev_warn(priv->netdev, "Failed to parse tunnel attributes"); - return err; + } else { + err =3D mlx5e_tc_set_attr_rx_tun(flow, tmp_spec); } - err =3D mlx5e_tc_set_attr_rx_tun(flow, tmp_spec); + if (mlx5_flow_has_geneve_opt(tmp_spec)) + mlx5_geneve_tlv_option_del(priv->mdev->geneve); kvfree(tmp_spec); if (err) return err; --=20 2.34.1 From nobody Sun Feb 8 08:33:05 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 255062441AF; Tue, 10 Jun 2025 15:16:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568602; cv=fail; b=sZddyLEOBWOpmzeEu5NvA2jkXHND3uTlR3biJoUgMu/qBEWzQS1Lwih4G5PTGgBTXsyFM5f5oNZLKsFDabUuiiuKezPldEOjo64kC3W9odArxXMlD/hxkDOQC0H8aUVsfpaWN6xq+VlZM2nX6n2mhYgGJc2ef8ekO/GFTS7m5qc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749568602; c=relaxed/simple; bh=A8w3E5NZoBjwQKv0LCjpaiIF1/GCJ6OwYhhVTnZV/B4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LwOo0w/YdRjDsGIFXw/ndWnKkbX8XH8hgVLkCXhccfHe0feDxBAHYHnF8gCUX9YQYftIgWGvlu4lvwKp0P1RDumNNGFy/71ncMoYZhV1cJgmaJbhypKn8moURIg7GKYwct2OLAUk4fmjSwZi5TweG//gmR6j8+yNju3hW1tXlHI= 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=WfnYqNZu; arc=fail smtp.client-ip=40.107.223.56 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="WfnYqNZu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QIBLGpl1agUoCbr+TZzAfX81p2Jn5Gf5I2gZ0JihXrhPOTCwRh16l32CqLBzNC0hO057zwtHROKYs4LaHX76yWXvJkJ7+Ax7sNjlilPgsqypTeWL08Ag3mvJwQZm7GXkk/r/22VgG1UrRcFdWeGDVrdLGzo0zleuKB5epCcGDRJMCjGsixMemoYe5iJDc19DYkICdyWXu6f9fIEoh+U/lVd1jPBTzV/WeyGFM1XVVMywOOE8BtDwZ9gPD7rTgENwFPI385P4fbKmSGfugZLaI2bLjCGr/jvtoxSCdKE0Jp5OwoSzdA4lsuBL0bvp6DNrtv3bGO0qg8JvVzOKTAj8YQ== 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=mAcXlUnuztOWMxV0h6BHLXgTDjOkQHbn4Nuc/x315A8=; b=HEMeh9496C+LF8ZjmokDZR79OWgpKpqY/3QOAVK8K9qkMP2WcYW8lOZXxsRtwkPnGkI0Y3ODvMFmXwrRmpwt45Qr3XcFLbSa8TUDyuSVsdUe1hmW3URnjwsp8bvgnVbE+5DF15TwleU2IWFp3qE0HEyLmtDqw0Z8qjzpfDRArcCvNaKo8ib3RRF3u1FfKaNiPR8rAjQarz/nPSiEO7/vGXOp61C5JS0NO9dDeQQOCtLKOlm9enHaSi7gARApFka6z12ni6gtnZPNhRq+Qr+MXVITDPIq3L6OZxQPEVl2IDJtOkYiu8CuLpf0nLTwDk8VhtLrlsCXHYu9LWha5DG52g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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=mAcXlUnuztOWMxV0h6BHLXgTDjOkQHbn4Nuc/x315A8=; b=WfnYqNZuma7D5CWlp4BhOLP457x36UKwSrQJJjXEwWiq4RaObnNj1XCaHU05fAxXuKvM3Rrx1vJUABJ8j6jeVVQ9A9kg8czzonxaposoSDd9T0uIvbF6L3EAJagvzP051QAfDgEeS1Fu/GTJIiDgVsIaWRE7PejmkSQa8fHRv4E1Zc+5N2s3lcrSswmfvH/4iuZf70rt4ljk2Ns+T+DRRs39UyVtJD65a+dO3F5d+MkvkFmgfSsDm+bXOtCF7pAD7NNUhSTECOeE2/pJkMylqVF4QFc+mc0EJ40V6glAXkbvNOoJYbtnTSeMR65Ys7JpiGAue7qNtmixT27hFLyqBA== Received: from SJ0PR03CA0183.namprd03.prod.outlook.com (2603:10b6:a03:2ef::8) by IA0PR12MB8376.namprd12.prod.outlook.com (2603:10b6:208:40b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.34; Tue, 10 Jun 2025 15:16:38 +0000 Received: from CO1PEPF000066E7.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::5b) by SJ0PR03CA0183.outlook.office365.com (2603:10b6:a03:2ef::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.35 via Frontend Transport; Tue, 10 Jun 2025 15:16:37 +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 CO1PEPF000066E7.mail.protection.outlook.com (10.167.249.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Tue, 10 Jun 2025 15:16:37 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Tue, 10 Jun 2025 08:16:16 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 10 Jun 2025 08:16:15 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Tue, 10 Jun 2025 08:16:11 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Leon Romanovsky , , , , Shahar Shitrit , "Mark Bloch" Subject: [PATCH net 9/9] net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper Date: Tue, 10 Jun 2025 18:15:14 +0300 Message-ID: <20250610151514.1094735-10-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610151514.1094735-1-mbloch@nvidia.com> References: <20250610151514.1094735-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: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E7:EE_|IA0PR12MB8376:EE_ X-MS-Office365-Filtering-Correlation-Id: 618d7724-c69b-48fa-6282-08dda831cb82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CwFXIxraEGjULcI0sXin/xErFEHUsl2VS8JQe80MxFbZMjenFvnXwHhq7Ha3?= =?us-ascii?Q?8XXCAnj6DM8XkNhaTT+HnjGpa8WOI1S6d/LFPOTfYr0enR7s5STLVX+hf+F9?= =?us-ascii?Q?b3H/d8pKLXkPwWS8Nvhav3M4wuymy78xSqpCE9C6dNg6nIR8aJGojSd/BDZ6?= =?us-ascii?Q?6sU5vnZL2aqeJVaWteMkGm7GY4xNFoNs8wzFK9ZZlIPELlVKzy7u3Ooux7lh?= =?us-ascii?Q?pljJzbOVbIxHcK0bW/iEGOC4vIyqNL1f07mmRYITobpMzpNcB+y5xfsCvxU+?= =?us-ascii?Q?Pfw5NERJpPJmuiVE6oX5+k39I/K4U1PBe+feW/g3uXI59jYUYKDyVo3TqgcQ?= =?us-ascii?Q?1YbNtCOSVkmxxpuPHqRuAQC3NOryWsJexI2vhgFORDcvpluwdh7Z0g/E8aHX?= =?us-ascii?Q?TceoUxydoBXuHodXuogcwDNDoflXgbEM89pyWVUee1zGVEkmAKtfkf7U/kXO?= =?us-ascii?Q?4DL8HFxTWU00owMN/V7YkladJT43UjxLEqsZMpdyfdqNUuN5Jloej3Qqyqg9?= =?us-ascii?Q?jYM4BMP0zUKTvXx/sIvXOlOc+LSICnGSvCqegd0PdvpOM/YjPLuf8LxkMEwm?= =?us-ascii?Q?JJUXQc7Q+QqfbqPcF2mDU27EO0f+DdaSQI/bBBEVHGgAfizBknTsqRBUDMRx?= =?us-ascii?Q?7FhSSXc2pCh3KlhYCDlHRZOylp1GJfg0UyboTVMerylE2fmbrECmuzYokF5M?= =?us-ascii?Q?/yTuKqGJkqaAOwW8wG1mLZC8MRLftDKv1ZGJ0DfPORmVhenRJ6ZPxicOe5eF?= =?us-ascii?Q?zmn1mOPGWPT+OT1HctrP1d+tC5P0z9V4stz/ZTvSu4sqBG9wFk1PqDsZ72iO?= =?us-ascii?Q?uaQkZ0OdkPvqp8tOOCdcQHf6vDLg4Zoyn6n49m1jQF3Et9LkWvGBYWdAIb0e?= =?us-ascii?Q?0ncaXrCniWIE2ooSlDosWPO7qtLX2YiBUoDeL3raApihDg/RCLHWwom1H9G9?= =?us-ascii?Q?WrUEoUdhTHkRomxDwj1BDBoj0xS58oxnspP0/Wpbp3qyE620/pbGEyAk8zcY?= =?us-ascii?Q?HARI4avMIZPt3pjs4K2g4iIARSb3OmfYuAynMC2VUWr6vBz/LV+xqdzhJqa2?= =?us-ascii?Q?yBWAiEG1sMiof75OydolfNUbFBMW1mpuehhtnSlHcLmitmcccJ1u6mVzKGWV?= =?us-ascii?Q?xL25lD2gc9Yu1Hdf/fkTFqcs6n6e1uvRyKwyv8oPlVJQA6GMYKgKi0t0jgnc?= =?us-ascii?Q?i43GP+9EmVzBMMr+nGvlAWoojaFMoi1BV0j63PDk/axCYhMq9NVkXbF0nXZZ?= =?us-ascii?Q?zLkzXSiLAoCL63BgCIL8MKqqn0O4bOIsNjDaHtgza0lMfdKPX/iz1w+v6WYE?= =?us-ascii?Q?YFNp/Rg9FqsgE7KGtBUTop1khRn+Fn3P2Ks9yS0cWBMZ3pMh39otj8a+tOuR?= =?us-ascii?Q?MLLcty4/vdQiV5au2/n3Xw2BaKMWkmrTqid5OJMkpMcMqKHjX+LwABe304XG?= =?us-ascii?Q?4K9vkGA8+R/eAy5pl7E5DwbDqwV97ocRkc6Q73GCfEk64V5Yg4z4Zmcjn2Tj?= =?us-ascii?Q?3lR7a3hfHFLBHuGPAZX3QzWHCOy7a4TVU6A7?= 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)(36860700013)(82310400026)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2025 15:16:37.6093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 618d7724-c69b-48fa-6282-08dda831cb82 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: CO1PEPF000066E7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8376 Content-Type: text/plain; charset="utf-8" From: Shahar Shitrit When the link is up, either eth_proto_oper or ext_eth_proto_oper typically reports the active link protocol, from which both speed and number of lanes can be retrieved. However, in certain cases, such as when a NIC is connected via a non-standard cable, the firmware may not report the protocol. In such scenarios, the speed can still be obtained from the data_rate_oper field in PTYS register. Since data_rate_oper provides only speed information and lacks lane details, it is incorrect to derive the number of lanes from it. This patch corrects the behavior by setting the number of lanes to UNKNOWN instead of incorrectly using MAX_LANES when relying on data_rate_oper. Fixes: 7e959797f021 ("net/mlx5e: Enable lanes configuration when auto-negot= iation is off") Signed-off-by: Shahar Shitrit Reviewed-by: Tariq Toukan Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers= /net/ethernet/mellanox/mlx5/core/en_ethtool.c index ea078c9f5d15..3cb8d3bf9044 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -43,7 +43,6 @@ #include "en/fs_ethtool.h" =20 #define LANES_UNKNOWN 0 -#define MAX_LANES 8 =20 void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, struct ethtool_drvinfo *drvinfo) @@ -1098,10 +1097,8 @@ static void get_link_properties(struct net_device *n= etdev, speed =3D info->speed; lanes =3D info->lanes; duplex =3D DUPLEX_FULL; - } else if (data_rate_oper) { + } else if (data_rate_oper) speed =3D 100 * data_rate_oper; - lanes =3D MAX_LANES; - } =20 out: link_ksettings->base.duplex =3D duplex; --=20 2.34.1