patch 'net/mlx5: fix error info in actions construct' 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/88c582b391e757c2edf7af59415467fce84fecea

Thanks.

Kevin

---
>From 88c582b391e757c2edf7af59415467fce84fecea Mon Sep 17 00:00:00 2001
From: Maayan Kashani <mkashani at nvidia.com>
Date: Thu, 27 Feb 2025 12:45:28 +0200
Subject: [PATCH] net/mlx5: fix error info in actions construct

[ upstream commit 562eba858fa4fcd049a797145fcb1f7b72d5a35e ]

In some cases in debug it misses the error info.
Fix to update the error structure.

Fixes: 654ebd8cb7a3 ("net/mlx5: support flow table resizing")

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

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index fc78bf2e1d..c82db20bfa 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -3570,5 +3570,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
 		mp_segment = mlx5_multi_pattern_segment_find(table, flow->res_idx);
 		if (!mp_segment || !mp_segment->mhdr_action)
-			return -1;
+			return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+						  NULL, "No modify header action found");
 		rule_acts[pos].action = mp_segment->mhdr_action;
 		/* offset is relative to DR action */
@@ -3900,6 +3901,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
 error:
 	flow_hw_release_actions(dev, queue, flow);
-	rte_errno = EINVAL;
-	return -rte_errno;
+	return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+				  NULL, "Action construction failed");
 }
 
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-24 16:15:15.236299333 +0000
+++ 0012-net-mlx5-fix-error-info-in-actions-construct.patch	2025-03-24 16:15:14.747735488 +0000
@@ -1 +1 @@
-From 562eba858fa4fcd049a797145fcb1f7b72d5a35e Mon Sep 17 00:00:00 2001
+From 88c582b391e757c2edf7af59415467fce84fecea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 562eba858fa4fcd049a797145fcb1f7b72d5a35e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 7f34af49de..88660c1627 100644
+index fc78bf2e1d..c82db20bfa 100644
@@ -22 +23 @@
-@@ -3616,5 +3616,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
+@@ -3570,5 +3570,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
@@ -30 +31 @@
-@@ -3947,6 +3948,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
+@@ -3900,6 +3901,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,