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 2C0D848B59 for ; Thu, 20 Nov 2025 13:46:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2191640262; Thu, 20 Nov 2025 13:46:09 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 3AF87402DC for ; Thu, 20 Nov 2025 13:46:07 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-477ba2c1ca2so6591375e9.2 for ; Thu, 20 Nov 2025 04:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763642767; x=1764247567; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5NhDMZqgNd4UFo/2ppTZIqXlkO12nQdfHpiEyTZvjd0=; b=kq6Kok42wA9fJk+nWj1oX8I9AO0XpIjC8szxdQr4nAxQy3RUbUlwqQ7NHyYgjsuLLk 2lK4jjzHKVdbeOcBh0i8c/ip/fnHypJU/rELHt9pM3Szrs8FEqpTCIomsrMqVqipLRdK RzxLhRiYMZJbhiJDyv6tPzyjPFA5goXUb1slJWwaf/IW1KYxYfNUzI3yhMJ5/OpSxeTa f2xO44IF2xcmEIG5NX66DQSPZcqN6UXMVb1UyuTvTf3tPN0haeeYlb4cIKvrcaOsU2AN 3U3ZIdpAA0StDOsTisRZteV3rjkH296vILNNuCKiUCtFNuQ7Kbw/Y+AoZBLPTfd5ilIj aaAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763642767; x=1764247567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5NhDMZqgNd4UFo/2ppTZIqXlkO12nQdfHpiEyTZvjd0=; b=RlK45WKO1DdBjjW5x9gQqlRhbRpC4e8MiTZJ3fliTzijfau+QF8O+KKLLahL5SaOB5 vEq8WyhbS3l8pWipmtKEdvBgTEWuG4z95M/C30kazD5SIQ/6yQLFsbRKUudI6Yv30L4Q E71n7GxbsozAGwOXc3YzGT56pG/5YTenvkyGAqL/XdQPBhL0q/TdWJvC5MmZB1UPe3P5 xGMEmEnRxKz762FVQMCeqr2GUaJEWaxzT+vcpOyI21TNNeU2jgi2Sa6ny/MKqgH4TMp3 veq9eD7fM2PEyvpV9kVLnFseY4wPjVNqssAmLAEz3C6I5mHk6Be6RDFlTtErRGK78UoR YzEg== X-Forwarded-Encrypted: i=1; AJvYcCU8kiUCGLzbYPUz75ZVlYVYckxn608O2hLbkDE5f7QyEaZ4NPcRUaY5vDvCLGkPXPXauXLj2DE=@dpdk.org X-Gm-Message-State: AOJu0YxEtCMET+kkLw3y0he3eNPH/GsUfwVlTib7fnquByGpUotB7THb CzFsG2rNOIOiZDYNiDb2UGyJioqCoH2UuYJGeIk26Qvai+YFJ6nv8P9uRwTUKG71 X-Gm-Gg: ASbGnctbQuQBNSts4JMpdaXSJZ+nlL19PqcXyGVbIGPDSLQL46cM2U3F+oW2LKb1BiS 64JGXoC62DphNQZFrOgWmnj4qGj3ITZFE+1iOc33wiw734SvH0vlz1ryYSIavEsv2tfM7LMO8Sq gkjZA/5JDflvFj99j8rYBuycn1W6WdS1vly9r3marswafsDDWbF0cYPb1mmtnTFToYpA21idorD EBW/TFI2DvkLhfgfmtnR9FENH6AVglhgQnszjfSGPINvIetsBKDvIDbDc0FGel64Cmkmeq5lN8F 2Fsp32KlRAl18QJ0bmSvwlaZfuXj1AhYAajuZODrK5nGgem9EdwjG9mUX7qEIFajugbuYhZxLwn rGb7Gg4eQMfe1+yyrcPcc+HDrqwyng56SrCHqMirLtf8G5EKJHdq/SqGU1ow4vfp8Km0A7dTfLS TyhIin2l3ET+ftI43H X-Google-Smtp-Source: AGHT+IE30LSD/6jskj+MsX4biQRTdxxTCyZf+g9RlhfIQaR2P1flZTDC3Tj4PBGFGOw+nEHLDbtkDQ== X-Received: by 2002:a05:600c:c4b7:b0:476:4efc:8ed4 with SMTP id 5b1f17b1804b1-477b8a5100cmr25073295e9.11.1763642766648; Thu, 20 Nov 2025 04:46:06 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f372:8d1a:399f:e8a2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-477b1013edcsm103284945e9.4.2025.11.20.04.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 04:46:06 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.11 Date: Thu, 20 Nov 2025 12:44:49 +0000 Message-ID: <20251120124514.757933-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120124514.757933-1-luca.boccassi@gmail.com> References: <20251112165308.1618107-49-luca.boccassi@gmail.com> <20251120124514.757933-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 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 e831062a09..1851ddecab 100644 --- a/.mailmap +++ b/.mailmap @@ -558,6 +558,7 @@ Ilya V. Matveychikov Ilyes Ben Hamouda Intiyaz Basha Isaac Boukris +Itai Sharoni Itsuro Oda Ivan Boule Ivan Dyukov 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@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 +@@ -558,6 +558,7 @@ Ilya V. Matveychikov + Ilyes Ben Hamouda @@ -34 +34,0 @@ - Ioana Ciornei @@ -37 +36,0 @@ - Itamar Gozlan @@ -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 @@ -56 +41 @@ -index 7a625fb880..15c6fc5613 100644 +index f907b21ecc..57b3cbffb2 100644 @@ -72 +57 @@ -index 2cd4e95325..c087bca4be 100644 +index 856d8ba948..17e5a27e3a 100644