[dpdk-stable] patch 'app/testpmd: fix GENEVE flow item' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. 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.

Thanks.

Luca Boccassi

---
>From 44ff767e7aee732809944763c205e2252bab9ba4 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 8 Jan 2020 17:07:02 +0200
Subject: [PATCH] app/testpmd: fix GENEVE flow item

[ upstream commit dcd05da0aed1674263918b3b25b987c7bc99da88 ]

Previous patch added support of GENEVE pattern item in flow rule.
Function flow_item_default_mask() was not updated, so using it with
GENEVE item returns null.
Using testpmd command "set raw_decap" or "set raw_encap" with
GENEVE item, without specifying any parameters, results in
segmentation fault.

This patch updates function flow_item_default_mask(),
adding case to handle GENEVE item.

Fixes: 0f4203fe9d18 ("app/testpmd: support GENEVE pattern item in flow rules")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 app/test-pmd/cmdline_flow.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 99dade7d8c..3cf05b5072 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -6236,6 +6236,9 @@ flow_item_default_mask(const struct rte_flow_item *item)
 	case RTE_FLOW_ITEM_TYPE_GTP_PSC:
 		mask = &rte_flow_item_gtp_psc_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_GENEVE:
+		mask = &rte_flow_item_geneve_mask;
+		break;
 	case RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID:
 		mask = &rte_flow_item_pppoe_proto_id_mask;
 	default:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:41.654768381 +0000
+++ 0077-app-testpmd-fix-GENEVE-flow-item.patch	2020-02-11 11:17:38.504003291 +0000
@@ -1,8 +1,10 @@
-From dcd05da0aed1674263918b3b25b987c7bc99da88 Mon Sep 17 00:00:00 2001
+From 44ff767e7aee732809944763c205e2252bab9ba4 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 8 Jan 2020 17:07:02 +0200
 Subject: [PATCH] app/testpmd: fix GENEVE flow item
 
+[ upstream commit dcd05da0aed1674263918b3b25b987c7bc99da88 ]
+
 Previous patch added support of GENEVE pattern item in flow rule.
 Function flow_item_default_mask() was not updated, so using it with
 GENEVE item returns null.
@@ -14,7 +16,6 @@
 adding case to handle GENEVE item.
 
 Fixes: 0f4203fe9d18 ("app/testpmd: support GENEVE pattern item in flow rules")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -24,10 +25,10 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
-index 77a6141ee3..1240de4efb 100644
+index 99dade7d8c..3cf05b5072 100644
 --- a/app/test-pmd/cmdline_flow.c
 +++ b/app/test-pmd/cmdline_flow.c
-@@ -6286,6 +6286,9 @@ flow_item_default_mask(const struct rte_flow_item *item)
+@@ -6236,6 +6236,9 @@ flow_item_default_mask(const struct rte_flow_item *item)
  	case RTE_FLOW_ITEM_TYPE_GTP_PSC:
  		mask = &rte_flow_item_gtp_psc_mask;
  		break;