net/vhost: move statistics into a structure

[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 7539cd4..57ede23 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -41,7 +41,7 @@
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
-#include <rte_dev.h>
+#include <rte_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_virtio_net.h>
 #include <rte_spinlock.h>
@@ -72,6 +72,12 @@ static struct ether_addr base_eth_addr = {
        }
 };
 
+struct vhost_stats {
+       uint64_t pkts;
+       uint64_t bytes;
+       uint64_t missed_pkts;
+};
+
 struct vhost_queue {
        int vid;
        rte_atomic32_t allow_queuing;
@@ -80,11 +86,7 @@ struct vhost_queue {
        struct rte_mempool *mb_pool;
        uint8_t port;
        uint16_t virtqueue_id;
-       uint64_t rx_pkts;
-       uint64_t tx_pkts;
-       uint64_t missed_pkts;
-       uint64_t rx_bytes;
-       uint64_t tx_bytes;
+       struct vhost_stats stats;
 };
 
 struct pmd_internal {
@@ -145,11 +147,11 @@ eth_vhost_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
        nb_rx = rte_vhost_dequeue_burst(r->vid,
                        r->virtqueue_id, r->mb_pool, bufs, nb_bufs);
 
-       r->rx_pkts += nb_rx;
+       r->stats.pkts += nb_rx;
 
        for (i = 0; likely(i < nb_rx); i++) {
                bufs[i]->port = r->port;
-               r->rx_bytes += bufs[i]->pkt_len;
+               r->stats.bytes += bufs[i]->pkt_len;
        }
 
 out:
@@ -176,11 +178,11 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
        nb_tx = rte_vhost_enqueue_burst(r->vid,
                        r->virtqueue_id, bufs, nb_bufs);
 
-       r->tx_pkts += nb_tx;
-       r->missed_pkts += nb_bufs - nb_tx;
+       r->stats.pkts += nb_tx;
+       r->stats.missed_pkts += nb_bufs - nb_tx;
 
        for (i = 0; likely(i < nb_tx); i++)
-               r->tx_bytes += bufs[i]->pkt_len;
+               r->stats.bytes += bufs[i]->pkt_len;
 
        for (i = 0; likely(i < nb_tx); i++)
                rte_pktmbuf_free(bufs[i]);
@@ -428,6 +430,35 @@ rte_eth_vhost_get_queue_event(uint8_t port_id,
        return -1;
 }
 
+int
+rte_eth_vhost_get_vid_from_port_id(uint8_t port_id)
+{
+       struct internal_list *list;
+       struct rte_eth_dev *eth_dev;
+       struct vhost_queue *vq;
+       int vid = -1;
+
+       if (!rte_eth_dev_is_valid_port(port_id))
+               return -1;
+
+       pthread_mutex_lock(&internal_list_lock);
+
+       TAILQ_FOREACH(list, &internal_list, next) {
+               eth_dev = list->eth_dev;
+               if (eth_dev->data->port_id == port_id) {
+                       vq = eth_dev->data->rx_queues[0];
+                       if (vq) {
+                               vid = vq->vid;
+                       }
+                       break;
+               }
+       }
+
+       pthread_mutex_unlock(&internal_list_lock);
+
+       return vid;
+}
+
 static void *
 vhost_driver_session(void *param __rte_unused)
 {
@@ -582,10 +613,10 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                if (dev->data->rx_queues[i] == NULL)
                        continue;
                vq = dev->data->rx_queues[i];
-               stats->q_ipackets[i] = vq->rx_pkts;
+               stats->q_ipackets[i] = vq->stats.pkts;
                rx_total += stats->q_ipackets[i];
 
-               stats->q_ibytes[i] = vq->rx_bytes;
+               stats->q_ibytes[i] = vq->stats.bytes;
                rx_total_bytes += stats->q_ibytes[i];
        }
 
@@ -594,11 +625,11 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                if (dev->data->tx_queues[i] == NULL)
                        continue;
                vq = dev->data->tx_queues[i];
-               stats->q_opackets[i] = vq->tx_pkts;
-               tx_missed_total += vq->missed_pkts;
+               stats->q_opackets[i] = vq->stats.pkts;
+               tx_missed_total += vq->stats.missed_pkts;
                tx_total += stats->q_opackets[i];
 
-               stats->q_obytes[i] = vq->tx_bytes;
+               stats->q_obytes[i] = vq->stats.bytes;
                tx_total_bytes += stats->q_obytes[i];
        }
 
@@ -619,16 +650,16 @@ eth_stats_reset(struct rte_eth_dev *dev)
                if (dev->data->rx_queues[i] == NULL)
                        continue;
                vq = dev->data->rx_queues[i];
-               vq->rx_pkts = 0;
-               vq->rx_bytes = 0;
+               vq->stats.pkts = 0;
+               vq->stats.bytes = 0;
        }
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
                if (dev->data->tx_queues[i] == NULL)
                        continue;
                vq = dev->data->tx_queues[i];
-               vq->tx_pkts = 0;
-               vq->tx_bytes = 0;
-               vq->missed_pkts = 0;
+               vq->stats.pkts = 0;
+               vq->stats.bytes = 0;
+               vq->stats.missed_pkts = 0;
        }
 }
 
@@ -714,7 +745,7 @@ eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
                goto error;
 
        /* reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocate(name, RTE_ETH_DEV_VIRTUAL);
+       eth_dev = rte_eth_dev_allocate(name);
        if (eth_dev == NULL)
                goto error;
 
@@ -924,13 +955,12 @@ rte_pmd_vhost_devuninit(const char *name)
        return 0;
 }
 
-static struct rte_driver pmd_vhost_drv = {
-       .type = PMD_VDEV,
+static struct rte_vdev_driver pmd_vhost_drv = {
        .init = rte_pmd_vhost_devinit,
        .uninit = rte_pmd_vhost_devuninit,
 };
 
-PMD_REGISTER_DRIVER(pmd_vhost_drv, eth_vhost);
-DRIVER_REGISTER_PARAM_STRING(eth_vhost,
+DRIVER_REGISTER_VDEV(net_vhost, pmd_vhost_drv);
+DRIVER_REGISTER_PARAM_STRING(net_vhost,
        "iface=<ifc> "
        "queues=<int>");