diff mbox series

[08/20] net/iavf: release port upon close

Message ID	20200913220711.3768597-9-thomas@monjalon.net (mailing list archive)
State	Changes Requested, archived
Delegated to:	Ferruh Yigit
Headers	From: Thomas Monjalon <thomas@monjalon.net> To: dev@dpdk.org Cc: ferruh.yigit@intel.com, arybchenko@solarflare.com, Steve Yang <stevex.yang@intel.com>, Jingjing Wu <jingjing.wu@intel.com>, Beilei Xing <beilei.xing@intel.com>, Anatoly Burakov <anatoly.burakov@intel.com> Date: Mon, 14 Sep 2020 00:06:59 +0200 Message-Id: <20200913220711.3768597-9-thomas@monjalon.net> In-Reply-To: <20200913220711.3768597-1-thomas@monjalon.net> References: <20200913220711.3768597-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 08/20] net/iavf: release port upon close Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	cleanup ethdev close operation \| [00/20] cleanup ethdev close operation [01/20] ethdev: reset device and interrupt pointers on release [02/20] ethdev: allow drivers to return error on close [03/20] net/af_packet: release port upon close [04/20] net/atlantic: release port upon close [05/20] net/axgbe: release port upon close [06/20] net/bonding: release port upon close [07/20] net/failsafe: release port upon close [08/20] net/iavf: release port upon close [09/20] net/mlx4: release port upon close [10/20] net/null: release port upon close [11/20] net/octeontx: release port upon close [12/20] net/pcap: release port upon close [13/20] net/ring: release port upon close [14/20] net/softnic: release port upon close [15/20] net/tap: release port upon close [16/20] ethdev: remove old close behaviour [17/20] drivers/net: accept removing device without any port [18/20] drivers/net: remove redundant MAC addresses freeing [19/20] app/testpmd: reset port status on close notification [20/20] app/testpmd: align behaviour of multi-port detach

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Thomas Monjalon Sept. 13, 2020, 10:06 p.m. UTC

From: Steve Yang <stevex.yang@intel.com>

The flag RTE_ETH_DEV_CLOSE_REMOVE is set so all port resources
can be freed by rte_eth_dev_close().

Freeing of private port resources is moved
from the ".remove(device)" to the ".dev_close(port)" operation.

Signed-off-by: Steve Yang <stevex.yang@intel.com>
---
[Thomas] Note: freeing in secondary process is inconsistent
between .dev_close and .remove operations.
---
 drivers/net/iavf/iavf_ethdev.c | 46 ++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 4860a94d4c..f7552f33db 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1362,6 +1362,11 @@  iavf_dev_init(struct rte_eth_dev *eth_dev)
 	adapter->eth_dev = eth_dev;
 	adapter->stopped = 1;
 
+	/* Pass the information to the rte_eth_dev_close() that it should also
+	 * release the private port resources.
+	 */
+	eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
 	if (iavf_init_vf(eth_dev) != 0) {
 		PMD_INIT_LOG(ERR, "Init vf failed");
 		return -1;
@@ -1416,6 +1421,7 @@  iavf_dev_close(struct rte_eth_dev *dev)
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 	struct iavf_adapter *adapter =
 		IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
 	iavf_dev_stop(dev);
 	iavf_flow_flush(dev, NULL);
@@ -1428,21 +1434,21 @@  iavf_dev_close(struct rte_eth_dev *dev)
 	rte_intr_callback_unregister(intr_handle,
 				     iavf_dev_interrupt_handler, dev);
 	iavf_disable_irq0(hw);
-	return 0;
-}
-
-static int
-iavf_dev_uninit(struct rte_eth_dev *dev)
-{
-	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
 
 	dev->dev_ops = NULL;
 	dev->rx_pkt_burst = NULL;
 	dev->tx_pkt_burst = NULL;
-	iavf_dev_close(dev);
+
+	if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) {
+		if (vf->rss_lut) {
+			rte_free(vf->rss_lut);
+			vf->rss_lut = NULL;
+		}
+		if (vf->rss_key) {
+			rte_free(vf->rss_key);
+			vf->rss_key = NULL;
+		}
+	}
 
 	rte_free(vf->vf_res);
 	vf->vsi_res = NULL;
@@ -1451,14 +1457,16 @@  iavf_dev_uninit(struct rte_eth_dev *dev)
 	rte_free(vf->aq_resp);
 	vf->aq_resp = NULL;
 
-	if (vf->rss_lut) {
-		rte_free(vf->rss_lut);
-		vf->rss_lut = NULL;
-	}
-	if (vf->rss_key) {
-		rte_free(vf->rss_key);
-		vf->rss_key = NULL;
-	}
+	return 0;
+}
+
+static int
+iavf_dev_uninit(struct rte_eth_dev *dev)
+{
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return -EPERM;
+
+	iavf_dev_close(dev);
 
 	return 0;
 }