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 A9B6243B86 for ; Tue, 5 Mar 2024 10:55:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A4A0D4026B; Tue, 5 Mar 2024 10:55:09 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2068.outbound.protection.outlook.com [40.107.96.68]) by mails.dpdk.org (Postfix) with ESMTP id E96964014F for ; Tue, 5 Mar 2024 10:55:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eBoeyXcaD6fd5XXeh8W7wqY68kQ38lBYj0S5KLNGvbNzCPJO1yeaG3/QTovjXvi0daeYJDjC//qdsMbh5KDxeObgDlYM9MZ73wxzkIFXnytNpyUuZ9xI5XYYuR2qCjrTSphwjpEcVwmu1Unw5/RTceay2PPADE41Xm2Yqu1XDH4WYa8oi9tmmONiFs9zuzysOtWBS17BrhJBmETIedoIEFBtbSmmJ4Cl06rkNvpQ7yql4+Es23wKN2tmRdVwll5DgYZBCo2ejprFuvAZAkoIG1fdsUXWgm3PHlHGcFye/6zQ52lVUkHZiGW2V7IhJdWk4CthdDDgUn7kIDHVcQLxxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=JhXa3Vpv1dMGGX+OvjYjPyYR/PaeRj/noHOKMGE4nsY=; b=eijN2scm2cROV2msAsipD1xeXmoW4bIVYnZNkG9rhviTBEObNHKgQVjzCpC/hcfMtDKc3uEtk1tVd2WheygzmfVK6NcBZxNVs4b5ExA3px1m3hnyNZ+S8+HCHuj0+/1i9FuSF39kiYEIZ5TNJy6sOAQMDNKwx17XFR8/ofn+TQPWtZoMoyTwfs4IhDnph6f0UtJymtMafl+rb5vbcV6PkfOAc9iKgKnm1GJLUgKPcrBggJQrtcEkx7g+TBI94O/447/GtyywjyVccBCFztE9Nvcz5+1h0bRscVVANGKvEk9oeUu+VpYOE/eONM54IIntmsJkJqOwL17oc7CWV/wODw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=JhXa3Vpv1dMGGX+OvjYjPyYR/PaeRj/noHOKMGE4nsY=; b=MFJaNecGPMeCFYkpLw9YlcPTp2bOB5dM+18+ng1tSij4CBwXKxH6qUeetqtMKDcTrNW3mGUBdQtEdYEpHDDuJsjoYLvCaqWi2+xtEDeRDhO6/lPatqwxmwl+w1GegjZAZGMG9tNbLirscP2+/D9Y5DIIX4RVoIrbLLLad+ilJbEAJMuedO1dQo2ISmRGeDYAD7oxhX1lFqPYxQWs0SLjs2oZrOF/7jgGImag6hxQqLo5Me8IwNS2IMlY7tJgTOXXdAOLf5RrGXqUWHqh1XVSqfW+r5AbC/SA+XnJV+CKCvJSN7032epugDmM5COBUcJVSUurTYfN3XNrQxZGUhnUJQ== Received: from SJ0PR13CA0204.namprd13.prod.outlook.com (2603:10b6:a03:2c3::29) by MW4PR12MB7216.namprd12.prod.outlook.com (2603:10b6:303:226::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Tue, 5 Mar 2024 09:55:05 +0000 Received: from SJ5PEPF000001D0.namprd05.prod.outlook.com (2603:10b6:a03:2c3:cafe::8) by SJ0PR13CA0204.outlook.office365.com (2603:10b6:a03:2c3::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.23 via Frontend Transport; Tue, 5 Mar 2024 09:55:05 +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.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:55:05 +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.986.41; Tue, 5 Mar 2024 01:54:53 -0800 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.1258.12; Tue, 5 Mar 2024 01:54:51 -0800 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix resource leak for PF initialization' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:56 +0800 Message-ID: <20240305094757.439387-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: SJ5PEPF000001D0:EE_|MW4PR12MB7216:EE_ X-MS-Office365-Filtering-Correlation-Id: 4dbb9931-db0a-4157-f628-08dc3cfa5572 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6k4WPAuV+8VLZfJUMIkcA3PE5ooVGOu01nuIXl3WqVqBhWHm4uZHEPECMUNwkzzA3ick0xSxvguBWP3LdMRkwA1ExL7mrsRQVBNSqKZxEz2gro25KbC++lmRHCQoryhVlJ+U4JGYnmoq/5DTh8T6LFBqqpg/CnpggrAPUfrxgHFaEskx1b6z0hLKamtinYgyeqqM4Ehxl6HxZ/0fsIPnTN7VRzUgRA0MKSJZuKVK08OLr8q9cjIowV6qvcuxXxGcch1ow7kINMo5iwW1WVOaeTKBZLp6L11HrQDmq0Gfx7gymhBW3G7soSoSgJlxXKgm3WEFya72M/AyKOLVV8+L/M6hxVOj04kSbslEOzKlIgOkfjCXZznMJrL2kVbm0kt+NWOocIKUggCdLMIeK0jk53ztL0rHh8vuKzPa6AxasVQzz8hxDpmdM7etQgQsBPXk7XeXd7GgOl+29x4fwDxACXOOF4QwRwvGnkw8nXy6ZVUBawCq7I9ZaOtg3JlQGCOX2mqprOD4qkh9VhCBLYETX86sZwD4ju0Nw8tVzftwenqH5J3O0V+EkzObx3l8GMSukUro1SJemqqI8qgFF/QSUDBwY/X3fEv16SImYlsDftH211rufDkkwoK6ciIPedsW0vG/xfHMLdD/czFqU+T7A7UILKDuvVAs/EEWw90dUtjFJWlFZM70M9poumBp0UOtKqdWTCDfNsJTRq4TnQBZ5LNC5obUMyA/DlDVzsmCM1euJVT7C9kI8RMbfhtldKJ3 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:(13230031)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:55:05.2699 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4dbb9931-db0a-4157-f628-08dc3cfa5572 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: MW4PR12MB7216 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=02916557c12578a78bef1e837aa2b4bb923bca80 Thanks. Xueming Li --- >From 02916557c12578a78bef1e837aa2b4bb923bca80 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Mon, 4 Dec 2023 09:57:14 +0800 Subject: [PATCH] net/nfp: fix resource leak for PF initialization Cc: Xueming Li [ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ] Fix the resource leak problem in the abnormal logic of PF initialize function. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 38ee1c399a..bb0ddf3d54 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1326,12 +1326,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) return 0; hwqueues_cleanup: - nfp_cpp_area_free(pf_dev->qc_area); + nfp_cpp_area_release_free(pf_dev->qc_area); sym_tbl_cleanup: free(sym_tbl); fw_cleanup: nfp_fw_unload(cpp); nfp_net_keepalive_stop(&pf_dev->multi_pf); + nfp_net_keepalive_uninit(&pf_dev->multi_pf); eth_table_cleanup: free(nfp_eth_table); hwinfo_cleanup: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.280678476 +0800 +++ 0075-net-nfp-fix-resource-leak-for-PF-initialization.patch 2024-03-05 17:39:30.813566494 +0800 @@ -1 +1 @@ -From 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 Mon Sep 17 00:00:00 2001 +From 02916557c12578a78bef1e837aa2b4bb923bca80 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c132e97d1a..6fdde105ba 100644 +index 38ee1c399a..bb0ddf3d54 100644 @@ -24 +26 @@ -@@ -1333,12 +1333,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -1326,12 +1326,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev)