patch 'common/cnxk: fix E-tag pattern parsing' has been queued to stable release 24.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/23/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/71a46e1a8a9d7f45c979b456171c207b149733b4

Thanks.

Kevin

---
>From 71a46e1a8a9d7f45c979b456171c207b149733b4 Mon Sep 17 00:00:00 2001
From: Satheesh Paul <psatheesh at marvell.com>
Date: Thu, 22 May 2025 15:41:16 +0530
Subject: [PATCH] common/cnxk: fix E-tag pattern parsing

[ 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 <psatheesh at marvell.com>
Reviewed-by: Kiran Kumar K <kirankumark at marvell.com>
---
 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 53f278c764..9c7bd0e15c 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -940,8 +940,9 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[],
 	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;
diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c
index 0aaf86c768..18ce71a5cc 100644
--- a/drivers/common/cnxk/roc_npc_parse.c
+++ b/drivers/common/cnxk/roc_npc_parse.c
@@ -530,4 +530,5 @@ npc_parse_lb(struct npc_parse_state *pst)
 		lt = NPC_LT_LB_ETAG;
 		lflags = 0;
+		info.len = pattern->size;
 
 		last_pattern = pst->pattern;
@@ -544,5 +545,4 @@ npc_parse_lb(struct npc_parse_state *pst)
 			last_pattern = pattern;
 		}
-		info.len = pattern->size;
 	} else if (pst->pattern->type == ROC_NPC_ITEM_TYPE_QINQ) {
 		info.hw_mask = NULL;
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:13.480625823 +0100
+++ 0070-common-cnxk-fix-E-tag-pattern-parsing.patch	2025-07-18 20:29:10.969907450 +0100
@@ -1 +1 @@
-From a610e32b96768b84436ba523bc97af88df4d6963 Mon Sep 17 00:00:00 2001
+From 71a46e1a8a9d7f45c979b456171c207b149733b4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a610e32b96768b84436ba523bc97af88df4d6963 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 1f2461e026..50106b8773 100644
+index 53f278c764..9c7bd0e15c 100644
@@ -24 +25 @@
-@@ -996,8 +996,9 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[],
+@@ -940,8 +940,9 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[],
@@ -37 +38 @@
-index b52024f434..37b43995db 100644
+index 0aaf86c768..18ce71a5cc 100644
@@ -40 +41 @@
-@@ -532,4 +532,5 @@ npc_parse_lb(struct npc_parse_state *pst)
+@@ -530,4 +530,5 @@ npc_parse_lb(struct npc_parse_state *pst)
@@ -46 +47 @@
-@@ -546,5 +547,4 @@ npc_parse_lb(struct npc_parse_state *pst)
+@@ -544,5 +545,4 @@ npc_parse_lb(struct npc_parse_state *pst)