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 D9DC7470AE for ; Sun, 21 Dec 2025 16:01:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D31A3402E9; Sun, 21 Dec 2025 16:01:24 +0100 (CET) Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010001.outbound.protection.outlook.com [52.101.46.1]) by mails.dpdk.org (Postfix) with ESMTP id 466B24025F for ; Sun, 21 Dec 2025 16:01:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Fb0J8kQmr4/Z7EW6qFCLR020Fw6rKc0mtau68iX2GTtdy4xooM3sjp2falIOr7d/+hdKLPDXtCG5Io9Roa8tn/4lh2q6cGE7EQXdrFl8bKhbBoJjEgG7suaAyU6QzW4Wu0EFEFbzisxo3w5JFAab+RdJmrNqbtyLzj1M8JUqQQ0cxqSYgUjVZuvVBmvChy4oPLQhivBsmMKhaVyl2b3O/sYL+y3BkM/amBhbtg2kp6ARARj6I5eQ81cGS87blivMmn6IVuh+I5dgrp9ijfh25k0A+mjNKFvTTHEQZc1EE6pAmCUnTQWKSvvZotJLHQ4QJtkuipD7uwWntPiEFlsdyA== 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=UEitzjwiDhT1063ElNfr87DTDQmFP2CDWE/G1ljlGA8=; b=e+WDy6rzSFQKEa4XjE2Y4/Ie/KKWrwUltBP0h4yJSKJRJEr7yapUTwUF3x/N3tHRacgcH/q1bcjkmBUC6xpJ1GUWUP+kl90SwzBtDNFdDotcoyc0RwwR9ossSYMC2P0IXGgxer/7zuZvn2qZxWroTf5aYaRGNpQUxFfVc+iJDVSUVQelwT3LtDBZKu8PJiSj6NsUQrXBNpq0JDIeNjZf8jrNvmgPdBccagLAbKBuN882pByHGROr3AwIVLaJM/eb4igEE/EfuU/RVOxkElIoi6w0I2LHuC+JNChGYX4SzJ0wChk60f/ANIoU7F2UFBNVtpGfmGxpixHSCKkmNXyVTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=UEitzjwiDhT1063ElNfr87DTDQmFP2CDWE/G1ljlGA8=; b=aZOM707dFlEJMkYKJZKaruIZE6Qali9taabaNYcHVeBfdKJVU5M2hroZ4Ks/TmXEH+amVfECReGZN76jG/ptcj9ENfzoVjuUrmYzNDF0W1tew37Idrhx//a3dieFjZXYwjIvUO4R3PLjh9zGVApJ7ItlvJgSS8jVHNqSgR/WueLXVYnAgNGyfq85/oOaedLtX7f2OUhGfcq5c3kM0k3qBK+wj8N6JCczuIdyK1BmAMQM1Tt3WTsi7smHJ7/D6AGPkTbh5ku7QoDdGNYeoUS4WPIHratEbDLId5aL1pubpSuc9/13MooMXfNZdsNcvkx3CG5ecUE7Slbi+Q2Rf9bn5A== Received: from BYAPR11CA0046.namprd11.prod.outlook.com (2603:10b6:a03:80::23) by IA1PR12MB7760.namprd12.prod.outlook.com (2603:10b6:208:418::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Sun, 21 Dec 2025 15:01:19 +0000 Received: from SJ5PEPF00000203.namprd05.prod.outlook.com (2603:10b6:a03:80:cafe::56) by BYAPR11CA0046.outlook.office365.com (2603:10b6:a03:80::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.11 via Frontend Transport; Sun, 21 Dec 2025 15:01:19 +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 SJ5PEPF00000203.mail.protection.outlook.com (10.167.244.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Sun, 21 Dec 2025 15:01:18 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.2562.20; Sun, 21 Dec 2025 07:01:03 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Sun, 21 Dec 2025 07:01:02 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Sun, 21 Dec 2025 07:01:00 -0800 From: Shani Peretz To: Shaiq Wani CC: Jeff Shaw , Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix adding special words' has been queued to stable release 23.11.6 Date: Sun, 21 Dec 2025 16:56:23 +0200 Message-ID: <20251221145746.763179-35-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251221145746.763179-1-shperetz@nvidia.com> References: <20251221145746.763179-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: SJ5PEPF00000203:EE_|IA1PR12MB7760:EE_ X-MS-Office365-Filtering-Correlation-Id: e34d0220-6561-4c64-7196-08de40a1cbe5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pdYQrvRCnaK5uHvMjtyAE2Rk4Q4LfWBURCtdag/1Msb3Cj9JWXe9BcE9SNeH?= =?us-ascii?Q?lLDIGosj47r224bTq6hPIVx91Mm5FdHs3fzSogZu1W0bvplQRhqiDozKX/mr?= =?us-ascii?Q?r7E/CUoo0+ioRBLk68ahKNKLn7P3HVRv/kciOxqyD2wxwCZK4Crp2bflUvru?= =?us-ascii?Q?WwplA3gaP309GhCBtij58GRd5pme3gK4UBPSo6VDkCdf40MCy12IQrWO8Ba1?= =?us-ascii?Q?2/DuNTOIaAGfBgeUrZiU9x7ApEcNeYzCmjH6FJOyT1d5Liu+HDrzDJogiQ5R?= =?us-ascii?Q?yP8FnIxY4oVkvS1Fu+DHJw3pxMP8n2G+e4pH0ZacJJC86g5UmkHyPBY8aiBY?= =?us-ascii?Q?Tz+vLSY3X3UP5v0xG1WRt0szkroTO+lQy2/cU9GsD1lFdx/8FkcmerWRCu6V?= =?us-ascii?Q?AM8ugOt4N07zSl4proY21b8v+rEMFQnuMcEQR6RG/TuhEUTNC7Kq+QaroqSO?= =?us-ascii?Q?gZ6LXma21DCjKVxJmtJjwM4zWINS1Yt1i49HmeTvqoX42zCVikfPz0v/NGZm?= =?us-ascii?Q?qfk/CGiy1hC6ZZbv9o7QBRAO/8PcQs3zpCViy1JUP5ebOefNCnOuANh0DfPJ?= =?us-ascii?Q?DBw4jTEu0ZkYjaYkuAv78ntsTXR11uKAQwt2Zeir7eAD3T57RVbWvJO3GG3I?= =?us-ascii?Q?wM4LrpNOqM9tmuMyaZT7KkPzKqrKa8eTuC2XtEgGD9Gs3+FvW/r7V5L4hwBC?= =?us-ascii?Q?LflkoIFdkQC3RBzSX3ks6KYWhyEd7maIIVquyl90wQ19g3Y2p8HUhZoD3JJ+?= =?us-ascii?Q?UMtud8vPFEll0mwlQO1DUktpuhiHINbolc95bgjwghHDf+f0N3Xo+y4UBHgB?= =?us-ascii?Q?rQN0NpVMHBProm6DNlZIA4bJP1tD1VlnkENuRM3BhrL2NALyAkngicmpsHxr?= =?us-ascii?Q?mRiox5fbznEejIdtJUZg3BD0cyLRsyw+PlxznVVICCzIaiMdU11lGvZplrqY?= =?us-ascii?Q?1yycUaB3bGgbu5jeXW8MbRsB+yCpiIzp+f8VN0ZO9QtIqqTHJ9XVvLf5Trst?= =?us-ascii?Q?rEdPMJDJcvliV2wU14p4qWQIfl+9wH6PXoOZ+vuVMxu3O6iiD6N2dyAyIYmZ?= =?us-ascii?Q?wrbCd0EFb82zrPnndaT8DqB8p2V7uE/ra8i0yiF009Qft4N/BgBUbPW0SIyT?= =?us-ascii?Q?aR8Orp7PPk3Evf1dt88H8PewMCqOgSCa1uf6t3/Nw4nEgcQWjRC+9tvjxALy?= =?us-ascii?Q?ydI7E2a3Y/Io6vTXVRkkQODZN2Z33nRW2qt2pv3nLVFuhuUT6DPtZzYrdMqu?= =?us-ascii?Q?8BxJIagIU6MAohLzHH408qdGuNilbkbAmrAFZnNB4QNS8oFiBC39ok2JsALg?= =?us-ascii?Q?Bo1mvSCQ2HBUqKbLrd+lr5CSyXkdPt8oy9rKjjBzHYzgMwhRf1is6HlWwxGL?= =?us-ascii?Q?09tMST3iqvc+07pJ3Mx8ja8ByUOmzX34UkCAP86JihqIHKQ/nocyyZY5RoWt?= =?us-ascii?Q?GbvvZ8sRCi+xjbsZAiPDWdrE4RR59TTacnE3zJxo4e8RNPPGTe1sbCrV6Nsk?= =?us-ascii?Q?dOIujpzzm7M0oCM/6aBuEd1YcEnxEbhAuw6WzbeITI0ArHpHK3eGDdnz1GOe?= =?us-ascii?Q?WYBIRSdhT5JJfVBNzpOjMnHjwCy3Ze8BraOsQ2iO?= 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)(82310400026)(1800799024)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2025 15:01:18.6587 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e34d0220-6561-4c64-7196-08de40a1cbe5 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: SJ5PEPF00000203.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7760 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/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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/f479205884bfd9a49a4911143dccef2fb213f5e6 Thanks. Shani --- >From f479205884bfd9a49a4911143dccef2fb213f5e6 Mon Sep 17 00:00:00 2001 From: Shaiq Wani Date: Tue, 2 Sep 2025 18:26:52 +0100 Subject: [PATCH] net/ice/base: fix adding special words [ upstream commit e563992fba809bcae90b4734f555e354024ec564 ] The function ice_add_special_words() is meant to add special words (such as traffic direction) to the rule. The function that interprets/translates these additional words is ice_get_sw_fv_list(). However, the ice_get_sw_fv_list() is called *before* ice_add_special_words(), so the "special" words weren't added at that point yet, hence they're not translated. This results in the driver ignoring whatever special words that were added. The fix is to call ice_get_sw_fv_list() *after* ice_add_special_words(). Fixes: ed3066a3b1b0 ("net/ice/base: refactor DDP code") Signed-off-by: Jeff Shaw Signed-off-by: Shaiq Wani Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_switch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 7b103e5e34..6321f8a3fc 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -8147,10 +8147,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, */ ice_get_compat_fv_bitmap(hw, rinfo, fv_bitmap); - status = ice_get_sw_fv_list(hw, lkup_exts, fv_bitmap, &rm->fv_list); - if (status) - goto err_unroll; - /* Create any special protocol/offset pairs, such as looking at tunnel * bits by extracting metadata */ @@ -8158,6 +8154,10 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, if (status) goto err_free_lkup_exts; + status = ice_get_sw_fv_list(hw, lkup_exts, fv_bitmap, &rm->fv_list); + if (status) + goto err_unroll; + /* Group match words into recipes using preferred recipe grouping * criteria. */ -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-21 16:54:19.144653897 +0200 +++ 0035-net-ice-base-fix-adding-special-words.patch 2025-12-21 16:54:16.982059000 +0200 @@ -1 +1 @@ -From e563992fba809bcae90b4734f555e354024ec564 Mon Sep 17 00:00:00 2001 +From f479205884bfd9a49a4911143dccef2fb213f5e6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e563992fba809bcae90b4734f555e354024ec564 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - drivers/net/intel/ice/base/ice_switch.c | 8 ++++---- + drivers/net/ice/base/ice_switch.c | 8 ++++---- @@ -27,5 +28,5 @@ -diff --git a/drivers/net/intel/ice/base/ice_switch.c b/drivers/net/intel/ice/base/ice_switch.c -index 54cc2e1c07..f16bec044c 100644 ---- a/drivers/net/intel/ice/base/ice_switch.c -+++ b/drivers/net/intel/ice/base/ice_switch.c -@@ -8287,10 +8287,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c +index 7b103e5e34..6321f8a3fc 100644 +--- a/drivers/net/ice/base/ice_switch.c ++++ b/drivers/net/ice/base/ice_switch.c +@@ -8147,10 +8147,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, @@ -42 +43 @@ -@@ -8298,6 +8294,10 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +@@ -8158,6 +8154,10 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,