patch 'net/mlx5: fix GRE matching on root table' has been queued to stable release 23.11.4

[Xueming Li <xuemingl@nvidia.com>]

Hi,

FYI, your patch has been queued to stable release 23.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 04/10/25. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d73bb7acd41e6cef0d2263e8e2bac1dad3478a83

Thanks.

Xueming Li <xuemingl@nvidia.com>

---
From d73bb7acd41e6cef0d2263e8e2bac1dad3478a83 Mon Sep 17 00:00:00 2001
From: Maayan Kashani <mkashani@nvidia.com>
Date: Wed, 12 Mar 2025 13:23:48 +0200
Subject: [PATCH] net/mlx5: fix GRE matching on root table
Cc: Xueming Li <xuemingl@nvidia.com>

[ upstream commit 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 ]

The current implementation sets a gre mask with protocol masked in
case the user did not supply the protocol mask.

In template mode, for group 0, the gre translation was called
once with the mask and later with the value.
with gre open matcher(mask/value is null) default values were assigned
gre protocol mask=0xffff and gre protocol value=0.

Therefore gre packet with protocol value not equal zero,
will not match the rule.
Changed the default protocol mask to be zero instead of 0xffff.

In case of empty gre match,
this fix will ignore the protocol field matching,
gre will only be matched by the IP next header field in
previous header in packet.

Fixes: 25ab2cbba31d ("net/mlx5: fix GRE flow item translation for root table")

Signed-off-by: Maayan Kashani <mkashani@nvidia.com>
Acked-by: Bing Zhao <bingz@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 1caec52ceb..43889e8625 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9491,7 +9491,7 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,
 	/* HWS mask logic only */
 	if (key_type & MLX5_SET_MATCHER_HS_M) {
 		if (!gre_m)
-			gre_m = &rte_flow_item_gre_mask;
+			gre_m = &empty_gre;
 		gre_v = gre_m;
 	} else if (!gre_v) {
 		gre_v = &empty_gre;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-04-08 15:39:07.148577286 +0800
+++ 0042-net-mlx5-fix-GRE-matching-on-root-table.patch	2025-04-08 15:39:06.036436546 +0800
@@ -1 +1 @@
-From 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 Mon Sep 17 00:00:00 2001
+From d73bb7acd41e6cef0d2263e8e2bac1dad3478a83 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 ]
@@ -24 +26,0 @@
-Cc: stable@dpdk.org
@@ -33 +35 @@
-index 8703403b8f..608c42db1d 100644
+index 1caec52ceb..43889e8625 100644
@@ -36 +38 @@
-@@ -9856,7 +9856,7 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,
+@@ -9491,7 +9491,7 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,