net/vhost: free consumed Tx buffers on demand

[dpdk.git] / drivers / net / vhost / rte_eth_vhost.c

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 410bfd8..abe91c7 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -53,8 +53,6 @@
 #define ETH_VHOST_CLIENT_ARG           "client"
 #define ETH_VHOST_DEQUEUE_ZERO_COPY    "dequeue-zero-copy"
 
-static const char *drivername = "VHOST PMD";
-
 static const char *valid_arguments[] = {
        ETH_VHOST_IFACE_ARG,
        ETH_VHOST_QUEUES_ARG,
@@ -803,6 +801,32 @@ eth_dev_stop(struct rte_eth_dev *dev)
        update_queuing_status(dev);
 }
 
+static void
+eth_dev_close(struct rte_eth_dev *dev)
+{
+       struct pmd_internal *internal;
+       struct internal_list *list;
+
+       internal = dev->data->dev_private;
+       if (!internal)
+               return;
+
+       rte_vhost_driver_unregister(internal->iface_name);
+
+       list = find_internal_resource(internal->iface_name);
+       if (!list)
+               return;
+
+       pthread_mutex_lock(&internal_list_lock);
+       TAILQ_REMOVE(&internal_list, list, next);
+       pthread_mutex_unlock(&internal_list_lock);
+       rte_free(list);
+
+       free(internal->dev_name);
+       free(internal->iface_name);
+       rte_free(internal);
+}
+
 static int
 eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
                   uint16_t nb_rx_desc __rte_unused,
@@ -859,7 +883,6 @@ eth_dev_info(struct rte_eth_dev *dev,
                return;
        }
 
-       dev_info->driver_name = drivername;
        dev_info->max_mac_addrs = 1;
        dev_info->max_rx_pktlen = (uint32_t)-1;
        dev_info->max_rx_queues = internal->max_queues;
@@ -936,6 +959,16 @@ eth_queue_release(void *q)
        rte_free(q);
 }
 
+static int
+eth_tx_done_cleanup(void *txq __rte_unused, uint32_t free_cnt __rte_unused)
+{
+       /*
+        * vHost does not hang onto mbuf. eth_vhost_tx() copies packet data
+        * and releases mbuf, so nothing to cleanup.
+        */
+       return 0;
+}
+
 static int
 eth_link_update(struct rte_eth_dev *dev __rte_unused,
                int wait_to_complete __rte_unused)
@@ -971,12 +1004,14 @@ rte_eth_vhost_feature_get(void)
 static const struct eth_dev_ops ops = {
        .dev_start = eth_dev_start,
        .dev_stop = eth_dev_stop,
+       .dev_close = eth_dev_close,
        .dev_configure = eth_dev_configure,
        .dev_infos_get = eth_dev_info,
        .rx_queue_setup = eth_rx_queue_setup,
        .tx_queue_setup = eth_tx_queue_setup,
        .rx_queue_release = eth_queue_release,
        .tx_queue_release = eth_queue_release,
+       .tx_done_cleanup = eth_tx_done_cleanup,
        .link_update = eth_link_update,
        .stats_get = eth_stats_get,
        .stats_reset = eth_stats_reset,
@@ -985,6 +1020,8 @@ static const struct eth_dev_ops ops = {
        .xstats_get_names = vhost_dev_xstats_get_names,
 };
 
+static struct rte_vdev_driver pmd_vhost_drv;
+
 static int
 eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
                     const unsigned numa_node, uint64_t flags)
@@ -1069,7 +1106,7 @@ eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
        data->dev_flags =
                RTE_ETH_DEV_DETACHABLE | RTE_ETH_DEV_INTR_LSC;
        data->kdrv = RTE_KDRV_NONE;
-       data->drv_name = internal->dev_name;
+       data->drv_name = pmd_vhost_drv.driver.name;
        data->numa_node = numa_node;
 
        /* finally assign rx and tx ops */
@@ -1196,8 +1233,6 @@ static int
 rte_pmd_vhost_remove(const char *name)
 {
        struct rte_eth_dev *eth_dev = NULL;
-       struct pmd_internal *internal;
-       struct internal_list *list;
        unsigned int i;
 
        RTE_LOG(INFO, PMD, "Un-Initializing pmd_vhost for %s\n", name);
@@ -1207,22 +1242,9 @@ rte_pmd_vhost_remove(const char *name)
        if (eth_dev == NULL)
                return -ENODEV;
 
-       internal = eth_dev->data->dev_private;
-       if (internal == NULL)
-               return -ENODEV;
-
-       list = find_internal_resource(internal->iface_name);
-       if (list == NULL)
-               return -ENODEV;
-
-       pthread_mutex_lock(&internal_list_lock);
-       TAILQ_REMOVE(&internal_list, list, next);
-       pthread_mutex_unlock(&internal_list_lock);
-       rte_free(list);
-
        eth_dev_stop(eth_dev);
 
-       rte_vhost_driver_unregister(internal->iface_name);
+       eth_dev_close(eth_dev);
 
        if (rte_atomic16_sub_return(&nb_started_ports, 1) == 0)
                vhost_driver_session_stop();
@@ -1230,9 +1252,6 @@ rte_pmd_vhost_remove(const char *name)
        rte_free(vring_states[eth_dev->data->port_id]);
        vring_states[eth_dev->data->port_id] = NULL;
 
-       free(internal->dev_name);
-       free(internal->iface_name);
-
        for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
                rte_free(eth_dev->data->rx_queues[i]);
        for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
@@ -1240,7 +1259,6 @@ rte_pmd_vhost_remove(const char *name)
 
        rte_free(eth_dev->data->mac_addrs);
        rte_free(eth_dev->data);
-       rte_free(internal);
 
        rte_eth_dev_release_port(eth_dev);