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 ED9A746532 for ; Tue, 8 Apr 2025 10:12:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6BB040A89; Tue, 8 Apr 2025 10:12:24 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2055.outbound.protection.outlook.com [40.107.236.55]) by mails.dpdk.org (Postfix) with ESMTP id 2CEE940E4C for ; Tue, 8 Apr 2025 10:12:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TtZOpn+ws4jAISy6d4CQCpIC21L6gGrSjYjQM4mvG1W08e6CyQ+rNpsyoTSPjdVrp0a0OacBiOCug/25MqwXTDtIo4p5d+qW2Rt79ONov6kZPdsU9YdVXem4X2qHvwbf9sP8x9t93oRg9GH+PG/rYvmkFAFRCeBRwKVQb9xWOHEf1pfGuHxhYQXPqzUgDQMx3nCS0F4OX1pJtUMasyDg0uu32eFDyb3pgYezUI1Q+g2q3i4lwjvbbmJhoaakkzOJiLjldGykgmsVuS7lN+Sbjldl5RI2UufbuZPmmwBEtyfUkyVroAEyD7g0yQq71YVLjnEjNVVpDGeTrRIWnCwnFA== 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=hLCfnrW5RVdePdYfr2Dy4NnVOrNaV82P6WlWCAwWH5k=; b=vho7AUjNJTWarGdR1EDku1ViZD8vhDKAagb2DSL2dRkhAHIynl7tHWJ/0HLX2S1/F1a7VTd/jMmxqn65k4F6Te7w1a7qqFXpXYLGkTopubH1eXu0J3Xmu4tGOitykCBtJ0ZHOh75xRLbosUfvfHsCkRSrK8mwTmVv7WrikF/rWVLCVyMc/cmPl2kjMGtKrxTX1glYOs6jS01X8I2iqk8STm1o+IhJxabX4Lx1qXuwBORrleGlL3zh3bfYP2TukbdiEHc6fvuEggbEXXQH/1jWTWTj7c48xdofxkTc0kreVlNZyNBt7dv2W9ZdhM6pMXFJaNlDUxcf1e6Ofi6TESsnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=hLCfnrW5RVdePdYfr2Dy4NnVOrNaV82P6WlWCAwWH5k=; b=JkgXrQtp4nMNujKwWHGmvjkI8Vy3XHUrvXVn3hHCV4nzFH1kcls+waASkQU8gA0NkIXfMK3wXYHY1Zbl2Rm2K45YlxJbpTm21VopKncKvv9jim7IAPLDYUbex86huDFifIep8XXWaFUwMP6pELEXnNueYcfIl/CxUg+07zuSRyX66EjUzaAEg+h43TL98I8+SVI9JmTArmK4hMTDK3HIhfkhT2ft3/HXxgrSCp5aCBJ1PoZ5R4E3YujIAQMxflJDIeIqBOEDbRkgJDBRxS9k3vgTUQT/0ljmdOjuV+OQzQ6Zg7sIDQUeKBAyRREttS4HzzCd8tsa5Pwylr2+UctxQw== Received: from BN1PR10CA0009.namprd10.prod.outlook.com (2603:10b6:408:e0::14) by CY8PR12MB8315.namprd12.prod.outlook.com (2603:10b6:930:7e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Tue, 8 Apr 2025 08:12:18 +0000 Received: from BN1PEPF00004688.namprd05.prod.outlook.com (2603:10b6:408:e0:cafe::f0) by BN1PR10CA0009.outlook.office365.com (2603:10b6:408:e0::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.35 via Frontend Transport; Tue, 8 Apr 2025 08:12:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004688.mail.protection.outlook.com (10.167.243.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.13 via Frontend Transport; Tue, 8 Apr 2025 08:12:18 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 8 Apr 2025 01:12:04 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 8 Apr 2025 01:12:02 -0700 From: Xueming Li To: Maayan Kashani CC: Xueming Li , Bing Zhao , "dpdk stable" Subject: patch 'net/mlx5: fix GRE matching on root table' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:10:46 +0800 Message-ID: <20250408081054.375502-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408081054.375502-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408081054.375502-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004688:EE_|CY8PR12MB8315:EE_ X-MS-Office365-Filtering-Correlation-Id: f76954e9-3738-483e-c7f0-08dd76751471 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ei06VHitSlo/AZHmLrYR2mwaU7Bg60zHsisGTEuo5+l1NrA2emYcagMR5rrt?= =?us-ascii?Q?wAP0ljCOkZJ3r3Dg4Dbyb5vAziq1kg63wyl/ODOfx1sQYmJhW9ycYvxiCWf2?= =?us-ascii?Q?n/YRDYXt7ybeilN3lza6/WZrYTgxUhJTTvIp33vHUUDerPuCsUvTxvuqB2sp?= =?us-ascii?Q?i+ZRDtf3m8vHj21ItXeb8fjMh2BDx1btN+nEy1nuHiKFuwNu7I9NOUB2SVhd?= =?us-ascii?Q?6tky9khGRDF/jWx+mA0FkC4/rwdd+Q5djRsxZS/srWKPjx87yFI6vh6MIXca?= =?us-ascii?Q?3elTtmCUjOv4q6iqo0TNMLlPTEwb4H1lQ52+8pjEGv80ozfNdGuzTghwSxc3?= =?us-ascii?Q?bjcfYljpNPxoruxT3oZxw7B+rYdyum67zkStD5cZZZg/4h/3UZXRyJFeCb3O?= =?us-ascii?Q?nlK6TN8SbdiiPq5PivisYkW/MHmA2HQviRHYL41tm0Ev5XuYDqU/5fpn5qfz?= =?us-ascii?Q?5GqccX8pmCgmpaLlZ9C4kSh++1e1hSGc7b1zZqtWTUd6aMe/PQInjwWaZms6?= =?us-ascii?Q?f+oGhtzrPojBWpYfAVQyRg02uBuso7R2WjH0+O0afrLR3iE/IQLuDWUJjBUe?= =?us-ascii?Q?bIAabv8Xsgv16Us4OD5ZHMJBCf9qUbHRVEPdpqXROau29p7Dph7NLAmFKSE1?= =?us-ascii?Q?QHD87rYsuCSh4L1NelwHju1X8ptcs78a74prRQyWhMILcijzp1LAoG4wOijU?= =?us-ascii?Q?X+NhN1vwYyOIAl8vQpIqRmb2VbxU858vA/GEHby0HoPsPtYV19cnXlfD0cAL?= =?us-ascii?Q?qDLo2S4oM+nZAUov3nWsaFuwIbrhiPC2zjpbgf4aOkX/6Z2PPDkEKWsmgtKN?= =?us-ascii?Q?Wmi1sRGid96rB1zg8tFEKhzmu5xLewMr8EcXF76Vcb3jMImfWZypF+QEiNNT?= =?us-ascii?Q?qcItyymHPp6H5BoXG3Bt92eWUyFXXFfxpolFKIVUFL3VTe7Z0u++wABTT9MB?= =?us-ascii?Q?3gCLN2zkPebcjSCO1e96ytBusqLEKIZoEAkRDKokGOdN07zTvpLkgkHWHjl/?= =?us-ascii?Q?vCBzEv6B/mQ5hgoVn+q6zNT5qGE1NZ5h72SRvGW5rPvUZexcIDD5G2PV2GU7?= =?us-ascii?Q?1qlFA+0cU07BGU5BC0rZeuSa4+Xesh/un5BqQCz2gdp45ERpcTqlZEIgFRko?= =?us-ascii?Q?RJscFgTbfcwid4uuS/I4RVTAqlunPSfE6yo5ctTLFa5EWcJG2XryqrPN0jfy?= =?us-ascii?Q?8ikMJmyAej0tr28iA0Ef+U3jHjlSVB6pxPVzM1rQGAzjHHcVHuri4vHGZTcN?= =?us-ascii?Q?BqTAmvsx6iZvJjjYcNhEJ8g7GUf1qggjpfUq8FWOB6ksQl/4wNDFXpstjpfe?= =?us-ascii?Q?wCeDJskpW0oTM0xeq/EQ9/gW1YTPJDkrDqHQN+P2jAP6+BE37qAqs2U7xe2M?= =?us-ascii?Q?CMnfibmPWcRFES63Cjy8cc2/gUPYWV3gdHrzH6WVFbCMvi4S5qFZNhOoHmJ2?= =?us-ascii?Q?rcOV842dfnO1kVULagBekfbGmKd5Bdh5TusRZV6v8lcWAkLfFjHJy1An24Qp?= =?us-ascii?Q?aKO6MGBs1nhX0ts=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:12:18.0924 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f76954e9-3738-483e-c7f0-08dd76751471 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004688.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8315 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.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 --- >From d73bb7acd41e6cef0d2263e8e2bac1dad3478a83 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Wed, 12 Mar 2025 13:23:48 +0200 Subject: [PATCH] net/mlx5: fix GRE matching on root table Cc: Xueming Li [ 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 Acked-by: Bing Zhao --- 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 + +[ 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,