patch 'net/mlx5: fix flow tag indexes support on root table' has been queued to stable release 23.11.6

[Shani Peretz <shperetz@nvidia.com>]

Hi,

FYI, your patch has been queued to stable release 23.11.6

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

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

Thanks.

Shani

---
From b431414c74e2474e9fb5a7677fc4b9d3184c3c3a Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski@nvidia.com>
Date: Fri, 14 Nov 2025 21:17:20 +0100
Subject: [PATCH] net/mlx5: fix flow tag indexes support on root table

[ upstream commit 3087db16ab13cdd6996b1f3ea8c64171c2e8fd8f ]

Offending patch introduced support for additional flow tag indexes
with HW Steering flow engine. New tag indexes will be mapped
to HW registers REG_C_8 to REG_C_11, depending on HW capabilities.

That patch only handled tables created on group > 0 (non-root table),
where mlx5 PMD directly configures the HW.
Tables and flow rules on group 0 (root table) are handled through
kernel driver, and new registers were not addressed for that case.

Because of that, usage of unsupported tag index in group 0
triggered an assertion in flow_dv_match_meta_reg().

This patch adds necessary definitions for REG_C_8 to REG_C_11 to make
these registers usable for flow tag indexes in root table.
Validation of flow tag to HW register translation is also amended
to report invalid cases to the user, instead of relying on assertions.

Fixes: 7e3a14423c1a ("net/mlx5/hws: support 4 additional C registers")

Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 drivers/common/mlx5/mlx5_prm.h  |  6 ++++-
 drivers/net/mlx5/mlx5_flow_dv.c | 40 ++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index d9e216b635..64d814d2d3 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1184,7 +1184,11 @@ struct mlx5_ifc_fte_match_set_misc5_bits {
 	u8 tunnel_header_1[0x20];
 	u8 tunnel_header_2[0x20];
 	u8 tunnel_header_3[0x20];
-	u8 reserved[0x100];
+	u8 reserved[0x80];
+	u8 metadata_reg_c_8[0x20];
+	u8 metadata_reg_c_9[0x20];
+	u8 metadata_reg_c_10[0x20];
+	u8 metadata_reg_c_11[0x20];
 };
 
 /* Flow matcher. */
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 56a0beeef6..d42b95ce0c 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -10175,8 +10175,8 @@ static void
 flow_dv_match_meta_reg(void *key, enum modify_reg reg_type,
 		       uint32_t data, uint32_t mask)
 {
-	void *misc2_v =
-		MLX5_ADDR_OF(fte_match_param, key, misc_parameters_2);
+	void *misc2_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_2);
+	void *misc5_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_5);
 	uint32_t temp;
 
 	data &= mask;
@@ -10220,6 +10220,18 @@ flow_dv_match_meta_reg(void *key, enum modify_reg reg_type,
 	case REG_C_7:
 		MLX5_SET(fte_match_set_misc2, misc2_v, metadata_reg_c_7, data);
 		break;
+	case REG_C_8:
+		MLX5_SET(fte_match_set_misc5, misc5_v, metadata_reg_c_8, data);
+		break;
+	case REG_C_9:
+		MLX5_SET(fte_match_set_misc5, misc5_v, metadata_reg_c_9, data);
+		break;
+	case REG_C_10:
+		MLX5_SET(fte_match_set_misc5, misc5_v, metadata_reg_c_10, data);
+		break;
+	case REG_C_11:
+		MLX5_SET(fte_match_set_misc5, misc5_v, metadata_reg_c_11, data);
+		break;
 	default:
 		MLX5_ASSERT(false);
 		break;
@@ -10438,8 +10450,11 @@ flow_dv_translate_mlx5_item_tag(struct rte_eth_dev *dev, void *key,
  *   Flow pattern to translate.
  * @param[in] key_type
  *   Set flow matcher mask or value.
+ *
+ * @return
+ *   0 on success. Negative errno value otherwise.
  */
-static void
+static int
 flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
 			   const struct rte_flow_item *item,
 			   uint32_t key_type)
@@ -10451,7 +10466,7 @@ flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
 	uint32_t index;
 
 	if (MLX5_ITEM_VALID(item, key_type))
-		return;
+		return 0;
 	MLX5_ITEM_UPDATE(item, key_type, tag_v, tag_m,
 		&rte_flow_item_tag_mask);
 	/* When set mask, the index should be from spec. */
@@ -10461,8 +10476,18 @@ flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
 		reg = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, index, NULL);
 	else
 		reg = flow_hw_get_reg_id(dev, RTE_FLOW_ITEM_TYPE_TAG, index);
