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

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/30/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/b87d31178d809ee6b778ff05d670f8abbcafa984

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b87d31178d809ee6b778ff05d670f8abbcafa984 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 21f018dd1d..2533a9102e 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -585,7 +585,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 		.type = RTE_FLOW_ITEM_TYPE_VXLAN_GPE,
 	},
 	[MLX5_EXPANSION_GRE] = {
-		.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),
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:05.708802346 +0800
+++ 0046-net-mlx5-fix-RSS-expansion-scheme-for-GRE-header.patch	2021-11-28 22:41:03.346873831 +0800
@@ -1 +1 @@
-From a21d616b99ffc5810a4b5333e5efdf1ddff21405 Mon Sep 17 00:00:00 2001
+From b87d31178d809ee6b778ff05d670f8abbcafa984 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 205fe19cdd..43598f92ee 100644
+index 21f018dd1d..2533a9102e 100644
@@ -23 +25 @@
-@@ -654,7 +654,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+@@ -585,7 +585,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {