[dpdk-stable] patch 'net/mlx5: support more tunnel types' 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/12/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/17739766e31c9c38ce6d018cfcf2580d8b4c33d2

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 17739766e31c9c38ce6d018cfcf2580d8b4c33d2 Mon Sep 17 00:00:00 2001
From: Eli Britstein <elibr at nvidia.com>
Date: Thu, 23 Sep 2021 11:43:01 +0300
Subject: [PATCH] net/mlx5: support more tunnel types
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 292be511d2909c14db3c9ceaffa317f2beee67a0 ]

Accept RTE_FLOW_ITEM_TYPE_GRE, RTE_FLOW_ITEM_TYPE_NVGRE and
RTE_FLOW_ITEM_TYPE_GENEVE as valid tunnel types.

Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")

Signed-off-by: Eli Britstein <elibr at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 75d172e06b..5f44af5fa6 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -7771,6 +7771,9 @@ mlx5_flow_tunnel_validate(struct rte_eth_dev *dev,
 		err_msg = "unsupported tunnel type";
 		goto out;
 	case RTE_FLOW_ITEM_TYPE_VXLAN:
+	case RTE_FLOW_ITEM_TYPE_GRE:
+	case RTE_FLOW_ITEM_TYPE_NVGRE:
+	case RTE_FLOW_ITEM_TYPE_GENEVE:
 		break;
 	}
 
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:09.222729848 +0800
+++ 0164-net-mlx5-support-more-tunnel-types.patch	2021-11-10 14:17:01.974078578 +0800
@@ -1 +1 @@
-From 292be511d2909c14db3c9ceaffa317f2beee67a0 Mon Sep 17 00:00:00 2001
+From 17739766e31c9c38ce6d018cfcf2580d8b4c33d2 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 292be511d2909c14db3c9ceaffa317f2beee67a0 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index c914a7120c..6a03fc52d7 100644
+index 75d172e06b..5f44af5fa6 100644
@@ -22 +24 @@
-@@ -9123,6 +9123,9 @@ mlx5_flow_tunnel_validate(struct rte_eth_dev *dev,
+@@ -7771,6 +7771,9 @@ mlx5_flow_tunnel_validate(struct rte_eth_dev *dev,