Skip to contentSkip to conversation

net/ena: remove resources when port is being closed

PATCH Applied Michal Krawczyk 2 participants 2 messages Oct 31, 2018 – Nov 2, 2018 Network drivers

lore
Share & tools
lore

Michal Krawczyk

author
#0 lore raw

PATCH 1/1 net/ena: remove resources when port is being closed

The new API introduced in 18.11 is suggesting, that the driver should release all it's resources at the dev_close routine.

All resources previously released in uninit routine during PCI removal, are now being released at the dev_close and the PMD is indicating that it is supporting API changes by setting RTE_ETH_DEV_CLOSE_REMOVE flag.

As the device is not allocating MAC addresses dynamically, it is setting mac_addrs field to NULL, so it wouldn't be released by the rte_eth_dev_release_port().

Signed-off-by Michal Krawczyk <[email protected]>
---
 drivers/net/ena/ena_ethdev.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/net/ena/ena_ethdev.c +21 -10
index 0c0ed9302..abe1e7bd0 100644
@@ -509,6 +509,8 @@ static void ena_config_debug_area(struct ena_adapter *adapter)
 
 static void ena_close(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 ena_adapter *adapter =
 		(struct ena_adapter *)(dev->data->dev_private);
 

@@ -518,6 +520,25 @@ static void ena_close(struct rte_eth_dev *dev)
 
 	ena_rx_queue_release_all(dev);
 	ena_tx_queue_release_all(dev);
+
+	rte_free(adapter->drv_stats);
+	adapter->drv_stats = NULL;
+
+	rte_intr_disable(intr_handle);
+	rte_intr_callback_unregister(intr_handle,
+				     ena_interrupt_handler_rte,
+				     adapter);
+
+	/*
+	 * 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;
+	/*
+	 * MAC is not allocated dynamically. Setting NULL should prevent from
+	 * release of the resource in the rte_eth_dev_release_port().
+	 */
+	dev->data->mac_addrs = NULL;
 }
 
 static int

@@ -1683,8 +1704,6 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
 
 static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev)
 {
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 	struct ena_adapter *adapter =
 		(struct ena_adapter *)(eth_dev->data->dev_private);
 

@@ -1699,14 +1718,6 @@ static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev)
 	eth_dev->tx_pkt_burst = NULL;
 	eth_dev->tx_pkt_prepare = NULL;
 
-	rte_free(adapter->drv_stats);
-	adapter->drv_stats = NULL;
-
-	rte_intr_disable(intr_handle);
-	rte_intr_callback_unregister(intr_handle,
-				     ena_interrupt_handler_rte,
-				     adapter);
-
 	adapter->state = ENA_ADAPTER_STATE_FREE;
 
 	return 0;
Signature · 1 line
2.14.1
Applied
#1 lore raw
Quoted 7 lines · Michal Krawczyk

The new API introduced in 18.11 is suggesting, that the driver should release all it's resources at the dev_close routine.

All resources previously released in uninit routine during PCI removal, are now being released at the dev_close and the PMD is indicating that it is supporting API changes by setting RTE_ETH_DEV_CLOSE_REMOVE flag.

Quoted 5 lines

As the device is not allocating MAC addresses dynamically, it is setting mac_addrs field to NULL, so it wouldn't be released by the rte_eth_dev_release_port().

Signed-off-by Michal Krawczyk <[email protected]>

Applied to dpdk-next-net/master, thanks.