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 87BA046C4D for ; Wed, 30 Jul 2025 09:13:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82DE54025E; Wed, 30 Jul 2025 09:13:10 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2070.outbound.protection.outlook.com [40.107.236.70]) by mails.dpdk.org (Postfix) with ESMTP id 521264025E for ; Wed, 30 Jul 2025 09:13:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=V8XXUHtQTwOkaBoMGwKaB3LxcGGslc+nNo/QiAkXOYi7qMaUKzr+AvQFxJmCYyrNzubqkwo3onIRd4HmF5xn9I2xotZMIGv4cjs5rbpeR1D8KR4mD8mi4auEdFJSxbCUy6lCvgS0FMA73EaJVwTVaW4Q84cLaLHYiHskHaEou/a9pYJCeTcVAbLWriOJkStF/W9Ryb9ZUv+m8yxpaW7P7HJ+lcF8Jxi1AB/zRQgZY8eFsthad4+eJ6UTqiMEKGqNfsaL/2tzT8BHyDpB4SPfhdYYZvCGo0DAIF59JrzT2MgMNcAT2oc4aQHhUMvoMD3sCqEo4X4HiXvBhAcb+bLjOQ== 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=DO3xY4tENgpppYZOZqLS5X60nmAluZOnRG27eLFloyE=; b=SiqaFqdWlgA0UeKV7t8VVIbhnFJASweizZr2cqF+o4EbaefWj2WrB1SCn3tnD/mvT7kr041YHYcZgB1lPwnbEG631yCTIDAC3jlTAUobrthPoX9gz760+Sr4ecGW7KoyoVcDEE2EjiS+mN/xPXOU/bAEhLW/fZvILkNJ3oW1I4MOx7T5waG8EvMLfjn+e0svhEbO975OHucEzyjFJN2a2uq26C3erP9l3hR7Iy/L2b9gGNvAKJEqOY7jMyPZR4vXCeVnHrZ9vBCdlR1QRUzDA1WdKOF9S1ZLSqRZ3N9DkzDy0o1g3yegMDY+bU4YKsXyqtEECdjCra/Lo9raGKH0pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.com 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=DO3xY4tENgpppYZOZqLS5X60nmAluZOnRG27eLFloyE=; b=S3WGFad8jN1WGgRy3RMPnyuKsi0JiX3CXeB/DooT2ARnQWzmCjag/uotvo3DvdyCVd99VvUghDqKS4pBeNqjFRVJ5C9fZDa3Cg1edk/4jPEOhlbLa7QIVlHTUn1L4lJ2ju6d9HQ+FrMQbo1DN1wYZ/Ul5nxhznecdvuca5j5As88eExf/v16gN5AV1/E31ZxWGXM5iVhr90Uhj21lglVlX8lnvl3iZPV5JbXYXuFiTbOHOhvsUTgn6/T/V80q5DeX2HlQjt0s9EEWY4TOS2ANrgzZpavjiMsE441+AaSMjN9FT8uk7wygTYa66uMnp+T325I/H/LFYMlL84fUAlFww== Received: from SJ0PR13CA0114.namprd13.prod.outlook.com (2603:10b6:a03:2c5::29) by LV3PR12MB9235.namprd12.prod.outlook.com (2603:10b6:408:1a4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.27; Wed, 30 Jul 2025 07:13:05 +0000 Received: from BY1PEPF0001AE1B.namprd04.prod.outlook.com (2603:10b6:a03:2c5:cafe::15) by SJ0PR13CA0114.outlook.office365.com (2603:10b6:a03:2c5::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 07:13:05 +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 BY1PEPF0001AE1B.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:13:04 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.1544.14; Wed, 30 Jul 2025 00:12:37 -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; Wed, 30 Jul 2025 00:12:36 -0700 From: Xueming Li To: Jiawen Wu CC: Xueming Li , dpdk stable Subject: patch 'net/txgbe: fix ntuple filter parsing' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:29 +0800 Message-ID: <20250730071045.136672-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0001AE1B:EE_|LV3PR12MB9235:EE_ X-MS-Office365-Filtering-Correlation-Id: 0568164f-04a5-44ce-6d2b-08ddcf388743 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dMXmpfHUxDxrG8Pz8ChyAYKYDkKcZAlEGyTfw+JEeWnlxAMerA9eHJ0GeUUp?= =?us-ascii?Q?nQLK38tDdxf0YLFKYEvKxy4oVnB0J3/ji4N8aUPvuK/suqJPFh/KxZBjM363?= =?us-ascii?Q?YWzr5XFEcJHYfbjOZIQp+PllqtZdVT2Vbh9hPzvpcvZEU9hQytTqZrc7ouF8?= =?us-ascii?Q?MVdm1X1JRcarcjPW5b5K1L6XsSrDyYYpJ1oz3c3SR/niqfze7Po3vEzhyyPp?= =?us-ascii?Q?woE91fVi7NYZ4pzAI0GQKNLK40aa10CY9OrMFHLgIROX9bTFvtxXEg1F9GKY?= =?us-ascii?Q?MlMPpDGk463uuMMYuyHHnIgU9VH9nYKTHoEwNownvwK95fl23Pk1ngYAYzun?= =?us-ascii?Q?Qa2rBzRoRggXqhPGGZ8bltu1+M1HcohK8FaF22uT7bsxbVKP0P7Z9rJy0fI8?= =?us-ascii?Q?mMOS65FSLQAclZSU5OpiMi/qPzKXqm/j7oLNZvPsA3aXoOGvKqYFcEDbRhIT?= =?us-ascii?Q?/ZRzeOKCZDP6qsFFq4AUqpxNEgo+tPgzgROweIgFIxPccEUmcojygnDc/NW+?= =?us-ascii?Q?Ssmx26ATXnT9DiRuFzS/dKRx12PTjdhTdLKi0Mbx0dk30KLySL/hJtRkg5Sq?= =?us-ascii?Q?vftRRCS74uDBCmDtmEKhKQmfepSm/2Tc4d9jheLFkQUQM1SLR4jR3TnDpKRg?= =?us-ascii?Q?M7AeMfR5kqRxnI0fxiEImMdMo8aQV8C2B/9FJZZEP344akAYxPx/rJmqYWVJ?= =?us-ascii?Q?tgY7HRL/qmeBosk3b3qYURi3kwqrcDHgU7m+ciTRBnoVGN9WSX19b0Vh4FJe?= =?us-ascii?Q?ynVp3+ljh+XlOenSPuyM33G9v5bF5L2duCUVb8M0Qaw2NtLLmuTUe29ycRTk?= =?us-ascii?Q?r/UysUlIZ2nbjKMXR8ZLVSkbLDzhRaLx6AJWQO8JF/nb9uG+61/XUlsYbzIB?= =?us-ascii?Q?Zxjmlm/27cJghwjtcL7bfPR+Xb+wzAbSn2xMX+GQqSeLiPVuXY+RzayfRj3X?= =?us-ascii?Q?ax+rTU7DjqFldKAePpvBGMwujuj6q+SCBmpo+XqzILDdEHNEO9TqEeOBnKsg?= =?us-ascii?Q?sVcbWEbIIAgvoEJM2zeYK9TPhAFhYUMG6XrJeyg107ET1fe6Eooq3d/e7YQP?= =?us-ascii?Q?g/PYNIm++UA5FqiMX3eSOx/DqfJSXExekBvBa5fZtOw1pzjfFKW/2CtW1J9Y?= =?us-ascii?Q?S4VXUhtKRANTxClxSq+mWLSpjwjg1rwc/RQbousDU2iIQqvHGj3IzZZFBjeP?= =?us-ascii?Q?CXXgcy+5UYDlqlpHEl0CZdzf9FUypaELPKq6nqDzMAHlipjo/jpkASVHOrph?= =?us-ascii?Q?lkNw+zk0zlqJlri1zWfeHZXcE6U6lb5aLf/QdWF0p5oQknp2COkM32J1+8HU?= =?us-ascii?Q?w441NY7zhvZ3GsLIN3c3QnaUbnWxPyFQ6tOCtaKat1atkWHHwZb92gI114s+?= =?us-ascii?Q?Ns/QfXvlIvfjkwl6Fq+wVZToqv+Uwx4kks8pnObYIQOBymoO0zsk32UQBMUM?= =?us-ascii?Q?OfiUTBk6n91HtQ+ixxljlS1NGWCTpQxOXcMd1Oi/pdym14q3AIAOekvYPxWd?= =?us-ascii?Q?vNsLtiiTeqGZ+4NUcKpYnckbQ4FE4WLc1+nN?= 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)(376014)(82310400026)(1800799024)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:13:04.9579 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0568164f-04a5-44ce-6d2b-08ddcf388743 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: BY1PEPF0001AE1B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9235 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/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=9ac65fa4a2468863d318ec1ae1a91c305a388df0 Thanks. Xueming Li --- >From 9ac65fa4a2468863d318ec1ae1a91c305a388df0 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:44 +0800 Subject: [PATCH] net/txgbe: fix ntuple filter parsing Cc: Xueming Li [ upstream commit bed0e6aba0aef7a1e67d3ee620873817f00a511d ] The rule is incorrectly parsed to ntuple filter when setting the pattern likes: flow create ... ipv4 / udp dst is ... / raw ... / end actions ... / end It causes the rule to be created successfully, but not works. Fix it to parse for FDIR rules. Fixes: b7eeecb17556 ("net/txgbe: parse n-tuple filter") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c index 7ef52d0b0f..d7dc88a316 100644 --- a/drivers/net/txgbe/txgbe_flow.c +++ b/drivers/net/txgbe/txgbe_flow.c @@ -361,7 +361,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, if (item->type != RTE_FLOW_ITEM_TYPE_END && (!item->spec && !item->mask)) { - goto action; + goto item_end; } /* get the TCP/UDP/SCTP info */ @@ -490,6 +490,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, goto action; } +item_end: /* check if the next not void item is END */ item = next_no_void_pattern(pattern, item); if (item->type != RTE_FLOW_ITEM_TYPE_END) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.351839630 +0800 +++ 0018-net-txgbe-fix-ntuple-filter-parsing.patch 2025-07-30 15:02:12.812206833 +0800 @@ -1 +1 @@ -From bed0e6aba0aef7a1e67d3ee620873817f00a511d Mon Sep 17 00:00:00 2001 +From 9ac65fa4a2468863d318ec1ae1a91c305a388df0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bed0e6aba0aef7a1e67d3ee620873817f00a511d ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 1d854d0767..269f0b54e3 100644 +index 7ef52d0b0f..d7dc88a316 100644