[dpdk-stable] patch 'app/testpmd: add 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/94d1b9ecfce815c0279cb943baefa7ea7e800b01

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 94d1b9ecfce815c0279cb943baefa7ea7e800b01 Mon Sep 17 00:00:00 2001
From: Eli Britstein <elibr at nvidia.com>
Date: Thu, 23 Sep 2021 11:43:00 +0300
Subject: [PATCH] app/testpmd: add tunnel types
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit ad6a8a20cb6be078575c7dab579877ab51c3cb4b ]

Current testpmd implementation supports VXLAN only for tunnel offload.
Add GRE, NVGRE and GENEVE for tunnel offload flow matches.

For example:
testpmd> flow tunnel create 0 type vxlan
port 0: flow tunnel #1 type vxlan
testpmd> flow tunnel create 0 type nvgre
port 0: flow tunnel #2 type nvgre
testpmd> flow tunnel create 0 type gre
port 0: flow tunnel #3 type gre
testpmd> flow tunnel create 0 type geneve
port 0: flow tunnel #4 type geneve

Fixes: 1b9f274623b8 ("app/testpmd: add commands for tunnel offload")

Signed-off-by: Eli Britstein <elibr at nvidia.com>
Reviewed-by: Gregory Etelson <getelson at nvidia.com>
---
 app/test-pmd/config.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 4847c36481..11369ca2c2 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1473,6 +1473,15 @@ port_flow_tunnel_type(struct rte_flow_tunnel *tunnel)
 	case RTE_FLOW_ITEM_TYPE_VXLAN:
 		type = "vxlan";
 		break;
+	case RTE_FLOW_ITEM_TYPE_GRE:
+		type = "gre";
+		break;
+	case RTE_FLOW_ITEM_TYPE_NVGRE:
+		type = "nvgre";
+		break;
+	case RTE_FLOW_ITEM_TYPE_GENEVE:
+		type = "geneve";
+		break;
 	}
 
 	return type;
@@ -1533,6 +1542,12 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops)
 
 	if (!strcmp(ops->type, "vxlan"))
 		type = RTE_FLOW_ITEM_TYPE_VXLAN;
+	else if (!strcmp(ops->type, "gre"))
+		type = RTE_FLOW_ITEM_TYPE_GRE;
+	else if (!strcmp(ops->type, "nvgre"))
+		type = RTE_FLOW_ITEM_TYPE_NVGRE;
+	else if (!strcmp(ops->type, "geneve"))
+		type = RTE_FLOW_ITEM_TYPE_GENEVE;
 	else {
 		printf("cannot offload \"%s\" tunnel type\n", ops->type);
 		return;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:09.173654598 +0800
+++ 0163-app-testpmd-add-tunnel-types.patch	2021-11-10 14:17:01.970745273 +0800
@@ -1 +1 @@
-From ad6a8a20cb6be078575c7dab579877ab51c3cb4b Mon Sep 17 00:00:00 2001
+From 94d1b9ecfce815c0279cb943baefa7ea7e800b01 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ad6a8a20cb6be078575c7dab579877ab51c3cb4b ]
@@ -20 +22,0 @@
-Cc: stable at dpdk.org
@@ -29 +31 @@
-index bdcd826490..23aa334cda 100644
+index 4847c36481..11369ca2c2 100644
@@ -32 +34 @@
-@@ -1249,6 +1249,15 @@ port_flow_tunnel_type(struct rte_flow_tunnel *tunnel)
+@@ -1473,6 +1473,15 @@ port_flow_tunnel_type(struct rte_flow_tunnel *tunnel)
@@ -48 +50 @@
-@@ -1309,6 +1318,12 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops)
+@@ -1533,6 +1542,12 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops)
@@ -59,2 +61,2 @@
- 		fprintf(stderr, "cannot offload \"%s\" tunnel type\n",
- 			ops->type);
+ 		printf("cannot offload \"%s\" tunnel type\n", ops->type);
+ 		return;