[dpdk-stable] patch 'net/mlx5: fix flow match on GRE key' 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/29/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 d8858ade2807f6a34397c4ec211a1a78053d0035 Mon Sep 17 00:00:00 2001
From: Matan Azrad <matan at mellanox.com>
Date: Tue, 18 Feb 2020 14:45:20 +0000
Subject: [PATCH] net/mlx5: fix flow match on GRE key

[ upstream commit 38ad946892830c9fb5f8fe221bf677ee8e9bc819 ]

The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should
be present on the flow and in addition can explicitly match on the GRE
key field itself.

When no value is set in this item any GRE key should match the flow.

The match on GRE key wrongly was not added if the item fields are NULL
while at least the GRE key should be present in the flow.

Add the GRE key present match when RTE_FLOW_ITEM_TYPE_GRE_KEY is in
the flow item list.

Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits")

Signed-off-by: Matan Azrad <matan at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7b5471b54a..f3d9ae5bc4 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -5372,13 +5372,13 @@ flow_dv_translate_item_gre_key(void *matcher, void *key,
 	void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
 	rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);
 
-	if (!key_v)
-		return;
-	if (!key_m)
-		key_m = &gre_key_default_mask;
 	/* GRE K bit must be on and should already be validated */
 	MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1);
 	MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1);
+	if (!key_v)
+		return;
+	if (!key_m)
+		key_m = &gre_key_default_mask;
 	MLX5_SET(fte_match_set_misc, misc_m, gre_key_h,
 		 rte_be_to_cpu_32(*key_m) >> 8);
 	MLX5_SET(fte_match_set_misc, misc_v, gre_key_h,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.359803386 +0000
+++ 0016-net-mlx5-fix-flow-match-on-GRE-key.patch	2020-02-27 09:31:55.719945756 +0000
@@ -1,8 +1,10 @@
-From 38ad946892830c9fb5f8fe221bf677ee8e9bc819 Mon Sep 17 00:00:00 2001
+From d8858ade2807f6a34397c4ec211a1a78053d0035 Mon Sep 17 00:00:00 2001
 From: Matan Azrad <matan at mellanox.com>
 Date: Tue, 18 Feb 2020 14:45:20 +0000
 Subject: [PATCH] net/mlx5: fix flow match on GRE key
 
+[ upstream commit 38ad946892830c9fb5f8fe221bf677ee8e9bc819 ]
+
 The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should
 be present on the flow and in addition can explicitly match on the GRE
 key field itself.
@@ -16,7 +18,6 @@
 the flow item list.
 
 Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits")
-Cc: stable at dpdk.org
 
 Signed-off-by: Matan Azrad <matan at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -25,10 +26,10 @@
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index 1c01269117..467d1ce6b1 100644
+index 7b5471b54a..f3d9ae5bc4 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -5594,13 +5594,13 @@ flow_dv_translate_item_gre_key(void *matcher, void *key,
+@@ -5372,13 +5372,13 @@ flow_dv_translate_item_gre_key(void *matcher, void *key,
  	void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
  	rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);