patch 'app/testpmd: fix flex parser destroy command' has been queued to stable release 21.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.2

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/30/22. 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/95b87a53149da82c97849606b4d2ac2c8ae38ff3

Thanks.

Kevin

---
From 95b87a53149da82c97849606b4d2ac2c8ae38ff3 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Thu, 16 Jun 2022 12:15:35 +0300
Subject: [PATCH] app/testpmd: fix flex parser destroy command

[ upstream commit 8bc3c062b2a4b39d5fde5f7364f857e2cd96dc1c ]

Separate flex item destruction function implementation.

Setups with installed JSON development library can use any value in
range [0, FLEX_MAX_PARSERS_NUM - 1] as input flex item ID.
In setups without JSON development library flex item destruction
function is resolved to empty stub.

Fixes: 2d3d84013508 ("app/testpmd: fix flex item flush")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Reviewed-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 app/test-pmd/cmd_flex_item.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/test-pmd/cmd_flex_item.c b/app/test-pmd/cmd_flex_item.c
index 1e8dc38594..3e54724237 100644
--- a/app/test-pmd/cmd_flex_item.c
+++ b/app/test-pmd/cmd_flex_item.c
@@ -21,4 +21,6 @@ struct flex_item *flex_items[RTE_MAX_ETHPORTS][FLEX_MAX_PARSERS_NUM];
 struct flex_pattern flex_patterns[FLEX_MAX_PATTERNS_NUM];
 
+#ifdef RTE_HAS_JANSSON
+
 static struct flex_item *
 flex_parser_fetch(uint16_t port_id, uint16_t flex_id)
@@ -35,5 +37,4 @@ flex_parser_fetch(uint16_t port_id, uint16_t flex_id)
 }
 
-#ifdef RTE_HAS_JANSSON
 static __rte_always_inline bool
 match_strkey(const char *key, const char *pattern)
@@ -370,13 +371,4 @@ out:
 }
 
-#else /* RTE_HAS_JANSSON */
-void flex_item_create(__rte_unused portid_t port_id,
-		      __rte_unused uint16_t flex_id,
-		      __rte_unused const char *filename)
-{
-	printf("cannot create flex item - no JSON library configured\n");
-}
-#endif /* RTE_HAS_JANSSON */
-
 void
 flex_item_destroy(portid_t port_id, uint16_t flex_id)
@@ -385,6 +377,4 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)
 	struct rte_flow_error error;
 	struct flex_item *fp = flex_parser_fetch(port_id, flex_id);
-	if (!flex_id)
-		return;
 	if (fp == FLEX_PARSER_ERR) {
 		printf("Bad parameters: port_id=%u flex_id=%u\n",
@@ -407,4 +397,20 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)
 }
 
+#else /* RTE_HAS_JANSSON */
+void flex_item_create(__rte_unused portid_t port_id,
+		      __rte_unused uint16_t flex_id,
+		      __rte_unused const char *filename)
+{
+	printf("cannot create flex item - no JSON library configured\n");
+}
+
+void
+flex_item_destroy(__rte_unused portid_t port_id, __rte_unused uint16_t flex_id)
+{
+
+}
+
+#endif /* RTE_HAS_JANSSON */
+
 void
 port_flex_item_flush(portid_t port_id)
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-28 16:18:04.273338145 +0100
+++ 0010-app-testpmd-fix-flex-parser-destroy-command.patch	2022-06-28 16:18:04.011387176 +0100
@@ -1 +1 @@
-From 8bc3c062b2a4b39d5fde5f7364f857e2cd96dc1c Mon Sep 17 00:00:00 2001
+From 95b87a53149da82c97849606b4d2ac2c8ae38ff3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8bc3c062b2a4b39d5fde5f7364f857e2cd96dc1c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 78a89c0f8a..63593fd456 100644
+index 1e8dc38594..3e54724237 100644
@@ -40 +41 @@
-@@ -369,13 +370,4 @@ out:
+@@ -370,13 +371,4 @@ out:
@@ -54 +55 @@
-@@ -384,6 +376,4 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)
+@@ -385,6 +377,4 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)
@@ -61 +62 @@
-@@ -406,4 +396,20 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)
+@@ -407,4 +397,20 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)