From patchwork Mon Dec 4 01:57:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134772 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 9DE7143666; Mon, 4 Dec 2023 02:58:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 428A940A6B; Mon, 4 Dec 2023 02:57:47 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2135.outbound.protection.outlook.com [40.107.243.135]) by mails.dpdk.org (Postfix) with ESMTP id 8B61B4068A; Mon, 4 Dec 2023 02:57:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QFFk7lMKoU+XygAYlK3qUcYy/Qrn/YEXz7I15fe/jJ3sS5acwwcpu4vyQLyHkEeMJvMgwocVoJWoiH64PkKFKyLUOTkQa52fu19m2+71Tw1efN3FaHhUvyypqlUBKHUs08rhAk+D1H4out5blROAJ38CIUs28HM7n9bNeYmX6vGK3MKsjMYoXBTA1vhIzhFfFMVV2inz9EZmXvQr39AeQb6K5zYEoThOkHakWl3FRjRLPBDnokDdLurgav1RkDEjJ9CpSKboIOOuKflJPX88UWB6JDeGYpMzPd5MQ/DxVubYZx8olxrGh23Lm0a3XfLhRLblCMXMVkAqXVaglZ+MOw== 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=iPwiyhsy5rlCgcTDAKmhSqSPNCicL9v6dmaLws5Kg28=; b=WK93n1s2XGvy1tRBmZAVeR2+eP47XB9iatQrTqqaJMI5lvhtQxJmiEMkDm/urjCrBe13xnwJOD5B8kOvEW4QoKLuLZ0rieegFR22Cml0InWdIE+hZnRDgQ0KrVEDZyjfbLkdXMHOU/QOR8mohXHAgYVSKiNRZVxQxqmZKVCRPLB3iY5t7o42W+ogMPIyeVBs7SkcJl3UYbsUaWgIE/fmiN6NhHu2XT0UnP4bQc1pk8b2YzD8hrPwpuM91tDzEvN7+yjUhPamwH8TDVc8aF/zvZx53CQedjxYl0fu6DrPSTm5u8jcbycZ2ZyRJZnTZ0fsaNGuRp0Ydxl5WDQxXd+Miw== 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=iPwiyhsy5rlCgcTDAKmhSqSPNCicL9v6dmaLws5Kg28=; b=oQsgE1tCsZMU28MNnG7QcbLRzIInpRn1AzINhOy05dffHiRC7LliME3tURxgJXVNe46RyI0vZdORiOWyx0nXIfivNNvp6Wy3IpGwDObmjuxQbLIHRZpP+EfjCPhRUuhv541KHR61Dmfk2JXTntpQHyk+yCvn56Y4Kor12+V86D4= 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 PH0PR13MB5876.namprd13.prod.outlook.com (2603:10b6:510:168::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.33; Mon, 4 Dec 2023 01:57:44 +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.033; Mon, 4 Dec 2023 01:57:44 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH v2 3/8] net/nfp: fix resource leak for CoreNIC firmware Date: Mon, 4 Dec 2023 09:57:13 +0800 Message-Id: <20231204015718.780578-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231204015718.780578-1-chaoyong.he@corigine.com> References: <20231130085238.60290-1-chaoyong.he@corigine.com> <20231204015718.780578-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH0PR07CA0021.namprd07.prod.outlook.com (2603:10b6:510:5::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5876:EE_ X-MS-Office365-Filtering-Correlation-Id: ce675626-71ce-408a-e4fb-08dbf46c67d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OPz0zMfXzV4yg4smsVzp1o2Ff2QBS+vV40ndAPggw7QNWj/O6KVwwSdVkHP9aPYXJEBU6GVqFiEgkpoc0WVmegpys80d8oo7n/r9v1GL0a1cxnH1eeqIZ9tmpdS6eGBrkWUcTY/6K7N817xQGldT8Vcu60PmQkVe38KDtEFzPfCadtynN1V9PSjEfR92SKITDDkrSmlk17syDKMzpvZlZAVZ8GBadDjAQKHhGxzxbW6/vFnkISPUTLS75LR5ZyHsm/bF/BzlDZntjwmjC2FDh7RTvpfaA+/n4ZFHQo+u5Q0jrhCEWUN1YQLrAZYIVnt0QPWgF7h3HeCQbkaGYBwEm4kibIgoTriJHbdfm2DC5Hbl1YdxdjLoi2DgAokCq1nBokP7wdQB2eCDyZbgXnH+ke+520bUZGYkypJsm3pVhnI9MtkaOI4WHAxIF1w9RUZyDki38VmbC5HQjzXmDdLvlsnnczKR6Pxvip29bw+Ji0rgy9AOoCJ/QrKKTSfZiZnAutjxAVAi+z3NaOk70THuXI+yLBfhBh06y/at3FdNF7BW//nBV6a9y401n9mANGgRSV2gk959WKCloAQhocwABQHzTocnlBdG5uB85AY4Dk5FxA3w7oBpznDuDy/rdebx5dEK5iVjKDO+zyIn9OdZhX9p77RircNvHm8DU3omKNw= 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)(366004)(376002)(136003)(346002)(39830400003)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(83380400001)(38100700002)(41300700001)(26005)(66556008)(66476007)(6916009)(66946007)(44832011)(5660300002)(8936002)(8676002)(4326008)(450100002)(316002)(54906003)(6512007)(6506007)(107886003)(1076003)(2616005)(6486002)(6666004)(52116002)(478600001)(2906002)(86362001)(36756003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9joF67Gfae0WOgNqrzM4SvEHOnG0gGxchfK/7SxP5DKlrq1SCTvE1mnDaEZNH36JtAP53SKdA+Hsy2UwjVWUgJzaZOgKgJtmBC9ZXaUHkot0EMoGKnTFVka/ltElsK6fPysQBNuHPqQFGgQzGrBr4/b1NAvcNtltZj10HHho8UpOtChdmrG++00all8BW4CR1ka+sjDqNER82mRbxxA1pMzip765dpbRr8f7kajzGKlWZgDM9vaYTampAVNhCjNohpbQ/rTtb9NxC36oaBa6VvPgl/QwoP2OskQye/mSerA8JaRkKI82IdLVNQA1PMzGTcsi1+iE2JARA19leqBhpH2OKve4s0dcYPTxeJNd8ogVba9prNnzXLioXqqVEnsgoFbGaeJyyEvOptLDZ/JXeXRiuP4COdF2d3YFHl6lRAwOhzIWMkwtuBV3VzioO4154eWVv+OeudUfJZoggkx5grp9VYdizoBBcm7KINzgkDt6t91MFxR9CzZmpWULUJOxAivc49ENhqXTKMqEYXCjJDxnc81N7c2GYTuWNUNLROZqup0Tz497IY2t0QgMDBT6kCKi5YtECAcq5o7Bt7APzNmZRRXJyilaKWXoq0N+AltSFhPwf+Qz05O1imaEQ+fwoAXRPyFEqCKpXjpNg7WEf5jDwd5Hu/aF2QXjhANpJQ6edqkT3RJkAi0QaD74uksgscPGwnZdhAizSES0GkeGFp9vfxdF+/3dcbS670M+Oh76d8c0gR/LPpfjVQLDcbF3xTz3p5YAohUGGPGhCt3yaBdG3XZhpJ1NcQHF603ARgRrizfzyYJX+VqnrErKGHT68wAOLTu+SlHLZoQqepvM5t9R4yOtw3ZpCNfEltzcCTJ2DpfZof3i5askqT7xJXvVuukfl7aGKW33e9hH+oJQD6sOA5zqU4fLBX12w5qkn9TJnffVxKiqI8x2p2bU76qAZnjZXcP9llHU6sSkBuhvl/tHWOPqtVQk8SninutqML7myjs5bI+Qew5pWAx2G1C68GbZK5GMc0eOemdoJjcsGOIwSRm2R4dLt4Gyp3klsGTnO+CwuUdV1jHlAwPvJ+dibFIiZDMPaHjJunqFNFGB8doQG3weBUxSyAK10raqxvXOPn7xdXx20yhp0ei+orvUVHEatGoFZ3RvxsTcPL8PsIoDZ3cXr8TPLePPEKBCCsHeGX7wPdUpW5y9b9Zofev5Gd4zQ5uqtFQJlcILXnPXg+f5PeCsDyhQbth64pxgDW7+HsU/b4Qgg71dKzBOR4Dlavf61H3ziDVvEFnWcSdxcgSD8HAMQ/ITddNOlvrjWmRsaOTk4zztY7YUE0BeklDDrh0U+FQyvgIb43XCmkHBv8Q42hOY/JHB4GvoDZCKzBCpjk7ky9hVaVqTwUAD52gPDdRpKN872sMWDcjU4bUNPLW0bO9njqAwZE3WhfnA5a8asNUlk3/kc6eCCV/wJ/vUT7tG6ebwtCLDqbNiVyhrB4jawbUkSH7KyHXtMEGdpYHbxI5rM3E7eC5NIF4rs6TicjF6d9pLsg/TBcAj0oi3qrz7cJnz/p/S+kqz0UBGjzW1uaQ3jiupuaRS6shJC6dqsjd4Q8Hb0HS5sr6cBd5IYA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce675626-71ce-408a-e4fb-08dbf46c67d9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 01:57:44.1949 (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: rCSrByicK/b7LK8+8+ieIZLLl88jqgkRp0F8meZK+ZRj2mITKFIDRDGXVk4lhHFW5kP1C0UhlVFy0oPcJDAvMMWvbdea4LV2KQndpyZ/R5A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5876 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 logic of CoreNIC firmware application. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 2a80a592f2..c132e97d1a 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -317,6 +317,18 @@ nfp_net_keepalive_stop(struct nfp_multi_pf *multi_pf) rte_eal_alarm_cancel(nfp_net_beat_timer, (void *)multi_pf); } +static void +nfp_net_uninit(struct rte_eth_dev *eth_dev) +{ + struct nfp_net_hw *net_hw; + + net_hw = eth_dev->data->dev_private; + rte_free(net_hw->eth_xstats_base); + nfp_ipsec_uninit(eth_dev); + if (net_hw->mac_stats_area != NULL) + nfp_cpp_area_release_free(net_hw->mac_stats_area); +} + /* Reset and stop device. The device can not be restarted. */ static int nfp_net_close(struct rte_eth_dev *dev) @@ -1137,12 +1149,11 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev, app_fw_nic->ports[id]->eth_dev != NULL) { struct rte_eth_dev *tmp_dev; tmp_dev = app_fw_nic->ports[id]->eth_dev; - nfp_ipsec_uninit(tmp_dev); + nfp_net_uninit(tmp_dev); rte_eth_dev_release_port(tmp_dev); - app_fw_nic->ports[id] = NULL; } } - nfp_cpp_area_free(pf_dev->ctrl_area); + nfp_cpp_area_release_free(pf_dev->ctrl_area); app_cleanup: rte_free(app_fw_nic);