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 4FA0748B69 for ; Fri, 21 Nov 2025 12:24:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4827A402E0; Fri, 21 Nov 2025 12:24:57 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 3462B402EF for ; Fri, 21 Nov 2025 12:24:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vUUSwbbxNoYUT388nPw4b2EhLYfP34mAAPIhG/gjegM=; b=Ze5/npcRojBI/Wt4TesWE0TsPZKtVxmpD1Zp6Vd1gOutFWd8RVNT2ik5xKjaq8jbvKRsKd dwlhuwMqI84Rc9Y9SVPBDPyQNr0YNUUqe9xESX0y88FxibUSp8dOMVyGg4O3kEoXLmqDuI Bmcoe62ldCPUJngeY52ZJfglTnpgJlo= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-388-YTc47gHZOCiuNnhPGlr-uw-1; Fri, 21 Nov 2025 06:24:54 -0500 X-MC-Unique: YTc47gHZOCiuNnhPGlr-uw-1 X-Mimecast-MFC-AGG-ID: YTc47gHZOCiuNnhPGlr-uw_1763724293 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 773A2195608D; Fri, 21 Nov 2025 11:24:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C85CF30044DB; Fri, 21 Nov 2025 11:24:51 +0000 (UTC) From: Kevin Traynor 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 24.11.4 Date: Fri, 21 Nov 2025 11:21:21 +0000 Message-ID: <20251121112128.485623-97-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: x18hV7qf8Y-KAgrl84Fc4CLK-Gh0jDpVfF3LskCdfvE_1763724293 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 11/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/21276ae4916a85e3b14c88cbd57b3b4283ccf16b Thanks. Kevin --- >From 21276ae4916a85e3b14c88cbd57b3b4283ccf16b 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 723b168e04..f48a6a0462 100644 --- a/.mailmap +++ b/.mailmap @@ -612,4 +612,5 @@ Ilyes Ben Hamouda Intiyaz Basha Isaac Boukris +Itai Sharoni Itamar Gozlan Itsuro Oda diff --git a/drivers/net/mlx5/windows/mlx5_flow_os.c b/drivers/net/mlx5/windows/mlx5_flow_os.c index 7a625fb880..15c6fc5613 100644 --- a/drivers/net/mlx5/windows/mlx5_flow_os.c +++ b/drivers/net/mlx5/windows/mlx5_flow_os.c @@ -220,7 +220,7 @@ mlx5_flow_os_create_flow(void *matcher, void *match_value, 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 2cd4e95325..c087bca4be 100644 --- a/drivers/net/mlx5/windows/mlx5_flow_os.h +++ b/drivers/net/mlx5/windows/mlx5_flow_os.h @@ -48,4 +48,5 @@ mlx5_flow_os_item_supported(int item) case RTE_FLOW_ITEM_TYPE_VLAN: case RTE_FLOW_ITEM_TYPE_ESP: + case RTE_FLOW_ITEM_TYPE_NVGRE: return true; default: -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:12.605731015 +0000 +++ 0097-net-mlx5-windows-fix-match-criteria-in-flow-creation.patch 2025-11-21 11:05:09.656201992 +0000 @@ -1 +1 @@ -From e0b87fa079b9f35750f4d6fb71a00ab0ca19d170 Mon Sep 17 00:00:00 2001 +From 21276ae4916a85e3b14c88cbd57b3b4283ccf16b 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 723b168e04..f48a6a0462 100644 @@ -32,2 +32,2 @@ -@@ -640,4 +640,5 @@ Intiyaz Basha - Ioana Ciornei +@@ -612,4 +612,5 @@ Ilyes Ben Hamouda + Intiyaz Basha @@ -38,13 +37,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 -@@ -1232,4 +1232,8 @@ On Windows, the features are limited: - - L4 steering rules for port RSS of IP, UDP, TCP - -+- Tunnel protocol support: -+ -+ - NVGRE (requires DevX dynamic insertion mode) -+ - - .. _mlx5_multiproc: