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 3023B46A63 for ; Thu, 26 Jun 2025 14:05:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26CD2400D6; Thu, 26 Jun 2025 14:05:29 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2069.outbound.protection.outlook.com [40.107.92.69]) by mails.dpdk.org (Postfix) with ESMTP id DAD25400D6 for ; Thu, 26 Jun 2025 14:05:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WXjWeHXzS0shJAC2fiykVmAxuEYl7v99H9q2RX2QKEMhptsX83M54N4tYQHNjRl7LOC38ZOezGLFLosjdEBmIDGmwPRIgzKMPj+exNR1LbbtXoEwxZxJtTP8tLXtIEzkN8YPF4hlerCXQ91jhMAYPcuZa0V7uJKPALX1Z1JS8rep+P8tgEzis7nI0KGIPGrIpN7jFJf60r8SjBxwaCBSJHRtYINon8DzJfuIcWXAWFTqGPEMMSq/S+Cbhwe1xwVv6XDPuN8VCOtwrSw3tsJn5mfyQjuuZwz7OSg/VL7pANMQlWeAJ38R4FupDSxziUmpJpfO2PAz9jVvf/suAvqCmQ== 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=XbxM51s3Y1E+0n2Da+kAcgMF3gZBmsehiktiZKOxj1U=; b=ZCLE+fVvntLOU2Swti7GyhC/uf6+Ix/AHWbqKqjdxjxzwUWMvhzAazSf3L9TzNgboDafr4W3AzWrAWonY89QF3gpN9wVcZL0uGSnEzBoPI6cwg6o1dfOYzcCFtnEd/ur4eos1/sHnhW3uPNole+Q9/MkmC+eKPubVIWi/DswpmjpM/S12lQAdGeHTWEFCaaN6QFZRiqh4NsQ2R9o8hgaBx+mtbm5OzsO6Enq5Mrjyc/JRurQLGvDraiTqcQ3PUDk8Yew5AHbx96rw2ieo3m+N3tApS8zIcBWvCGOFFZKmCjjt7xN50iTTUHLjd88TmKE3VlSCxv07xwVp0heHjuUFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.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=XbxM51s3Y1E+0n2Da+kAcgMF3gZBmsehiktiZKOxj1U=; b=brgnF/b8h0ge4bL3QPom6JG9RVBwrKkuKwJ6YyVeUcY3PTT5wBei4/ijMlCLQ7XAHt9zT4oHL4IPxBks6ZHaRKJahe3cg/5VCoBaX6qwsxorBY5nP1uZqjuJw8F8/gOeodIqWodyfbMjvo++oo7H5xlTkbroO+bTruR4V2RiHddz3X3QPjlyfoKhqKPG/OzZbmW7mmc+M1y2UxCsICfh/ZlCca/aPvogaCx4BuOJrGtvZJNy9lNYH/95AWYr2c1HxIs0iz+AFrnmkgQ6qvcW2LEdaBU58wZAxOM53VlXDAWFQX3bur6AT/WpthcL4UTubJLTdwKGSRHObYsBpFaeoA== Received: from SJ0PR03CA0153.namprd03.prod.outlook.com (2603:10b6:a03:338::8) by LV9PR12MB9832.namprd12.prod.outlook.com (2603:10b6:408:2f3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Thu, 26 Jun 2025 12:05:25 +0000 Received: from SJ5PEPF000001D0.namprd05.prod.outlook.com (2603:10b6:a03:338:cafe::ab) by SJ0PR03CA0153.outlook.office365.com (2603:10b6:a03:338::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:05:25 +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 SJ5PEPF000001D0.mail.protection.outlook.com (10.167.242.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:05:24 +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; Thu, 26 Jun 2025 05:05:08 -0700 Received: from nvidia.com (10.126.230.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; Thu, 26 Jun 2025 05:05:07 -0700 From: Xueming Li To: Dengdui Huang CC: Xueming Li , dpdk stable Subject: patch 'net/hns3: fix memory leak on failure' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:55 +0800 Message-ID: <20250626120145.27369-36-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D0:EE_|LV9PR12MB9832:EE_ X-MS-Office365-Filtering-Correlation-Id: f23cf6a0-03c1-4e5e-dcbd-08ddb4a9bb48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HyuorBd/S4CwWjo9WcL+3A5eK+KRMtKuJAXMH1kEQ7GxyoOnKVj44hP8fhWi?= =?us-ascii?Q?wJLPzNjZKzLIZAAh9+5JyrAZ5vI/LO82c0X5Tp6DfmJheNcS/99b2ORy24K/?= =?us-ascii?Q?p53eHQ3D49GONzmNphEZ8ihE74HN9M/47J0YdiyO+68tuBnNqJyVr1pFigij?= =?us-ascii?Q?XW4RsdIuDPNBPShsfd3YCvyis2HmDBSvlssIuF9mtfD++8/UNWTwuiQQUmle?= =?us-ascii?Q?8yLcCMRPbsP07gQN38fbuwxeQyRNWCtTvceIvgkgV3Xik+CEA/ycaXNcz0af?= =?us-ascii?Q?+UvwHrTxBamrFJuwDjpIrotZS3PXf1/iyTkhQ6aazKjKNw6WPWvhy2ScFaA1?= =?us-ascii?Q?ZIkkRwSN6HPBVHmlqR8Qs8wX2g6NDfsjVDJpleESay5YwsaIf+Dm5xgxwcTY?= =?us-ascii?Q?DLl0NcXa9i2jZDqvBgVKgRHAljzWkSrJMBVsWyYFBcp5XInJfjTOFoeGSV6y?= =?us-ascii?Q?fzcfAs3DVYyDqGvJGwjLTPCQ4ZjZXqCwUcO8y6UZQT4QhLgFEBbt3kl72Acn?= =?us-ascii?Q?1ImRrP8DDnTkbU7YqWHEgkntKcfSqesO1S18beL51PY13kHcylgn3+nvNbE2?= =?us-ascii?Q?ddO9sOmxnO8I/rs3XZh5lPPbtEj7oVgQYX4FnRF8Ei7OaELJF2fLUB20KiLu?= =?us-ascii?Q?3xw409EIFlCD/NzZ5RYR5HvJz0rU42dhRhpxR7CtCnGjldFtq7u5/NSHJkOR?= =?us-ascii?Q?jNspUga85g987k2nNyYc6RZClliFJUeKFExrB53zXwlaj0w+XfFL3nBl8a5r?= =?us-ascii?Q?eHj3Uk+s1ok0cbTlmlt8KIYFYoP97D7eTRnhK79dyFWMnA5XNDfk15D6EvHU?= =?us-ascii?Q?3Qz9XIdYpuu1LnZk2983jp3wc2fcTId6kM4GErgEk1Ntj7/fkHKt9UG90IcG?= =?us-ascii?Q?cmYHNE7Pool+LUQI9OBQ/qg6j57getlL0ECmSPJicSY3hg97zlzz5PCU2jGA?= =?us-ascii?Q?iqZaG+SPKSkMFhzHw9Df2fzUDxZEJhrbt06egFe8DArw/dnjq+a1T1Y/0bZz?= =?us-ascii?Q?0WUxh4fiXspwXZHgEbGXTJbLbJ3WsmvNhxCFWhdNWZP/MOD2DH+fSPa8YTJm?= =?us-ascii?Q?DJ2Gv72ayK4OKTjJ6SuIL/2ZJYglDET+LkqsILnAvQrelsHuifNzcpolfBJP?= =?us-ascii?Q?UzXs0YxbeVYbe37TR2lAM9cbcemoMdcR+u2YTGuQqW715vKDyUAuhE0ibwKY?= =?us-ascii?Q?M+zlBxx+Xl8JXOD65eAvtrMLZtcYA8HVva3V/YSKF3g0RK6j4cB7XnAtN+oo?= =?us-ascii?Q?OMLufO/1yg1+iJFMFDq6t8dTj66+xql2nPgZXV4szP+zo6hAqRyOiY++d2P9?= =?us-ascii?Q?rkpgRNjv+uHzeQjlOmOPMT8sT7UMYBfeuLwJpeNbSu6FQzw36u4CDOXOHqud?= =?us-ascii?Q?3TVWj8I4HavE+zfkWJ3mYZ48huNnfWetFRQpKQB4/wqihBsf7gqeTc5gCNbo?= =?us-ascii?Q?bLUQQWsB60itnhLvo7xTJjo6zQJKDokCeOWVbpUbF4wLI0TENDDHR8DHd2py?= =?us-ascii?Q?EMWk6FGH7/L6G8rpmXLdFlaEO/Y9Va1SLHT0H5AHo2Zgw54JAtMqWziiTA?= =?us-ascii?Q?=3D=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)(82310400026)(1800799024)(376014)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:05:24.0802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f23cf6a0-03c1-4e5e-dcbd-08ddb4a9bb48 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: SJ5PEPF000001D0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV9PR12MB9832 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 06/28/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=bee4d0630908981173a4d6ca8ee174041e03d711 Thanks. Xueming Li --- >From bee4d0630908981173a4d6ca8ee174041e03d711 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Tue, 8 Apr 2025 16:30:55 +0800 Subject: [PATCH] net/hns3: fix memory leak on failure Cc: Xueming Li [ upstream commit 1c27385dcef1384a1a10edd86bb843b06547b161 ] When the hns3_dfx_reg_fetch_data() function returns from processing failure, cmd_descs is not freed, which leads to leakage. This patch fit it. By the way, this patch uses calloc to apply for heap memory instead of hugepage memory. Fixes: ef1fbd355451 ("net/hns3: add more registers to dump") Signed-off-by: Dengdui Huang --- drivers/net/hns3/hns3_regs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c index 8c0c0a3027..c8b251ead8 100644 --- a/drivers/net/hns3/hns3_regs.c +++ b/drivers/net/hns3/hns3_regs.c @@ -444,7 +444,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, void **data) for (i = 0; i < opcode_num; i++) max_bd_num = RTE_MAX(bd_num_list[i], max_bd_num); - cmd_descs = rte_zmalloc(NULL, sizeof(*cmd_descs) * max_bd_num, 0); + cmd_descs = calloc(max_bd_num, sizeof(*cmd_descs)); if (cmd_descs == NULL) return -ENOMEM; @@ -457,8 +457,9 @@ hns3_get_dfx_regs(struct hns3_hw *hw, void **data) if (ret) break; reg_val += hns3_dfx_reg_fetch_data(cmd_descs, bd_num, reg_val); + free(cmd_descs); } - rte_free(cmd_descs); + free(cmd_descs); *data = (void *)reg_val; return ret; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.281190965 +0800 +++ 0035-net-hns3-fix-memory-leak-on-failure.patch 2025-06-26 19:59:17.342418046 +0800 @@ -1 +1 @@ -From 1c27385dcef1384a1a10edd86bb843b06547b161 Mon Sep 17 00:00:00 2001 +From bee4d0630908981173a4d6ca8ee174041e03d711 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1c27385dcef1384a1a10edd86bb843b06547b161 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 8a6ddbfe8c..5c74f9ae2e 100644 +index 8c0c0a3027..c8b251ead8 100644 @@ -25 +27 @@ -@@ -1270,7 +1270,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo +@@ -444,7 +444,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, void **data) @@ -34,4 +36,4 @@ -@@ -1290,13 +1290,14 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo - if (regs_num != hns3_reg_lists[i].entry_num) { - hns3_err(hw, "Query register number differ from the list for module %s!", - hns3_get_name_by_module(i)); +@@ -457,8 +457,9 @@ hns3_get_dfx_regs(struct hns3_hw *hw, void **data) + if (ret) + break; + reg_val += hns3_dfx_reg_fetch_data(cmd_descs, bd_num, reg_val); @@ -39,5 +40,0 @@ - return -EINVAL; - } - hns3_fill_dfx_regs_name(hw, regs, hns3_reg_lists[i].reg_list, regs_num); - regs->length += regs_num; - data += regs_num; @@ -46,0 +44 @@ + *data = (void *)reg_val; @@ -49 +46,0 @@ - }