From patchwork Thu Nov 30 08:52:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134730 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 CE5B94340A; Thu, 30 Nov 2023 09:53:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56A4742ED9; Thu, 30 Nov 2023 09:53:14 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2105.outbound.protection.outlook.com [40.107.223.105]) by mails.dpdk.org (Postfix) with ESMTP id 718DD42EB2; Thu, 30 Nov 2023 09:53:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vx/wva+5cxFlHKIQCEth75mMQd4UryzHHc6G3TY8PaiL8H2kRAddcmRmjUC8Ay2RJ6U6u3XzftHPagZBaqbdA1yxHdfiBYfu+MzM/md/+hcvveLUyo8VnW5EAazEozhTZH4k1Xo0UhjPD2N7emkC+VN01tYW4gTOPaYSguaXpCSS6O/XBRPDgxa67atWweXtcjGgMOMzJiMO48vLVj5/jL7YYs2N3DbbZE9GMQNWHA520HsQPZrw5+/IPbm+mG7J6473hJA7hfcJXTQ7YLLCl1aoHva/bOxoWr0qlQ+3aetG/s6FbLfxDrbLJoC5QtjYAZcZ+18N6njUXiTMosEQ/Q== 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=2/AFRG7qctTKgzQ+2Zz7QLV/vIbU9ZAt/d1hBeC+k0w=; b=PJ2Ay12HMRuohGozzANeXmWi+RDZ3eIpiRIMmFqLDchPibPmHGA9ajQWR1cAP4jZqO5Ksc0aFzwrgrkn7FmCK66qO5OkKNFCrsB0JABskU0XDsmT4Yu0WAVEzaae2aRmwhlRKg1lfi8wcyQgoyDW2tA1LXxYvUCTByMn8YvotIvjMgFqrJdUrjw3zeglH7VZ8rewfIFv9DeM3CW8cB4RVxqDFsgVHUwvaGdGqO73Zk15d0x4LdEW9MY899IsCUu4et46MTwuOr7SW+2dDM7uAYMM8Q9S4jVaHGr0x1MNDnyREtxz0wjg/pntYVdl2sG3G/ZtxwrylsIKEFhwW4ZnKw== 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=2/AFRG7qctTKgzQ+2Zz7QLV/vIbU9ZAt/d1hBeC+k0w=; b=CphEc03N2Vq6LF8sEWY7fsYN98LzWiMrEUFmkqlZWhDA6gDBgC3nyUMf/kbe+xjzCamX3AoIazKEavNjN/XyqoUQ97uEWEAFcCS4FUO/DSp+Mu4xja29yK0J7dVSz69YfLytHfkWhLwIX1axMa2Shv5Ad7/5fmakg5GBpoq1w14= 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:10 +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:10 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 6/7] net/nfp: fix resource leak for exit of flower firmware Date: Thu, 30 Nov 2023 16:52:37 +0800 Message-Id: <20231130085238.60290-7-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: 50852ad7-de1a-43a1-c7ae-08dbf181c77f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ulrZqw4TDqYPZ04UHK/M82BQ+UQkmJkFTCTvI5v64f3V90Aan62qIIghklK8eMKYz/mZgzyYU6HgX71x0e7tMaYDFehRG2N0yXfaSGu5MGPI96vtVD23Roj/CACwY51nsb63TRKbnh1dAJEVx1oHsrZFMaTcuLorpgXFmuZ1bHx5fahDRLO4WF2CEAXQL+F6KoysoQwrJ6VA0d/w3qREUAAJvfN1DmuacvCTnKB/BY6FT5pKAV1xjTsxJema3VhABF8wsMqfaiKRD9JUHKftS1DyC2RBp9JC6E1lI8B+uOLC4stdinTFQrmldpTQZErO2Nx966ufI3/0D5iBefsPw35+PdzxVQpLqCg60CRWhUvBzujBsYM4QlQQWWW6Hmi+/4j7qacb11fKZAsJhxD1f9l49vYRGf2GuE/zQevGKj6cH0xIc4qLwMiOyxUyPYdzp8yJCWDW0RocpRcfvuk7F4fbxS/gChwwgSFthdCMMNMbixH1XY3U2yIpIBq658iehWDFydsKrfOI07DOx0yGFisPGADj2l6IWAJ9y923U74knyqFAU/DjiZJM11+p+Mmn84h+Pslx9WuRlCwaXdXMjqcg3KXtTlY+1azRPhz1X1EXxnTOzgAxivoK32JZa3dwZ5YxsP8tQE3mIAh6Dvc6ZVzFH29HB0Rvb71PMdyFVD+OpnOKFUVpimbtM6TOkNXKYoYsmhhmJMhdfySStMF4w== 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: h4Jp9oq0Lg/vXAQKN4siw0730wtoAInZePE/z7iXfPyBTD/j8KSWv2629Z1xBQUEEJF/FamMg/s3b0mZZqga8vvQh1pPz6VogyLoHSnkJ8m2RqzWZBB2USsRC9JPZpJeN1SU3Zr+y7CqaMigQXdsBHc17YSGAelTVRLGFIRKDaA06JwP5nWUD0VC8FUPD2VcgCLnVBf+6AE+snxW6LPi+7IEuGDKUpdhbDKuDeIFTm8Ty6/3e7zfbFeUGVSu+6h1NDWjj5TEcvS0AyAC40wYOLM2PGf0B2GIMIV6/lyCBTduLKD2GTRoN1eifkUibZoP+xkIZqSvMvVxnLAeEL5bweiTwzD0bdcwTXS28nAkIbJxs7kUL1QIdQRqMuklpmAJtCV0IDiGIVh5OkD5WH8Rh5mmZe6FBD4q540AdliFbuTMIBa4SHqXzc3wlIkdrL5VDTj2bYIq2Qd+YODvUiWX+xODPkZw20YaiVglAOqA7dMOLN4duBCPeiCYQ5oLcc0zeJ6lS4RaToEOgy7caycboifhMp73dAIzp5AZPmN0QgtKWuXBI5GMZTDcOdINo7aYk9eJ3gEptJfcIuznzc9fuhLSTPK9LiBXLK3P/6arLGX9tx3tyiwi4n8xAO8OnndfqjbQ7ty0spV05rbfhAsckCkQJ5xXevaWlmSyaTaodnUIY2oXrSgxb3qqVs3pSok6mrKGeQbHUH2rVfATGwV7qE7vpzTPLdd/ct7/MaiTjAv7iCFspzgIN+IbxdGUsKHospLY3rMMIS1NlgS+M9ShYpVX3JMV0k5eyqizO1iAke0hrTSW1oDeNGodG0xfZsjvedr4sc5pLP5ZggLEpDNS1HBalx9PKBBpPjBSDJnDG8Y9gkbGmvk901unTh28WEgFHNpUBBSEZcz2zovHYbzpz/YCt5T+ft8U3AUlG3Hx8TGb0fYacMQWHILLFkf/4zKprz1T3eIxYt61g2Na5YWQzrN1ehCcMkvfUbRmkOid9Ck1bHje2G/2cUC7gQnZukviCid0zpOv/le2BGQp3GD/qBAqV04jBxPDJsy2uFCoQjRRMiNYS50Jqz+HhXywPBFkcOFEOciEu7Ghy+cvGpOZ0Mc3Y9PieGOjiavExip97knORNc1h55N9F0QqFDTkpuKjFPReidAd45eMwvxIjgRkfNP6FZaekXVFz+Bhf82rRDsZeWTDcK+93KhYB9KylfAwMJje9ovys9maCanbSOL+21qrdRAFSLCRtCRp5+mfNK2q+ZwfQpJkZSSc0MQc9f5FPIfh8arYml0MOg6q8rdgWr7hwY0TQuDD3PQQ/IxZcnghJ6J/p8DEBTDVLQ7gcqet7DBHWQcRWZoHKXN/SMqFXV0Zty59ZF8RtipFrjJJGCgX0gFTAx4IoqSCt6GAG97nlP4POeahIdO8jeTg6y5FI+JbK+A+4U/VwR9kLf+52WWtHVOjUPrm2rh1czP9QDor7TJDRCMP6owa1yHyTHI7I7vCV82anbnpTWEr0Q5UVs6Ti6u4cWexjwUTt8hCqxDFIAHeuc/uIX0jR2R2TMqGlQgpjD0zogHzZAE73DliMRV5504YS+092oSEaWjVoVWYHa0HYnE9wWRTBDv0TgWPQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50852ad7-de1a-43a1-c7ae-08dbf181c77f 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:10.6041 (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: yG4bL4I4jy2EEnei0e7vHhqkX4ZHcwf74eHXzQcx8AhARwnOjgNvTa6e/0fxBgYBHEdkvxKQm5o2hC3aTlExJj128sgXYagU+z7SV9IOheQ= 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 exit logic of flower firmware. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 73 ++++--------------- drivers/net/nfp/flower/nfp_flower.h | 1 + .../net/nfp/flower/nfp_flower_representor.c | 64 ++++++++++++++++ 3 files changed, 80 insertions(+), 58 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 6b523d98b0..3698a3d4aa 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -82,63 +82,6 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) return 0; } -/* Reset and stop device. The device can not be restarted. */ -static int -nfp_flower_pf_close(struct rte_eth_dev *dev) -{ - uint16_t i; - struct nfp_net_hw *hw; - struct nfp_pf_dev *pf_dev; - struct nfp_net_txq *this_tx_q; - struct nfp_net_rxq *this_rx_q; - struct nfp_flower_representor *repr; - struct nfp_app_fw_flower *app_fw_flower; - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - - repr = dev->data->dev_private; - hw = repr->app_fw_flower->pf_hw; - pf_dev = hw->pf_dev; - app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); - - nfp_mtr_priv_uninit(pf_dev); - - /* - * We assume that the DPDK application is stopping all the - * threads/queues before calling the device close function. - */ - nfp_net_disable_queues(dev); - - /* Clear queues */ - for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = dev->data->tx_queues[i]; - nfp_net_reset_tx_queue(this_tx_q); - } - - for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = dev->data->rx_queues[i]; - nfp_net_reset_rx_queue(this_rx_q); - } - - /* Cancel possible impending LSC work here before releasing the port */ - rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void *)dev); - - nn_cfg_writeb(&hw->super, NFP_NET_CFG_LSC, 0xff); - - /* Now it is safe to free all PF resources */ - PMD_DRV_LOG(INFO, "Freeing PF resources"); - 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_flower); - rte_free(pf_dev); - - return 0; -} - static const struct eth_dev_ops nfp_flower_pf_vnic_ops = { .dev_infos_get = nfp_net_infos_get, .link_update = nfp_net_link_update, @@ -146,7 +89,6 @@ static const struct eth_dev_ops nfp_flower_pf_vnic_ops = { .dev_start = nfp_flower_pf_start, .dev_stop = nfp_net_stop, - .dev_close = nfp_flower_pf_close, }; static inline struct nfp_flower_representor * @@ -858,6 +800,21 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, return ret; } +void +nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev) +{ + struct nfp_app_fw_flower *app_fw_flower; + + app_fw_flower = pf_dev->app_fw_priv; + nfp_flower_cleanup_ctrl_vnic(app_fw_flower->ctrl_hw); + nfp_cpp_area_free(app_fw_flower->ctrl_hw->ctrl_area); + nfp_cpp_area_free(pf_dev->ctrl_area); + rte_free(app_fw_flower->pf_hw); + nfp_mtr_priv_uninit(pf_dev); + nfp_flow_priv_uninit(pf_dev); + rte_free(app_fw_flower); +} + int nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev) { diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index 6f27c06acc..8393de66c5 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -106,6 +106,7 @@ nfp_flower_support_decap_v2(const struct nfp_app_fw_flower *app_fw_flower) int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, const struct nfp_dev_info *dev_info); +void nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev); int nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev); bool nfp_flower_pf_dispatch_pkts(struct nfp_net_hw *hw, struct rte_mbuf *mbuf, diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 7212d9e024..02089d390e 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -328,12 +328,75 @@ nfp_flower_repr_free(struct nfp_flower_representor *repr, } } +/* Reset and stop device. The device can not be restarted. */ +static int +nfp_flower_repr_dev_close(struct rte_eth_dev *dev) +{ + uint16_t i; + struct nfp_net_hw *hw; + struct nfp_pf_dev *pf_dev; + struct nfp_net_txq *this_tx_q; + struct nfp_net_rxq *this_rx_q; + struct nfp_flower_representor *repr; + struct nfp_app_fw_flower *app_fw_flower; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + repr = dev->data->dev_private; + app_fw_flower = repr->app_fw_flower; + hw = app_fw_flower->pf_hw; + pf_dev = hw->pf_dev; + + /* + * We assume that the DPDK application is stopping all the + * threads/queues before calling the device close function. + */ + nfp_net_disable_queues(dev); + + /* Clear queues */ + for (i = 0; i < dev->data->nb_tx_queues; i++) { + this_tx_q = dev->data->tx_queues[i]; + nfp_net_reset_tx_queue(this_tx_q); + } + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + this_rx_q = dev->data->rx_queues[i]; + nfp_net_reset_rx_queue(this_rx_q); + } + + if (pf_dev->app_fw_id != NFP_APP_FW_FLOWER_NIC) + return -EINVAL; + + nfp_flower_repr_free(repr, repr->repr_type); + + for (i = 0; i < MAX_FLOWER_VFS; i++) { + if (app_fw_flower->vf_reprs[i] != NULL) + return 0; + } + + for (i = 0; i < NFP_MAX_PHYPORTS; i++) { + if (app_fw_flower->phy_reprs[i] != NULL) + return 0; + } + + if (app_fw_flower->pf_repr != NULL) + return 0; + + /* Now it is safe to free all PF resources */ + nfp_uninit_app_fw_flower(pf_dev); + nfp_pf_uninit(pf_dev); + + return 0; +} + static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { .dev_infos_get = nfp_flower_repr_dev_infos_get, .dev_start = nfp_flower_pf_start, .dev_configure = nfp_net_configure, .dev_stop = nfp_net_stop, + .dev_close = nfp_flower_repr_dev_close, .rx_queue_setup = nfp_net_rx_queue_setup, .tx_queue_setup = nfp_net_tx_queue_setup, @@ -356,6 +419,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { .dev_start = nfp_flower_repr_dev_start, .dev_configure = nfp_net_configure, .dev_stop = nfp_flower_repr_dev_stop, + .dev_close = nfp_flower_repr_dev_close, .rx_queue_setup = nfp_flower_repr_rx_queue_setup, .tx_queue_setup = nfp_flower_repr_tx_queue_setup,