patch 'net/mlx5: fix connection tracking state item validation' has been queued to stable release 22.11.11

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.11

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

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

Thanks.

Luca Boccassi

---
From 22388ebd621d3554ab259e159f4f0964702ecc7e Mon Sep 17 00:00:00 2001
From: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk>
Date: Thu, 14 Aug 2025 06:16:01 -0400
Subject: [PATCH] net/mlx5: fix connection tracking state item validation

[ upstream commit 179e70fd7ad2027705b42e7416d436d299eca78c ]

This patch validate a connection tracking state when matching
'conntrack is' in rte_flow rules. Since conntrack item flags
is a bitmap, then any combination of RTE_FLOW_CONNTRACK_PKT_STATE_*
flags is a valid value to match on.

This patch validate the CT state item.

Fixes: aca19061e4b9 ("net/mlx5: validate connection tracking item")

Signed-off-by: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h    | 5 +++++
 drivers/net/mlx5/mlx5_flow_dv.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index eb7040ee4d..3a23954697 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -95,6 +95,11 @@ enum {
 #define MLX5_ACTION_CTX_CT_GET_OWNER MLX5_INDIRECT_ACT_CT_GET_OWNER
 #define MLX5_ACTION_CTX_CT_GEN_IDX MLX5_INDIRECT_ACT_CT_GEN_IDX
 
+#define MLX5_FLOW_CONNTRACK_PKT_STATE_ALL \
+	(RTE_FLOW_CONNTRACK_PKT_STATE_VALID | RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED | \
+	 RTE_FLOW_CONNTRACK_PKT_STATE_INVALID | RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED | \
+	 RTE_FLOW_CONNTRACK_PKT_STATE_BAD)
+
 /* Matches on selected register. */
 struct mlx5_rte_flow_item_tag {
 	enum modify_reg id;
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index f3a76f9e93..ff8d58db64 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -2862,6 +2862,11 @@ flow_dv_validate_item_aso_ct(struct rte_eth_dev *dev,
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM, NULL,
 					  "Conflict status bits");
+	if (spec->flags & ~MLX5_FLOW_CONNTRACK_PKT_STATE_ALL)
+		return rte_flow_error_set(error, EINVAL,
+				RTE_FLOW_ERROR_TYPE_ITEM,
+				NULL,
+				"Invalid CT item flags");
 	/* State change also needs to be considered. */
 	*item_flags |= MLX5_FLOW_LAYER_ASO_CT;
 	return 0;
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-10-27 15:54:35.576474552 +0000
+++ 0020-net-mlx5-fix-connection-tracking-state-item-validati.patch	2025-10-27 15:54:34.767948846 +0000
@@ -1 +1 @@
-From 179e70fd7ad2027705b42e7416d436d299eca78c Mon Sep 17 00:00:00 2001
+From 22388ebd621d3554ab259e159f4f0964702ecc7e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 179e70fd7ad2027705b42e7416d436d299eca78c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -19,4 +20,3 @@
- drivers/net/mlx5/mlx5_flow.h    |  5 +++++
- drivers/net/mlx5/mlx5_flow_dv.c |  5 +++++
- drivers/net/mlx5/mlx5_flow_hw.c | 10 ++++++++++
- 3 files changed, 20 insertions(+)
+ drivers/net/mlx5/mlx5_flow.h    | 5 +++++
+ drivers/net/mlx5/mlx5_flow_dv.c | 5 +++++
+ 2 files changed, 10 insertions(+)
@@ -25 +25 @@
-index e890e732c3..ed0c1fcfd2 100644
+index eb7040ee4d..3a23954697 100644
@@ -28,3 +28,3 @@
-@@ -100,6 +100,11 @@ enum mlx5_indirect_type {
- #define MLX5_INDIRECT_ACT_CT_GET_IDX(index) \
- 	((index) & ((1 << MLX5_INDIRECT_ACT_CT_OWNER_SHIFT) - 1))
+@@ -95,6 +95,11 @@ enum {
+ #define MLX5_ACTION_CTX_CT_GET_OWNER MLX5_INDIRECT_ACT_CT_GET_OWNER
+ #define MLX5_ACTION_CTX_CT_GEN_IDX MLX5_INDIRECT_ACT_CT_GEN_IDX
@@ -37,3 +37,3 @@
- /*
-  * When HW steering flow engine is used, the CT action handles are encoded in a following way:
-  * - bits 31:29 - type
+ /* Matches on selected register. */
+ struct mlx5_rte_flow_item_tag {
+ 	enum modify_reg id;
@@ -41 +41 @@
-index 7b9e5018b8..f673637e7d 100644
+index f3a76f9e93..ff8d58db64 100644
@@ -44,10 +44,9 @@
-@@ -3289,6 +3289,11 @@ mlx5_flow_dv_validate_item_aso_ct(struct rte_eth_dev *dev,
- 						  RTE_FLOW_ERROR_TYPE_ITEM,
- 						  NULL,
- 						  "Conflict status bits");
-+		if (spec->flags & ~MLX5_FLOW_CONNTRACK_PKT_STATE_ALL)
-+			return rte_flow_error_set(error, EINVAL,
-+					RTE_FLOW_ERROR_TYPE_ITEM,
-+					NULL,
-+					"Invalid CT item flags");
- 	}
+@@ -2862,6 +2862,11 @@ flow_dv_validate_item_aso_ct(struct rte_eth_dev *dev,
+ 		return rte_flow_error_set(error, EINVAL,
+ 					  RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+ 					  "Conflict status bits");
++	if (spec->flags & ~MLX5_FLOW_CONNTRACK_PKT_STATE_ALL)
++		return rte_flow_error_set(error, EINVAL,
++				RTE_FLOW_ERROR_TYPE_ITEM,
++				NULL,
++				"Invalid CT item flags");
@@ -56,28 +55 @@
-diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
-index 3da8d93454..bca396a9ab 100644
---- a/drivers/net/mlx5/mlx5_flow_hw.c
-+++ b/drivers/net/mlx5/mlx5_flow_hw.c
-@@ -17010,6 +17010,7 @@ flow_hw_validate_rule_pattern(struct rte_eth_dev *dev,
- 		switch (items->type) {
- 		const struct rte_flow_item_ethdev *ethdev;
- 		const struct rte_flow_item_tx_queue *tx_queue;
-+		const struct rte_flow_item_conntrack *spec;
- 		struct mlx5_txq_ctrl *txq;
- 
- 		case RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT:
-@@ -17030,6 +17031,15 @@ flow_hw_validate_rule_pattern(struct rte_eth_dev *dev,
- 							  RTE_FLOW_ERROR_TYPE_ITEM_SPEC, items,
- 							  "Invalid Tx queue");
- 			mlx5_txq_release(dev, tx_queue->tx_queue);
-+			break;
-+		case RTE_FLOW_ITEM_TYPE_CONNTRACK:
-+			spec = items->spec;
-+			if (spec->flags & ~MLX5_FLOW_CONNTRACK_PKT_STATE_ALL)
-+				return rte_flow_error_set(error, EINVAL,
-+						RTE_FLOW_ERROR_TYPE_ITEM,
-+						NULL,
-+						"Invalid CT item flags");
-+			break;
- 		default:
- 			break;
- 		}
+ 	return 0;