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 8DF06470E5 for ; Thu, 25 Dec 2025 10:25:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FD224066C; Thu, 25 Dec 2025 10:25:08 +0100 (CET) Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010032.outbound.protection.outlook.com [52.101.193.32]) by mails.dpdk.org (Postfix) with ESMTP id 258174066E for ; Thu, 25 Dec 2025 10:25:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oSAlxLME3fRO5bcJlxsuc3pSy0bJRqK32fRITAtGrW7EWn4eCBFKWUOLH27SxQBcHGsRyEF/4h7+Kr852CrjW9goKwEth2dsPYsZ+C88owLfc+u43Fq2viqUwpOvnjqByAFa2Fl4/04RdJpwJona5aXD9Iv8wM1EZ2p+gyvinm21dhVEWn8aciXmExfCx297+YkaYG3TQjuzV3WedZgcYK+GLiGEEuKfTJy7tlxYmUSHQ3HT8vdFMA0+TR139SS9STz4hLECzKJxIyBDGs5gSGP1F3bGnTwnb2swM1exHKKsjnfCi1YedtfSCYSnptZHmovtG01uctlc1eyj1eRpLA== 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=8q76Cn2T7pRU2O+lTAAvjQhm6vpaCPapLSLbGhZuUjA=; b=GCcL+G4fFsQ1OtXMTzMsu+svA1phshv5BrBUisFIC9QFKqeSLEyCEdU1Jdc+Q3cLTVw79oA1B22oJ+OYnXv+tkYQtodItHgu33Rs9tw8bcyEnVyWzjE0HXZJ0zfea+XEEc+jN3N94WfsvURVfU/rcPWBuIzAyNjMxB5hBgkS5vjI7FByiajCNOMkNSTJFRK+5LUzYPo9r+FYY1cDY+j0Y+eMU/CoXeFFXh/HuXSjuaUzfVNslxuILItRQw98i1upfWSCSgr4wj2rOqq2AYza+fWIVoIs3/pS45rqV0EIUoIPI+D/oyk8oCZyqchw+D6MJAy2HWAS/1u0kt/Iv0wK9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=8q76Cn2T7pRU2O+lTAAvjQhm6vpaCPapLSLbGhZuUjA=; b=GQ8xFVNhNAkFPAJLwmxwZw1hwInVOX0sHVLddQ4SWOS1FN72UwKCQBBKl73AfVplyey/RMxVhORLH8wPT6lxzcY/WEdXCIyQ+nshp2SvKxQ6ssgjryJuTG4DbTjAioFSshDByPxRCOcZKLL/RL91E39TesCIeKpB8JrSwSPeF5KbLWqu3p5Qi/PtAcKoxxJoiI8IFyK7ysTOP0SrY6AjZKlAIrWgAgYB3QZtVjTfUGDsC8VYZQk4beO99V3wy4SCXsXIrKw83N9jj27VC4w+2taZ8pdXfrdBuZAmQJEdA+GW3IAUzoWnHBWK/ZxgOmIj+MHFb3SyQN6isF7VVHFo+g== Received: from DM6PR02CA0077.namprd02.prod.outlook.com (2603:10b6:5:1f4::18) by DM4PR12MB6256.namprd12.prod.outlook.com (2603:10b6:8:a3::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:25:03 +0000 Received: from DS2PEPF00003448.namprd04.prod.outlook.com (2603:10b6:5:1f4:cafe::6f) by DM6PR02CA0077.outlook.office365.com (2603:10b6:5:1f4::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.12 via Frontend Transport; Thu, 25 Dec 2025 09:25:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by DS2PEPF00003448.mail.protection.outlook.com (10.167.17.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:25:03 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:24:59 -0800 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:24:58 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:24:57 -0800 From: Shani Peretz To: Zhichao Zeng CC: Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix statistics' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:38 +0200 Message-ID: <20251225091938.345892-77-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-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: DS2PEPF00003448:EE_|DM4PR12MB6256:EE_ X-MS-Office365-Filtering-Correlation-Id: 6dcf28f4-46bf-413d-a26e-08de43977bf7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uSvXP4tgygL/LT2Pf8D4yCegDhyhu8cYRFKWfAo8UiTGAxAhbISdwixeAkpp?= =?us-ascii?Q?/Dh0GbThCHwAO+MiMz512W/u8URYhmSUuXu+nWWzAbfnKrd1QBi9ToTQM1N/?= =?us-ascii?Q?bGKHvP77evI6RlbvC9JAATBAeBQ+YxauInNYAvGjMJsPJaWhpjRPa/khof12?= =?us-ascii?Q?bP/Odynv0etiBy3UY6jklXBtosQHdi86bka2XAtUBN4AcT5AmFGNSRj+yIS8?= =?us-ascii?Q?kFFYvsRIL9XRG9yHOckV/kG4Rv/rtb26sUeytQ8w2X4FIBRnlnAXfKi8wSf5?= =?us-ascii?Q?5VYTt/0j8teWEYl/AGR1n2kO1NK9HwBixItydyyCfWWfo9hnB3e1mB1LkyP9?= =?us-ascii?Q?jC8LMBG4piyoHf7okJoL1DAej9ey3NRqhKuEKCu5zG5NV7MvP2Ec1GnPVFpd?= =?us-ascii?Q?zjog4SnMGLoMAEWVjWOuY4BP9JSc2vZ5Cl/FFwNYkwHKoEKSXxJtmCgVvlOK?= =?us-ascii?Q?DYGLxiahWRNPcRA1oKPmorHFIh3dojhFT7nFD+aa2pO9HiHOAAKz51yB+ygz?= =?us-ascii?Q?x+16/j7OMTdtqMpxAl7RhiXtTeEJpJwD3rt/VVhM1rJSUbyeGygA9sCO+dBv?= =?us-ascii?Q?X1anw7FepxrEpUzawe8ISgLm/V13n6DHWDsS81z2nfez/aFyi5hrYyhTNzP6?= =?us-ascii?Q?l0zytVAXc6qW2Ype5/1I1Pa+QjxL2fJHGwNf7fNbFVYTuGmxRALoIj29naA2?= =?us-ascii?Q?eG8POh2Lq863hBNt0cAcIOmZmABQPeEPcSfPh3PLLNxjBp11YuIVnDR1Nl52?= =?us-ascii?Q?/gR8r10nWwwmmkIoXjdfCAnLeEf+SZIqROm8TR2GE+Hmocqbz3s5NVP/k6pf?= =?us-ascii?Q?zHZs+jKxez7nH5gixM9JZH2r3jmAKiFAZ3kiTiRVogg6091eKS2estRh576p?= =?us-ascii?Q?lZESQY4aj4CXB9/NjY31PrheNirUmNZ4HG54nTEG0+e596ooi+8pY8u6FRdP?= =?us-ascii?Q?TtrY6efkWS/IchhdtkbvMCuwSR7nSKWFTfMYbS6bnnyyXNAIrB/gFWRuvHqV?= =?us-ascii?Q?kkLlf4yEgk1QyH22EM/mOZEx9OgxHqDxgUFFDcl7Z6aGbxndE0dlHSmLV+83?= =?us-ascii?Q?N59DOSp3jbNAWLhZekc27RgNXKy/PFj8M6QgmzdCW2Pb7qJOmOAmrCidi3kd?= =?us-ascii?Q?+d9VkPtwVas0xDsylDPrdWKvDuHZCNRj9onKILA8ZAgHcT/3uuh23olmTeGB?= =?us-ascii?Q?+wNC0rVJrTC8cMIF95zLFkCsMkLZXoV6Ga5nToBaW7zdTsxZI6wph2jSkOiX?= =?us-ascii?Q?nG+NF1CevBi/qMqN4NW4tmYwiIuvXnA95ujdq0NC+5VlxntFD1M7LmCM63wY?= =?us-ascii?Q?S95QRf2C7Ms+TcIxLuvXS594DZa+KM2ZcwJqSzHq6hv8OoEnqUxj9jEX9GPb?= =?us-ascii?Q?k+3Jstrc5hxXpTKrZ0cKMsrzfjSBgb3pV1gjVTJZ4YZaEU/8KtxBMUSHdnkr?= =?us-ascii?Q?EUOJwRDG3umICqppV8JsM1OAxDxc4tghVEFaq/NEL2i6V+IOLxWbjpm2qOHE?= =?us-ascii?Q?08qkVK3kpUiJkL5RbyQQ5F7bHLiC4kqoEJ6mwfJ8XSlbRoiPrLquYDRG05Lb?= =?us-ascii?Q?JmLTIdKdYjLyvbr/iHdwFxukI2xY1Zn5qLvcTC3I?= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:25:03.0603 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dcf28f4-46bf-413d-a26e-08de43977bf7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003448.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6256 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/30/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/9187078df1e0a054b3ea5156abbdf3a02992e82b Thanks. Shani --- >From 9187078df1e0a054b3ea5156abbdf3a02992e82b Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Thu, 13 Nov 2025 15:47:10 +0800 Subject: [PATCH] net/ice: fix statistics [ upstream commit 9ac3d9cc61bc70fdc6dff14969a7111a673be932 ] The statistics contain 40 bits. The lower 32 bits are read first, followed by the upper 8 bits. In some cases, after reading the lower 32 bits, a carry occurs from the lower bits, which causes the final statistics to be incorrect. This commit fixes this issue. Fixes: a37bde56314d ("net/ice: support statistics") Signed-off-by: Zhichao Zeng Acked-by: Bruce Richardson --- drivers/net/ice/ice_ethdev.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 91609b948d..fc6fc1a3e8 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -5710,10 +5710,16 @@ ice_stat_update_40(struct ice_hw *hw, uint64_t *stat) { uint64_t new_data; + uint32_t lo_old, hi, lo; - new_data = (uint64_t)ICE_READ_REG(hw, loreg); - new_data |= (uint64_t)(ICE_READ_REG(hw, hireg) & ICE_8_BIT_MASK) << - ICE_32_BIT_WIDTH; + do { + lo_old = ICE_READ_REG(hw, loreg); + hi = ICE_READ_REG(hw, hireg); + lo = ICE_READ_REG(hw, loreg); + } while (lo_old > lo); + + new_data = (uint64_t)lo; + new_data |= (uint64_t)(hi & ICE_8_BIT_MASK) << ICE_32_BIT_WIDTH; if (!offset_loaded) *offset = new_data; -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:40.175420617 +0200 +++ 0077-net-ice-fix-statistics.patch 2025-12-25 11:16:36.123946000 +0200 @@ -1 +1 @@ -From 9ac3d9cc61bc70fdc6dff14969a7111a673be932 Mon Sep 17 00:00:00 2001 +From 9187078df1e0a054b3ea5156abbdf3a02992e82b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ac3d9cc61bc70fdc6dff14969a7111a673be932 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ - drivers/net/intel/ice/ice_ethdev.c | 12 +++++++++--- + drivers/net/ice/ice_ethdev.c | 12 +++++++++--- @@ -23,5 +24,5 @@ -diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c -index c1d92435d1..c721d135f5 100644 ---- a/drivers/net/intel/ice/ice_ethdev.c -+++ b/drivers/net/intel/ice/ice_ethdev.c -@@ -6417,10 +6417,16 @@ ice_stat_update_40(struct ice_hw *hw, +diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c +index 91609b948d..fc6fc1a3e8 100644 +--- a/drivers/net/ice/ice_ethdev.c ++++ b/drivers/net/ice/ice_ethdev.c +@@ -5710,10 +5710,16 @@ ice_stat_update_40(struct ice_hw *hw,