From patchwork Mon Sep 2 10:27:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chenxu Di X-Patchwork-Id: 58377 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 BB0761E88D; Mon, 2 Sep 2019 13:13:40 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 62ACB1E567 for ; Mon, 2 Sep 2019 13:13:38 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Sep 2019 04:13:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="265996704" Received: from intel.sh.intel.com ([10.239.255.149]) by orsmga001.jf.intel.com with ESMTP; 02 Sep 2019 04:13:36 -0700 From: Di ChenxuX To: dev@dpdk.org Cc: Wenzhuo Lu , Beilei Xing , Qi Zhang , Yang Qiming , Di ChenxuX Date: Mon, 2 Sep 2019 10:27:44 +0000 Message-Id: <20190902102745.66695-5-chenxux.di@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190902102745.66695-1-chenxux.di@intel.com> References: <20190902102745.66695-1-chenxux.di@intel.com> Subject: [dpdk-dev] [PATCH 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 --- drivers/net/ice/ice_ethdev.c | 33 ++++++++++++++++++++++----------- drivers/net/ice/ice_ethdev.h | 1 + 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 44a14cb8a..d2e2085fa 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1488,6 +1488,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) { @@ -1536,6 +1541,9 @@ ice_dev_init(struct rte_eth_dev *dev) TAILQ_INIT(&pf->flow_list); + pf->adapter_stopped = 0; + pf->adapter_closed = 0; + return 0; err_pf_setup: @@ -1653,6 +1661,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 @@ -1672,17 +1683,6 @@ ice_dev_close(struct rte_eth_dev *dev) rte_free(hw->port_info); hw->port_info = NULL; ice_shutdown_all_ctrlq(hw); -} - -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; - - ice_dev_close(dev); dev->dev_ops = NULL; dev->rx_pkt_burst = NULL; @@ -1705,6 +1705,17 @@ ice_dev_uninit(struct rte_eth_dev *dev) rte_free(p_flow); } + pf->adapter_closed = 1; +} + +static int +ice_dev_uninit(struct rte_eth_dev *dev) +{ + struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); + + if (pf->adapter_closed == 0) + ice_dev_close(dev); + return 0; } diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index f569da833..2d4a2b4bb 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -270,6 +270,7 @@ struct ice_pf { struct ice_eth_stats internal_stats; bool offset_loaded; bool adapter_stopped; + bool adapter_closed; struct ice_flow_list flow_list; };