From patchwork Thu Nov 30 08:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134727 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C80A84340A; Thu, 30 Nov 2023 09:53:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED2FD42EB9; Thu, 30 Nov 2023 09:53:07 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2112.outbound.protection.outlook.com [40.107.100.112]) by mails.dpdk.org (Postfix) with ESMTP id 2FC7842EA7; Thu, 30 Nov 2023 09:53:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hAfGzqxxZauV/I4kmA1u4PZpR2OwWCjVTESN7s2UjWwYB41XboipKfSAiFx9ATGyuyYdjJoFvRjIqPCQ0E2lfdrTu6QkAh137gM91Ogp5thMyAAYq2p6VlDjB18lOfBnohdJ8lmLevMlw13RDJJkJsfbYGqPnHYWBuX9VkUTBpiK38AAiFyQuvjEfCtv+Zh7bt5dQnZ/d8ttQUj+1tXnYVmkJYza7EFuBZXlLhk4TB3Jr9umTtBTT/xggi7twfyyK3XE9sF8YZ38oIyG2KhfxgQ6UZEwbPqQp4kagg63A5PZsxy0r7nN5vezSuRe7CF+ovw2TZOaf083zELoVPZkmA== 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=K9mIl5VbakJVu4mUJrDZEB/9VRgDgxghhUPC7GyECJg=; b=RdsWQFr1PqsVcVtdIUryF6mQ9AD6qWgfL2sXUynqQz5TAyTNx9BI0zxK5EzT2IV46e/QvgS3oU65DK/+82R0tXGE4XWftXOxZyamOYl0a7oNuUdbg41D/+JQcLoKIh6D2AfEq0XQ4/Fil7qYBZjciueMulEsm/H6lAuAi/TQSMJxSsxs6cnOqJTynGdmI7UzXz7tne3CFVmyfLvVRi+TCVrJUpPSpqmjL1n8MQqCtwbJ7qjPVy49uGtPbEpHKFImy7MqiKgfagUYaZVX754u598ZQwinoOIWTMc454ip9JTcjoo576sWXUtw/8uNbo/J6/MVZGTihdvoPpgkDZbj5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K9mIl5VbakJVu4mUJrDZEB/9VRgDgxghhUPC7GyECJg=; b=sDjz3tkmgpAW/S4q8hGmzBeJSWPWxzLgpap1GovFCGoQH94QX4mXLshIQ2MIwgmzLf5VNI2iI6N5123f7N57kRl+3vE3vbY9VT1G1VSJpBZJvwWfelxEdgt3vhC+OBXv14MgYUrbqyxPRtyFGzFKgc7fDK9fL4T3AhC2bg8Nk9s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5381.namprd13.prod.outlook.com (2603:10b6:a03:3d2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.25; Thu, 30 Nov 2023 08:53:04 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7046.023; Thu, 30 Nov 2023 08:53:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , peng.zhang@corigine.com, stable@dpdk.org, Long Wu Subject: [PATCH 3/7] net/nfp: fix resource leak for PF initialization Date: Thu, 30 Nov 2023 16:52:34 +0800 Message-Id: <20231130085238.60290-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231130085238.60290-1-chaoyong.he@corigine.com> References: <20231130085238.60290-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR08CA0056.namprd08.prod.outlook.com (2603:10b6:a03:117::33) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5381:EE_ X-MS-Office365-Filtering-Correlation-Id: 164da792-9dec-44c4-4ef2-08dbf181c395 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a4G73UWJ7b66AAcH3QbwsuBP40kxFgc4n7wpQ6udusUUsthaDQ/Po9y3juYIKeaRJtwUHJEkatHpDFicDX1AX3gu91F5logQkddHMbT9rVSnWGm5LhsBWFl92l/dIhLJ5wiqK99GDmbzSYwb0WkkzvHPUTOeGW0+zTotsicgO+1dpBNVHYlfCfsNz4R01Z8+UdtUNUwimjxBsJMEG9xotYB5FtJUU+vkc1EO43TDs/tGuFJnEr7BBTN5WHRUzQfSOlOxMtPaXgtIlPLbLFQ7QShtXDO8T5oUqW3VryqG8FNfZKITNE1K1qd4kYq9tqbpZUmWbcJvbn2fs9a0YOH5hvFAxTzutvJXmxnezonlrZYJp/Px4hFnnqSdKOspX5zRrS/mRbvrESnzIJgl7RevoPEYGgwr8eTPgWI6ylfQF18KvZMg9s5URZutKcbUL7Ww6Xx+EPYXNb7RGDpqJssooQMqt7fsemd/mpdpC1gvP8UE4cPiMUWxHDef8dhpLkkkrGHL/OazxdiogZJiESJaQPs1RK5aUVVvUD7BonOc9k5woZBYUKWeKB0BOcyXirhODSGc2h9z9hhyY2GWJR6St/llaoUmFHjQYxN286/xgZsBXYz8Fy9VvfQ78UUiCDPaMan1SxOYUTi8oUgg8WpPdKUZLDgGx4hUV4lVkT1Lzijbvau9oGeIxtwZSlStxTFH6i25JrFHOcSlz8U+DgmEFw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39840400004)(376002)(366004)(136003)(396003)(346002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(5660300002)(38100700002)(2906002)(36756003)(38350700005)(41300700001)(202311291699003)(86362001)(66476007)(107886003)(316002)(478600001)(54906003)(66556008)(6666004)(83380400001)(6916009)(52116002)(6486002)(6512007)(66946007)(1076003)(26005)(44832011)(2616005)(450100002)(8936002)(8676002)(4326008)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VZ8h6H6n0jt6WE79vJ7bynn5TlaEW1gqco3rpCEEK+dw9ATilnZM4PCTHV6N08AROeXq3ND15AJ96iorp+lJQtsUZhC7b/eUrf0AFDRasLX1ljdzDNAO5BTLyY0PlDLPzHmnaQAI+y/2DssbSHp+S/fpsAWWIzt0Ug6Jm2cEJVDjv3/zxikAAg1vVQhY3vXxQUDp1R0Juc8inaQbbjHFvdVNTE9Y80T7TMGlm+xlM/lLJQjF2HfE6ba62X6wtCKftwdadMFtnGeJjNSVjlFAEUxdY8jKY03F8CR5qSdp4p5W7lDaQ3PfW2yhvdWYbqJWW1XEixVJnAI3nQ4w0jGFnymbHxRU83/5wtT1vfL+XEr99y19WQS5cnLjSEhmhfN/lOQFT3DPRkKkRaPpNbwYO/5FUNmO2Cm2VKqlh57DQpIl2pfSqEZgFz/zsp4bzkogAek3uiYUZYhGe5KEcewoWKHRYmGYRKfAXfv5jugi6jxDdfwYJaS0PWXtX/HmTFFa3ayQInbT5+JUr3+9LX/FJyeEpQbGGQbGqRyUVZZtx0cv+SoWrkBO4DS02hN/KhAjhGc6fFI4qhAitJaJ/IYe/ysIH2hu8sJKYwiU3KFENci2SMSSa1s53MpAYdGhMOi36uGwm4chO4A7JERnZG1eLZCr2CR4t65BO0LLprGswxF8NukxoWCKkcp39MF30hGjznx7orLRH1WDs7pn37Ha1pPkAxoAyFLuK4VaTwWVILugDit0Eur742jH6EOF9S31MNaxsjDy1m8NigGpOWJEoOJx9sZo2t9VY+uXCjIZ6NKY8p2TclthQhSoCESAs5pdzUQYCz86qzRmoiB86qorDu6V5U2NUzY/UPLVIYBVr9FbkGq41r1qjDC4qkx9KlWAxzRr86VBGqWB772rnkCI9ReBjKNf5atwLnAlSZACPQUcQtsjGRW24br/Jbiz/QolMMHxHgMjU0mwvbGHUmfP7moUM5ePHTTxU0gJjO+pJYwB9XjwdFkntBSQfvohA3fiuVc1cMWjyZpZH6xGUskYQM4aioG2TXKbk86D+6eLNRn+0rOtDKzNrT7UNgTy0iN4zfDvVvFuvWQbrfPVsBwN9ScnrRU97fPRYGdyug+fTnD1HbQiTVHrHwY9S+RzGjTIB++hL2DMVGpGU+C96/VqMXQRYqXWIZrzz+OXDYd/f9qhQZXSe3BXmtIocCRs4ysZG7TxF+vVeMdjoYCVOfv4CuwgzznVIPE1VFFWZCiRkMeNlw3nOC/7C7/E/vjr9HQ1TPi2JYssjbRKhaC5Jnt9PjR75XHBS42EYQG3Y7geJvUz3K39f6/i9WSTrsYXhukBATSXDAYTIJWELiDIIFixzRtN4DUbL5nheDINBKw6IpI99GGSGDkrweIn3ID9kyYOeR/iYnQ7Vzkeg2BEp2Oop4D5usUsIMy8I+KtKzPvSQ/UURxB5/aqbBakHkGwcOfSVeLu1yVbphj14dg4fbf21FPedIkxY0aP5VQf/Dt12TV1C7V0Or/N6o+u3cARign6JZUS+tx9PKxgSlfS4yQWAvQswA2C4JG0ZCa2oqqQz8T9HwZ20MXBgN7KzgbtZDriWu9VYUaPX618OR0UwdqYsw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 164da792-9dec-44c4-4ef2-08dbf181c395 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2023 08:53:04.0278 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9fpAuKEXHY0rI/EFtLrNZPqQjWEFPgPyuP9mh8FWygZBHYYu2SDVyuBT8jUbw394F8RFI4Cue4gAh6PncbqlvPokVeuH9OqwTB+xgWMcWFg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5381 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: peng.zhang@corigine.com Cc: stable@dpdk.org 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: