patch 'net/mlx5/windows: fix match criteria in flow creation' has been queued to stable release 22.11.11

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.11

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/22/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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/705a9d081dd0025bc886784481a14924349ddd95

Thanks.

Luca Boccassi

---
>From 705a9d081dd0025bc886784481a14924349ddd95 Mon Sep 17 00:00:00 2001
From: Itai Sharoni <isharoni at nvidia.com>
Date: Mon, 17 Nov 2025 10:45:00 +0200
Subject: [PATCH] net/mlx5/windows: fix match criteria in flow creation

[ upstream commit e0b87fa079b9f35750f4d6fb71a00ab0ca19d170 ]

Currently the Windows implementation hardcodes match criteria to
MLX5_MATCH_OUTER_HEADERS when creating flow rules, which prevents
matching on inner headers and other criteria types like NVGRE.

The fix uses the matcher's match_criteria_enable attribute instead
of hardcoding OUTER_HEADERS, and moves the assignment outside the
action switch block to apply to all cases.

NVGRE item type is also added to the supported items list.

Fixes: 1d194496b9d1 ("net/mlx5: create flow rule on Windows")

Signed-off-by: Itai Sharoni <isharoni at nvidia.com>
Acked-by: Bing Zhao <bingz at nvidia.com>
---
 .mailmap                                | 1 +
 drivers/net/mlx5/windows/mlx5_flow_os.c | 4 ++--
 drivers/net/mlx5/windows/mlx5_flow_os.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index e831062a09..1851ddecab 100644
--- a/.mailmap
+++ b/.mailmap
@@ -558,6 +558,7 @@ Ilya V. Matveychikov <matvejchikov at gmail.com>
 Ilyes Ben Hamouda <ilyes.ben_hamouda at 6wind.com>
 Intiyaz Basha <intiyaz.basha at caviumnetworks.com>
 Isaac Boukris <iboukris at gmail.com>
+Itai Sharoni <isharoni at nvidia.com>
 Itsuro Oda <oda at valinux.co.jp>
 Ivan Boule <ivan.boule at 6wind.com>
 Ivan Dyukov <i.dyukov at samsung.com>
diff --git a/drivers/net/mlx5/windows/mlx5_flow_os.c b/drivers/net/mlx5/windows/mlx5_flow_os.c
index f907b21ecc..57b3cbffb2 100644
--- a/drivers/net/mlx5/windows/mlx5_flow_os.c
+++ b/drivers/net/mlx5/windows/mlx5_flow_os.c
@@ -219,9 +219,9 @@ mlx5_flow_os_create_flow(void *matcher, void *match_value,
 		default:
 			break;
 		}
-		MLX5_SET(devx_fs_rule_add_in, in, match_criteria_enable,
-			 MLX5_MATCH_OUTER_HEADERS);
 	}
+	MLX5_SET(devx_fs_rule_add_in, in, match_criteria_enable,
+		mlx5_matcher->attr.match_criteria_enable);
 	*flow = mlx5_glue->devx_fs_rule_add(mlx5_matcher->ctx, in, sizeof(in));
 	return (*flow) ? 0 : -1;
 }
diff --git a/drivers/net/mlx5/windows/mlx5_flow_os.h b/drivers/net/mlx5/windows/mlx5_flow_os.h
index 856d8ba948..17e5a27e3a 100644
--- a/drivers/net/mlx5/windows/mlx5_flow_os.h
+++ b/drivers/net/mlx5/windows/mlx5_flow_os.h
@@ -47,6 +47,7 @@ mlx5_flow_os_item_supported(int item)
 	case RTE_FLOW_ITEM_TYPE_IPV6:
 	case RTE_FLOW_ITEM_TYPE_VLAN:
 	case RTE_FLOW_ITEM_TYPE_ESP:
+	case RTE_FLOW_ITEM_TYPE_NVGRE:
 		return true;
 	default:
 		return false;
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-20 12:44:13.392703841 +0000
+++ 0017-net-mlx5-windows-fix-match-criteria-in-flow-creation.patch	2025-11-20 12:44:12.794088369 +0000
@@ -1 +1 @@
-From e0b87fa079b9f35750f4d6fb71a00ab0ca19d170 Mon Sep 17 00:00:00 2001
+From 705a9d081dd0025bc886784481a14924349ddd95 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e0b87fa079b9f35750f4d6fb71a00ab0ca19d170 ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -23 +23,0 @@
- doc/guides/nics/mlx5.rst                | 4 ++++
@@ -26 +26 @@
- 4 files changed, 8 insertions(+), 2 deletions(-)
+ 3 files changed, 4 insertions(+), 2 deletions(-)
@@ -29 +29 @@
-index efc66fd48c..2f089326ff 100644
+index e831062a09..1851ddecab 100644
@@ -32 +32,2 @@
-@@ -639,6 +639,7 @@ Ilyes Ben Hamouda <ilyes.ben_hamouda at 6wind.com>
+@@ -558,6 +558,7 @@ Ilya V. Matveychikov <matvejchikov at gmail.com>
+ Ilyes Ben Hamouda <ilyes.ben_hamouda at 6wind.com>
@@ -34 +34,0 @@
- Ioana Ciornei <ioana.ciornei at nxp.com>
@@ -37 +36,0 @@
- Itamar Gozlan <igozlan at nvidia.com>
@@ -40,15 +39 @@
-diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
-index 2cf95578de..51d7637fba 100644
---- a/doc/guides/nics/mlx5.rst
-+++ b/doc/guides/nics/mlx5.rst
-@@ -1231,6 +1231,10 @@ On Windows, the features are limited:
-   - IPv4/TCP with CVLAN filtering
-   - L4 steering rules for port RSS of IP, UDP, TCP
- 
-+- Tunnel protocol support:
-+
-+  - NVGRE (requires DevX dynamic insertion mode)
-+
- 
- .. _mlx5_multiproc:
- 
+ Ivan Dyukov <i.dyukov at samsung.com>
@@ -56 +41 @@
-index 7a625fb880..15c6fc5613 100644
+index f907b21ecc..57b3cbffb2 100644
@@ -72 +57 @@
-index 2cd4e95325..c087bca4be 100644
+index 856d8ba948..17e5a27e3a 100644