From patchwork Mon Dec 4 01:57:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134775 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 B564E43666; Mon, 4 Dec 2023 02:58:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 896DB40DD8; Mon, 4 Dec 2023 02:57:53 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2139.outbound.protection.outlook.com [40.107.243.139]) by mails.dpdk.org (Postfix) with ESMTP id 6E9F640DCE; Mon, 4 Dec 2023 02:57:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QDCzZq1zwRNVxx64k4L4ABFH6DciRc0gk55bgqxLIEZUb0aMxqLTt5gBYpoK0AzGxtxaPQEFsAFwR+VIRaSnNj/lFclUuIcR+xwdldWISlL0bxjCSCrJkDqNIdRL/Pz5oceQVRtxO0GRWG566dRPo+rh8WQFAWO9WPZzJm6T7W1ixMFlkt3KvrczVZF9GluOBxBLr1QVyHHoCdcTp2fQlv4iyIn/7Fr1OPLHcIrO9ZmleRy6VedSrEtbbKMe3keSbcNn4Ive1qYskg8DlUATX9/YICS8wE3b3nvAOKEHZtc/reG4liQDXn+BUWe26uIBe1JqREu0VftOg6M4nSa9UA== 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=stqftUeN7DElIrZSdRsiZK6WYBmmd+jbiXF/e61nNWk=; b=HT/yZIuc1Z9Lwq7E4Jp0K9L7lO5bvpDiDaloQh2+4NdD+zuTXBehZjJiwtRH0uNkc5mNxYYtlRASJFoTwpAI2LzMU5JN89VpwgLD9zKUerL7xt9PcotESq+S6P0aSfW5EzN+QmizfcmGdB1DAt3y+X2jRPFAugtb2UFeZbpMJnRYlU+Bcz/3U3iRSi3Pe2WDRdyhs0bASntkOiQwDgOyDXzD/wopZZ6T5MVXpcYK5casOHnTpYpjxUYzl7ggjte3cYD2+q3Gbj27TpyWZ5f0kgFyrkP5w5oEg6yX2yjG/OHdTFg81gFozHY/0PkD8UmpHd/qE0Tubu3fYApIEUpzBg== 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=stqftUeN7DElIrZSdRsiZK6WYBmmd+jbiXF/e61nNWk=; b=iWXKYkgsrbxn3qXRUU/ZCZ5qVoz4T/IyLskmgIu5uvRTDTq3jJWNphd8L/Ane7xx7f59NwvCi5LRttVYVamUpQ1DxAGxNzcgomN/XxihBIl6tVl8tP3mas6kjAnJtxUOQjtcHOWagNhQFrwVlUsn3NlWcPkFTdCY+L+4kMxfLRo= 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:50 +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:50 +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 6/8] net/nfp: fix resource leak for exit of CoreNIC firmware Date: Mon, 4 Dec 2023 09:57:16 +0800 Message-Id: <20231204015718.780578-7-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: b01f2656-0a68-4bef-2d30-08dbf46c6bcf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: coueCObdg991mvPlsDHRJheYKZAU/GSLnIMJD5lzjYG5GlyjyS07RInGbx0SobpzAUkk5qEJB7rJt4RKKYRfsn/19UQZrvyD0Po2Nn/NgYDoISDCKLbvIiR/ce23nXKw4/0fmdBYjaU0ptKdtKABJzz8i32YT/uIPiUzjmE5ZgtxbJuOCvZNbTaJVFZwwDTOvKp8CgqMJyVWrVnVJD0RMar3ag5K+9rJ3OcGuWCJgR9c7pjVKQrksUohWb6d/ka4JNHhyZMNNnKVEpj1/3+DGt2kIy2CKZKLQKQgkkAWCmznlNajcPeKDxh17f1J1WTznVRChiW33NeKyfIxKy9kREyODal6SPd4/iHx0ehOYkmrxaw8XoIiQ32ou6Mxopdmr6R8Z3XKPFtdfVVNTGmKvAOyQYO1t11ZuDhKGNvvEgLSNPCSw5kgMU1kZBtnPVYhyzjEsUnht38l3lb1737MIXnRVpgeoFVzjpb2L3LEGUKMKPzEaAgJPEpqAPIsiTUcilq/cQRMk5+mk32czC/MR8GqztjecISCflbY++0xtrPhTctdwpuuWzxV26MfJL8B1O+jaFSmQoThqH10pLVdnKT7E3OHBdv2boxHyHR73+VTK+/4w1ui49sRgTiZ1bPyYOmlEZYA0anL54mMlPQN4nV+eh8uWVKL84g7bYVZPtY= 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: sF0uibdYMDYCQ4thw9Bsh9idPZvV3BqrR4ntdN5ZKB5H2RC7iPxcp8ejR+EdB8RUj3VAV8vMUENwcmsIXU4Wyf0mslHk90rvTyIJsw3cocQ1q6Ebt4Nyna64cSR0bXFgieinRW2pQUnhgO0oDYq3g+s30Y0vYi+UQi+dKrwFfyJs2MOQtfEZxdxIPdoX0fkhMB2EaCpfvJPr79ZKqiX1uBf0EFuh38RenkxI+mnoeXDJYQ1QuR0V7OkF1mGVLYMTmEW6AyzOCN+6PAvOyuZZ/DI3w3FxkhS9XI39wBDAEKDk47AbYEYpBEe4qtCM0mF7fd9u/LhS7lPJrpvFA/ucvKgXj+PqSw3VIy8OQRHJMDAmHY4JJRkrBzFlXhQ/9AvPOpZNFfMz/w2siLABjXlmJmJm+vGTUbu0P2nz3lQKxVa12UUwtZiO0RyHHccevyKYStmOHICXtTjBVYUPn7nV0g5/MX6gX5iz2s08Iiy1JIM1ZojCLFlfcNwcBX3x491j7gYC8XuiB1BHs5gQUOJl4j32DOch2gEbucyG52ANxipASDN+seWXTOAKhiBlUDi4ikhnUDkLXYzpkBeO3iCL2BMsiVcn8+nS1TVPX0kqzEef818XvatnXltczUdQMvdsD8v/+VMyMPlSLnl3RNmF6QlfKiDowVykd8goeckQ6G9oT8J5cQieRb5o6UBq0otaGbZ+N/Vi23nuM60NwqRVzgJ/BHJR+VJrkCb6rRbCyy9r/Aq2ulkuslLPXXA/OEEhciwKlrbZLBJv3HLOXxm/r/GUxPopgleujL/kUX9EGfFchBqe37W6BZQ40ta8qd9+97lZDT3iQzYBLBMfaAJxl5Y+fD6Phlug+BmLRZhWrLi8ko3Q7iCm0rYKd2kXK4nvCeplSxWWWyKuvkiGSe/fVPeb90dXl1+fy83c2CuoQXo8am5dFFwTpD3A6j7+qQpDFbm5kaz8g14FP2U/GwgN1ZCaU42Kw8YH6IyRwNSCyeh1OAS/ffMRyeN6iyNxggI8C5cBNzMCzaOB3DlQ1zpJGsjYwaPQa5FhlK5g6X8KyJkxrG2tZ95Iu4lkQphdCxMnmv3AqFadTKWaWV/nWZ/Voxyewm0dHmsytyvLdwtwqC0pqcGaNfI197PhqHkt7yHplYxBHPLlZEtGSqIYyzG3EjzV8VkmGA56df0401Ft1ZLeyP2wor5dUmcb8hAmmadbJd5XP11FBCXo6rWsbZxgT1vnn8hQ+FHN5b0SVJKIdKTb/TZOvM1XgtZNcAHEXqG3fJXXKM1NBLo01jkQwBNIwwGy3lGP/OpdYt+ZicPlzH5XQqE7Xb0vFcNYmxxxEiam9p4u4Hj07vWlMfma/KRBbWh81BDCzxlEtz5uUu9iTxtxF0rCkXrQ4mX9qahbk18u5Q3kOsDmCS2K9helXUYIz8jru0nKhGLz9qvTeIHAjOlc4BiGpZVOVPJAtVpGCaZ8X606y31xpoejHLjgczO+jccTZzeLPvlumfEfUE2e48QXzuX5OrtL+W3Iw8APv6YhEKVXe9Bw69LGhOhMvG063sbBkQq5jqJNZPQnbq2FYnODYBAmZtItKdLYnduaLgVdBRCoWBGvaQ4gI5Psa2ktQg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b01f2656-0a68-4bef-2d30-08dbf46c6bcf 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:50.8451 (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: NPkmTm55LCEHEucga4g92iqHUXcqS4Psc0g31WMBBGRIVTMUqusFGEfgzOFaG7Fwi22Nbk2uV3SWMGSl8DxipxCcIMEPNiJWJPtzMyiUaes= 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 exit logic of CoreNIC firmware. 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 | 91 +++++++++++++++++++++++++------- drivers/net/nfp/nfp_net_common.h | 1 + 2 files changed, 72 insertions(+), 20 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 6fdde105ba..537b4fe792 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -329,6 +329,55 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev) nfp_cpp_area_release_free(net_hw->mac_stats_area); } +static void +nfp_cleanup_port_app_fw_nic(struct nfp_pf_dev *pf_dev, + uint8_t id) +{ + struct rte_eth_dev *eth_dev; + struct nfp_app_fw_nic *app_fw_nic; + + app_fw_nic = pf_dev->app_fw_priv; + if (app_fw_nic->ports[id] != NULL) { + eth_dev = app_fw_nic->ports[id]->eth_dev; + if (eth_dev != NULL) + nfp_net_uninit(eth_dev); + + app_fw_nic->ports[id] = NULL; + } +} + +static void +nfp_uninit_app_fw_nic(struct nfp_pf_dev *pf_dev) +{ + nfp_cpp_area_release_free(pf_dev->ctrl_area); + rte_free(pf_dev->app_fw_priv); +} + +void +nfp_pf_uninit(struct nfp_pf_dev *pf_dev) +{ + nfp_cpp_area_release_free(pf_dev->qc_area); + free(pf_dev->sym_tbl); + if (pf_dev->multi_pf.enabled) { + nfp_net_keepalive_stop(&pf_dev->multi_pf); + nfp_net_keepalive_uninit(&pf_dev->multi_pf); + } + free(pf_dev->nfp_eth_table); + free(pf_dev->hwinfo); + nfp_cpp_free(pf_dev->cpp); + rte_free(pf_dev); +} + +static int +nfp_pf_secondary_uninit(struct nfp_pf_dev *pf_dev) +{ + free(pf_dev->sym_tbl); + nfp_cpp_free(pf_dev->cpp); + rte_free(pf_dev); + + return 0; +} + /* Reset and stop device. The device can not be restarted. */ static int nfp_net_close(struct rte_eth_dev *dev) @@ -340,8 +389,19 @@ nfp_net_close(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev; struct nfp_app_fw_nic *app_fw_nic; - if (rte_eal_process_type() != RTE_PROC_PRIMARY) + /* + * In secondary process, a released eth device can be found by its name + * in shared memory. + * If the state of the eth device is RTE_ETH_DEV_UNUSED, it means the + * eth device has been released. + */ + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + if (dev->state == RTE_ETH_DEV_UNUSED) + return 0; + + nfp_pf_secondary_uninit(dev->process_private); return 0; + } hw = dev->data->dev_private; pf_dev = hw->pf_dev; @@ -358,16 +418,17 @@ nfp_net_close(struct rte_eth_dev *dev) nfp_net_close_tx_queue(dev); nfp_net_close_rx_queue(dev); - /* Clear ipsec */ - nfp_ipsec_uninit(dev); - /* Cancel possible impending LSC work here before releasing the port */ rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void *)dev); /* Only free PF resources after all physical ports have been closed */ /* Mark this port as unused and free device priv resources */ nn_cfg_writeb(&hw->super, NFP_NET_CFG_LSC, 0xff); - app_fw_nic->ports[hw->idx] = NULL; + + if (pf_dev->app_fw_id != NFP_APP_FW_CORE_NIC) + return -EINVAL; + + nfp_cleanup_port_app_fw_nic(pf_dev, hw->idx); for (i = 0; i < app_fw_nic->total_phyports; i++) { id = nfp_function_id_get(pf_dev, i); @@ -377,26 +438,16 @@ nfp_net_close(struct rte_eth_dev *dev) return 0; } - /* Now it is safe to free all PF resources */ - PMD_INIT_LOG(INFO, "Freeing PF resources"); - if (pf_dev->multi_pf.enabled) { - nfp_net_keepalive_stop(&pf_dev->multi_pf); - nfp_net_keepalive_uninit(&pf_dev->multi_pf); - } - nfp_cpp_area_free(pf_dev->ctrl_area); - nfp_cpp_area_free(pf_dev->qc_area); - free(pf_dev->hwinfo); - free(pf_dev->sym_tbl); - nfp_cpp_free(pf_dev->cpp); - rte_free(app_fw_nic); - rte_free(pf_dev); - + /* Enable in nfp_net_start() */ rte_intr_disable(pci_dev->intr_handle); - /* Unregister callback func from eal lib */ + /* Register in nfp_net_init() */ rte_intr_callback_unregister(pci_dev->intr_handle, nfp_net_dev_interrupt_handler, (void *)dev); + nfp_uninit_app_fw_nic(pf_dev); + nfp_pf_uninit(pf_dev); + return 0; } diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 30fea7ae02..ded491cbdc 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -272,6 +272,7 @@ int nfp_net_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); int nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); +void nfp_pf_uninit(struct nfp_pf_dev *pf_dev); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv)