patch 'net/mlx5: fix duplicated tag index matching in SWS' has been queued to stable release 20.11.9

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.9

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/17/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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/c85dbe8ee375bff9222786fa12376daa5b39bd58

Thanks.

Luca Boccassi

---
From c85dbe8ee375bff9222786fa12376daa5b39bd58 Mon Sep 17 00:00:00 2001
From: Rongwei Liu <rongweil@nvidia.com>
Date: Tue, 16 May 2023 08:43:29 +0300
Subject: [PATCH] net/mlx5: fix duplicated tag index matching in SWS

[ upstream commit d5a7699c10651cb1cea2b18f94099e984c466b75 ]

Duplicated matching tag index is not allowed in SWS
because they are using the same matching field in the
underlayer layout.
For example: "tag index is 0 data spec 0x12 mask 0xff /
tag index is 0 data spec 0x1234 mask 0xffff" is paradoxical
matching condition and "tag index is 0 data spec 0x12 mask 0xff /
tag index is 0 data spec 0x3400 mask 0xff00" should be "tag index
is 0 data spec 0x3412 mask 0xffff"

Add checking logic against it.

Fixes: e554b672aa05 ("net/mlx5: support flow tag")

Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c60aabf075..c413da53d7 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1499,6 +1499,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
  *   Pointer to the rte_eth_dev structure.
  * @param[in] item
  *   Item specification.
+ * @param[in] tag_bitmap
+ *   Tag index bitmap.
  * @param[in] attr
  *   Attributes of flow that includes this item.
  * @param[out] error
@@ -1510,6 +1512,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
 static int
 flow_dv_validate_item_tag(struct rte_eth_dev *dev,
 			  const struct rte_flow_item *item,
+			  uint32_t *tag_bitmap,
 			  const struct rte_flow_attr *attr __rte_unused,
 			  struct rte_flow_error *error)
 {
@@ -1553,6 +1556,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev,
 	if (ret < 0)
 		return ret;
 	MLX5_ASSERT(ret != REG_NON);
+	if (*tag_bitmap & (1 << ret))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ITEM_SPEC,
+					  item->spec,
+					  "Duplicated tag index");
+	*tag_bitmap |= 1 << ret;
 	return 0;
 }
 
@@ -5313,7 +5322,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 		.std_tbl_fix = true,
 	};
 	const struct rte_eth_hairpin_conf *conf;
-	uint32_t tag_id = 0;
+	uint32_t tag_id = 0, tag_bitmap = 0;
+	const struct mlx5_rte_flow_item_tag *mlx5_tag;
 
 	if (items == NULL)
 		return -1;
@@ -5584,7 +5594,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			last_item = MLX5_FLOW_LAYER_ICMP6;
 			break;
 		case RTE_FLOW_ITEM_TYPE_TAG:
-			ret = flow_dv_validate_item_tag(dev, items,
+			ret = flow_dv_validate_item_tag(dev, items, &tag_bitmap,
 							attr, error);
 			if (ret < 0)
 				return ret;
@@ -5594,6 +5604,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			last_item = MLX5_FLOW_ITEM_TX_QUEUE;
 			break;
 		case MLX5_RTE_FLOW_ITEM_TYPE_TAG:
+			mlx5_tag = (const struct mlx5_rte_flow_item_tag *)items->spec;
+			if (tag_bitmap & (1 << mlx5_tag->id))
+				return rte_flow_error_set(error, EINVAL,
+							  RTE_FLOW_ERROR_TYPE_ITEM_SPEC,
+							  items->spec,
+							  "Duplicated tag index");
+			tag_bitmap |= 1 << mlx5_tag->id;
 			break;
 		case RTE_FLOW_ITEM_TYPE_GTP:
 			ret = flow_dv_validate_item_gtp(dev, items, item_flags,
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-15 01:56:37.135371195 +0100
+++ 0048-net-mlx5-fix-duplicated-tag-index-matching-in-SWS.patch	2023-06-15 01:56:34.687543926 +0100
@@ -1 +1 @@
-From d5a7699c10651cb1cea2b18f94099e984c466b75 Mon Sep 17 00:00:00 2001
+From c85dbe8ee375bff9222786fa12376daa5b39bd58 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d5a7699c10651cb1cea2b18f94099e984c466b75 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 9ef9f13cbb..27e8b3a5a9 100644
+index c60aabf075..c413da53d7 100644
@@ -30 +31 @@
-@@ -2295,6 +2295,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
+@@ -1499,6 +1499,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
@@ -39 +40 @@
-@@ -2306,6 +2308,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
+@@ -1510,6 +1512,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
@@ -47 +48 @@
-@@ -2349,6 +2352,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev,
+@@ -1553,6 +1556,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev,
@@ -60,4 +61,4 @@
-@@ -7280,9 +7289,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
- 	bool def_policy = false;
- 	bool shared_count = false;
- 	uint16_t udp_dport = 0;
+@@ -5313,7 +5322,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+ 		.std_tbl_fix = true,
+ 	};
+ 	const struct rte_eth_hairpin_conf *conf;
@@ -66,2 +66,0 @@
- 	const struct rte_flow_action_age *non_shared_age = NULL;
- 	const struct rte_flow_action_count *count = NULL;
@@ -69,2 +67,0 @@
- 	struct mlx5_priv *act_priv = NULL;
- 	int aso_after_sample = 0;
@@ -72 +69,3 @@
-@@ -7611,7 +7621,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+ 	if (items == NULL)
+ 		return -1;
+@@ -5584,7 +5594,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -81,2 +80,2 @@
-@@ -7621,6 +7631,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
- 			last_item = MLX5_FLOW_ITEM_SQ;
+@@ -5594,6 +5604,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+ 			last_item = MLX5_FLOW_ITEM_TX_QUEUE;