patch 'net/mlx5: fix meter profile delete after disable' has been queued to stable release 19.11.14

[christian.ehrhardt@canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/b77ca4fb51acaca866310d227eadb423f5b89faf

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From b77ca4fb51acaca866310d227eadb423f5b89faf Mon Sep 17 00:00:00 2001
From: Shun Hao <shunh@nvidia.com>
Date: Sun, 18 Sep 2022 03:58:02 +0300
Subject: [PATCH] net/mlx5: fix meter profile delete after disable

[ upstream commit 9b7fcf395cd9f92e45bb322f983a3b9ead0d47e7 ]

If a meter's profile is changed after meter disabled, there's an issue
that will fail when deleting the old profile.

This patch fixes this by adding the correct process to decrease the old
profile's reference count when changing profile.

Fixes: 63ffeb2ff2 ("net/mlx5: support meter profile update")

Signed-off-by: Shun Hao <shunh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_meter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c
index e51a85b477..f38dd2c357 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -935,7 +935,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
 	fm->profile = fmp;
 	/* Update meter params in HW (if not disabled). */
 	if (fm->active_state == MLX5_FLOW_METER_DISABLE)
-		return 0;
+		goto dec_ref_cnt;
 	ret = mlx5_flow_meter_action_modify(priv, fm, &fm->profile->srtcm_prm,
 					      modify_bits, fm->active_state);
 	if (ret) {
@@ -945,6 +945,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
 					  NULL, "Failed to update meter"
 					  " parmeters in hardware.");
 	}
+dec_ref_cnt:
 	old_fmp->ref_cnt--;
 	fmp->ref_cnt++;
 	return 0;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:05.648731460 +0100
+++ 0024-net-mlx5-fix-meter-profile-delete-after-disable.patch	2022-11-11 12:35:04.765192018 +0100
@@ -1 +1 @@
-From 9b7fcf395cd9f92e45bb322f983a3b9ead0d47e7 Mon Sep 17 00:00:00 2001
+From b77ca4fb51acaca866310d227eadb423f5b89faf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9b7fcf395cd9f92e45bb322f983a3b9ead0d47e7 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 7c0d84907a..d4aafe4eea 100644
+index e51a85b477..f38dd2c357 100644
@@ -25 +26 @@
-@@ -1656,7 +1656,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
+@@ -935,7 +935,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
@@ -32 +33 @@
- 					      modify_bits, fm->active_state, 1);
+ 					      modify_bits, fm->active_state);
@@ -34 +35 @@
-@@ -1666,6 +1666,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
+@@ -945,6 +945,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
@@ -36 +37 @@
- 					  " parameters in hardware.");
+ 					  " parmeters in hardware.");