patch 'net/mlx5: fix handle validation for meter mark' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 02:10:33 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=532cb75dec42a09d1a65720d36013fd4f4aaf4aa

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 532cb75dec42a09d1a65720d36013fd4f4aaf4aa Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev at nvidia.com>
Date: Tue, 18 Jul 2023 16:32:13 +0300
Subject: [PATCH] net/mlx5: fix handle validation for meter mark
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 8b6f24396fc737ca831678a6acd3820c2073be87 ]

Skip the METER_MARK validation for the indirect action update.
The old synchronous indirect action update was left out
during the METER_MARK implementation in favor of the async way.
Allow the sync method of doing this with relaxed validation.

Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS")

Signed-off-by: Alexander Kozyrev <akozyrev at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index e3ca7b6093..942dccf518 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -10137,6 +10137,7 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,
 
 	switch (type) {
 	case MLX5_INDIRECT_ACTION_TYPE_CT:
+	case MLX5_INDIRECT_ACTION_TYPE_METER_MARK:
 		ret = 0;
 		break;
 	default:
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:21.110385400 +0800
+++ 0116-net-mlx5-fix-handle-validation-for-meter-mark.patch	2023-08-09 21:51:18.284352000 +0800
@@ -1 +1 @@
-From 8b6f24396fc737ca831678a6acd3820c2073be87 Mon Sep 17 00:00:00 2001
+From 532cb75dec42a09d1a65720d36013fd4f4aaf4aa Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 8b6f24396fc737ca831678a6acd3820c2073be87 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 9bd92f28fd..e91eb636d0 100644
+index e3ca7b6093..942dccf518 100644
@@ -24 +26 @@
-@@ -10758,6 +10758,7 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,
+@@ -10137,6 +10137,7 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,


More information about the stable mailing list