summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMichal Krawczyk <mk@semihalf.com>2018-10-31 15:53:16 +0100
committerFerruh Yigit <ferruh.yigit@intel.com>2018-11-05 15:01:25 +0100
commit4d7877fde2ef78639aa21273d585201884045abd (patch)
tree4e1b452b1505ce21663c7bf93048caa9ba13b2eb /drivers
parent66c4904f9298172e619d3c8f144f52c193914362 (diff)
downloaddpdk-4d7877fde2ef78639aa21273d585201884045abd.zip
dpdk-4d7877fde2ef78639aa21273d585201884045abd.tar.gz
dpdk-4d7877fde2ef78639aa21273d585201884045abd.tar.xz
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 <mk@semihalf.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ena/ena_ethdev.c31
1 files changed, 21 insertions, 10 deletions
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 0c0ed93..abe1e7b 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -509,6 +509,8 @@ err:
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 @@ err:
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;