patch 'net/mlx5: fix no-green metering with RSS' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 05/30/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/671e8fa0c83244427df0b92a62156b6e700ee68d

Thanks.

Kevin

---
>From 671e8fa0c83244427df0b92a62156b6e700ee68d Mon Sep 17 00:00:00 2001
From: Shun Hao <shunh at nvidia.com>
Date: Thu, 14 Apr 2022 10:55:20 +0300
Subject: [PATCH] net/mlx5: fix no-green metering with RSS

[ upstream commit fc7211097d41957bd6e29d64fd42ce679b4147b8 ]

When a meter with RSS action being used, there might be several
sub-flows using different sub-policies in the flow splitting stage.
If there's no green action, there's an error that will always use the
same sub-policy for all sub-flows, some resources will be
overwritten and cannot be released, leading assert during port close.

This patch fixes this issue by checking both green and yellow queue
index during getting a blank sub-policy, to avoid the incorrect
resource overwrite.

Fixes: b38a12272b3a ("net/mlx5: split meter color policy handling")

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

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 8a3d9b5b6f..b24c79b324 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -16991,5 +16991,6 @@ __flow_dv_meter_get_rss_sub_policy(struct rte_eth_dev *dev,
 	}
 	/* Create sub policy. */
-	if (!mtr_policy->sub_policys[domain][0]->rix_hrxq[0]) {
+	if (!mtr_policy->sub_policys[domain][0]->rix_hrxq[RTE_COLOR_GREEN] &&
+	    !mtr_policy->sub_policys[domain][0]->rix_hrxq[RTE_COLOR_YELLOW]) {
 		/* Reuse the first pre-allocated sub_policy. */
 		sub_policy = mtr_policy->sub_policys[domain][0];
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:59.737243659 +0100
+++ 0050-net-mlx5-fix-no-green-metering-with-RSS.patch	2022-05-25 17:26:58.660828468 +0100
@@ -1 +1 @@
-From fc7211097d41957bd6e29d64fd42ce679b4147b8 Mon Sep 17 00:00:00 2001
+From 671e8fa0c83244427df0b92a62156b6e700ee68d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fc7211097d41957bd6e29d64fd42ce679b4147b8 ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index cb5006bb11..f9c56204c4 100644
+index 8a3d9b5b6f..b24c79b324 100644
@@ -29 +30 @@
-@@ -17055,5 +17055,6 @@ __flow_dv_meter_get_rss_sub_policy(struct rte_eth_dev *dev,
+@@ -16991,5 +16991,6 @@ __flow_dv_meter_get_rss_sub_policy(struct rte_eth_dev *dev,