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 B54CB46A63 for ; Thu, 26 Jun 2025 14:07:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF117402A3; Thu, 26 Jun 2025 14:07:26 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2073.outbound.protection.outlook.com [40.107.93.73]) by mails.dpdk.org (Postfix) with ESMTP id B02C1400D6 for ; Thu, 26 Jun 2025 14:07:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SzknTtryXJeqMzglWrgjT4DlBgk6+PtseN5SGwW1O4ZHcSfRro2D8QbEpUMW9PKv9FHqgaiZxjF9cslC53GWyTPu3agnNDSIfe51H4qChxD5fTd1usj2LNzHQ1HW33VH55o8kL8kuzX4N93VZkXVxJ7xTKE2a7gPuKPehX558pptneAmslElIqsHZ24bidapiN5IejD5LEcrVx/nRGiaT1UAAhGvdiH+S93jkxslEDyMk4wokGMUW9OLxe4nOpd46up6/WnWF+89oG3aUkWcuE60jDj/UAgrR/F6m6coUW+8bEP6btf3LjXhp4xndzOGPREz/mZE/ER+ZU5nD7j2OQ== 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=IugcsxRCdbM4o2N0JmRiUfHeFBA756nFKeR4vun1UeY=; b=wY9Cqzcmb03DmJPW+DC0evx7lVEYq6ZLIP17DogQHnmlF0NyZu0inJCDoBlvaocixNn0OfV+jkKe4PGBIHHhl2x81iwOs5DIKiz2msZW4sB8lepqXNpekTzqaLIrcoi+eeSaWAp+W1Vp/CbjP17g6nu22GvbkCGASq53lhxiHYMfN0Oyo6sgpPj3W9SkL1ezdfvog9KlVmaPMw6fO0VpWi6MQlAvQxKpoCdNXtWHJpbpuXIdofztnU/v6tJNFhmHrS5FukV8AotmSVht//RNE4t5Koj7KI783SQL97W/q52miZIdGAme2LWJgK0oGNsNgoUZLoTQJUtavJcRpoQfxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IugcsxRCdbM4o2N0JmRiUfHeFBA756nFKeR4vun1UeY=; b=kkbOZex/pZZ7OlJS9ysCayNt/OEb6tcCn/NpSyMxVuwu04uqlR3OlwW5H8qXOGGiXksInsq/6VCDksw4ARxr8KUUUYGCx/rvR7qmGMmhct4iZs+DgLtvMAfSXdIgKGapgrwP7PaCco3xMtlhFh2wvCzgVNLOGn82yB9TwNNhdhKgnHF6yQ6PDvr0CgS72nf2s8MJ19MpIYAvAhJ/pjzpXgL6wXfIA5dS+AJrOdaRJwPdYhCEtN/4RSLNZjFAH74kvuNFWK+OiEIBy2jW3wTvhuyOTiaicGoB3h1xKwmkOUFYHEQhHlguIATixqwfT3aYh1hKSf0IiPkOI1twLFQKGQ== Received: from BLAPR05CA0010.namprd05.prod.outlook.com (2603:10b6:208:36e::19) by IA1PR12MB9738.namprd12.prod.outlook.com (2603:10b6:208:465::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21; Thu, 26 Jun 2025 12:07:22 +0000 Received: from MN1PEPF0000F0E0.namprd04.prod.outlook.com (2603:10b6:208:36e:cafe::2d) by BLAPR05CA0010.outlook.office365.com (2603:10b6:208:36e::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.9 via Frontend Transport; Thu, 26 Jun 2025 12:07:22 +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 MN1PEPF0000F0E0.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:07:22 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:07:02 -0700 Received: from nvidia.com (10.126.230.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; Thu, 26 Jun 2025 05:07:00 -0700 From: Xueming Li To: Satheesh Paul CC: Xueming Li , Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix E-tag pattern parsing' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:18 +0800 Message-ID: <20250626120145.27369-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E0:EE_|IA1PR12MB9738:EE_ X-MS-Office365-Filtering-Correlation-Id: bf832945-7bf3-473f-b8a9-08ddb4aa01dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IzygraZUDAxMub4QO9sr46P49/rHhtjI+3UMu2UcBRX7aZhiJDCaip+HdELs?= =?us-ascii?Q?3CX0FOMd5U0P2sD3NJW4kFcz1PlxFeB8yTQaPJ7/5AldOeFmFdgSxgnd2141?= =?us-ascii?Q?igIBX6QrRHdhjMI/VDw3/OmwJ9oiNUD1b78Rphov4jKFMKaxZQUNhud/SiUb?= =?us-ascii?Q?Xw1zVPdGjDmXVv9dJ/urJDrdW5/uhvadIIvPJZKIHptqXk9pfwvwlrfFiC6U?= =?us-ascii?Q?nf/3XIwuqopxzSSzBt7ABSECIhLsdm9jFu8Ma7dM7Gy+olXXaBbsowS09fI+?= =?us-ascii?Q?ktdPBv/nGl6VJpOGcrVPktjsIKAJhlKgZvYK0DNtCS1fst4X2jH48ggCnX/8?= =?us-ascii?Q?8xNnNgCE9WEWnbWW2oTPoWUWRTawJSsJwNww6jt/pDbCfTp9bFPZ/ON1ty3L?= =?us-ascii?Q?hZ+4svIyRSGbdAtYBkyoc8JSmjjTGpIhvl8Uym8OrbW8RGpNUqlHzcxtdopT?= =?us-ascii?Q?HxI+1acgkFHRc0P5U2g8BrHPhW6AS5qNs0a7E1rku3elgsoWBKsJLZet63hB?= =?us-ascii?Q?2RLOfnH6o5pSykiD9rQEEVAfrVWy8y3Po59VoC7+Rfbg8SjfNiJt9nC57wgf?= =?us-ascii?Q?uAUOG6mKmHZ1woSkADIUAubgPKQZ2bOiKn8ZKMp1DxE9k2otafRQHCcfvkY3?= =?us-ascii?Q?M2tMl4nUQlCeM6DNqSCq+HW08lWwxW17fmJIdKY1+LTn1vUIhAcbOQoS+Zj7?= =?us-ascii?Q?/g8YEXEkj48AHYktir9F02WbHr5k+kmyuhWYqfxVDA94npd60O17/lMOD0H7?= =?us-ascii?Q?LBUlGq3OmZaIyi3WKSG8k8/LNqa6rPKc80K1cDHLpaRgqG0KcA+oMRTlXfgo?= =?us-ascii?Q?TJiPCJSwKBSuwbc7UMoXkQv3We6oNnxDDflScOrq0fFad4ffrvLnhhcXVYso?= =?us-ascii?Q?SK4nrrO+16N0d2Pve1bd9gAi3L4eB6wc5JfAByEU7gwXl603qL2Da3Z7Afpy?= =?us-ascii?Q?VZ98vnGfG3hLGBKSgtKOgnnDm+/M/gt13W1VntBAXYBNqo+stlZ2+kJ56L3N?= =?us-ascii?Q?Md/A5h9hec3OCyclf5/Nk9elIU2tMBqqciggb/KvlMwUS+4KohUOPkw56cBo?= =?us-ascii?Q?ot0MaC9WGrEZNGtGYUziX4JTwmwmDPi92OUpjYMRib0Y7xM2YMMByDGO1Tb6?= =?us-ascii?Q?qO9v67RR6sie7WkhkfmC81q3+rACpRpjD+ZznS5/a4wP0+mo/SnoN0nK0UFK?= =?us-ascii?Q?yXvonuEJJj+cRWDUqxpARPurWOBrqeskWTa9oRTS54yRKrpEeRgf1+aGma/L?= =?us-ascii?Q?7mZ+TZb/u14LaSyehBFVB9t6g1C9Zos2WQJn5uy7mak6hpaubETAVrdWGCiu?= =?us-ascii?Q?7E4nCvkb3f5SEnqC/IAxQD5PGRtUEWvoWiMju5V6vkMH+nZaV+K7iDqfmRoR?= =?us-ascii?Q?w6PV0LqYNne2g9D/K7533mjs9BuN4abiQqL0lFG1J7BFnn1oWF02RSWSyNCY?= =?us-ascii?Q?ki1DwbFiLZ8Jy0+XlqZfoSX6q+43KN8fty56MSEoiM8a9R9/SK/b0MHc39Eq?= =?us-ascii?Q?phs8Zl4FwytMZz6DDwwIkv+snQFXzBrsowqcvplu/kJeWKIg5SRyJ8tBtw?= =?us-ascii?Q?=3D=3D?= 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)(82310400026)(376014)(36860700013)(1800799024)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:07:22.3283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf832945-7bf3-473f-b8a9-08ddb4aa01dc 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: MN1PEPF0000F0E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB9738 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/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=26f01ea8285ae3eb02870a4667f58657019d5441 Thanks. Xueming Li --- >From 26f01ea8285ae3eb02870a4667f58657019d5441 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Thu, 22 May 2025 15:41:16 +0530 Subject: [PATCH] common/cnxk: fix E-tag pattern parsing Cc: Xueming Li [ upstream commit a610e32b96768b84436ba523bc97af88df4d6963 ] E-tag pattern parsing was using wrong length leading to a segfault. Fixing this by using the correct length of the pattern item. Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc.c | 5 +++-- drivers/common/cnxk/roc_npc_parse.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 9ea96a524c..9c95e57876 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -820,10 +820,11 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[], pst->mcam_data = (uint8_t *)flow->mcam_data; pst->mcam_mask = (uint8_t *)flow->mcam_mask; - while (pattern->type != ROC_NPC_ITEM_TYPE_END && - layer < PLT_DIM(parse_stage_funcs)) { + while (pattern->type != ROC_NPC_ITEM_TYPE_END && layer < PLT_DIM(parse_stage_funcs)) { /* Skip place-holders */ pattern = npc_parse_skip_void_and_any_items(pattern); + if (pattern->type == ROC_NPC_ITEM_TYPE_END) + break; pst->pattern = pattern; rc = parse_stage_funcs[layer](pst); diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c index 3c288070fb..3ee8752dae 100644 --- a/drivers/common/cnxk/roc_npc_parse.c +++ b/drivers/common/cnxk/roc_npc_parse.c @@ -505,6 +505,7 @@ npc_parse_lb(struct npc_parse_state *pst) */ lt = NPC_LT_LB_ETAG; lflags = 0; + info.len = pattern->size; last_pattern = pst->pattern; pattern = npc_parse_skip_void_and_any_items(pst->pattern + 1); @@ -519,7 +520,6 @@ npc_parse_lb(struct npc_parse_state *pst) lflags = NPC_F_ETAG_CTAG; last_pattern = pattern; } - info.len = pattern->size; } else if (pst->pattern->type == ROC_NPC_ITEM_TYPE_QINQ) { info.hw_mask = NULL; info.len = pattern->size; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.017497834 +0800 +++ 0058-common-cnxk-fix-E-tag-pattern-parsing.patch 2025-06-26 19:59:17.438418042 +0800 @@ -1 +1 @@ -From a610e32b96768b84436ba523bc97af88df4d6963 Mon Sep 17 00:00:00 2001 +From 26f01ea8285ae3eb02870a4667f58657019d5441 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a610e32b96768b84436ba523bc97af88df4d6963 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 1f2461e026..50106b8773 100644 +index 9ea96a524c..9c95e57876 100644 @@ -24 +26 @@ -@@ -995,10 +995,11 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[], +@@ -820,10 +820,11 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[], @@ -39 +41 @@ -index b52024f434..37b43995db 100644 +index 3c288070fb..3ee8752dae 100644 @@ -42 +44 @@ -@@ -531,6 +531,7 @@ npc_parse_lb(struct npc_parse_state *pst) +@@ -505,6 +505,7 @@ npc_parse_lb(struct npc_parse_state *pst) @@ -50 +52 @@ -@@ -545,7 +546,6 @@ npc_parse_lb(struct npc_parse_state *pst) +@@ -519,7 +520,6 @@ npc_parse_lb(struct npc_parse_state *pst)