patch 'pipeline: fix annotation checks' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/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/1e8aa23aba7140b1e5425cadc6e35b58fa9d4b93

Thanks.

Kevin

---
>From 1e8aa23aba7140b1e5425cadc6e35b58fa9d4b93 Mon Sep 17 00:00:00 2001
From: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
Date: Fri, 3 Dec 2021 14:31:04 +0000
Subject: [PATCH] pipeline: fix annotation checks

[ upstream commit 8f8f6c14489ff78c6a4050a5001413b96ca32554 ]

The checks for the table-only and default-only annotations were
incorrect, as they were using the pipeline action ID instead of the
table action ID for retrieving the table action info. These checks are
now corrected and pushed into the internal table_entry_check()
function.

Fixes: cd79e0205824 ("pipeline: support action annotations")

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
Signed-off-by: Yogesh Jangra <yogesh.jangra at intel.com>
---
 lib/pipeline/rte_swx_ctl.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index 1c908e3e3f..8e29d58cec 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -373,10 +373,14 @@ table_entry_check(struct rte_swx_ctl_pipeline *ctl,
 	if (data_check) {
 		struct action *a;
+		struct rte_swx_ctl_table_action_info *tai;
 		uint32_t i;
 
 		/* action_id. */
-		for (i = 0; i < table->info.n_actions; i++)
-			if (entry->action_id == table->actions[i].action_id)
+		for (i = 0; i < table->info.n_actions; i++) {
+			tai = &table->actions[i];
+
+			if (entry->action_id == tai->action_id)
 				break;
+		}
 
 		CHECK(i < table->info.n_actions, EINVAL);
@@ -385,4 +389,16 @@ table_entry_check(struct rte_swx_ctl_pipeline *ctl,
 		a = &ctl->actions[entry->action_id];
 		CHECK(!(a->data_size && !entry->action_data), EINVAL);
+
+		/* When both key_check and data_check are true, we are interested in both the entry
+		 * key and data, which means the operation is _regular_ table entry add.
+		 */
+		if (key_check && !tai->action_is_for_table_entries)
+			return -EINVAL;
+
+		/* When key_check is false while data_check is true, we are only interested in the
+		 * entry data, which means the operation is _default_ table entry add.
+		 */
+		if (!key_check && !tai->action_is_for_default_entry)
+			return -EINVAL;
 	}
 
@@ -1447,6 +1463,4 @@ rte_swx_ctl_pipeline_table_entry_add(struct rte_swx_ctl_pipeline *ctl,
 	CHECK(!table_entry_check(ctl, table_id, entry, 1, 1), EINVAL);
 
-	CHECK(table->actions[entry->action_id].action_is_for_table_entries, EINVAL);
-
 	new_entry = table_entry_duplicate(ctl, table_id, entry, 1, 1);
 	CHECK(new_entry, ENOMEM);
@@ -1654,6 +1668,4 @@ rte_swx_ctl_pipeline_table_default_entry_add(struct rte_swx_ctl_pipeline *ctl,
 	CHECK(!table_entry_check(ctl, table_id, entry, 0, 1), EINVAL);
 
-	CHECK(table->actions[entry->action_id].action_is_for_default_entry, EINVAL);
-
 	new_entry = table_entry_duplicate(ctl, table_id, entry, 0, 1);
 	CHECK(new_entry, ENOMEM);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:48.856202905 +0000
+++ 0194-pipeline-fix-annotation-checks.patch	2022-02-21 15:22:44.383704784 +0000
@@ -1 +1 @@
-From 8f8f6c14489ff78c6a4050a5001413b96ca32554 Mon Sep 17 00:00:00 2001
+From 1e8aa23aba7140b1e5425cadc6e35b58fa9d4b93 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f8f6c14489ff78c6a4050a5001413b96ca32554 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org