net/avp: remove resources when port is closed

The rte_eth_dev_close() function now handles freeing resources for
devices (e.g., mac_addrs).  To conform with the new close() behaviour we
are asserting the RTE_ETH_DEV_CLOSE_REMOVE flag so that
rte_eth_dev_close() releases all device level dynamic memory.

Second level memory allocated to each individual rx/tx queue is now
freed as part of the close() operation therefore making it safe for the
rte_eth_dev_close() function to free the device private data without
orphaning the rx/tx queue pointers.

Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
Acked-by: Matt Peters <matt.peters@windriver.com>

diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 57af515..47b96ec 100644 (file)
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -959,6 +959,8 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev)
        eth_dev->dev_ops = &avp_eth_dev_ops;
        eth_dev->rx_pkt_burst = &avp_recv_pkts;
        eth_dev->tx_pkt_burst = &avp_xmit_pkts;
+       /* Let rte_eth_dev_close() release the port resources */
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                /*
@@ -1023,19 +1025,13 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev)
 static int
 eth_avp_dev_uninit(struct rte_eth_dev *eth_dev)
 {
-       int ret;
-
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return -EPERM;
 
        if (eth_dev->data == NULL)
                return 0;
 
-       ret = avp_dev_disable_interrupts(eth_dev);
-       if (ret != 0) {
-               PMD_DRV_LOG(ERR, "Failed to disable interrupts, ret=%d\n", ret);
-               return ret;
-       }
+       avp_dev_close(eth_dev);
 
        return 0;
 }
@@ -1941,8 +1937,25 @@ avp_dev_rx_queue_release(void *rx_queue)
        unsigned int i;
 
        for (i = 0; i < avp->num_rx_queues; i++) {
-               if (data->rx_queues[i] == rxq)
+               if (data->rx_queues[i] == rxq) {
+                       rte_free(data->rx_queues[i]);
+                       data->rx_queues[i] = NULL;
+               }
+       }
+}
+
+static void
+avp_dev_rx_queue_release_all(struct rte_eth_dev *eth_dev)
+{
+       struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+       struct rte_eth_dev_data *data = avp->dev_data;
+       unsigned int i;
+
+       for (i = 0; i < avp->num_rx_queues; i++) {
+               if (data->rx_queues[i]) {
+                       rte_free(data->rx_queues[i]);
                        data->rx_queues[i] = NULL;
+               }
        }
 }
 
@@ -1955,8 +1968,25 @@ avp_dev_tx_queue_release(void *tx_queue)
        unsigned int i;
 
        for (i = 0; i < avp->num_tx_queues; i++) {
-               if (data->tx_queues[i] == txq)
+               if (data->tx_queues[i] == txq) {
+                       rte_free(data->tx_queues[i]);
+                       data->tx_queues[i] = NULL;
+               }
+       }
+}
+
+static void
+avp_dev_tx_queue_release_all(struct rte_eth_dev *eth_dev)
+{
+       struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+       struct rte_eth_dev_data *data = avp->dev_data;
+       unsigned int i;
+
+       for (i = 0; i < avp->num_tx_queues; i++) {
+               if (data->tx_queues[i]) {
+                       rte_free(data->tx_queues[i]);
                        data->tx_queues[i] = NULL;
+               }
        }
 }
 
@@ -2105,6 +2135,10 @@ avp_dev_close(struct rte_eth_dev *eth_dev)
                /* continue */
        }
 
+       /* release dynamic storage for rx/tx queues */
+       avp_dev_rx_queue_release_all(eth_dev);
+       avp_dev_tx_queue_release_all(eth_dev);
+
 unlock:
        rte_spinlock_unlock(&avp->lock);
 }