From nobody Sat Jul 25 22:03:16 2026 Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11013022.outbound.protection.outlook.com [40.93.196.22]) (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 14B433C109F; Mon, 13 Jul 2026 08:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.196.22 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932277; cv=fail; b=EFi46vv0RmaehkfCw5C3+NfLd/l3j1F4FWFEq5fvPVm5KJMfGNmdWGNCmqU47Qn1I4XKdzYfJSMPPFRTKYWXogK/x6metUX4UNVBRvavZWuNMzf4yb36e76CEwDbUTfPXN4m/ciQBeoZGxRqAoStZAFEnTf2bo2cxzYuD2E4HPg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932277; c=relaxed/simple; bh=qY8uoAs38pCzHVqpTrVQSb0ZhjNZXI40aQUJOBu35iQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YnaeidMyBN9PRJ/auG4onrirnA7GUSa3BBsOnRcNypfmoj/fYcOwAUqstfYW9Mykh81TZuhWtJ3uEVz789u8ZHjwZNDlhJxDEOo7vYUei2qZDlSm3XV/RM3orHLJwtN/wBClQ5Ay3lW/rGCQfToCZy9KqhivoChnAskobU2b5oU= 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=TpF0ikFy; arc=fail smtp.client-ip=40.93.196.22 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="TpF0ikFy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=p9/+01PkEK3a3zGusCJHPZIjgS7co6izGPd58BZgDRGSoYaxPtLwmGyaerwcat4OTChRwk0c8dzyBdjP2VJz34nz2vDcDT49FnQVAItvEKrgAUXB2oJrQTE7Yug8NAxn4210Innx/M5e04gn/VhgLXGDm9vNMAJMDkrjF+q4U1edHzxkO1RMACiNWY06aATAKn1Df0jaZaXdr+jgQYS8Ht8auLydjmL+G8CttedHPmI8iSs8G+MF36c+ykH0nHNb4ymnyHmFuYCuP3Q/RWi4jyycS9EJpUesm9vQ2daAjyVqOA+SI074IFyp8d8xPAXwV77D+6Uxj/kCcamieX4LKw== 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=XOiEZHT53l8YKrUVjmeYrA2xeEBpLgteFshysnEE9Jk=; b=V5QudP0qpLAO+044idkWw9PInyiym66lOjHI1mKWeFwtt4C6cVYYeUauiGwrQZhxzC5PKRnXRR2CbEpO74ueNVAcNm0Pox3OYChhV4BJnCuOkHt3HlYVwSE/SNrEIo9WRlw5IWxLDH30zNFy4Yb6QoAV+HK6PZq8SQzf0XxS5kc2G+09ytOEoItRLtcqFfacnHu/Xn9LtnE0BbguJ05B3msPlMQtbG6lvjAeOu8JRRixYN4F2zPqBhRm80JhAIGI2HOR6/aMFp/wn1o6AUEc3gp/M799Qos4HytI00Dfq1a5DmmA3BJnB4zOQ8fopkkf1n0q9tdSMcvHpfjfiqdOUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=kernel.org 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=XOiEZHT53l8YKrUVjmeYrA2xeEBpLgteFshysnEE9Jk=; b=TpF0ikFy2Lh6WcGkOXX5F/38Sl1lxanlnzddL8oCTqfYQ02+Nx4WSUH6lG5QBjdQEHgyBgJQWAdTnD3t7wI7BI3kHOtvevSRPwyfYAXMKcqtC44OASCRat/bGSaGQbB1Fs2d95usy4UiF3Iw5zx+MpFhze2nTA1QASwSrn+MqN7Acun8suE2cllxoeJVPor9fNdcq2zczDNKVfJDHxx8HJX9fOz40MZE1tehmW5e04OyZmrBIKAnr/2RzzqZLyrJYUawUZfK4gMt4hMf8KWSLcArj+u2jln0SM97yH9vTyEbk4zO7hJRZHU3OidxysZGMbDpagNroCHb1Ex9mX4ZwA== Received: from PH7PR02CA0016.namprd02.prod.outlook.com (2603:10b6:510:33d::15) by PH7PR12MB6668.namprd12.prod.outlook.com (2603:10b6:510:1aa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.202.18; Mon, 13 Jul 2026 08:44:13 +0000 Received: from SJ1PEPF000023D8.namprd21.prod.outlook.com (2603:10b6:510:33d:cafe::9f) by PH7PR02CA0016.outlook.office365.com (2603:10b6:510:33d::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.202.19 via Frontend Transport; Mon, 13 Jul 2026 08:44:13 +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 SJ1PEPF000023D8.mail.protection.outlook.com (10.167.244.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.3 via Frontend Transport; Mon, 13 Jul 2026 08:44:13 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 13 Jul 2026 01:43:57 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 13 Jul 2026 01:43:56 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Mon, 13 Jul 2026 01:43:51 -0700 From: Tariq Toukan To: Leon Romanovsky , , "Mark Bloch" , , Saeed Mahameed , Tariq Toukan CC: Alexei Lazar , Alex Vesker , "Andrew Lunn" , Cosmin Ratiu , "David S. Miller" , Dragos Tatulea , "Eric Dumazet" , Feng Liu , Jakub Kicinski , Kees Cook , , Paolo Abeni , Parav Pandit , Shay Drory , Simon Horman , Yevgeny Kliteynik Subject: [PATCH mlx5-next 1/2] net/mlx5: Drop redundant esw_cap, reuse e_switch_cap Date: Mon, 13 Jul 2026 11:43:19 +0300 Message-ID: <20260713084320.1015240-2-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20260713084320.1015240-1-tariqt@nvidia.com> References: <20260713084320.1015240-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D8:EE_|PH7PR12MB6668:EE_ X-MS-Office365-Filtering-Correlation-Id: bc7653f9-0ee2-4b5e-2e9b-08dee0baea7c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|82310400026|23010399003|7416014|376014|3023799007|18002099003|22082099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: EgoEa5IEnUJ8nsyitoQPHPBiByR3Nl+LqjToTdxn5dAODs/cSZWukOQothqdEuRiW+6dMx8jbrP1xhjlHszX8JSl2SZwWXx/ypYqXRBO3kCKB8/ACEZknv7cwhebCrM8UAF9sJT5edy5cNSsH3/fP0C9Pj0Ml95+PrCx1LmFRJWZ6VGk765pW4Y0cFXzf2VTLWP2PnryG5PoehNU5rWGFIMILdk6xM1Il48ZDq7pUnbG4EXu/9tZVa33QHolAsuA++Ueo3TdUJbrUX4nN4lQU5LzgtPpnxOcRYrtxAmMAwx3ASLKR7vf6pgXbkxCtwxTKLPK60nfRIN3FceRrkD/7Jv7KDBmAc4AHlvLT9tIsUITJ3sZ+5keo4zp7OI8PycnTIaxgK8sM3XrPyueIpDVrUzGj+h/pLHPg2Ef6z0+oIXnnJ1q66J6Z7owSiQbHJ9XLBbzEt4dqMTNKXSUd99oaYN6hAawtb0SfRQbAh+KhLh8h1LnMHqILuiKrHJDedqqhV2xBqS7lpVQjR9N6krTT1nXYwUwmLeyfvVSxNVuKRtd9+jIvSmUyb7uzzPpIOjs+cR6cETJylIw2j0QTAhqXzGtXq/oivv1k62uu+8AgsbDAsbdWYpcD54mnbGbtZunqlzRDFSYfMgyydRuYO6wo9m/Y0MiJOh2A5HZgWFxb+WGsccS2P0N5oQ2ofl8Np0Vl+bAyhmLhjqUGkGzMnXlFg== 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)(36860700016)(82310400026)(23010399003)(7416014)(376014)(3023799007)(18002099003)(22082099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b9XntSK31k+GrlYkNnRw7+XZittxDP4RMPXZrMRbLuVKoPo2OLrOsISfUACnYuCDGso6Ea21kPbgmByPLRiuE4/3cwdhwkndOImoiL6nZcSBZOSfpcsCGQYbVzwclwV5hQzvh7rP4OF/OhDbwU6305o3/fOonXrnvvjJPCcUKu8/8FuVMC7MkttiKpk1+PHxuO5+riTQ+d709ti3Nu+MNMj4c/MZs0Y7wsatKqBkcL0QMRriKMBXXM60yqC+ytxdn/dFtiavfyRIHREqzSlN5NQH082NQIc+AbLJoNeEv6HqhK6do9YpEMRqmRtUlMEmlT43lpDI2Dcorbl6w/rdDWz80wfk0mABjEtm/YOvWfl52EYLH90oLj4+ArnL6ghjflB86s2KI16KoqRDellq4hB/jMySlVh14siPmxrOPrRaOqaX6m7m22AGgXmUWS1k X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2026 08:44:13.5326 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc7653f9-0ee2-4b5e-2e9b-08dee0baea7c 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: SJ1PEPF000023D8.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6668 Content-Type: text/plain; charset="utf-8" From: Shay Drory esw_manager_vport_number{,_valid} and merged_eswitch were read through a separate mlx5_ifc_esw_cap_bits struct, but these bits live in the e-switch capability that mlx5_ifc_e_switch_cap_bits already describes (both overlay the same QUERY_HCA_CAP op_mod 0x9 output). Add esw_manager_vport_number{,_valid} to mlx5_ifc_e_switch_cap_bits at the same offsets, drop the redundant mlx5_ifc_esw_cap_bits and its hca_cap_union member, and switch the only user (hws/cmd.c) to capability.e_switch_cap. Signed-off-by: Shay Drory Reviewed-by: Yevgeny Kliteynik Signed-off-by: Tariq Toukan Reviewed-by: Jacob Keller --- .../mellanox/mlx5/core/steering/hws/cmd.c | 6 +++--- include/linux/mlx5/mlx5_ifc.h | 21 +++++-------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c b/d= rivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c index e624f5da96c8..8fae90101653 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c @@ -1172,13 +1172,13 @@ int mlx5hws_cmd_query_caps(struct mlx5_core_dev *md= ev, } =20 if (MLX5_GET(query_hca_cap_out, out, - capability.esw_cap.esw_manager_vport_number_valid)) + capability.e_switch_cap.esw_manager_vport_number_valid)) caps->eswitch_manager_vport_number =3D MLX5_GET(query_hca_cap_out, out, - capability.esw_cap.esw_manager_vport_number); + capability.e_switch_cap.esw_manager_vport_number); =20 caps->merged_eswitch =3D MLX5_GET(query_hca_cap_out, out, - capability.esw_cap.merged_eswitch); + capability.e_switch_cap.merged_eswitch); } =20 ret =3D mlx5_cmd_exec(mdev, in, sizeof(in), out, out_size); diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 4f59b7e8a3d5..7de01d4f1b5e 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -1042,20 +1042,6 @@ struct mlx5_ifc_wqe_based_flow_table_cap_bits { u8 reserved_at_1c1[0x1f]; }; =20 -struct mlx5_ifc_esw_cap_bits { - u8 reserved_at_0[0x1d]; - u8 merged_eswitch[0x1]; - u8 reserved_at_1e[0x2]; - - u8 reserved_at_20[0x40]; - - u8 esw_manager_vport_number_valid[0x1]; - u8 reserved_at_61[0xf]; - u8 esw_manager_vport_number[0x10]; - - u8 reserved_at_80[0x780]; -}; - enum { MLX5_COUNTER_SOURCE_ESWITCH =3D 0x0, MLX5_COUNTER_FLOW_ESWITCH =3D 0x1, @@ -1096,7 +1082,11 @@ struct mlx5_ifc_e_switch_cap_bits { u8 log_max_esw_sf[0x5]; u8 esw_sf_base_id[0x10]; =20 - u8 reserved_at_60[0x7a0]; + u8 esw_manager_vport_number_valid[0x1]; + u8 reserved_at_61[0xf]; + u8 esw_manager_vport_number[0x10]; + + u8 reserved_at_80[0x780]; =20 }; =20 @@ -3855,7 +3845,6 @@ union mlx5_ifc_hca_cap_union_bits { struct mlx5_ifc_flow_table_nic_cap_bits flow_table_nic_cap; struct mlx5_ifc_flow_table_eswitch_cap_bits flow_table_eswitch_cap; struct mlx5_ifc_wqe_based_flow_table_cap_bits wqe_based_flow_table_cap; - struct mlx5_ifc_esw_cap_bits esw_cap; struct mlx5_ifc_e_switch_cap_bits e_switch_cap; struct mlx5_ifc_port_selection_cap_bits port_selection_cap; struct mlx5_ifc_qos_cap_bits qos_cap; --=20 2.44.0 From nobody Sat Jul 25 22:03:16 2026 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012036.outbound.protection.outlook.com [52.101.48.36]) (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 60A553C09F2; Mon, 13 Jul 2026 08:44:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932279; cv=fail; b=Xvj/Noda7UXhvlLx8qARvvG6srjZAb5PLxim8HYmmH6QSsxKJ+KLvn9OOh4T0ZKQpuf7zP56bNvf7TC0QhX3tpM19QMT4JmPagY2yIdm+aJtXXVTWBjVzbu+hMGoTjjkIp/rRPDVi8wPhBbEFatK30sN+G6VjEo5GBVdnrY/bas= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932279; c=relaxed/simple; bh=p9wFoVjMuFvVQ8ha8dHTnG5MYDUDPaDihpfamETzBWw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HuhuGd5B+MLVtzdsguuCEQgdgf/z5f5YmAEgiVuWpj4mv0iZBtgzv72R5Vxr8fQUUQMUqxBaqSenQIuv+T64ippcL+BsG9iQQfYG9XvTLWvnu+0cOf0okW8aoHKbnftei5L75SOXPfcIC9xetV1HaFnNC7DvYiF+FPe7FQv7ybw= 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=FMktS7Sy; arc=fail smtp.client-ip=52.101.48.36 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="FMktS7Sy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RhmboLhFre3jDCheRdT1jmm08XAvn3WRs/SmucaItTBhFfgOskIzbR4HX8lkS08zJ8QzG6XwU6jy0DEDVq2rbBaQ2cXxxPDfL0+M0UOwt6QzaOeDrFEFvvm+je8zwE4CtmlrDBz86+dySlWpVwIP8GZisaAPFII7t+H+qE6/LlvHEjq+2jB6QHvnqp/co/l+4OpeADOZbb8hk+4BpfTZMuKlDeOOYc3FHIw/QHrlsysRmAxVtt1mDLQTYL/STtxk1PQy8ZAkd65A/ygCjgEmVXiuiEjxj+H5SKyuCRU9b/xdrl2dM67ik3Szk47p84CldYlmyvH4i2CtYqNwrOYPzg== 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=4ncKCB3u9eu8r06MHmlfSbXtPeePlEfbzZY2sPNYGqo=; b=lteHMJ4d1webFwwWppB9Box8+OmHPzbw2ZQV1CKdG1wmGs+q3Al+A5a4wrFf61TrDzyfKQzDBIWEQVfbUUcVMVFMRQH2E8o8GhJMhr9SHdqi77Ikb5UPKF40mmhgw6AUkhiIHnw36c8hpFNllRgtoHqswy/eA+UkDvFGCFSOs3FhXxjZIU2nJZBFo3yfOu1JNy/p/roeec/GViFo1oiCvcI3Auixt7o7y9ps1SrAFoHbGUMnhLMJOSJGHu7xyWcoVhtFe80YUqDw0ZQOM+cSbjbTpLbDsa3ohRw/qfQaA1XQPzmMAQ/gioU6eHuKpCNpUspTmGBSa8UEwQzfcxmzCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=kernel.org 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=4ncKCB3u9eu8r06MHmlfSbXtPeePlEfbzZY2sPNYGqo=; b=FMktS7SyoqcWIipNf6l/Pef/2kV88qMvHGb9gDVFOlA4xqO4ojhK6/bU+DeUO7AqcMWFkqjkg/JaSmKp1TOOz8tCLKfkVI7vvZfnKaiidfWU4dY9Gw+JNIH5y0/yC8XfFSW/znst/ZUDEQwCCJjMfjjw3pH+VuL6pFqMXUh8C7axzznJf8sGKe215+oytCzmhzhsFizaTHEq+peqhgLss0Hiajf6F/Utxd2AMcwcQyyxK9nr5faFaGSAB+QTrZApfSXjOhPD7qmKyh2+HPDYoWRqRyytyaDDSqg7QDLv4F95FqyCrjtdku2NQ6XyKoA3e5Vn3eLOmRp3zIW0DwCJfA== Received: from CY8PR12CA0057.namprd12.prod.outlook.com (2603:10b6:930:4c::24) by BY5PR12MB4258.namprd12.prod.outlook.com (2603:10b6:a03:20d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.22; Mon, 13 Jul 2026 08:44:18 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:930:4c:cafe::63) by CY8PR12CA0057.outlook.office365.com (2603:10b6:930:4c::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.202.19 via Frontend Transport; Mon, 13 Jul 2026 08:44:18 +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 CY4PEPF0000EE36.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.9 via Frontend Transport; Mon, 13 Jul 2026 08:44:18 +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.2562.20; Mon, 13 Jul 2026 01:44:03 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.2562.20; Mon, 13 Jul 2026 01:44:02 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Mon, 13 Jul 2026 01:43:57 -0700 From: Tariq Toukan To: Leon Romanovsky , , "Mark Bloch" , , Saeed Mahameed , Tariq Toukan CC: Alexei Lazar , Alex Vesker , "Andrew Lunn" , Cosmin Ratiu , "David S. Miller" , Dragos Tatulea , "Eric Dumazet" , Feng Liu , Jakub Kicinski , Kees Cook , , Paolo Abeni , Parav Pandit , Shay Drory , Simon Horman , Yevgeny Kliteynik Subject: [PATCH mlx5-next 2/2] net/mlx5: ifc: Add PSP related fields Date: Mon, 13 Jul 2026 11:43:20 +0300 Message-ID: <20260713084320.1015240-3-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20260713084320.1015240-1-tariqt@nvidia.com> References: <20260713084320.1015240-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|BY5PR12MB4258:EE_ X-MS-Office365-Filtering-Correlation-Id: a0b81d54-ab96-4b32-85b0-08dee0baed4b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|7416014|376014|1800799024|82310400026|56012099006|11063799006|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: UA6M24yFh9uJ63juORNBi9ixMSkvBKGVg4Wu8Sx8/R6/zzDclW2o+73vgdM2XsBSJlHAs3GuORhcZooqX4P4btog+mpjYHaIzZsfAoFM/UYfwXJjFfKS1bJ3qhlIufqAonjwoTjpsooVGQ7ISRUfpy88WyTKs06NqukMuSQJ+Z0CsYW1Gt1QKFQymjyuHM/pIq9o0warJEWG6siQbQlaFpayGMqjZJNpFqfLfYcE23nk3/mAONqgSY72lQA1CD9ny0JDy7M5rLhKRcwo5cptEsSzEcls7WxxCw9MYrZXee1+TqBxcRg+dLh0Cntx6EBWbbl8ZCBZGHxv6GyEbHA1iEXMGqWObce3OzYTfwqzlPhj8uDgFsApTmji6sf6FnW5iaCK09GgChlKs3k17OvI588RM86gBozUq8rzV41JlF5TKJM6K3CGMwO5x0Q1aqprMGvsX5IlpYoWV0CvPdkm3U3TBl0Cp6UHuZ23R9HvHhIeAIsSFjEmONoo9smp9mIDTkJ/k2Upu6Hkgb9AcTKzMZNZK1WDYIcTziJ1r98SftLYfaKG8UpRa1H+g6z3NtlwyD/dHtu5r/Dl7lzbyoWgz2/ZlNvSHNS34X1OY/Jua4mWMRZMsu/IJs7ESySb/UVq6vjpdm8ApdDcXDbbJzfFCfgaIYTzMmbz1Zh5CAZMb1fsWxKSr84O6+/Cif9jgSPv0axgUzpcncodAJvn2kiXKA== 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)(36860700016)(23010399003)(7416014)(376014)(1800799024)(82310400026)(56012099006)(11063799006)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gQk3VKlzIN2nimeTmCRGosB49ncQ78Bz78rBCJ8lpfDCnvE/u8tXGJ/wjlGTeqNYhbpNDR5CtOjJgA9odoHAoXK3u+fF0Wm7QoyP+3vID3cPFFBtawhLn/k2tN9FJMrOFMdC7+VlMlA6i3/k1XF5sOLzm00UibTjC0M6IcmvxHLcCagNaVQ0DfHAAhkp1/ICQdVgRK4nvf3KlZyyBe51yPmdCB2dKufROcAGXt2tKtImTwqs0w+GXWYYs5XWkjbdnAxRTAbLeT8cSLHkLHlZTg/M96/3V37FgPxuMKdGlQf7gMaOpo27041zSIVUUbndMofFqQ8mecmYFrQgYOGAaeD1p2XEojEFD94LFjfXkEuI+ba00CR+5dGnoojhMoKjbD+U0pM0aC6O0TsuTQtLdTSiIcz8/LYe/AFNINllhtTXvMdZ3YqPNd6WLL4CsSSS X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2026 08:44:18.1430 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0b81d54-ab96-4b32-85b0-08dee0baed4b 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: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4258 Content-Type: text/plain; charset="utf-8" From: Cosmin Ratiu This adds: - misc_parameters_6, containing a few fields for matching PSP headers. As this is the last misc_parameters field defined, retire the old optimization added in commit [1] to not touch the reserved part. - PSP decap action. - PSP SPI header field pointer. [1] commit 667cb65ae5ad ("net/mlx5: Don't store reserved part in FTEs and FGs") Signed-off-by: Cosmin Ratiu Reviewed-by: Dragos Tatulea Signed-off-by: Tariq Toukan Reviewed-by: Jacob Keller --- .../net/ethernet/mellanox/mlx5/core/fs_core.h | 12 +----------- include/linux/mlx5/device.h | 1 + include/linux/mlx5/mlx5_ifc.h | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/ne= t/ethernet/mellanox/mlx5/core/fs_core.h index dbaf33b537f7..906584345a02 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h @@ -214,17 +214,7 @@ struct mlx5_ft_underlay_qp { u32 qpn; }; =20 -#define MLX5_FTE_MATCH_PARAM_RESERVED reserved_at_e00 -/* Calculate the fte_match_param length and without the reserved length. - * Make sure the reserved field is the last. - */ -#define MLX5_ST_SZ_DW_MATCH_PARAM \ - ((MLX5_BYTE_OFF(fte_match_param, MLX5_FTE_MATCH_PARAM_RESERVED) / sizeof(= u32)) + \ - BUILD_BUG_ON_ZERO(MLX5_ST_SZ_BYTES(fte_match_param) !=3D \ - MLX5_FLD_SZ_BYTES(fte_match_param, \ - MLX5_FTE_MATCH_PARAM_RESERVED) +\ - MLX5_BYTE_OFF(fte_match_param, \ - MLX5_FTE_MATCH_PARAM_RESERVED))) +#define MLX5_ST_SZ_DW_MATCH_PARAM MLX5_ST_SZ_DW(fte_match_param) =20 struct fs_fte_action { int modify_mask; diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 07a25f264292..8cb321a9fb3d 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -1171,6 +1171,7 @@ enum { MLX5_MATCH_MISC_PARAMETERS_3 =3D 1 << 4, MLX5_MATCH_MISC_PARAMETERS_4 =3D 1 << 5, MLX5_MATCH_MISC_PARAMETERS_5 =3D 1 << 6, + MLX5_MATCH_MISC_PARAMETERS_6 =3D 1 << 7, }; =20 enum { diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 7de01d4f1b5e..cf01922cf69f 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -508,7 +508,8 @@ struct mlx5_ifc_flow_table_prop_layout_bits { u8 reformat_l2_to_l3_audp_tunnel[0x1]; u8 reformat_l3_audp_tunnel_to_l2[0x1]; u8 ignore_flow_level_rtc_valid[0x1]; - u8 reserved_at_70[0x8]; + u8 reserved_at_70[0x7]; + u8 reformat_del_psp_transport[0x1]; u8 log_max_ft_num[0x8]; =20 u8 reserved_at_80[0x10]; @@ -798,6 +799,15 @@ struct mlx5_ifc_fte_match_set_misc5_bits { u8 reserved_at_100[0x100]; }; =20 +struct mlx5_ifc_fte_match_set_misc6_bits { + u8 reserved_at_0[0x1a]; + u8 psp_version[0x4]; + u8 reserved_at_1e[0x2]; + + u8 reserved_at_20[0x1e0]; +}; + + struct mlx5_ifc_cmd_pas_bits { u8 pa_h[0x20]; =20 @@ -2339,7 +2349,7 @@ struct mlx5_ifc_fte_match_param_bits { =20 struct mlx5_ifc_fte_match_set_misc5_bits misc_parameters_5; =20 - u8 reserved_at_e00[0x200]; + struct mlx5_ifc_fte_match_set_misc6_bits misc_parameters_6; }; =20 enum { @@ -6984,6 +6994,7 @@ enum { MLX5_QUERY_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS_3 =3D 0x4, MLX5_QUERY_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS_4 =3D 0x5, MLX5_QUERY_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS_5 =3D 0x6, + MLX5_QUERY_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS_6 =3D 0x7, }; =20 struct mlx5_ifc_query_flow_group_out_bits { @@ -7245,6 +7256,7 @@ enum mlx5_reformat_ctx_type { MLX5_REFORMAT_TYPE_REMOVE_HDR =3D 0x10, MLX5_REFORMAT_TYPE_ADD_MACSEC =3D 0x11, MLX5_REFORMAT_TYPE_DEL_MACSEC =3D 0x12, + MLX5_REFORMAT_TYPE_REMOVE_PSP_TRANSPORT =3D 0x16, }; =20 struct mlx5_ifc_alloc_packet_reformat_context_in_bits { @@ -7368,6 +7380,7 @@ enum { MLX5_ACTION_IN_FIELD_OUT_EMD_47_32 =3D 0x6F, MLX5_ACTION_IN_FIELD_OUT_EMD_31_0 =3D 0x70, MLX5_ACTION_IN_FIELD_PSP_SYNDROME =3D 0x71, + MLX5_ACTION_IN_FIELD_PSP_HEADER_1 =3D 0x78, }; =20 struct mlx5_ifc_alloc_modify_header_context_out_bits { --=20 2.44.0