From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F1B446532 for ; Tue, 8 Apr 2025 10:11:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 583A24027F; Tue, 8 Apr 2025 10:11:53 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) by mails.dpdk.org (Postfix) with ESMTP id 671D54027F for ; Tue, 8 Apr 2025 10:11:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fD87JlPuCuQg1ZTUOzyL+gr28uBZiJuZpUktmvm92h1PTPHlsbbvDvaIzf9QI7GPFZtNEt+Zdr0z5+XvsEZrYke6uDcNTVWdDRDBD+4Noxz4N6DMP3Jii+fPhdWVmnGdiXMlzl+fBtJtfEchanzBdRemb5CE9B4cpzU3iUBdHH0U4h0WH/vFft1y5BH1dkecaDNIUNwv3SjSPEDeya4g5YF4E7h4fc5f8eIZUitg5k7MIk61V4hTaB/UVmqSzIslBZ+AXCrGUhOK3klm3dNCq4rgw7pP6YgLcgXAfPkqgM1jquYqduBn03QIgkV9qE9Wz6yKP9C8ZMxTByT8OGZfOQ== 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=Ix7CYRXuNYAfZ1tQ3qCaqE6s/6t4bH7EKrDqc5uFjeY=; b=drpRg4Wb9RfTE7bkY5Deaxcx6wMkSZlGLE7v7u3X7FMF1TaXrZ8AZ1Wj7z4/1VFQMTbvw0wHAagGkWVhB+GgDUaIE/TGbxn3zYR9vpN4WrPQSZdAvYgX5MrJwZ9f/aJxgRDxys3L+vps0x5HOlH+brYPGfQOZNzbJrLoD/ikakdvnajg7hESRgZpjOUkFNjfCxO28cjn1NVgn/5diC1h0I45iYqcRo6WGFEz/++9C2Rx3sphTWpSes72i+cwcoGNsoy8JKcAHr7t9Wxxiyv2cr+jp9nLxDsYLHg7y8uAZKDMC3vC0duVTVqqHvYs+GlrSWPBGVgKHdoeF2+27EDtKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.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=Ix7CYRXuNYAfZ1tQ3qCaqE6s/6t4bH7EKrDqc5uFjeY=; b=bJ6oCeWJ0KoC+ofoJEe7NMy5t2jt7OiaJ31IQ5uAOetNA9aAiVCTNB2eSIWxISs3XfQ5w+ahoRaZXoqxkrYSn5SN4pA6oFSIEeTGiwasGDHPO+Krp8aH9+434XKxbWn/nxOI8xbQp4xX+FsAYk3Q49+8NRAKmpk/tG2CAvdVEKytm1JiO1tsYyoHg6kaU2p8FIJ8UwJJavWUPvXArW135H6MoArpVM7/W37eQRTdPHqdxFnNAMdvm9fWHebe4jXrgis9GH6wSQKLQMHrBue0ho1o2FDywwrC7pMEixJOo4/5BCj43NQoWVfOHHWz2KupQUgf3jrzgYCwUdD4SFdByQ== Received: from BL1P223CA0015.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:2c4::20) by IA1PR12MB8239.namprd12.prod.outlook.com (2603:10b6:208:3f7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Tue, 8 Apr 2025 08:11:48 +0000 Received: from BN1PEPF0000468A.namprd05.prod.outlook.com (2603:10b6:208:2c4:cafe::cd) by BL1P223CA0015.outlook.office365.com (2603:10b6:208:2c4::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.19 via Frontend Transport; Tue, 8 Apr 2025 08:11:48 +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 BN1PEPF0000468A.mail.protection.outlook.com (10.167.243.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.13 via Frontend Transport; Tue, 8 Apr 2025 08:11:48 +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, 8 Apr 2025 01:11:36 -0700 Received: from nvidia.com (10.126.231.35) 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, 8 Apr 2025 01:11:23 -0700 From: Xueming Li To: Maayan Kashani CC: Xueming Li , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5/hws: fix crash using represented port without ID' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:10:43 +0800 Message-ID: <20250408081054.375502-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408081054.375502-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408081054.375502-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468A:EE_|IA1PR12MB8239:EE_ X-MS-Office365-Filtering-Correlation-Id: d0b2c205-e578-4701-0d88-08dd767502b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?c8Cb0uD5stBHVY3ZKcqaE1tgFwvZr9eEbtxBp3UsKSuLoKi/tN7NTIEn7c33?= =?us-ascii?Q?kg18bD5oubd3g0ChaEZuEmrZHy2RgkNFCCT1U23GgC9CXxh5ep8HsvkxW/if?= =?us-ascii?Q?S2G3//5aIfyM8pwqWSW5KlKU8yumtTkDDQ8+4VTWi/BumbjfiAHtcrDRkr7x?= =?us-ascii?Q?s61Li/LXuS0CKO0XpkKTWDg38RRsIqjbG5if8vUuUAWbwlhYBwlYEJcEM0zA?= =?us-ascii?Q?f5nXb+ETrNmPsDAJt3hEHHKxrnzS/skSbSdTGeldCLXPxO5LmxjNjDS6B2rH?= =?us-ascii?Q?BhuMd/S6U0BJGBiovcf5cX8IBFIe8/P43l43RZPhE50CRLAxtpyFDJoLhjWS?= =?us-ascii?Q?qwAcVt3hTGTS4N9bxXNK3Z5OYmwvjUVF78zzCfpG+N5kzyE8CPkHj4G94gtG?= =?us-ascii?Q?4RJt+g7EoH7Tp+mAKjnXSQhnqqGDpAgFUCFTMcSNywO1/6+elVh77Z9Xhdfv?= =?us-ascii?Q?v9csyyZAVXfDf5/layEd0ClepuKdsW2+8OKJYHHzkHapkXbkXuCOXxEgOH0D?= =?us-ascii?Q?TU7DLU1KjYYJaBoieoqcmpb1KFzrHpK30KkmErMXIBP13/h4GhX8di7/AyvU?= =?us-ascii?Q?7UnYEsTpEb7x7EZch8mLZpl3LeCtqTS5SQJwHoNYQPQ6mOWErPFoe+uLZwGb?= =?us-ascii?Q?9mxMuF2IW/OkFul9C1a1pHP1rnxenAzSQNOcepZ0chx0VGq6et/+9AnLwLqi?= =?us-ascii?Q?OV6fTHK7eBGG4IK00Wo1J6pW7hJaW+CutvRgwA3EVnkOLR19zfZzyHaxWgrS?= =?us-ascii?Q?87BwVfum6rdH9DbhrxHDOzzTDkhRTysxFQjj0s+WXWoQatcHy+8cUQb8JNAp?= =?us-ascii?Q?kVj+SHamCY/llVLTpyfeKLd/kuKPG/dQKlQ04HOhXlXM/Mtsgd6NpmT1CAHN?= =?us-ascii?Q?pQJVmK0SvjIL5bYmEoDP/IvF3J/eJj2CZU8EuvNXwBVid+3r7OBDCETWgINK?= =?us-ascii?Q?3wxyNwnK5uln1CljDko4YesAOMTubSLN+4tQkckSoIF8Qk/KCyotYQ4GcqoW?= =?us-ascii?Q?XosqrbPrynCIGKFxsVEE/UaweuCC4lNLEaCE74FtFml8V14ul9kSDZNXd2Sr?= =?us-ascii?Q?hjYIap9ArbERkAUA/qd/DcznkOYsZHm5icPDjDS0sx+3Q8VFDQQW2ugBrp6y?= =?us-ascii?Q?tZqNxxgPUF7wvicyweSFfre/H0/nPNn7F/U0tAbCDClENdFxKDmbkJMJwS7L?= =?us-ascii?Q?hMj/11dvAeZb9UQueVfAJ9DlJcK8yPRl0/v14RNqcnIN46zcSuo5KKdOkF7D?= =?us-ascii?Q?LG1NORN2MVVAI3gevCoTj8SeQjTcoQWEQvdNOt+0P3lqIRbnFDPTW/ZrcGZT?= =?us-ascii?Q?nUmUCOfjzVqkWcBNJZte9onvaJThJxeuzz+Qg02TGWPSGQ+cv6GVGTEGM3YQ?= =?us-ascii?Q?rIFLVKtA4VmsFzaXPkKJp/wN7pk9cB5h9VhrXEVhnWkXJmIhwGvp+Dnz5pbR?= =?us-ascii?Q?t4UU4xTgWsNcwxNlSBD5NzrMKJ2gbP8LA3FTruj9DT3wvRXJjHrpA/zL+APf?= =?us-ascii?Q?1CQDFN9NtdJv5OM=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:11:48.3172 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0b2c205-e578-4701-0d88-08dd767502b4 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: BN1PEPF0000468A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8239 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/10/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=6135fd39aa5d5fb6dc1f2cafc46d9ab4bcbba3ae Thanks. Xueming Li --- >From 6135fd39aa5d5fb6dc1f2cafc46d9ab4bcbba3ae Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 27 Feb 2025 12:33:29 +0200 Subject: [PATCH] net/mlx5/hws: fix crash using represented port without ID Cc: Xueming Li [ upstream commit 1de93ca6aee6acb785c8080f84da26b09835af0f ] For non-template API on top of HWS, when trying to use represented-port item w/o setting the ethdev_port_id, it crashes. Added default values to match the case for SWS. Default port is now eswitch manager id. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_definer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 93e15122ed..14caae6563 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -592,10 +592,11 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc, uint8_t *tag) { const struct rte_flow_item_ethdev *v = item_spec; - const struct flow_hw_port_info *port_info; + const struct flow_hw_port_info *port_info = NULL; uint32_t regc_value; - port_info = flow_hw_conv_port_id(v->port_id); + if (v) + port_info = flow_hw_conv_port_id(v->port_id); if (unlikely(!port_info)) regc_value = BAD_PORT; else @@ -1326,11 +1327,12 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, int item_idx) { struct mlx5dr_cmd_query_caps *caps = cd->ctx->caps; - const struct rte_flow_item_ethdev *m = item->mask; + uint16_t port_id = item->mask ? + ((const struct rte_flow_item_ethdev *)(item->mask))->port_id : 0; struct mlx5dr_definer_fc *fc; uint8_t bit_offset = 0; - if (m->port_id) { + if (port_id) { if (!caps->wire_regc_mask) { DR_LOG(ERR, "Port ID item not supported, missing wire REGC mask"); rte_errno = ENOTSUP; @@ -1347,10 +1349,6 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, DR_CALC_SET_HDR(fc, registers, register_c_0); fc->bit_off = bit_offset; fc->bit_mask = caps->wire_regc_mask >> bit_offset; - } else { - DR_LOG(ERR, "Pord ID item mask must specify ID mask"); - rte_errno = EINVAL; - return rte_errno; } return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:07.067622112 +0800 +++ 0039-net-mlx5-hws-fix-crash-using-represented-port-withou.patch 2025-04-08 15:39:06.006436555 +0800 @@ -1 +1 @@ -From 1de93ca6aee6acb785c8080f84da26b09835af0f Mon Sep 17 00:00:00 2001 +From 6135fd39aa5d5fb6dc1f2cafc46d9ab4bcbba3ae Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1de93ca6aee6acb785c8080f84da26b09835af0f ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 98d670fc1c..a4b9306d2b 100644 +index 93e15122ed..14caae6563 100644 @@ -26 +28 @@ -@@ -772,10 +772,11 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc, +@@ -592,10 +592,11 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc, @@ -34 +36 @@ -- port_info = flow_hw_conv_port_id(fc->dr_ctx, v->port_id); +- port_info = flow_hw_conv_port_id(v->port_id); @@ -36 +38 @@ -+ port_info = flow_hw_conv_port_id(fc->dr_ctx, v->port_id); ++ port_info = flow_hw_conv_port_id(v->port_id); @@ -40 +42 @@ -@@ -1585,10 +1586,11 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, +@@ -1326,11 +1327,12 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, @@ -47,0 +50 @@ + uint8_t bit_offset = 0; @@ -54,4 +57,4 @@ -@@ -1603,10 +1605,6 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, - fc->bit_off = rte_ctz32(caps->wire_regc_mask); - fc->bit_mask = caps->wire_regc_mask >> fc->bit_off; - fc->dr_ctx = cd->ctx; +@@ -1347,10 +1349,6 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, + DR_CALC_SET_HDR(fc, registers, register_c_0); + fc->bit_off = bit_offset; + fc->bit_mask = caps->wire_regc_mask >> bit_offset;