Skip to contentSkip to conversation

app/testpmd: fix flex parser destroy command

PATCH Superseded Gregory Etelson 2 participants 3 messages Jun 16, 2022 – Jun 23, 2022

lore
Share & tools
lore

Gregory Etelson

author
#0 lore raw

PATCH 1/1 app/testpmd: fix flex parser destroy command

The patch separates 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.

cc [email protected]
Fixes 2d3d84013508 ("app/testpmd: fix flex item flush")
Signed-off-by Gregory Etelson <[email protected]>
Reviewed-by Viacheslav Ovsiienko <[email protected]>
---
 app/test-pmd/cmd_flex_item.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)
app/test-pmd/cmd_flex_item.c +16 -11
index 78a89c0f8a..f2560dbf83 100644
@@ -368,23 +368,12 @@ flex_item_create(portid_t port_id, uint16_t flex_id, const char *filename)
 	free(fp);
 }
 
-#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)
 {
 	int ret;
 	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",
 		       port_id, flex_id);

@@ -405,6 +394,22 @@ 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)
 {
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH v2 1/1 app/testpmd: fix flex parser destroy command

The patch separates 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.

cc [email protected]
Fixes 2d3d84013508 ("app/testpmd: fix flex item flush")
Signed-off-by Gregory Etelson <[email protected]>
Reviewed-by Viacheslav Ovsiienko <[email protected]>

---
v2: fix compilation warning on setups without JSON library.

---
 app/test-pmd/cmd_flex_item.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)
app/test-pmd/cmd_flex_item.c +18 -12
index 78a89c0f8a..63593fd456 100644
@@ -20,6 +20,8 @@
 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)
 {

@@ -34,7 +36,6 @@ flex_parser_fetch(uint16_t port_id, uint16_t flex_id)
 	return flex_items[port_id][flex_id];
 }
 
-#ifdef RTE_HAS_JANSSON
 static __rte_always_inline bool
 match_strkey(const char *key, const char *pattern)
 {

@@ -368,23 +369,12 @@ flex_item_create(portid_t port_id, uint16_t flex_id, const char *filename)
 	free(fp);
 }
 
-#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)
 {
 	int ret;
 	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",
 		       port_id, flex_id);

@@ -405,6 +395,22 @@ 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)
 {
Signature · 1 line
2.34.1
Reviewed-by on v2 1/1 Applied
#2 lore raw
Quoted 6 lines · Gregory Etelson

The patch separates 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.

Quoted 8 lines
cc [email protected]
Fixes 2d3d84013508 ("app/testpmd: fix flex item flush")
Signed-off-by Gregory Etelson <[email protected]>
Reviewed-by Viacheslav Ovsiienko <[email protected]>

---
v2: fix compilation warning on setups without JSON library.
---

Reviewed-by Andrew Rybchenko <[email protected]>

Applied to dpdk-next-net/main, thanks.