patch 'net/mlx5: fix non-template flow validation' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.2

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/3057c26c7f113b530fe2d7d4bb2687a4ed6f1cb5

Thanks.

Kevin

---
>From 3057c26c7f113b530fe2d7d4bb2687a4ed6f1cb5 Mon Sep 17 00:00:00 2001
From: Maayan Kashani <mkashani at nvidia.com>
Date: Mon, 3 Mar 2025 15:34:48 +0200
Subject: [PATCH] net/mlx5: fix non-template flow validation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 5b0b6742d222299f3369eeeaa484639ef0134db3 ]

For non template API on top of HWS,
it’s validation function pointed to SWS legacy validation function,
which does not match HWS restrictions.

Added HWS validation function for non template rules.

Fixes: e38776c36c8a ("net/mlx5: introduce HWS for non-template flow API")

Signed-off-by: Maayan Kashani <mkashani at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_hw.c | 56 ++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index c82db20bfa..95c13d6a11 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -211,4 +211,11 @@ flow_hw_allocate_actions(struct rte_eth_dev *dev,
 			 struct rte_flow_error *error);
 
+static int
+flow_hw_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+		 const struct rte_flow_item items[],
+		 const struct rte_flow_action actions[],
+		 bool external __rte_unused, int hairpin __rte_unused,
+		 struct rte_flow_error *error);
+
 bool
 mlx5_hw_ctx_validate(const struct rte_eth_dev *dev, struct rte_flow_error *error)
@@ -15136,8 +15143,55 @@ flow_hw_update_resized(struct rte_eth_dev *dev, uint32_t queue,
 }
 
+/**
+ * Internal validation function. For validating both actions and items.
+ *
+ * @param[in] dev
+ *   Pointer to the rte_eth_dev structure.
+ * @param[in] attr
+ *   Pointer to the flow attributes.
+ * @param[in] items
+ *   Pointer to the list of items.
+ * @param[in] actions
+ *   Pointer to the list of actions.
+ * @param[in] external
+ *   This flow rule is created by request external to PMD.
+ * @param[in] hairpin
+ *   Number of hairpin TX actions, 0 means classic flow.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_hw_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+		 const struct rte_flow_item items[],
+		 const struct rte_flow_action actions[] __rte_unused,
+		 bool external, int hairpin __rte_unused,
+		 struct rte_flow_error *error)
+{
+	const struct rte_flow_pattern_template_attr pattern_template_attr = {
+		.relaxed_matching = 0,
+		.ingress = attr->ingress,
+		.egress = attr->egress,
+		.transfer = attr->transfer,
+	};
+	uint64_t item_flags = 0;
+	int ret = 0;
+
+	if (external) {
+		/* Validate application items only */
+		ret = flow_hw_pattern_validate(dev, &pattern_template_attr, items,
+						    &item_flags, error);
+		if (ret < 0)
+			return -rte_errno;
+	}
+	return 0;
+}
+
 const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = {
 	.list_create = flow_hw_list_create,
 	.list_destroy = flow_hw_list_destroy,
-	.validate = flow_dv_validate,
+	.validate = flow_hw_validate,
 	.info_get = flow_hw_info_get,
 	.configure = flow_hw_configure,
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-24 16:15:15.305148912 +0000
+++ 0014-net-mlx5-fix-non-template-flow-validation.patch	2025-03-24 16:15:14.759735537 +0000
@@ -1 +1 @@
-From 5b0b6742d222299f3369eeeaa484639ef0134db3 Mon Sep 17 00:00:00 2001
+From 3057c26c7f113b530fe2d7d4bb2687a4ed6f1cb5 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 5b0b6742d222299f3369eeeaa484639ef0134db3 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 88660c1627..8d9c0d2813 100644
+index c82db20bfa..95c13d6a11 100644
@@ -40 +41 @@
-@@ -15398,8 +15405,55 @@ flow_hw_update_resized(struct rte_eth_dev *dev, uint32_t queue,
+@@ -15136,8 +15143,55 @@ flow_hw_update_resized(struct rte_eth_dev *dev, uint32_t queue,