patch 'app/testpmd: fix flow rule number parsing' has been queued to stable release 22.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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 08/11/23. 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=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=626cc012ccc96a76eebde80739274bb8a23e8ca4

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 626cc012ccc96a76eebde80739274bb8a23e8ca4 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at nvidia.com>
Date: Fri, 30 Jun 2023 16:30:02 +0300
Subject: [PATCH] app/testpmd: fix flow rule number parsing
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 70a7d9bc4d3fd7f2f2c89f1721daa4c99f60f987 ]

When creating a template table, the object pointer of the
command line "struct context" was set with an offset from the
original out buffer if there is a template ID.

If the "rules_number" is specified after the template IDs, it
couldn't be set and passed to the API correctly. With this commit,
the pointer is reset before pasring the "rules_number" field.

Fixes: c4b38873346b ("app/testpmd: add flow table management")

Signed-off-by: Bing Zhao <bingz at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
 app/test-pmd/cmdline_flow.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 042da57a61..b30fad18ad 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -2940,6 +2940,7 @@ static const struct token token_list[] = {
 			     NEXT_ENTRY(COMMON_UNSIGNED)),
 		.args = ARGS(ARGS_ENTRY(struct buffer,
 					args.table.attr.nb_flows)),
+		.call = parse_table,
 	},
 	[TABLE_PATTERN_TEMPLATE] = {
 		.name = "pattern_template",
@@ -8993,6 +8994,11 @@ parse_table(struct context *ctx, const struct token *token,
 	case TABLE_TRANSFER:
 		out->args.table.attr.flow_attr.transfer = 1;
 		return len;
+		return len;
+	case TABLE_RULES_NUMBER:
+		ctx->objdata = 0;
+		ctx->object = out;
+		ctx->objmask = NULL;
 	default:
 		return -1;
 	}
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:19.915009500 +0800
+++ 0068-app-testpmd-fix-flow-rule-number-parsing.patch	2023-08-09 21:51:18.214352000 +0800
@@ -1 +1 @@
-From 70a7d9bc4d3fd7f2f2c89f1721daa4c99f60f987 Mon Sep 17 00:00:00 2001
+From 626cc012ccc96a76eebde80739274bb8a23e8ca4 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 70a7d9bc4d3fd7f2f2c89f1721daa4c99f60f987 ]
@@ -15 +17,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 8557704785..94827bcc4a 100644
+index 042da57a61..b30fad18ad 100644
@@ -27 +29 @@
-@@ -3390,6 +3390,7 @@ static const struct token token_list[] = {
+@@ -2940,6 +2940,7 @@ static const struct token token_list[] = {
@@ -35,3 +37,3 @@
-@@ -10234,6 +10235,11 @@ parse_table(struct context *ctx, const struct token *token,
- 			return -1;
- 		out->args.table.attr.specialize = RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG;
+@@ -8993,6 +8994,11 @@ parse_table(struct context *ctx, const struct token *token,
+ 	case TABLE_TRANSFER:
+ 		out->args.table.attr.flow_attr.transfer = 1;
@@ -38,0 +41 @@
++		return len;
@@ -43 +45,0 @@
-+		return len;