From nobody Sun Feb 8 03:47:50 2026 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2046.outbound.protection.outlook.com [40.107.101.46]) (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 BF12026FA68; Wed, 23 Apr 2025 08:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397407; cv=fail; b=gAZdbAdMl516L63szXVpIp98Dv66ZJVhDd8LQdsONyBJQz4vvGCmUotcMF/ee1QGagpkLhFPupfczeZ+X81vRWuYEbuQ2Rx1eshLQ4e2+7yBZ0FP2v9MsH1uAmCyWfgnx3bmATcvYR+xIFDMcJKHyhdPzf2tdoL/Xi+7WfqQTm8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397407; c=relaxed/simple; bh=cCRzA+WDVYL5DpDqiwF0AnPx8C8BXbsWwsC07kUckHI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SZkUygdqry/Z8sOEE5ZGWr+AtGQl68o0RmrGfMJQcmikRTCexGJ5bA0yxrSjD22nBlCH6n34bsXG35LnhT53Izq9yN14bdVUw6374cOds+To8ThH2sgQ7EvbajWpYrcMJED+HqdRMi/wXZqt+8YmXeOVVbvCcjNTRr517cgNtkI= 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=WD5Aq46G; arc=fail smtp.client-ip=40.107.101.46 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="WD5Aq46G" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VFkMqyo3NuCQ9VwhEeD1pJXDLKOe/PWExa4xkG55xDws9hy61xarHipQOt78q3MdIjZjZcPH7ti37KoZabF6DUJ7YDBjx1qRb60I/Jz5fmJEMjME7/qmLtVYGoq1HfIDmZ2Fe8/S1RqjfNqc5THPypx7YfKt3NMWdDiwueUm7Hk3diI17jYghTLWQVdXhxeHHLh4iESSQGsgguVnfQWAUwPh2yIkH4+NLm/evY7vUcmMaIX6xEQvIro7k2+epxV5+LpU9xKROPVuKUwK5znI/wBwztswiGJ1WMQCI616kSBPSevH/Z+mEO+wDCU6CwNMYWNOGAVjgMAg2TGzW9oS9g== 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=btvmSUxpCcpbJ0mzQpthakQleukSP/xWSc0m+oL3QHg=; b=r7B5RgYGNAwu13I0L3PGUkoTeMgKdmAXDsT3EQwhqGCr3uBIsipvHvxJ9rfPgq7m21V0EGXpNsdCyarovK874jjW6oY+/EoPidHL2Q48TUURIpj/Au6p+E4SRGq8lJjCxRMepc3fBCakwpIs0va07N7p85d0Z7yfcynanCypdw3kQpqu9sRqWM9O4wffY10kKB5uSrME0s1ttfn5x2OdNmICHg/GcWVqsxXC8rrpHvEbLNhegZrotrXRp8yUzjWVkX9GmtlL9y9remgEjYETUoYBy4JenI6MuBt8lkRTje7BPhq0xBW39pxryfqaLChEsCdYyiu6TJXGmBKV13VqUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=btvmSUxpCcpbJ0mzQpthakQleukSP/xWSc0m+oL3QHg=; b=WD5Aq46GXQKhxC/19GvDge+beK1AQEEBesp3RvvI6MwZQm6Td+5gmgSzMaI3tqjmLkzNAaCQQF0cVA8GUtBbuz1sVGJwR3Q8ahDFegyN7lpKaZoUsTqbKh/OijCe27et8YmpeReTOPlV0+/M95Ok4tiJQJkPlq3hv9rLlScGevPFkGr3ewDLRmHBBn6X8hTNXyPCBlOn4go8GCFRyBCeD7Ww7NUMbyEay3DZ0IOtLkAE4C67D9J0nW3aZLV1CImKneXj1ki+grCKNS4ZVZm4WC2ocOd71ir2YC5+iCU0/79rXfiS6TkLHkY53XyFCFf3JfeJP6oGICPiDXf0nH3ULQ== Received: from BN9PR03CA0059.namprd03.prod.outlook.com (2603:10b6:408:fb::34) by DS7PR12MB6022.namprd12.prod.outlook.com (2603:10b6:8:86::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.23; Wed, 23 Apr 2025 08:36:38 +0000 Received: from BN1PEPF00006001.namprd05.prod.outlook.com (2603:10b6:408:fb:cafe::44) by BN9PR03CA0059.outlook.office365.com (2603:10b6:408:fb::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Wed, 23 Apr 2025 08:36:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF00006001.mail.protection.outlook.com (10.167.243.233) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Wed, 23 Apr 2025 08:36:37 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 23 Apr 2025 01:36:22 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 23 Apr 2025 01:36:21 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 23 Apr 2025 01:36:18 -0700 From: Mark Bloch To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Andrew Lunn CC: Saeed Mahameed , Tariq Toukan , "Leon Romanovsky" , , , , Vlad Dogaru , Yevgeny Kliteynik , Mark Bloch Subject: [PATCH net 1/5] net/mlx5e: Use custom tunnel header for vxlan gbp Date: Wed, 23 Apr 2025 11:36:07 +0300 Message-ID: <20250423083611.324567-2-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250423083611.324567-1-mbloch@nvidia.com> References: <20250423083611.324567-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: BN1PEPF00006001:EE_|DS7PR12MB6022:EE_ X-MS-Office365-Filtering-Correlation-Id: 41226a8c-4ec8-4db6-5b85-08dd8241f6c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fSYYLMJx8pHZ/158cFeh78ziE1+NqTuWvPH574e5mgPdINSuV1ncMSppFl+H?= =?us-ascii?Q?ShoLe1TQ3LYW1l3hXtZB6eqAdqofkMw1nG2cPaFn9Dce643Jo3i33z27GEYM?= =?us-ascii?Q?rti2m1qkHTfbmFr21HymRFDDaXqRYADnYVhEkwjkXnTp3xaGmiEIMaTszbf6?= =?us-ascii?Q?fPUBBVPgitvSk2wXSTiPsmz2Q2q+0ZvI9NoN9mtURPYy3AchbQJXD/FkysP7?= =?us-ascii?Q?QdPbIn+0k0kXCthaTje3UWpX+r/2gXYaHa2G4Rln4nAPLMoPMme++xaUoU+s?= =?us-ascii?Q?z8d4A3d1Yn5pbI9EZyNxrqaxLkNHedy7kL990DMO2O/C5uLsD6Il2PEcT713?= =?us-ascii?Q?kdeBmF4o2VDaY3Tm9+av8qfPrESbpDaPXFEW1ESkXoCccNk8R9pTfP4t7bQu?= =?us-ascii?Q?zumSv3IQRRJNm3XoTklqPk/pBBOqQzAjB3EFQrKO5MZE2RvD3Okc+TBfOBPh?= =?us-ascii?Q?uioNvMfEPELiCxcvGgI9GKFDQ15PHeTbl7G8PbGwMTd2B9T1WO+pjC8+dglf?= =?us-ascii?Q?jsBDWUux0+C1NnRjpUk6CT32RF2FnCJubdtisfdgykYBpkSUVYjvr0F8xTP7?= =?us-ascii?Q?gVlE0L/t3fIyFcDjjHkbnXoHGiyUhfQfUxCIbMhU0BCo/OQzfMD3Bt6/ImbL?= =?us-ascii?Q?EnQ7aMhiaxq2c0/TbD8O7MoP23v6WbcYoJOvGDJ1gFuhM7b5q1U9R0fA25A0?= =?us-ascii?Q?PVXi2xr+qw/i06NsGTmdq7wUFbP0GwOsPatil7cZVhL9njAu+92oo/I88uqH?= =?us-ascii?Q?gCrXKcJJUln8XexBRFl6PlnKUwGf1pjDLZDOjwMV55OQ1Ccmec9X7tmaDhXy?= =?us-ascii?Q?Dn2N48svNKsGvwZsldtnYCubXmRNr7allVVJg9snLZxpyY1CwjYXsY3s77us?= =?us-ascii?Q?03MOXq0p+KNq1YzLutEaSnbQmTy3zVhAabBxtgisNgkTRWqN5JRnoPakV3J+?= =?us-ascii?Q?GEJHgsfmqemRU10fj5ia1WZ7Zx9ES3MSa65qIF73jQ3hOtUy83njfCNq0Ira?= =?us-ascii?Q?WkiiqHasb4KH+04KUb1BuY97EbFZNAH90j4xmgHm1+M67uTRqeDzXP9YyzQw?= =?us-ascii?Q?9dcmrBuOJrSXBvGE9pRnKGNDXDYQjxF7yrxCCBafIctYjRRI3DgF4ArZQHzq?= =?us-ascii?Q?mRWl58gYbUi8kCULumkx7z3x5GYEagvzBZv64ePP7TGOsX4aEmnXuOcSKVlR?= =?us-ascii?Q?fjxUSktIeaSd7e3wcpfRtdwECSmX/TW/anzVEGmQFbb2rGkHrtNNZjF27VuR?= =?us-ascii?Q?PP9cYWpurZDQ2X6oeWc8/L3Tjn3IRJoQuqwDm4/OV6bB+oX9YMZRZa5ahjMA?= =?us-ascii?Q?BW6OTVBTyp3qlwbicBqmbizlfddvNk1jnMal30cvDFOHm/Jy6e2mL8Z6N/e/?= =?us-ascii?Q?lNeFxIpgzdReK+SDF62aPXp+BLRVWVZlUbl9r7LH4Zosq/rxYuN68yJrj6+J?= =?us-ascii?Q?ZenA8rSIrUDoqjh2CG5n7nHKDD1YTga129p1lDsHm5FC3ijSASr7lK3ZOwAd?= =?us-ascii?Q?aQhWkXx3QINKpQzqs4GjkbRfovQ9Spb6C9LY?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2025 08:36:37.8643 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 41226a8c-4ec8-4db6-5b85-08dd8241f6c1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00006001.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6022 Content-Type: text/plain; charset="utf-8" From: Vlad Dogaru Symbolic (e.g. "vxlan") and custom (e.g. "tunnel_header_0") tunnels cannot be combined, but the match params interface does not have fields for matching on vxlan gbp. To match vxlan bgp, the tc_tun layer uses tunnel_header_0. Allow matching on both VNI and GBP by matching the VNI with a custom tunnel header instead of the symbolic field name. Matching solely on the VNI continues to use the symbolic field name. Fixes: 74a778b4a63f ("net/mlx5: HWS, added definers handling") Signed-off-by: Vlad Dogaru Reviewed-by: Yevgeny Kliteynik Signed-off-by: Mark Bloch Reviewed-by: Michal Swiatkowski --- .../mellanox/mlx5/core/en/tc_tun_vxlan.c | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c b/dr= ivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c index 5c762a71818d..7a18a469961d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c @@ -165,9 +165,6 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv *= priv, struct flow_match_enc_keyid enc_keyid; void *misc_c, *misc_v; =20 - misc_c =3D MLX5_ADDR_OF(fte_match_param, spec->match_criteria, misc_param= eters); - misc_v =3D MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_paramete= rs); - if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID)) return 0; =20 @@ -182,6 +179,30 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv = *priv, err =3D mlx5e_tc_tun_parse_vxlan_gbp_option(priv, spec, f); if (err) return err; + + /* We can't mix custom tunnel headers with symbolic ones and we + * don't have a symbolic field name for GBP, so we use custom + * tunnel headers in this case. We need hardware support to + * match on custom tunnel headers, but we already know it's + * supported because the previous call successfully checked for + * that. + */ + misc_c =3D MLX5_ADDR_OF(fte_match_param, spec->match_criteria, + misc_parameters_5); + misc_v =3D MLX5_ADDR_OF(fte_match_param, spec->match_value, + misc_parameters_5); + + /* Shift by 8 to account for the reserved bits in the vxlan + * header after the VNI. + */ + MLX5_SET(fte_match_set_misc5, misc_c, tunnel_header_1, + be32_to_cpu(enc_keyid.mask->keyid) << 8); + MLX5_SET(fte_match_set_misc5, misc_v, tunnel_header_1, + be32_to_cpu(enc_keyid.key->keyid) << 8); + + spec->match_criteria_enable |=3D MLX5_MATCH_MISC_PARAMETERS_5; + + return 0; } =20 /* match on VNI is required */ @@ -195,6 +216,11 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv = *priv, return -EOPNOTSUPP; } =20 + misc_c =3D MLX5_ADDR_OF(fte_match_param, spec->match_criteria, + misc_parameters); + misc_v =3D MLX5_ADDR_OF(fte_match_param, spec->match_value, + misc_parameters); + MLX5_SET(fte_match_set_misc, misc_c, vxlan_vni, be32_to_cpu(enc_keyid.mask->keyid)); MLX5_SET(fte_match_set_misc, misc_v, vxlan_vni, --=20 2.34.1 From nobody Sun Feb 8 03:47:50 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 BA68F26FA5A; Wed, 23 Apr 2025 08:36:45 +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=1745397411; cv=fail; b=qFQ98PknA14qfLysrdoPZJ6Xu+PlbfmrmacM0tUiq0aHHSacOZcKDp5/YfLRR5TXMX24jLBccRXwI+U3y9h9zKlAVLm9DWri+vIOIDqtXBkjS2IjOYutdYaPEvgVpefteIBazyAoOxjK7529h6YgqumxGJ6eOqwRQQ+GSqJxg6Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397411; c=relaxed/simple; bh=HTa5oU/JaRYiEIpV+vDIEhDez5qIUzU+gS2FS3m6sDI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rqVLMf+nwEiQa4zE48GPKmdhy425Jt5LNXbF3MRdw/4W6TDkn+246TboJgliOOddN7woRUBGI2abFUgtzHtt8DvKkKSUl07+FRrZjLVEelWqCvb8QFV+si32Kd48aZ2Fat6gqep8Eb+FgUapNTZnKUWPXdZTn2R9EWERJGVDo4o= 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=c0kP1icg; 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="c0kP1icg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DXzcHnuXblWCOvwR3xZRzD7mJU/siAlowg9cp+lWXokwPBzKwO5DQQvxwzQZ3BBMJk6QE+2JG55s253bfKWFA19Os5yyzDIKrdMCjg+8PDxlvUOGVsO2l/l/d9BZ1i+JVAHh/UlAQUq5h6pNyam1TcIK08/lyCSV9pQj46iHd3sLQ+G3U7Wc9RhAQQ83ZKBSZfSG+K+br+ThpRmUFYP9Ngi9VDn+9LjHqFm80rx0+yrE69UYLkBuB66SeQTnKbj9/g2XyDkTAZRm42sTTFRZyzRyfxAsCoNwjIZhzQYWc/WptsHynDfNek6KxtxudLyWUnVHzTxDbrFvT9eYMgTHXQ== 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=jd+baZ+cQ7SFVqbeNhBwzkthKJI3EvwJKeZi0rXd/kM=; b=TCqFRxNjB1PbtxabQ7BlPbhyju8aYOV0qnOct3W5DV0PCNWh/Z0MYgxDqgevt2AQGUMbf4zU/p+dnBNhmXLiSrUSryvjUGGBZ2p7a+s43by8Zt+7gYh0cbfJdcJxDj7njcBpTporB9goyICKcu49xaDd+43w1VHxK46MfrLVYHonD8nXMd1xOjlaoHUpzhIxjfMAD8YMEIo3D/JMXUASC8BQ2Ry+XkK0qR9YfWkbHqngXAVVIWNvBpkUmMt3xDjCJSS0yWBN7IOmt0BrEvUaOJ6PlDhXXSEC8jMbWXBKPMG2mOQH/MsWZnA/Nz6mOPMk/KphhsyhyAPtXs6TtXFxLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=jd+baZ+cQ7SFVqbeNhBwzkthKJI3EvwJKeZi0rXd/kM=; b=c0kP1icgyMI1W9OuCo0mMYYDK/kNGw/Gt96+CeWMxaGamaZDHRkWbSuIUcLOt4R+pRLuX6z4lW01qejz5VvMetMS0bEFy9zYNYwU5VBgsR/BuQZEQXcFm7qraQsMliWuDc9OieEMX5lzEheNMJpNU07Haw6Vx1aSJ/aZ/3AKkDVAJiiORJeYCYFfb+dvmjsp4XW4E3Nk2nUSISmsq+2U3iJrPpfVYE1l8YuXSx5FMPDjp0EErZ2SAO3Sy7toFtC2a6ia9CE3awLrmA+hwlZuH3GqAiF49qI0L2JNIGlPslaYDLQkZQG9wYIJt4MukUNw+82UEJefX+FtAKZAitis5Q== Received: from MN2PR19CA0035.namprd19.prod.outlook.com (2603:10b6:208:178::48) by DM4PR12MB5940.namprd12.prod.outlook.com (2603:10b6:8:6b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.34; Wed, 23 Apr 2025 08:36:42 +0000 Received: from BN1PEPF00005FFE.namprd05.prod.outlook.com (2603:10b6:208:178:cafe::25) by MN2PR19CA0035.outlook.office365.com (2603:10b6:208:178::48) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Wed, 23 Apr 2025 08:36:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF00005FFE.mail.protection.outlook.com (10.167.243.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Wed, 23 Apr 2025 08:36:41 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 23 Apr 2025 01:36:26 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 23 Apr 2025 01:36:26 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 23 Apr 2025 01:36:23 -0700 From: Mark Bloch To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Andrew Lunn CC: Saeed Mahameed , Tariq Toukan , "Leon Romanovsky" , , , , Maor Gottlieb , Mark Bloch Subject: [PATCH net 2/5] net/mlx5: E-Switch, Initialize MAC Address for Default GID Date: Wed, 23 Apr 2025 11:36:08 +0300 Message-ID: <20250423083611.324567-3-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250423083611.324567-1-mbloch@nvidia.com> References: <20250423083611.324567-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: BN1PEPF00005FFE:EE_|DM4PR12MB5940:EE_ X-MS-Office365-Filtering-Correlation-Id: 035a99b4-2323-4266-0168-08dd8241f8ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3LUqY+1hmBGApUTYNqXa1enWLYWkjyCSzc/bfBlk1deV9sekIXHxuL4qWXxm?= =?us-ascii?Q?UwhaU7CW4f4JpNgJ6QI1JTIqZ32d3KuSc40JyDIq8nOridU5ANBVJhF5lcTY?= =?us-ascii?Q?yEOaVEqtxxAO47TnXbfvKieLoiiAN6jGZ/6vy+mKXX4uyftHZusAcnEXVx2c?= =?us-ascii?Q?ITxtQFBGFlkfdjkVZS3wYaNOkUB6IlHeicVk5mMe3W/Yt0x5P6IczK+jzUMa?= =?us-ascii?Q?7g4vxhVlmq7SXf2L2TOBPza9l+7/PXSuzsj3rjypD2qT2cSq8XEoKBtYczw9?= =?us-ascii?Q?VqcgFB+ABHqzISypWqn3ebND7a2DIWgYKvr/PcVJKH9du0uNX0tffqkp52GD?= =?us-ascii?Q?kV30GID/YbXqhWaH+yyO4Wj2Bl4QN8bPVtUZKlrvrCKcLPMr0V+ZmT3w1p2H?= =?us-ascii?Q?v45AokvvKrs++RZ4JgytuUlqeDM/10tRys6/flEqnruP2ArgpdIZtqGJryKa?= =?us-ascii?Q?+7oMQuT9udKFD6yIPVLNL9enYWEtSk78MyMPKpAW5KlO7ZsT1/T27e1EyW/f?= =?us-ascii?Q?doXy1IdaLBWytVef1D3zeumqN8nH+Qyg1BZ6Ij5QykEsgeJNuXDVX98D1bdy?= =?us-ascii?Q?yq+E8F221EHtMdXTVPJFMXBXTydKf+QUAPOhWPn8HD0H4o+L3xo2jA8zSDta?= =?us-ascii?Q?glSc33M2Cos2LRcPwiplEngLdlRusjmXzLQRFm6IvFmfhQT2y16tXxXdUD/I?= =?us-ascii?Q?0Nm6kBKxPvlMCeV13jFhzAzJXqRs18v3DNQdvEFhJZgOVMBbJzvQBzTQJq05?= =?us-ascii?Q?xLeqKwBZmwh8AY+mBP2VCWyuuxn1EHRQfX7NM/Dv3CxetcdFGOL53f7TWtpR?= =?us-ascii?Q?9vlYRjQP/7RWAx0rf1xrTrUHfJY4NZJ4rI9zPtUQl9Zg+d0x+rwx0sBOcgk8?= =?us-ascii?Q?qRhdxLUabIcaB+jnInpXGT774Ya5tNdOzG8pyv+3B6gNYpIDs0gkNQW55NMx?= =?us-ascii?Q?g3kMoYwMSCdTW4lPIxNWrewScqx++gViDcBkRRBh7U5lyitXplqPIw/yv+sg?= =?us-ascii?Q?TeJQ9ymQH+3kuAWYlOqld6lj9UpWKRh3BTSPIVwkRgiN4aPkDl9nBYtL9rlc?= =?us-ascii?Q?PENMaYjT43ZKTbOKqpbW8slENSfgF/toPERiMyfz/wkWsGMJZ8/XKkPYPaFZ?= =?us-ascii?Q?Jla9Me5fI7dMPrT0G/Rmh6SbaI77dS9nesChLPuj83A2ceQ/Fv0ZqojtbNXR?= =?us-ascii?Q?jkwweP644IeKVecBIqXf3z4Ng17Gbx56PEpEniY9WpWHJpbvSOXKoUd0QR7j?= =?us-ascii?Q?ltpDu1fwtTtarwKVFtqigRQ4Wyh2CO5GUK5/4sJXY7aURMcin99iNxjwcwGd?= =?us-ascii?Q?r0Q6ifT5E+WEs/Hw80Id1WpVOgD7XhE7uUf8xge7g6pJMIdqIA2yzrEMP4o4?= =?us-ascii?Q?+qbedLg0plC+oBs6SFVwGDMTUaKARx/GQzGjqMI+HJ5V2E1cNUqmUXB+Tln/?= =?us-ascii?Q?ZCgleMw26/ny05tsffPubZeM52fekl/owrKKEoEra9Xi7F1zi4ZDTI1JsOfo?= =?us-ascii?Q?G4ClIO0H40Fqzyc2HBNn8vOaLzaKhiz+7Cfl?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2025 08:36:41.2920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 035a99b4-2323-4266-0168-08dd8241f8ca X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00005FFE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5940 Content-Type: text/plain; charset="utf-8" From: Maor Gottlieb Initialize the source MAC address when creating the default GID entry. Since this entry is used only for loopback traffic, it only needs to be a unicast address. A zeroed-out MAC address is sufficient for this purpose. Without this fix, random bits would be assigned as the source address. If these bits formed a multicast address, the firmware would return an error, preventing the user from switching to switchdev mode: Error: mlx5_core: Failed setting eswitch to offloads. kernel answers: Invalid argument Fixes: 80f09dfc237f ("net/mlx5: Eswitch, enable RoCE loopback traffic") Signed-off-by: Maor Gottlieb Signed-off-by: Mark Bloch Reviewed-by: Michal Swiatkowski --- drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c b/drivers/net/e= thernet/mellanox/mlx5/core/rdma.c index a42f6cd99b74..f585ef5a3424 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c @@ -118,8 +118,8 @@ static void mlx5_rdma_make_default_gid(struct mlx5_core= _dev *dev, union ib_gid * =20 static int mlx5_rdma_add_roce_addr(struct mlx5_core_dev *dev) { + u8 mac[ETH_ALEN] =3D {}; union ib_gid gid; - u8 mac[ETH_ALEN]; =20 mlx5_rdma_make_default_gid(dev, &gid); return mlx5_core_roce_gid_set(dev, 0, --=20 2.34.1 From nobody Sun Feb 8 03:47:50 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2067.outbound.protection.outlook.com [40.107.220.67]) (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 EECD0275118; Wed, 23 Apr 2025 08:36:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397411; cv=fail; b=ewNPlLpGmtUo+x/PJ1SJjeunVPuvgq2l5eMi6nsfSwnp9nbOuXGR+fuP6kSoXuENaqDOt4IDcmmQ0CyAtPan56p+wxyLfnw+1UxG7XkVwRnZpNGZ1NtkX24EErCVLVXlndfBLcvLRXcN7CRmvdjEft3OVP5png4gmB5ImRUn56o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397411; c=relaxed/simple; bh=sW6lUPMnzsY7ASAgue9XYiEAEaP+tGWTdVYTTPDb5lg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jHTUcPyzbtmkorTZUFdJRthsMHQj6FCxss0iuYlbsSaycBXGbtpUGUgXJ2jN3N02Ow+00jADV61SzTFrpCA140PQ9e8EscVfiWzhc/HvCdpFOK7hDTC7me/epFO+vLYBC57hDwrRzP9gpGAHXmwpSm3+D99jkemIea7MEQBXGpo= 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=Nmc/ObLk; arc=fail smtp.client-ip=40.107.220.67 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="Nmc/ObLk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y/2CqVTV/zj+88zQVmxTaulZKGtY04E5dUpKjnqvwolIhsHbp3xd2sP9WgM/iGy5um2MGxLufYo6zLPPGYXgGQ0yUXuLej5fagYUW2hqYjrWWmFmFXZaGjA9FKyj7IJrmQTgtJY5SYo8xvKEiP0hGIaBt0q+lt58qt8eDdP5DT0BEjq8d0BbRkTGE/B+JRyPLUd1rVIOiierL9rJWocQ3/UjT1zGj7FkxqzZLCav7iMXSXuKYNvhykpnSJG7bWk659O6Ldh4HMoetikP9aa0W5NnbiguzyPlLfDE0fPWgt9QS4OdWiNq3dbzV7et3jzHfWlLUGqLPKnuK0rW2q92OA== 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=B1bDP87eXPxSYDM3fWNPLuja9C5QwsHEV42+c0WyD00=; b=yo08JJQaeFoLMlTpommxAchsMhq5tkE1KTYx4ta45tyIAS7H9iumbR6i4yGdBKBHYq7Wh2rDOUac/2kbDPX6wM/bD+yu/qFOLxCjVXMPEmn9mD349hmbZdAsa6BLZnmqOhY+EYFPVWzF2JYHaPeUQ4ft9tYob7kRBAQcEQAfZWWOV+VzMcdultOV1Py32h7ui3qd07yivjVfH9PURafpu0vPOOvVTDNVniCPbN7KrBGWAUMDQDTsuQWHWeUD3+36LxE7nj57ERvn21CPIsTBH/xFQxjlx0akwYf0psTjP2DUdYgH5prhpbhTqfcyfm6x91soj25/CDhC69GRSO7gyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=B1bDP87eXPxSYDM3fWNPLuja9C5QwsHEV42+c0WyD00=; b=Nmc/ObLklZE2zDcpOab6cJ/Tt7ouABH3RZ/b4vTreBuPxmHYn11frffrW/KcH862zm3yl3PrNTkov4X7kSmk/0mTga3GS7ktsSvR6pklXq7EqeCZzlDVotvfJIhxWEjSG1EH+PmA2fTHcWYQXJOOdxOKRsme8+MXvfqhbt/aE3PUsu6pKS2ulN1Egc/9sFIdcxt1lMpMydBhp/GmVxWPT1Td6chpyY2MQ6EGLU4Puv1g3mR2P0ryNW3dDXRaaG27ZHW7t36WIthrVwj3F5wPj6azk4RwOTAnXmA6VBSLUH8O3eLtQPOczANhDq3/eS3D4XXIHZnL6soOSGboVtWz2Q== Received: from MN2PR19CA0031.namprd19.prod.outlook.com (2603:10b6:208:178::44) by DS7PR12MB5790.namprd12.prod.outlook.com (2603:10b6:8:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.23; Wed, 23 Apr 2025 08:36:45 +0000 Received: from BN1PEPF00005FFE.namprd05.prod.outlook.com (2603:10b6:208:178:cafe::be) by MN2PR19CA0031.outlook.office365.com (2603:10b6:208:178::44) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Wed, 23 Apr 2025 08:36:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF00005FFE.mail.protection.outlook.com (10.167.243.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Wed, 23 Apr 2025 08:36:44 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 23 Apr 2025 01:36:32 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 23 Apr 2025 01:36:32 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 23 Apr 2025 01:36:28 -0700 From: Mark Bloch To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Andrew Lunn CC: Saeed Mahameed , Tariq Toukan , "Leon Romanovsky" , , , , Jianbo Liu , Cosmin Ratiu , Mark Bloch Subject: [PATCH net 3/5] net/mlx5e: TC, Continue the attr process even if encap entry is invalid Date: Wed, 23 Apr 2025 11:36:09 +0300 Message-ID: <20250423083611.324567-4-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250423083611.324567-1-mbloch@nvidia.com> References: <20250423083611.324567-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: BN1PEPF00005FFE:EE_|DS7PR12MB5790:EE_ X-MS-Office365-Filtering-Correlation-Id: f8f8c3e6-1f67-42fb-7427-08dd8241fae2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UXqDTmzELnqiqVcBAqvwJt5gPL8PfhVEQ5LHOEJ7NOzi0g87Z/AwmjK6pGHC?= =?us-ascii?Q?0XScnFv66rtYOuk4zwFPcUgeID/OOAxODQ0EK9Wa7M9DAWamjYprjLfvGuTQ?= =?us-ascii?Q?UKZKgHm1g/7cNoxVTTJxQPeXF4Io++TC2flpO5qzHriyLauh8s2xxK04CI4T?= =?us-ascii?Q?4/c4n19StJnaWYGNCmqCwTCSS+4aOQNljVX/VL/iGJzP+lGLHJBV4jkNcDnX?= =?us-ascii?Q?dXEPJ6WarzXJ4Oetf+0lQWvEpZ7MXdRk4yker7qGppJ9JEFQXtUnzoZm5Va0?= =?us-ascii?Q?JCVlaHJ/YQQXTPRurjq2vmPJo6xo4YW8yIFzwJtydRFr0O+zw+3HPHQ+WL3D?= =?us-ascii?Q?4c3oS84AdAY2O908/Jy8iO16pXWlqpB9GvuXKKurUdQJO/oGFTanD4FzPeNP?= =?us-ascii?Q?sE+RlBxROKHVl0GEl4Uyt/iBgU5v/7xyAodtRRYOgIfp3MERz4sbIlKJ2guq?= =?us-ascii?Q?eXceAanykLMumQLhDxNEt+rX8FDCQZJ9Mm82Gqc1BPq3SNqC4byCzWMMxYvq?= =?us-ascii?Q?DVMoTfoBbkRjY5aIcAt4/mzaEC+p16tUXOJsy7HTDbebKv4SuuQ21NxgY3L1?= =?us-ascii?Q?fBnn15g6W1SD7JbRppQ16iY+LyPEVCCP7O+iXggYb3kRex6n53jreNSa3kwX?= =?us-ascii?Q?T/YEtjygnokghrjas3zWU0l5OCVXSFE5Zbmh3SNJoz4weksO7A2DsxnAKAj3?= =?us-ascii?Q?wzhfPPNqgI/8Zqokwc760uw95tfdIjq2fUsV15Cxd7SEm74XvBbgxJqdLPvd?= =?us-ascii?Q?rV0L5fKUe5YRR+Qmqa+Jm3vAqseDPCFOYMCQmufv0xN92lAfsQ93SE1fLnq5?= =?us-ascii?Q?6EMHZJfSMKOkc4uIrxsvPQDpfkCZTQnIudxWQHZ0u4JKl9Mld/NQ9ymVP0Kh?= =?us-ascii?Q?4sLp+izdOc7AIAD9g0fl0PTXgsf2UDYBU8qF9c+wyhRjtUMLip/PA2qxfVyu?= =?us-ascii?Q?MAkgR/+fCPzNGez90DFqq/EywHQHvJtYaMKJPOLQsvuXaBv8ScjUn/1+3bls?= =?us-ascii?Q?Jr6hXF7Rpqej9yl/OKeETndsX8dwefJF9GBt9Z0o9+f00QJLkgjHwyty7xfN?= =?us-ascii?Q?OLBuoGVWIHNWkA3KGJeX/9qyXCBEp9FKUB2jX3VmsMsnnst1KhTnh8V20rIW?= =?us-ascii?Q?teXduVNAnAkC1oTTpVbQi/qSh4c6/6m20/T2o5racW5rYlovqM4PXvoASDuD?= =?us-ascii?Q?CREUFrZJ08Q05qtf3SCrU67kXX+LX7IIpQUWktkEhcB/r8ui9sW9vO7W7ldL?= =?us-ascii?Q?N7BNudwhEaJGTbNiF50i3gzSqRHp16yLBRlBqZ9FLfuE0DGkrxfL8USzz8Qe?= =?us-ascii?Q?rAP2mhRaXWM/6Tx1Vbd9S44Rvot5R4XMzv/+b/ssJfuyR7l+e7n0SFdr3mxe?= =?us-ascii?Q?rFf1wCAxWq6OKlnIZvWtIDyzH5DMqOzya8xz9saIJT/IgeJdgywy55onfgqd?= =?us-ascii?Q?wq6mIj2RzLy8H4zYstg3zeEQGxKyyDGD4ztzTR2RuCW2n/TTfcxUWx1e9VVv?= =?us-ascii?Q?Iz/Orf76g1DAWMvPAEjwKUXcdQ3sm22eY1m2?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2025 08:36:44.8077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8f8c3e6-1f67-42fb-7427-08dd8241fae2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00005FFE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5790 Content-Type: text/plain; charset="utf-8" From: Jianbo Liu Previously the offload of the rule with header rewrite and mirror to both internal and external destinations is skipped if the encap entry is not valid. But it shouldn't because driver will try to offload it again if neighbor is updated and encap entry is valid, to replace the old FTE added for slow path. But the extra split attr doesn't exist at that time as the process is skipped, driver then fails to offload it. To fix this issue, remove the checking and continue the attr process if encap entry is invalid. Fixes: b11bde56246e ("net/mlx5e: TC, Offload rewrite and mirror to both int= ernal and external dests") Signed-off-by: Jianbo Liu Reviewed-by: Cosmin Ratiu Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_tc.c index 9ba99609999f..f1d908f61134 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1750,9 +1750,6 @@ extra_split_attr_dests_needed(struct mlx5e_tc_flow *f= low, struct mlx5_flow_attr !list_is_first(&attr->list, &flow->attrs)) return 0; =20 - if (flow_flag_test(flow, SLOW)) - return 0; - esw_attr =3D attr->esw_attr; if (!esw_attr->split_count || esw_attr->split_count =3D=3D esw_attr->out_count - 1) @@ -1766,7 +1763,7 @@ extra_split_attr_dests_needed(struct mlx5e_tc_flow *f= low, struct mlx5_flow_attr for (i =3D esw_attr->split_count; i < esw_attr->out_count; i++) { /* external dest with encap is considered as internal by firmware */ if (esw_attr->dests[i].vport =3D=3D MLX5_VPORT_UPLINK && - !(esw_attr->dests[i].flags & MLX5_ESW_DEST_ENCAP_VALID)) + !(esw_attr->dests[i].flags & MLX5_ESW_DEST_ENCAP)) ext_dest =3D true; else int_dest =3D true; --=20 2.34.1 From nobody Sun Feb 8 03:47:50 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2060.outbound.protection.outlook.com [40.107.244.60]) (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 426DD275118; Wed, 23 Apr 2025 08:36:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397417; cv=fail; b=RHoP3nxytBakuknn9VJ8FHIbv5qYKossBYcRuQpqG6qwKnwLF/BVR7+fVDwOPz51BkDoxmUlvDVuJY8Lyk4t4SJoZGCxVwFYYxs9KfEszZSH42yJFCMwdEQxm3/m3OaZxNWeraQpKg33B8HMRaHhy/ehrYmg84pnGfZo0JjQJh8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397417; c=relaxed/simple; bh=q5bJgQagCzEanAJq0pAHCDKTVDfnUDYxEYEplUif9V4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QdLxUZiUlFJxUpQAD3FYKb2Ady7H6VogozLRXvtkscpHTgHBjd397Fp3P37vPPlsOlQ37YqlTVpAtnDhiTmhAhnwPT3U45ortlamLDwlaqn4h1XxZUiumR7vkU3qCZNaYf81K3Cn7uilayqYKoVRP15k5X78qlKzQIGdEQ/fGSI= 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=lS+WIGSZ; arc=fail smtp.client-ip=40.107.244.60 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="lS+WIGSZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UDGybDeaSn5YlzGrxcdl9ojNKmVWviAZ2HUM88h68p9KYOElvyj2dV7QMOCUk1Pa39B3OYE96qHPTX4B+DCBo3igTtIwkD2Zwjkimmk/z5vphMeKgZKjF+eWYBOMrr8eLaHE649lOcb+NRoV45di9f3HDgkZ/3rss+PEnYcpnsrZI9MYmat7lRfHAdOrGlLKrwBmCbv1O6016XFqmELKvK35KteVaqQw1EcCIeQx2i9/TJKh2XUuWwcI8ztGHg20pyW5anKh97drXdqbuUMUy7wCDX21nozE4mRJ2Sr3FX9eFDpyShMPEIOEmPFbCuBiA0kOb6eOuOTDdOv4zW+QuA== 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=DuLsWTWIlxmmI7742Y8KZyxubJ9feDhmVqQzDjxsFtQ=; b=EI5JJgeYbHd3VlVAe1/e8S1amf/s+ACkzG/owFddDhsRI+S59EPu7QcTUltWi+aKlcQxO9Kaa6PWpYLzHn/GK2OqiIfuv1BHG00Re1A1ohn9UIDJB1VMSu5BOnEp42XHpukuiHsiJA7mFV422cw0Mi3UCZ2LPL0b7FbODLr7rgQ6D6VVwfjf1wRHM3Pmuub3FEqSyAQn/7GMKR8SihXl86ut2L2UHf7YHGSKL/AEbhZTgwO9oNBYMyUxoEYIDePji+WN7u5G4WWcS5IEc582xkwBP793AzOU6ympyu3BtB6tr9QFaRIqHdjDPLqytAHs+zb+8jIxPgvXJIymzsmtFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=DuLsWTWIlxmmI7742Y8KZyxubJ9feDhmVqQzDjxsFtQ=; b=lS+WIGSZAmpM6AlgMMGfdPoP1z0L/YlUhkJnxPpFSXfNjIZJQ2TwPkxDvaLmaaXbjHK570B2gmBApcoNn7WCxCb8V22sZDxtRDykLnXPub1E6j7MLFMWjgkDa2B4w+xxCUrZeqK5A7P+3JyekZm+8SB7dOwrHfG1iDEmwKrELYCGObuIpC2xPE1bJBNpTuD6wyoQVmajeettaX21gSHZlGVWP1ieTBw22h2H19rof74Y1YPKWSKwzvHRyntkpOfzfZYQR63bmXyhdopTj4LuWTiVK16CLVRYaf8/Us6VYgxLBT/P08751t+qkijo24VO6VuTyfRolO1SRIOb7MxJPw== Received: from MN2PR19CA0016.namprd19.prod.outlook.com (2603:10b6:208:178::29) by CY3PR12MB9608.namprd12.prod.outlook.com (2603:10b6:930:102::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Wed, 23 Apr 2025 08:36:52 +0000 Received: from BL6PEPF00022575.namprd02.prod.outlook.com (2603:10b6:208:178:cafe::f6) by MN2PR19CA0016.outlook.office365.com (2603:10b6:208:178::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Wed, 23 Apr 2025 08:36:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BL6PEPF00022575.mail.protection.outlook.com (10.167.249.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Wed, 23 Apr 2025 08:36:51 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 23 Apr 2025 01:36:37 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 23 Apr 2025 01:36:36 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 23 Apr 2025 01:36:33 -0700 From: Mark Bloch To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Andrew Lunn CC: Saeed Mahameed , Tariq Toukan , "Leon Romanovsky" , , , , Cosmin Ratiu , Dragos Tatulea , Mark Bloch Subject: [PATCH net 4/5] net/mlx5e: Fix lock order in mlx5e_tx_reporter_ptpsq_unhealthy_recover Date: Wed, 23 Apr 2025 11:36:10 +0300 Message-ID: <20250423083611.324567-5-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250423083611.324567-1-mbloch@nvidia.com> References: <20250423083611.324567-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: BL6PEPF00022575:EE_|CY3PR12MB9608:EE_ X-MS-Office365-Filtering-Correlation-Id: 0cdd680c-0608-4d67-85ad-08dd8241fedd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wsfYsm1q8tMiBt9LB1EFrZM96nWZkOuatmJejjDHZiB70UDQ6zeFROJBvCM4?= =?us-ascii?Q?kJbRqQTeD9AXWQ2Q20ni+b9O9lrNBWMNbBCCBD5OlvnN1N4V0ioaT5KCstnx?= =?us-ascii?Q?1UY0zj/hm+mLMjyaO0RYdY0jVtZm4mu1pvvLtCs3Q8TyyRp7WGA+oMJryNjY?= =?us-ascii?Q?PV2187wpQe7N2gCBheYIyfub0kCS7Slyc1MESRaDiw6H6rOtbIgY5nV3ahyZ?= =?us-ascii?Q?lQGikB4XWEJeMiq2217HkS4D7qMcbs2fAOMyDssIUm4YsxrKx0R3wX1u1RuE?= =?us-ascii?Q?93tEWDspwPzdvwCh+WDsyGipwsDY3QOwINyZ8asVPcLovYrII6u9C0nmpPwi?= =?us-ascii?Q?bXBuKtE3Pdl8ueGa18uXk9X3NR4oJLbX1cvVuv2LQOBhTsh5dwiV6fSuWEXM?= =?us-ascii?Q?Y0ZKpeZemLMzYLzhWfbeZiBdCjSeOE8iRsca6sYh53oAs6VfsnKqGiaU1W4x?= =?us-ascii?Q?sPoZCuxxC67dugSG3xBV0pxFsJ8C7Jjj8TrHHx2bltKRPEk5VygwfEX+u8tK?= =?us-ascii?Q?noKlIDL9fHayzk8br49yh/lguwxZsuziuwNveOJcTvPeXAWoO5tzTDVxOz/P?= =?us-ascii?Q?M85RpLkqfanmcDKR4GgQ3Ur3LirrcHZYjP35p88DcJIkLzw53/sNR6KPazAl?= =?us-ascii?Q?f3ZsSmj3/vtCHo64oC6Bs1GIXhQ3XSmzzF0S5dx++9O9mQls7q95W/wfPPDh?= =?us-ascii?Q?wqMd1oVdOyJszGML0SVrvdvuZTnlWGmIYToURcMiYTjfuvnuqIH4TrMlBirF?= =?us-ascii?Q?Yj4wvw7JOgAzjh+iCJ/mQxfvknAPPLQioH5JYtgW4l4/KZ4CfDwh1Kl4kx1t?= =?us-ascii?Q?cjRGp1NrkmAwHfcPK5vCWejEvEVxrXaWLsJdMhR8Eh+DUO4UmoC4zyv7oFpO?= =?us-ascii?Q?u7ZI53jdIAKLalUncMofRn4vWxWpSY3+jwuKvaMzrSDd1UVyU8RyChiFTC7T?= =?us-ascii?Q?K4H34VtIeghBRKvfTmbZSKvv5YgU/MuO3js1T6Hf2DNYGVBCpWDnU6c0bvM7?= =?us-ascii?Q?m2K+sVhYSxJR69RSFOCUOqkKXN0dW806fvWd2kPCfIB2SOn9/eRXz9biObGO?= =?us-ascii?Q?e6vXElKBUJDsBSS9GkxYSLjaRcSUkfA7wclNQ8QuEZk1LyF3wz8BDdRPgaQk?= =?us-ascii?Q?gcYuyH4LVLcXfxX+//LTQ5NrOepC7btJnH0iyva+efcTdbVPMSwOtCisVfF5?= =?us-ascii?Q?lhMgzrPayv0c4UBxYPTOslYxdIRwWYiEM9dwk/w26MKM8pJdMEKOOQwjIive?= =?us-ascii?Q?arz3lHTuEbinHDiIonctmSzScujRGq3SSFOeeboccPTlvj/W0+t1OswdL9UJ?= =?us-ascii?Q?gUzHGkgjhaeQLKCymgnwJOOXr5QZQLJwrebJgDSeWJvDyG1o6RUw4JJRmjbu?= =?us-ascii?Q?ejtuc4Kf9dLIoFEB6f7f8hi74pKdS7ASmV4WlgcbokBCeZyBI1rEAqEY7O0H?= =?us-ascii?Q?OiLLDOeVVUkcpX+Ccgvyh2KyDEp6BYjAscYPDZloZKZO3J0Wnk2gATLEUJB9?= =?us-ascii?Q?qNvRfsa+EHOjLdkuRZ3B1vlMpXtLbXmYlciQ?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2025 08:36:51.5079 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0cdd680c-0608-4d67-85ad-08dd8241fedd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00022575.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY3PR12MB9608 Content-Type: text/plain; charset="utf-8" From: Cosmin Ratiu RTNL needs to be acquired before state_lock. Fixes: fdce06bda7e5 ("net/mlx5e: Acquire RTNL lock before RQs/SQs activatio= n/deactivation") Signed-off-by: Cosmin Ratiu Reviewed-by: Dragos Tatulea Signed-off-by: Mark Bloch --- drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/dri= vers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index 532c7fa94d17..dbd9482359e1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -176,6 +176,7 @@ static int mlx5e_tx_reporter_ptpsq_unhealthy_recover(vo= id *ctx) =20 priv =3D ptpsq->txqsq.priv; =20 + rtnl_lock(); mutex_lock(&priv->state_lock); chs =3D &priv->channels; netdev =3D priv->netdev; @@ -183,22 +184,19 @@ static int mlx5e_tx_reporter_ptpsq_unhealthy_recover(= void *ctx) carrier_ok =3D netif_carrier_ok(netdev); netif_carrier_off(netdev); =20 - rtnl_lock(); mlx5e_deactivate_priv_channels(priv); - rtnl_unlock(); =20 mlx5e_ptp_close(chs->ptp); err =3D mlx5e_ptp_open(priv, &chs->params, chs->c[0]->lag_port, &chs->ptp= ); =20 - rtnl_lock(); mlx5e_activate_priv_channels(priv); - rtnl_unlock(); =20 /* return carrier back if needed */ if (carrier_ok) netif_carrier_on(netdev); =20 mutex_unlock(&priv->state_lock); + rtnl_unlock(); =20 return err; } --=20 2.34.1 From nobody Sun Feb 8 03:47:50 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2078.outbound.protection.outlook.com [40.107.237.78]) (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 A814227585E; Wed, 23 Apr 2025 08:36:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397420; cv=fail; b=dx+yOm0/cqUFwRE0YpDwBHii4vJAEj3TkaPharJh8CeLU3WvNoByyYBm/mxmchfi/Z8RefluPFeVNNwnbUsuYzsNkUSHVvsHAXdVwYJnvwzvgAzEZj5150xwJ+5tM1iKM20qgjfPXNnPvucUZ1v5skXbXukJHNpQdXBmgp8vuEg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745397420; c=relaxed/simple; bh=c8qQiGnaaQUxwIN3xhTt1bqyBVBN+mv0BGDJZffP2nA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=h7koy62sS0mLcBREF/vai9ovM3NO9Wyz9u8DHfTSqDJ7vrqEjZ9PfkJqYShvzxzQFRL3jusIhy63exvpAq7+138UREOaHKOlD44Uag+/gmUjAoQKLL8Vg4+BH4sDmbFpvEB2I0Ne1z1v0RhcMk4UC8JN3kmv8DnP6vkUhH9o/Vw= 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=XPIBvcqC; arc=fail smtp.client-ip=40.107.237.78 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="XPIBvcqC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rNtiz+LrmfotBOhVVHJx1CdTDe3QZ3oNZEe2hNZLgY7j5ldbEkorrxHWZg2qys3wGMb+LZOh3VeYZuG6h6u4hMsT8+BhdQXq/sb/0Ca65k1kKZULwACGeKN4VUuTfQjjAQf+Ipr97DyMwtElNUcMUyS5/tmYt19O98SVBTOZGwwWBipnhWqjn12H7pCg10hfKxLT+W6iqQ1b9oC4y1i0d2O136q5vIVvMxeV3wZe35W9Ul1XbNvB6HZ5PLuUC+VE0HXrTmbdfaPBbDU4+8ylnt5fp81lKrU8lJ+YNLuIdvz0Qh+c4JsU0SkGNwpmC7qerVLJ3YJgi+4IfEvlwTYVzg== 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=rzgMSOwQQI9hmZLiSBV9+OWV/jFepbCv5DYJH1gbqpM=; b=o1DigLCnXT8pyvPLWzTKAUXV6XtGq5x+o5G+3alnnefo6I9JgQ1wbvR6czjqxuglb2VbuijZfDUeBMFtnK+iFGehJ3kEAJC/gIzWdNUdl/wbFv72/YBELk7eGh5X1vC11eb80So30l0nTyYC8VtRKWr64vjokSi3XIbfS8rqxOvVpoo788GFbNaAArUM5mMnHE//EkdZTxcUvrkaDS7D5CCqZ3OwSSfoTy7cr3/14LIAyCJeN4BQIq7ZfoWWiNErq4XY/JKEYYWzaH0eMeWMcMSKA/u1xlbedwuZ0fXe4aUMArlmX7liRPpDRt3JDSapNfJU9ZCrqP95l7u9f/iiLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=rzgMSOwQQI9hmZLiSBV9+OWV/jFepbCv5DYJH1gbqpM=; b=XPIBvcqC3dgJTshXpHE6baMy0u8xtySIW8JC4RRttPkhiEYS4Z3pban6xqtTnGoj7wgN0wny+xF5ofRE/oiTgk/oucoXooR99/UJYBwTUCoqzmh4JX/TUIQG6Boo0PKu0OYJVBIUMrkW1/blGohk03lJ/2YGM5O5kv8XczVGr2d82nxZsnjNaXmIr6fh5EyF5WjzSXflIfGPIKYlw5KSIHFVdymITdU1B6JJw715hXxVVNyfPDQGe0GGQG+QFJ7TF44US8LM68a8GC2IYMUP6VgiJAG+UEfK9Vf9n6qKjNU+igaonw+2tEWUYsBlvpNrTeXjHtsN1Lws4uH6VNjowA== Received: from BN9PR03CA0037.namprd03.prod.outlook.com (2603:10b6:408:fb::12) by DS0PR12MB9059.namprd12.prod.outlook.com (2603:10b6:8:c5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.36; Wed, 23 Apr 2025 08:36:54 +0000 Received: from BN1PEPF00006001.namprd05.prod.outlook.com (2603:10b6:408:fb:cafe::13) by BN9PR03CA0037.outlook.office365.com (2603:10b6:408:fb::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Wed, 23 Apr 2025 08:36:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF00006001.mail.protection.outlook.com (10.167.243.233) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Wed, 23 Apr 2025 08:36:54 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 23 Apr 2025 01:36:41 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 23 Apr 2025 01:36:41 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 23 Apr 2025 01:36:38 -0700 From: Mark Bloch To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Andrew Lunn CC: Saeed Mahameed , Tariq Toukan , "Leon Romanovsky" , , , , Chris Mi , Roi Dayan , Maor Gottlieb , Mark Bloch Subject: [PATCH net 5/5] net/mlx5: E-switch, Fix error handling for enabling roce Date: Wed, 23 Apr 2025 11:36:11 +0300 Message-ID: <20250423083611.324567-6-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250423083611.324567-1-mbloch@nvidia.com> References: <20250423083611.324567-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: BN1PEPF00006001:EE_|DS0PR12MB9059:EE_ X-MS-Office365-Filtering-Correlation-Id: 438e063d-4e2a-41c3-ea93-08dd8242008f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zyv4gYEHWm0V8XQPXtp547JDcMvAGDI/wNWq5AsO8lnIv2ngRCMYbfeJ7hnI?= =?us-ascii?Q?mQGQ/ll2Qj6aFhyQ28zEGVrOvq0p/9uwY2s30jHqhY1h7EFrv3ZgaGLHnsiR?= =?us-ascii?Q?wQV3FSHI1NpWfW8kmfPMouu/2zVvzyK1RCzXEyHnr8bc0AQ9T5YTGA6oB0q0?= =?us-ascii?Q?Q+HYTYUNZ52SkWqo0yqPSlqqXVpnBMTW38w/5xFKF/iySOVsekmSDr/dwOKQ?= =?us-ascii?Q?ZkdjQGgh/vuwIlJzml2bH3+DzzRSkDaYnj5Ol3jOH6yB1pEnxXyXCpkqIF/q?= =?us-ascii?Q?3PznMEar/j27Xh1AYGoczs3U5Cw4RJCX9psb0fTkq/oy1ONMT/mTOSMIdktk?= =?us-ascii?Q?HRKSy9FWl6znf9q9aMGag0N2FKg/xSwFio+KtD4n3o2oUqtZOLYS/agkR3Dr?= =?us-ascii?Q?jM/Vs4PKbYapli6QcSsQVoH5kGWx2ggME8kw8E7wzchvOk8vtu6jsKZ848XB?= =?us-ascii?Q?85mdB1XbGso6eCGLcvIkny5C4c6GPjSNdnV9rSf3xyXbvLCoxGFZJr697KLt?= =?us-ascii?Q?X6PTyQvBF6s+XbmeC/ElkjUl0S0IhnspGllMYXmCg9cnu9hj0CkTy8XDUG0T?= =?us-ascii?Q?gqcfwomX+QEogFrgZrsG124gTKyoikzFG6uNulv3NMQ1AtWxI910eQW59Qnd?= =?us-ascii?Q?x0WS47ITACXArDi1MbuzJdQExTv5NZqY7lrirSoc4uhwFreOPAmgWxUT1e8N?= =?us-ascii?Q?yWaXgR3ihTfDUg9hi1+RmnQWD6sKhssdYndBD4gfLYmNOTokKTacRpThJdxh?= =?us-ascii?Q?BdMYVLK2A7PICFcS06Lo4N9sDyeglb+nTnskK59lk9Uyk2IWg3jlN5wOey3i?= =?us-ascii?Q?KAzGbA40Ml3sFbMEVcLFxwmpNhVzO/dczh0j0dT2qtV5HkziScRqqyiw+Vwk?= =?us-ascii?Q?Mes0sPNHcL8mJuUDq0T8/ARGYJCr8EQyPpMh+6jUa1/kK8efhEcEsIWtP6Yy?= =?us-ascii?Q?tuyCfKKp+5tWqnOpwo2A3YtHmfVdopj96QbGQSAS9bN/CPcWZihnpq5GLkuV?= =?us-ascii?Q?jrAlcLThIpxX0+S4bshW9b+A/z+eATSSxjrd7Ea1KANkDarxFtTcS5Iiq8oP?= =?us-ascii?Q?kQycLSggp0RTVoHzgFvT/32fvzl4GpUD/FdlmTwokc1CTBRQO3t+qTmQfnVv?= =?us-ascii?Q?IxLUZYP5NCtya0qQcx6i+pamXPlLTmnNVZtGpi7cs+lCttYDNwRSNrXxZFfs?= =?us-ascii?Q?Bx+RRxO6FEskKjrFW2IzhKJ5c3dN7n3J9ox8/NLxyLAS/VD6p1sG29zKu+vc?= =?us-ascii?Q?kzeFc4PZN/Enmufs84hdsCiaWxATdlaZwUAmOOAgqjMOLa9fLLahc5dTiBM+?= =?us-ascii?Q?lg7b4jiqnaRmKxkK9Ab8IeCUE8QDAPfJyFuUnJciKmmIxXUvM+dC1IAtJief?= =?us-ascii?Q?Y9AwnZA0Tb1zkCKPF6KTr5fscw2g0bQyFxrNx6pakTzajM4zgOxn/tMJOgBz?= =?us-ascii?Q?bycbkP3i22xVx1VS2LvWJziTtQe8MqPvJWs+pciYEPLo51vI4S7QeskMKwEy?= =?us-ascii?Q?Bj92B89KuaO9d7XsXcZfJlfmRP/bryAVV3fB?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2025 08:36:54.3487 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 438e063d-4e2a-41c3-ea93-08dd8242008f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00006001.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9059 Content-Type: text/plain; charset="utf-8" From: Chris Mi The cited commit assumes enabling roce always succeeds. But it is not true. Add error handling for it. Fixes: 80f09dfc237f ("net/mlx5: Eswitch, enable RoCE loopback traffic") Signed-off-by: Chris Mi Reviewed-by: Roi Dayan Reviewed-by: Maor Gottlieb Signed-off-by: Mark Bloch Reviewed-by: Michal Swiatkowski --- .../net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 5 ++++- drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 9 +++++---- drivers/net/ethernet/mellanox/mlx5/core/rdma.h | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/d= rivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index a6a8eea5980c..0e3a977d5332 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -3533,7 +3533,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) int err; =20 mutex_init(&esw->offloads.termtbl_mutex); - mlx5_rdma_enable_roce(esw->dev); + err =3D mlx5_rdma_enable_roce(esw->dev); + if (err) + goto err_roce; =20 err =3D mlx5_esw_host_number_init(esw); if (err) @@ -3594,6 +3596,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) esw_offloads_metadata_uninit(esw); err_metadata: mlx5_rdma_disable_roce(esw->dev); +err_roce: mutex_destroy(&esw->offloads.termtbl_mutex); return err; } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c b/drivers/net/e= thernet/mellanox/mlx5/core/rdma.c index f585ef5a3424..5c552b71e371 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c @@ -140,17 +140,17 @@ void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev) mlx5_nic_vport_disable_roce(dev); } =20 -void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) +int mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) { int err; =20 if (!MLX5_CAP_GEN(dev, roce)) - return; + return 0; =20 err =3D mlx5_nic_vport_enable_roce(dev); if (err) { mlx5_core_err(dev, "Failed to enable RoCE: %d\n", err); - return; + return err; } =20 err =3D mlx5_rdma_add_roce_addr(dev); @@ -165,10 +165,11 @@ void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) goto del_roce_addr; } =20 - return; + return err; =20 del_roce_addr: mlx5_rdma_del_roce_addr(dev); disable_roce: mlx5_nic_vport_disable_roce(dev); + return err; } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.h b/drivers/net/e= thernet/mellanox/mlx5/core/rdma.h index 750cff2a71a4..3d9e76c3d42f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/rdma.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/rdma.h @@ -8,12 +8,12 @@ =20 #ifdef CONFIG_MLX5_ESWITCH =20 -void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev); +int mlx5_rdma_enable_roce(struct mlx5_core_dev *dev); void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev); =20 #else /* CONFIG_MLX5_ESWITCH */ =20 -static inline void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) {} +static inline int mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) { retur= n 0; } static inline void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev) {} =20 #endif /* CONFIG_MLX5_ESWITCH */ --=20 2.34.1