patch 'net/mlx5: fix RSS expansion scheme for GRE header' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/3f65b6101051deb4ad4a19a92c01044f8e52a145

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 3f65b6101051deb4ad4a19a92c01044f8e52a145 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Sun, 14 Nov 2021 17:36:14 +0200
Subject: [PATCH] net/mlx5: fix RSS expansion scheme for GRE header

[ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ]

RFC-2784 allows any valid Ethernet type in GRE protocol type field.

Add Ethernet to GRE RSS expansion.

Fixes: f4b901a46aec ("net/mlx5: add flow GRE item")

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

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 0805bdb8c9..eff0057a60 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -180,7 +180,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
 		.type = RTE_FLOW_ITEM_TYPE_VXLAN_GPE,
 	},
 	[MLX5_EXPANSION_GRE] = {
-		.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
+		.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
+						 MLX5_EXPANSION_IPV4,
 						 MLX5_EXPANSION_IPV6,
 						 MLX5_EXPANSION_GRE_KEY,
 						 MLX5_EXPANSION_MPLS),
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:14.526124224 +0100
+++ 0149-net-mlx5-fix-RSS-expansion-scheme-for-GRE-header.patch	2021-11-30 16:50:06.110875878 +0100
@@ -1 +1 @@
-From a21d616b99ffc5810a4b5333e5efdf1ddff21405 Mon Sep 17 00:00:00 2001
+From 3f65b6101051deb4ad4a19a92c01044f8e52a145 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 205fe19cdd..43598f92ee 100644
+index 0805bdb8c9..eff0057a60 100644
@@ -23 +24 @@
-@@ -654,7 +654,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+@@ -180,7 +180,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
@@ -27,6 +28,6 @@
--		.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
-+		.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
-+						  MLX5_EXPANSION_IPV4,
- 						  MLX5_EXPANSION_IPV6,
- 						  MLX5_EXPANSION_GRE_KEY,
- 						  MLX5_EXPANSION_MPLS),
+-		.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
++		.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
++						 MLX5_EXPANSION_IPV4,
+ 						 MLX5_EXPANSION_IPV6,
+ 						 MLX5_EXPANSION_GRE_KEY,
+ 						 MLX5_EXPANSION_MPLS),