patch 'net/mlx5: fix GRE item translation in Verbs' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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/11/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8de9d40b7c9057f2c3bf89e287bc55333baa09f5

Thanks.

Luca Boccassi

---
>From 8de9d40b7c9057f2c3bf89e287bc55333baa09f5 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Mon, 28 Feb 2022 11:53:01 +0200
Subject: [PATCH] net/mlx5: fix GRE item translation in Verbs

[ upstream commit df4986559f24fbf669aeaa33e5e23563f7fc90b3 ]

GRE item translation must set inner protocol value.
For that reason the item is not translated inplace when PMD
translation iterates over flow items, but moved after the loop, when
all inner types are discovered.

If PMD does not translate GRE flow item inside the translation loop
it must save the GRE item for access outside the loop.

Fixes: 985b479267aa ("net/mlx5: fix GRE protocol type translation for Verbs")

Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_verbs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index fa7ba129fd..a0c6d23c6a 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -1722,6 +1722,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
 	struct mlx5_priv *priv = dev->data->dev_private;
 	struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
 	struct mlx5_flow_rss_desc *rss_desc;
+	const struct rte_flow_item *tunnel_item = NULL;
 
 	MLX5_ASSERT(wks);
 	rss_desc = &wks->rss_desc;
@@ -1861,6 +1862,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
 		case RTE_FLOW_ITEM_TYPE_GRE:
 			subpriority = MLX5_TUNNEL_PRIO_GET(rss_desc);
 			item_flags |= MLX5_FLOW_LAYER_GRE;
+			tunnel_item = items;
 			break;
 		case RTE_FLOW_ITEM_TYPE_MPLS:
 			flow_verbs_translate_item_mpls(dev_flow, items,
@@ -1875,7 +1877,8 @@ flow_verbs_translate(struct rte_eth_dev *dev,
 		}
 	}
 	if (item_flags & MLX5_FLOW_LAYER_GRE)
-		flow_verbs_translate_item_gre(dev_flow, items, item_flags);
+		flow_verbs_translate_item_gre(dev_flow, tunnel_item,
+					      item_flags);
 	dev_flow->handle->layers = item_flags;
 	/* Other members of attr will be ignored. */
 	dev_flow->verbs.attr.priority =
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-09 16:30:09.127587012 +0000
+++ 0016-net-mlx5-fix-GRE-item-translation-in-Verbs.patch	2022-03-09 16:30:08.527024706 +0000
@@ -1 +1 @@
-From df4986559f24fbf669aeaa33e5e23563f7fc90b3 Mon Sep 17 00:00:00 2001
+From 8de9d40b7c9057f2c3bf89e287bc55333baa09f5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit df4986559f24fbf669aeaa33e5e23563f7fc90b3 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index f08aa7a770..85f0788222 100644
+index fa7ba129fd..a0c6d23c6a 100644
@@ -27 +28 @@
-@@ -1679,6 +1679,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
+@@ -1722,6 +1722,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
@@ -35 +36 @@
-@@ -1818,6 +1819,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
+@@ -1861,6 +1862,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
@@ -43 +44 @@
-@@ -1832,7 +1834,8 @@ flow_verbs_translate(struct rte_eth_dev *dev,
+@@ -1875,7 +1877,8 @@ flow_verbs_translate(struct rte_eth_dev *dev,