From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 587A4470E5 for ; Thu, 25 Dec 2025 10:26:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5250D40262; Thu, 25 Dec 2025 10:26:37 +0100 (CET) Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010059.outbound.protection.outlook.com [52.101.46.59]) by mails.dpdk.org (Postfix) with ESMTP id DA96B40262 for ; Thu, 25 Dec 2025 10:26:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=D31Xju4/cB5s+JN42QbgXy2ipOJ/EFbQ/taGVpwCInAOJx9mMB1a+sX3F/q4aiEnzuhu34GYOqP3Ff0Nm6I0RD8/3L1mdcJAYHp79GEmKGwV+pqclnSC0x+7rar7JXwHH90ed+I2Y2pyz71oTRlkkZ6sSm0k6Y/Zis5Cwhum8Awu4pgPDk2Rz2pG7tOcWaGcz5OHoOxIxtZiQEzM0f9xLmkTqTaEXgrqeHbnbOtFk23qAMnmMMibcY89egz6ssuQtAdS3XNf2FhgPmANILu3WSIO9f3vxpH/cPBC3L3+Hj+4rmVXg+4OYn7+AxRhZtlVoQ1OoSvag46aGvDWYPh3dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hcLmoAmAMu9WVlEmKoGufF9R+FG2tcgHOpbJwkEyQtU=; b=lBVYBPbQ50VTTNZ3blZNXK0BMWzcmMIt+fyZtlXoy448yk2blZLLilsdPp87/6BUaSp9dUolGygGeXcNKbIWwc1IYsu0HcHvDL6c17nOGo+RuMulo9+pK7LlbJu1vFE/nOY2/svKb5yoaEId61kzxBKkiwMYtcgSL677TkOrlysC4xPhSREDy2mSYFUhnoPQtKmVzDSadmbOmePPHwUu/UwtWHWqCacCzA3lxZIbUYBE46lphdJPltemo3dYh/p9alHyf/xsEy1BS5EqabDBS+tGy4SoonA5tMgudt+rBLLdrrpZgdIexGJ3aS7DvQZNhD22Nn82Lqxnt80fJLxckw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hcLmoAmAMu9WVlEmKoGufF9R+FG2tcgHOpbJwkEyQtU=; b=iXNkl2UAiZLx2qDy6PIfe66YowfU1B+mhhglpgYNPytBjrUuJ/PTNFUjGsl/wTFQcCJ+nHpXCczuqen3/Pt37q0sYxo4R+Gj7HKvzJzQifqh/QJLk4FF6kWi7lPpTl/zTf8LU8Ba1Sfh9/+diPNhG/rigtTlu9N0yjOSsXSCnXMfn/Es3bWHGwn99zx5wQsy3VhiiQGYE58GKmd96s1zlKNiEXPFx1KOnY47M0FV1sciW5uhPD1nXsxKHStoERgMUbde4T3nvlHDmELKliCymSRIouyUKEaWEf3/hM8ByzSdA9rvataWTM9wb2YPhA2JVrMbNq63d1y9ql3hdt+fVw== Received: from DS7PR03CA0259.namprd03.prod.outlook.com (2603:10b6:5:3b3::24) by SA3PR12MB8761.namprd12.prod.outlook.com (2603:10b6:806:312::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:26:31 +0000 Received: from CY4PEPF0000FCC0.namprd03.prod.outlook.com (2603:10b6:5:3b3:cafe::53) by DS7PR03CA0259.outlook.office365.com (2603:10b6:5:3b3::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.11 via Frontend Transport; Thu, 25 Dec 2025 09:26:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000FCC0.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:26:31 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:26:20 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:26:19 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:26:18 -0800 From: Shani Peretz To: Itai Sharoni CC: Bing Zhao , dpdk stable Subject: patch 'net/mlx5/windows: fix match criteria in flow creation' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:57 +0200 Message-ID: <20251225091938.345892-96-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC0:EE_|SA3PR12MB8761:EE_ X-MS-Office365-Filtering-Correlation-Id: cfda521a-3fb7-49e0-55d5-08de4397b082 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?THdpkKfJmcgsA0iEezMvzLatmnMrIOsB4awlPirSdRqgkk0Aivz6VyWLYJ/b?= =?us-ascii?Q?lEeDwrVyY+lYh2TcSQchfgZf/Mri+2lfx3gkKdvkIFOLxDxNsfx7l4MYm8Iv?= =?us-ascii?Q?yGCCk5x7ITeEx1RW5rTLrFksx1tMWGDPAosQr1BFxGIde58ZBx4cbYRTekRG?= =?us-ascii?Q?KRYUNZ96lQMlG0KhT9n/C8P4kLJezfKP/sDp6g0nJHZ0vXcFdJK05t8oEGRR?= =?us-ascii?Q?d5Xh4bAKQbyK/pSx6q6dKvF4Bder6fTtOrKzM8R1WZupivKZ0siZZvW/0j/9?= =?us-ascii?Q?3s3WQ25N8rkk5ib9BrkpvgDzaNM+RMv9153xZN+EEIZ8Z4xocLdaFIQlx+sU?= =?us-ascii?Q?qX1wX1Ypx+sOPZLK1TM28n32xYLivyhFAH6HmCH2OEsx50Z8rSZCI96P6X9U?= =?us-ascii?Q?izBpy8l9vIFSro6P+NDqT+3zC6EVPs2ehgX0X0LdqT5rbfUAntQSB+yH0Lio?= =?us-ascii?Q?8WAAUoR9gRB/FteNchFH9V9X6Gt22olree+pfu6fnTXW346iWJbFUa2KlygB?= =?us-ascii?Q?4XWBYS4bM9GAmEs4b1L93sygaaZ0Ai94PuVjEKQG9xun0rZSR/r4WMqzgGUL?= =?us-ascii?Q?3iXjbHw2fEU/AX6rMcENbokQdyrURfiHiR/DwrkfXwIkPpyVXX2jIxQ/bNI/?= =?us-ascii?Q?UrUo1oYUWqfanjPJj8L23YZWQTijG/AAkpf8MmoG47vnyTMkksH1UV6DZNR5?= =?us-ascii?Q?XkkGOaWq0aQVJE6CgXtHbDwzmGsNpYPLZjdgTpdLScRMFvuO1FxLVovBBbTi?= =?us-ascii?Q?gPCwSsW5cAojY8pqGRHMrI79v3cTJxKlbIB+dOQQ5knUwBi/K6IyiyBprI+V?= =?us-ascii?Q?tYlYhjcE1Qa3mMXAco9owgTYcSLyAyGedgk+CTnLrjkv9hh4dH35D6UsiApT?= =?us-ascii?Q?0h2pvJDOrdkSCtkK1plBzPQCT0pIe/5KD63DMTziLGbASlvIl7kKHgNjCfIK?= =?us-ascii?Q?20f3NND6Jbpy6jBsCTYFIPrhRUj0QkYmZ+9KAZlcLnEcdLgdGPTe+nrGdI69?= =?us-ascii?Q?nRXoQKxHtDzHH3z1e5QDM9u/RJAZ0yLKDQVhHq4E9kidulNtJCn3Uf8pO1xG?= =?us-ascii?Q?ThYglPABINhgnVWFsyEvU7M2IFyiOggbBWdRX3chMpysUVtan0SC5TngAR9c?= =?us-ascii?Q?9skm2GsBGUZdmlUBrKmvYmi+6W3xyjMaYJen7Y4e4ZZWEqLC5ttJ2+ulAzzF?= =?us-ascii?Q?E4FKve5RHYsUWSFiv90QMB3596tga2ZdUrFDpNofKCqIQTXA0VlUWLhWNW8z?= =?us-ascii?Q?PjFpYkfxAJmwIpZ5c58oKTDjJ+kJ1lC0GWH3YAa30yNec9yK0wLXqv37h3wY?= =?us-ascii?Q?Zo/DYwTGiEm+HAjCK4IXpoCt8shwNcOYxdJ6Tt69ORFWFlZbT2XtyT2/03K4?= =?us-ascii?Q?VcgTBT9AQWcM+8XjokJGRikBNfVQRx5sDMnQTcJr7ZKYu0M6d10dY0Eo6yjE?= =?us-ascii?Q?niesuWDP7suAGJib3ONKrObvBKWJERxpJJ+mOK5JvQYsNIi4CwxJ/E08KH55?= =?us-ascii?Q?KN+kAAbAQjtT2Pbm9K3LueDK3CNmvOPYhBUlDxqYRAF0GCxelhZLtVJOWjPo?= =?us-ascii?Q?sXrrmbo2aKJdAd3BYWg=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:26:31.2076 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfda521a-3fb7-49e0-55d5-08de4397b082 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC0.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8761 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/30/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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/d5ede0257aa86c164fac355a4af2be2ff9a2d827 Thanks. Shani --- >From d5ede0257aa86c164fac355a4af2be2ff9a2d827 Mon Sep 17 00:00:00 2001 From: Itai Sharoni 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 Acked-by: Bing Zhao --- .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 5298e5dd6a..96b7809f89 100644 --- a/.mailmap +++ b/.mailmap @@ -579,6 +579,7 @@ Ilya V. Matveychikov Ilyes Ben Hamouda Intiyaz Basha Isaac Boukris +Itai Sharoni Itamar Gozlan Itsuro Oda Ivan Boule 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.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:41.366658245 +0200 +++ 0096-net-mlx5-windows-fix-match-criteria-in-flow-creation.patch 2025-12-25 11:16:36.322801000 +0200 @@ -1 +1 @@ -From e0b87fa079b9f35750f4d6fb71a00ab0ca19d170 Mon Sep 17 00:00:00 2001 +From d5ede0257aa86c164fac355a4af2be2ff9a2d827 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e0b87fa079b9f35750f4d6fb71a00ab0ca19d170 ] + @@ -17 +18,0 @@ -Cc: stable@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 5298e5dd6a..96b7809f89 100644 @@ -32 +32,2 @@ -@@ -639,6 +639,7 @@ Ilyes Ben Hamouda +@@ -579,6 +579,7 @@ Ilya V. Matveychikov + Ilyes Ben Hamouda @@ -34 +34,0 @@ - Ioana Ciornei @@ -40,15 +39,0 @@ -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: - @@ -56 +41 @@ -index 7a625fb880..15c6fc5613 100644 +index f907b21ecc..57b3cbffb2 100644 @@ -72 +57 @@ -index 2cd4e95325..c087bca4be 100644 +index 856d8ba948..17e5a27e3a 100644