patch 'net/mlx5/hws: fix deletion of action vport' has been queued to stable release 22.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.6

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

Thanks.

Luca Boccassi

---
>From 6da7724d9e8b102d16c24bf390e853c94dacbae4 Mon Sep 17 00:00:00 2001
From: Erez Shitrit <erezsh at nvidia.com>
Date: Tue, 9 Jul 2024 15:30:59 +0300
Subject: [PATCH] net/mlx5/hws: fix deletion of action vport

[ upstream commit 29cd96c98dd999756f43715c7f3e85c44044b115 ]

No more ignoring this action while destroying it.

Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object")

Signed-off-by: Erez Shitrit <erezsh at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/hws/mlx5dr_action.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c
index b0ae4e7693..4fb9a03d80 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -1593,6 +1593,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
 	case MLX5DR_ACTION_TYP_ASO_METER:
 	case MLX5DR_ACTION_TYP_ASO_CT:
 	case MLX5DR_ACTION_TYP_PUSH_VLAN:
+	case MLX5DR_ACTION_TYP_VPORT:
 		mlx5dr_action_destroy_stcs(action);
 		break;
 	case MLX5DR_ACTION_TYP_POP_VLAN:
@@ -1614,6 +1615,9 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
 		mlx5dr_action_destroy_stcs(action);
 		mlx5dr_cmd_destroy_obj(action->reformat.arg_obj);
 		break;
+	default:
+		DR_LOG(ERR, "Not supported action type: %d", action->type);
+		assert(false);
 	}
 }
 
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-07-24 12:29:21.799867647 +0100
+++ 0013-net-mlx5-hws-fix-deletion-of-action-vport.patch	2024-07-24 12:29:20.715025005 +0100
@@ -1 +1 @@
-From 29cd96c98dd999756f43715c7f3e85c44044b115 Mon Sep 17 00:00:00 2001
+From 6da7724d9e8b102d16c24bf390e853c94dacbae4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 29cd96c98dd999756f43715c7f3e85c44044b115 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16 @@
- drivers/net/mlx5/hws/mlx5dr_cmd.c    | 3 ++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ 1 file changed, 4 insertions(+)
@@ -19 +19 @@
-index b90f18df8a..0d90280a7d 100644
+index b0ae4e7693..4fb9a03d80 100644
@@ -22 +22,2 @@
-@@ -2968,6 +2968,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
+@@ -1593,6 +1593,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
+ 	case MLX5DR_ACTION_TYP_ASO_METER:
@@ -25 +25,0 @@
- 	case MLX5DR_ACTION_TYP_REMOVE_HEADER:
@@ -29,4 +29,4 @@
- 	case MLX5DR_ACTION_TYP_DEST_ROOT:
-@@ -3027,6 +3028,9 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
- 		break;
- 	case MLX5DR_ACTION_TYP_LAST:
+ 	case MLX5DR_ACTION_TYP_POP_VLAN:
+@@ -1614,6 +1615,9 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
+ 		mlx5dr_action_destroy_stcs(action);
+ 		mlx5dr_cmd_destroy_obj(action->reformat.arg_obj);
@@ -40,14 +39,0 @@
-diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c b/drivers/net/mlx5/hws/mlx5dr_cmd.c
-index 72fc9e3d91..a4f778a8a4 100644
---- a/drivers/net/mlx5/hws/mlx5dr_cmd.c
-+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c
-@@ -1033,7 +1033,8 @@ int mlx5dr_cmd_generate_wqe(struct ibv_context *ctx,
- 
- 	ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, sizeof(out));
- 	if (ret) {
--		DR_LOG(ERR, "Failed to write GTA WQE using FW");
-+		DR_LOG(ERR, "Failed to write GTA WQE using FW (syndrome: %#x)",
-+		       mlx5dr_cmd_get_syndrome(out));
- 		rte_errno = errno;
- 		return rte_errno;
- 	}