patch 'net/mlx5: fix meter sub-policy creation' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

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/06/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/e311e6045e4f7e9a44a6feda81ffe39fe1f1a8a9

Thanks.

Kevin

---
>From e311e6045e4f7e9a44a6feda81ffe39fe1f1a8a9 Mon Sep 17 00:00:00 2001
From: Shun Hao <shunh at nvidia.com>
Date: Fri, 18 Feb 2022 09:43:08 +0200
Subject: [PATCH] net/mlx5: fix meter sub-policy creation

[ upstream commit 94112badf6f579ac76e96bda3b015ffee95a2c68 ]

If meter policy action was RSS, the correct items were not provided
for sub-policy creation.

This fixes the issue by providing original items in meter split, so
the sub-policy creation gets the correct items.

Fixes: 3c481324baf3 ("net/mlx5: fix meter flow direction check")

Signed-off-by: Shun Hao <shunh at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index d7cb1eb89b..5d56ce96ea 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -5023,4 +5023,5 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
 	struct rte_flow_item *vlan_item_dst = NULL;
 	const struct rte_flow_item *vlan_item_src = NULL;
+	const struct rte_flow_item *orig_items = items;
 	struct rte_flow_action *hw_mtr_action;
 	struct rte_flow_action *action_pre_head = NULL;
@@ -5147,5 +5148,6 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
 		if (!fm->def_policy) {
 			sub_policy = get_meter_sub_policy(dev, flow, wks,
-							  attr, items, error);
+							  attr, orig_items,
+							  error);
 			if (!sub_policy)
 				return -rte_errno;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:03.684193512 +0000
+++ 0082-net-mlx5-fix-meter-sub-policy-creation.patch	2022-03-01 10:41:01.425244123 +0000
@@ -1 +1 @@
-From 94112badf6f579ac76e96bda3b015ffee95a2c68 Mon Sep 17 00:00:00 2001
+From e311e6045e4f7e9a44a6feda81ffe39fe1f1a8a9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94112badf6f579ac76e96bda3b015ffee95a2c68 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 5b5b00cc3e..1c3f648491 100644
+index d7cb1eb89b..5d56ce96ea 100644
@@ -25 +26 @@
-@@ -5022,4 +5022,5 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
+@@ -5023,4 +5023,5 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
@@ -31 +32 @@
-@@ -5146,5 +5147,6 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
+@@ -5147,5 +5148,6 @@ flow_meter_split_prep(struct rte_eth_dev *dev,