From patchwork Fri Sep 27 09:09:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chenxu Di X-Patchwork-Id: 60010 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1C0DC1BEC4; Fri, 27 Sep 2019 11:53:17 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 0AA331B079 for ; Fri, 27 Sep 2019 11:53:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Sep 2019 02:53:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,555,1559545200"; d="scan'208";a="219722101" Received: from intel.sh.intel.com ([10.239.255.149]) by fmsmga002.fm.intel.com with ESMTP; 27 Sep 2019 02:53:01 -0700 From: Di ChenxuX To: dev@dpdk.org Cc: qiming.yang@intel.com, Di ChenxuX Date: Fri, 27 Sep 2019 09:09:47 +0000 Message-Id: <20190927090948.32909-5-chenxux.di@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927090948.32909-1-chenxux.di@intel.com> References: <20190827050142.16010-1-chenxux.di@intel.com> <20190927090948.32909-1-chenxux.di@intel.com> Subject: [dpdk-dev] [PATCH v7 4/5] net/ice: release port upon close X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Set RTE_ETH_DEV_CLOSE_REMOVE upon probe so all the private resources for the port can be freed by rte_eth_dev_close(). Signed-off-by: Di ChenxuX --- doc/guides/rel_notes/release_19_11.rst | 1 + drivers/net/ice/ice_ethdev.c | 30 ++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst index fc129cf3e..ac8f3d0e5 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -63,6 +63,7 @@ New Features * Added support for device-specific DDP package loading. * Added support for handling Receive Flex Descriptor. * Added support for protocol extraction on per Rx queue. + * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. * **Updated the Intel e1000 driver.** diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index c126d962c..dfccef65d 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1924,6 +1924,11 @@ ice_dev_init(struct rte_eth_dev *dev) goto err_init_mac; } + /* Pass the information to the rte_eth_dev_close() that it should also + * release the private port resources. + */ + dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; + ret = ice_res_pool_init(&pf->msix_pool, 1, hw->func_caps.common_cap.num_msix_vectors - 1); if (ret) { @@ -2090,6 +2095,9 @@ ice_dev_close(struct rte_eth_dev *dev) { struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; + struct rte_flow *p_flow; /* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc @@ -2109,22 +2117,6 @@ ice_dev_close(struct rte_eth_dev *dev) rte_free(hw->port_info); hw->port_info = NULL; ice_shutdown_all_ctrlq(hw); - rte_free(pf->proto_xtr); - pf->proto_xtr = NULL; -} - -static int -ice_dev_uninit(struct rte_eth_dev *dev) -{ - struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); - struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; - struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); - struct rte_flow *p_flow; - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - - ice_dev_close(dev); dev->dev_ops = NULL; dev->rx_pkt_burst = NULL; @@ -2146,6 +2138,12 @@ ice_dev_uninit(struct rte_eth_dev *dev) ice_free_switch_filter_rule(p_flow->rule); rte_free(p_flow); } +} + +static int +ice_dev_uninit(struct rte_eth_dev *dev) +{ + ice_dev_close(dev); return 0; }