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 0464145610 for ; Fri, 12 Jul 2024 12:48:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1C00402E5; Fri, 12 Jul 2024 12:48:28 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2054.outbound.protection.outlook.com [40.107.223.54]) by mails.dpdk.org (Postfix) with ESMTP id DB21340261 for ; Fri, 12 Jul 2024 12:48:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jow0aXcvW5QfuBTq1HGvTccGqclWhfac/nEZLUCwyNrxudbdhZTOInEY75yFbFXELyCc0oWpEUOhj/3xWZKD5ruYRchiheDTWDRUb9FCsOAR7wKKxgqfScSRinbxx4kLa7vCGZ0fCgxqF4fNU5Q2UUqUJOVMW21tL/C41x7g277mi7AG94L8J+5SopJ0FdwDb1/2KVuOIWG9RaoKsEsrRfcxX4kpubK5RyIcPLzOkAKrE8SIq3Gdm/hKNsP53POetZxIx7toyKFkWrwS6V8EvIWQSvDrb3fG/s21TWanLwEjeDS2kmCg1rcjTMCWzXPNNfGzeSx6bWPxhtjFRfWl5Q== 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=Fuxz57jYv9iye+tvO99Yl41gKGjYS3cKG+v3Cs8FI4M=; b=veGBQRFYe/MY6S0FmOl40JUo4FsDgbFyAfw3b8dAbcci0lyplbiNTnfbshjeDEcyfw8al4Kez3ucu2+JeT8yftBalLURh3Vf8aKkjn9orhLm3poj0IyVuMS90LKKFRyJ9algFrVpBrOWDZN0t5Bx7gs3LVbWkzU21BvTPM4iQgWfsIHbry0E0Y8z/2gh7WyUL+81pIIOZ8saDUU3P3RWWdTm7GkEvBu83PtTtnv/hGYtYk8VheYhZtq9YouD2qiZu5XgfS1/xvGZJp08v/9NEfWV0TkEMZYaiSEx9A0H0kD7lYW6fAZ+X60j26AWwrsKkMo4OGvntBiJ3lfaVI1Mag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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=Fuxz57jYv9iye+tvO99Yl41gKGjYS3cKG+v3Cs8FI4M=; b=gtqsunJ2avUp+G/jSldqtYl3rNO4TT3/cDEFbIKOcEasx7aCOlS7GvYJEk1tuwwM8wo58qURx513VLqRiliXy1GnMBD+o8SM+UgGMm28yu5MgkxUVoQiW5lVGVOp56AtCMZ4HAAH2R0acDItscerX1tzazDa8LUGTRWMVpehKLaysj4Z2b7APlUvNPvrV1BdeqYlyk0i+aWTM020S1O/vJdYxqAinVUXf8Bq1MuRWv5Vu6NGc4/QgOLy/e/Wq/O+0Xp/81FSmzP9d8+tiFi2jckJEwbsUYFWz+b1ZlrjQGPTgvbyXB0dxZvo78doCAnwvksR/sdJAcQXZXMSNReTnQ== Received: from MW4PR03CA0165.namprd03.prod.outlook.com (2603:10b6:303:8d::20) by IA1PR12MB8333.namprd12.prod.outlook.com (2603:10b6:208:3fe::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20; Fri, 12 Jul 2024 10:48:24 +0000 Received: from SJ1PEPF000023D4.namprd21.prod.outlook.com (2603:10b6:303:8d:cafe::84) by MW4PR03CA0165.outlook.office365.com (2603:10b6:303:8d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35 via Frontend Transport; Fri, 12 Jul 2024 10:48:23 +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 SJ1PEPF000023D4.mail.protection.outlook.com (10.167.244.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:48:23 +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.4; Fri, 12 Jul 2024 03:48:15 -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.4; Fri, 12 Jul 2024 03:48:13 -0700 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix resource leak in secondary process' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:12 +0800 Message-ID: <20240712104528.308638-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: SJ1PEPF000023D4:EE_|IA1PR12MB8333:EE_ X-MS-Office365-Filtering-Correlation-Id: 592b8472-ecb2-49ba-ff6e-08dca26026fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?icQ8C7bkBg/iHqBHcSTqAdxNdqBWpwobWFw8UDhpsG4ncmgRXqAbiLm2Bizr?= =?us-ascii?Q?nxftsKGj3KOY6Y3UxZHnkgy6Hbn6a/BLKNJ19NbytojPYTiivk7wR3H7s8hk?= =?us-ascii?Q?XHbPj/FTcofNkBBEZB3QHj3Sx7e58BBRpkF6Kt/aw1iSVwSCeSLGN/FQaW18?= =?us-ascii?Q?gSLEChCzUFu7n3yFXEueMl5g9PWr2CDoTXri1eDe/Ov9QXSMdFH6uujNyt5H?= =?us-ascii?Q?MiJKa1N4mhAkxu3AgDkhcJrEuJ/K7cZxtMVOjYoy5HSs5TQ0bLL7tUseWnj1?= =?us-ascii?Q?85Rxcf6DXepvElgZ1xkN5xyYydM0sbtNhNjLh5xGIQal2bF6VbHOxT+oB/gN?= =?us-ascii?Q?5tm8y9TQKUyy2T2epTJShppzN64h4+51f31FaEbOQwgnOfoRW5fDjv0ucfqU?= =?us-ascii?Q?mkB0SlClqK4XopBZNk6zYl2DsAvPaY2l/46mVm1S9k7ljh2rJYbmnVMO5xC+?= =?us-ascii?Q?NqZJ4LJNTsduZA7AYSt7E+R2n1U0gkgr7AnHRn6YIznHljJYCiJOlku23JEB?= =?us-ascii?Q?MJ60CRQrcsiAghocIjzYL1REc1DNPE3cp4ZC66NKsQRewOIO0zcUkmetBXNT?= =?us-ascii?Q?tC/GSp7g8VrkyTBk+PUfLBkYb6ctmB/Ds+l5D6KNpxcMIaEYTlPAq/L83JAQ?= =?us-ascii?Q?P1y12hOtk4YlFyI3kbRWM4ePsQqp8PzAYjbmkBLFsmXm7iEMwJOFZNVqLfxX?= =?us-ascii?Q?Srd6S3v7oDSVJdkrPGdWKjI0TIKoZt9G/TTsY7SIywjp7BTHhHN1vpSPyDdk?= =?us-ascii?Q?GPixxt+l+zJP79qOb5K30DDc3XNQvQPvW524D+u7IAzZrnODow+Zbgopfph7?= =?us-ascii?Q?3Qh8zqGyEIls3wntRNW4KyrbFsT2kjukWG5n5zao2Uey9NumRVAyPRdjeAle?= =?us-ascii?Q?uXut65mLT6NRejD41XhEgGQOIdg/AXv8HmYwHWS/t8jQq6ktx28DGlu7sG70?= =?us-ascii?Q?uo8XFBRcDdGSZsde1rzO3rdapyqHUC9LdX1bQisOq8KYfsD8/lHu/r+N2Lab?= =?us-ascii?Q?8ljuGaznCWwin4w+7V8L4LV0Zv4BsKXi2lVzALNfKUh3s6B2c1m/bNyYq6qY?= =?us-ascii?Q?uwA4gqLQhEFQwtm+o61xhehzUeclWQkJAq+DMaaQpfK5z+3Te93183K2H0oa?= =?us-ascii?Q?QdLqZPQTARBrskaSOmHfaavqAyPiqKIm7RjbGuGKnK1/G3dOuDgHrFKaHzuJ?= =?us-ascii?Q?KbanWtpgRmMl0zz+7aJ98s8O/r+vxlibgNX0LElblJdxOiMxVqg8EsQvPt1J?= =?us-ascii?Q?pUsegvr572hKfu1FbvIXgTs974hbdhsOsMvOZjTZgdb8D6Ova7nLvBz92M+B?= =?us-ascii?Q?VEj+uSdsPV6ZJ0/Lqgeu9mW8i5FX6edFRhJAjy1jpSNel8I4dowCUkQNi/7T?= =?us-ascii?Q?m8OXcLp0BUeO3Q7Wbpv1pDHs4Qwr3c6vJhB1E4iohbEGC7bynIWEhPExwo36?= =?us-ascii?Q?OqL+HVznxK6JMCToI9LOQJhXyEwdt5gL?= 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)(36860700013)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:48:23.4064 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 592b8472-ecb2-49ba-ff6e-08dca26026fb 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: SJ1PEPF000023D4.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8333 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. 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=57fc3f569eb0478ac4a151fa001798b47d580b24 Thanks. Xueming Li --- >From 57fc3f569eb0478ac4a151fa001798b47d580b24 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Fri, 19 Apr 2024 13:23:42 +0800 Subject: [PATCH] net/nfp: fix resource leak in secondary process Cc: Xueming Li [ upstream commit db8150de1557ff9abd50de22d63723d7cfe3a297 ] Fix one resource leak problem in the abnormal logic of secondary process. Fixes: 016141b18b3a ("net/nfp: refactor secondary process probe") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 7baacd18b0..e632051d42 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1509,7 +1509,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) if (sym_tbl == NULL) { PMD_INIT_LOG(ERR, "Something is wrong with the firmware symbol table"); ret = -EIO; - goto pf_cleanup; + goto cpp_cleanup; } /* Read the app ID of the firmware loaded */ @@ -1556,6 +1556,8 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) sym_tbl_cleanup: free(sym_tbl); +cpp_cleanup: + nfp_cpp_free(cpp); pf_cleanup: rte_free(pf_dev); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.435480667 +0800 +++ 0026-net-nfp-fix-resource-leak-in-secondary-process.patch 2024-07-12 18:40:13.986594241 +0800 @@ -1 +1 @@ -From db8150de1557ff9abd50de22d63723d7cfe3a297 Mon Sep 17 00:00:00 2001 +From 57fc3f569eb0478ac4a151fa001798b47d580b24 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit db8150de1557ff9abd50de22d63723d7cfe3a297 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index b711e15b9f..98d8e87028 100644 +index 7baacd18b0..e632051d42 100644 @@ -22 +24 @@ -@@ -2123,7 +2123,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) +@@ -1509,7 +1509,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) @@ -26 +28 @@ -- goto sync_free; +- goto pf_cleanup; @@ -31 +33 @@ -@@ -2171,6 +2171,8 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) +@@ -1556,6 +1556,8 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) @@ -37,2 +38,0 @@ - sync_free: - nfp_sync_free(sync); @@ -39,0 +40,2 @@ + rte_free(pf_dev); +