-	MLX5_ASSERT(reg > 0);
+	if (reg < 0) {
+		DRV_LOG(ERR, "port %u tag index %u does not map to correct register",
+			dev->data->port_id, index);
+		return -EINVAL;
+	}
+	if (reg == REG_NON) {
+		DRV_LOG(ERR, "port %u tag index %u maps to unsupported register",
+			dev->data->port_id, index);
+		return -ENOTSUP;
+	}
 	flow_dv_match_meta_reg(key, (enum modify_reg)reg, tag_v->data, tag_m->data);
+	return 0;
 }
 
 /**
@@ -13931,7 +13956,10 @@ flow_dv_translate_items(struct rte_eth_dev *dev,
 		last_item = MLX5_FLOW_LAYER_ICMP6;
 		break;
 	case RTE_FLOW_ITEM_TYPE_TAG:
-		flow_dv_translate_item_tag(dev, key, items, key_type);
+		ret = flow_dv_translate_item_tag(dev, key, items, key_type);
+		if (ret < 0)
+			return rte_flow_error_set(error, -ret, RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+						  "invalid flow tag item");
 		last_item = MLX5_FLOW_ITEM_TAG;
 		break;
 	case MLX5_RTE_FLOW_ITEM_TYPE_TAG:
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-12-25 11:16:41.254613292 +0200
+++ 0094-net-mlx5-fix-flow-tag-indexes-support-on-root-table.patch	2025-12-25 11:16:36.303788000 +0200
@@ -1 +1 @@
-From 3087db16ab13cdd6996b1f3ea8c64171c2e8fd8f Mon Sep 17 00:00:00 2001
+From b431414c74e2474e9fb5a7677fc4b9d3184c3c3a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3087db16ab13cdd6996b1f3ea8c64171c2e8fd8f ]
+
@@ -24 +25,0 @@
-Cc: stable@dpdk.org
@@ -29 +29,0 @@
- drivers/net/mlx5/mlx5_flow.h    |  3 ++-
@@ -31 +31 @@
- 3 files changed, 41 insertions(+), 8 deletions(-)
+ 2 files changed, 39 insertions(+), 7 deletions(-)
@@ -34 +34 @@
-index 6cde3f8f1a..9383e09893 100644
+index d9e216b635..64d814d2d3 100644
@@ -37 +37 @@
-@@ -1205,7 +1205,11 @@ struct mlx5_ifc_fte_match_set_misc5_bits {
+@@ -1184,7 +1184,11 @@ struct mlx5_ifc_fte_match_set_misc5_bits {
@@ -50,14 +49,0 @@
-diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
-index db408d7b38..8159008504 100644
---- a/drivers/net/mlx5/mlx5_flow.h
-+++ b/drivers/net/mlx5/mlx5_flow.h
-@@ -1837,7 +1837,8 @@ flow_hw_get_reg_id_by_domain(struct rte_eth_dev *dev,
- 	case RTE_FLOW_ITEM_TYPE_TAG:
- 		if (id == RTE_PMD_MLX5_LINEAR_HASH_TAG_INDEX)
- 			return REG_C_3;
--		MLX5_ASSERT(id < MLX5_FLOW_HW_TAGS_MAX);
-+		if (id >= MLX5_FLOW_HW_TAGS_MAX)
-+			return REG_NON;
- 		return reg->hw_avl_tags[id];
- 	default:
- 		return REG_NON;
@@ -65 +51 @@
-index 83046418c4..47f6d28410 100644
+index 56a0beeef6..d42b95ce0c 100644
@@ -68 +54 @@
-@@ -10554,8 +10554,8 @@ static void
+@@ -10175,8 +10175,8 @@ static void
@@ -78,2 +64,2 @@
- 	if (!key)
-@@ -10601,6 +10601,18 @@ flow_dv_match_meta_reg(void *key, enum modify_reg reg_type,
+ 	data &= mask;
+@@ -10220,6 +10220,18 @@ flow_dv_match_meta_reg(void *key, enum modify_reg reg_type,
@@ -98 +84 @@
-@@ -10819,8 +10831,11 @@ flow_dv_translate_mlx5_item_tag(struct rte_eth_dev *dev, void *key,
+@@ -10438,8 +10450,11 @@ flow_dv_translate_mlx5_item_tag(struct rte_eth_dev *dev, void *key,
@@ -111 +97 @@
-@@ -10832,7 +10847,7 @@ flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
+@@ -10451,7 +10466,7 @@ flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
@@ -120 +106 @@
-@@ -10842,8 +10857,18 @@ flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
+@@ -10461,8 +10476,18 @@ flow_dv_translate_item_tag(struct rte_eth_dev *dev, void *key,
@@ -140 +126 @@
-@@ -14402,7 +14427,10 @@ flow_dv_translate_items(struct rte_eth_dev *dev,
+@@ -13931,7 +13956,10 @@ flow_dv_translate_items(struct rte_eth_dev *dev,