From: Kevin Traynor <ktraynor@redhat.com>
To: Maayan Kashani <mkashani@nvidia.com>
Cc: Dariusz Sosnowski <dsosnowski@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/mlx5: fix error info in actions construct' has been queued to stable release 24.11.2
Date: Mon, 24 Mar 2025 16:16:19 +0000 [thread overview]
Message-ID: <20250324161731.63950-12-ktraynor@redhat.com> (raw)
In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com>
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@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@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@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@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,
next prev parent reply other threads:[~2025-03-24 16:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 16:16 patch 'doc: fix year of final LTS release' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/bnxt: fix epoch bit calculation' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/iavf: fix mbuf release in Arm multi-process' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/ice: fix flow engines order' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/ice: fix dropped packets when using VRRP' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/iavf: check interrupt registration failure' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/iavf: fix crash on app exit on FreeBSD' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix hairpin queue release' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix LACP packet handling in isolated mode' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5/hws: fix crash using represented port without ID' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix non-template set VLAN VID' " Kevin Traynor
2025-03-24 16:16 ` Kevin Traynor [this message]
2025-03-24 16:16 ` patch 'net/mlx5/hws: fix GTP flags matching' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix non-template flow validation' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix non-template flow validation on create' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix flow group ID for action translation' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix flow matching GENEVE options' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix IPIP tunnel verification' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix mark action validation in FDB mode' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix NAT64 register selection' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix GRE matching on root table' " Kevin Traynor
2025-03-24 16:16 ` patch 'common/mlx5: add device duplication function' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix GENEVE parser cleanup' " Kevin Traynor
2025-03-24 16:16 ` patch 'baseband/acc: fix queue setup failure clean up' " Kevin Traynor
2025-03-24 16:16 ` patch 'common/qat: fix devargs parsing' " Kevin Traynor
2025-03-24 16:16 ` patch 'dts: fix smoke tests docstring' " Kevin Traynor
2025-03-24 16:16 ` patch 'pdump: clear statistics when enabled' " Kevin Traynor
2025-03-24 16:16 ` patch 'examples/flow_filtering: fix IPv4 matching snippet' " Kevin Traynor
2025-03-24 16:16 ` patch 'examples/ipsec-secgw: fix cryptodev and eventdev IDs' " Kevin Traynor
2025-03-24 16:16 ` patch 'doc: add no-IOMMU mode in devbind tool guide' " Kevin Traynor
2025-03-24 16:16 ` patch 'eal: fix undetected NUMA nodes' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/ixgbe: add checks for E610 VF' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250324161731.63950-12-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=dsosnowski@nvidia.com \
--cc=mkashani@nvidia.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).