ethdev: get rid of device type

[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 395b892..d0bffbd 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -50,12 +50,14 @@
 
 #define ETH_VHOST_IFACE_ARG            "iface"
 #define ETH_VHOST_QUEUES_ARG           "queues"
+#define ETH_VHOST_CLIENT_ARG           "client"
 
 static const char *drivername = "VHOST PMD";
 
 static const char *valid_arguments[] = {
        ETH_VHOST_IFACE_ARG,
        ETH_VHOST_QUEUES_ARG,
+       ETH_VHOST_CLIENT_ARG,
        NULL
 };
 
@@ -89,6 +91,7 @@ struct pmd_internal {
        char *dev_name;
        char *iface_name;
        uint16_t max_queues;
+       uint64_t flags;
 
        volatile uint16_t once;
 };
@@ -300,6 +303,7 @@ destroy_device(int vid)
        struct internal_list *list;
        char ifname[PATH_MAX];
        unsigned i;
+       struct rte_vhost_vring_state *state;
 
        rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
        list = find_internal_resource(ifname);
@@ -342,6 +346,15 @@ destroy_device(int vid)
                vq->vid = -1;
        }
 
+       state = vring_states[eth_dev->data->port_id];
+       rte_spinlock_lock(&state->lock);
+       for (i = 0; i <= state->max_vring; i++) {
+               state->cur[i] = false;
+               state->seen[i] = false;
+       }
+       state->max_vring = 0;
+       rte_spinlock_unlock(&state->lock);
+
        RTE_LOG(INFO, PMD, "Connection closed\n");
 
        _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC);
@@ -467,7 +480,8 @@ eth_dev_start(struct rte_eth_dev *dev)
        int ret = 0;
 
        if (rte_atomic16_cmpset(&internal->once, 0, 1)) {
-               ret = rte_vhost_driver_register(internal->iface_name);
+               ret = rte_vhost_driver_register(internal->iface_name,
+                                               internal->flags);
                if (ret)
                        return ret;
        }
@@ -590,7 +604,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
        stats->ipackets = rx_total;
        stats->opackets = tx_total;
-       stats->imissed = tx_missed_total;
+       stats->oerrors = tx_missed_total;
        stats->ibytes = rx_total_bytes;
        stats->obytes = tx_total_bytes;
 }
@@ -672,7 +686,7 @@ static const struct eth_dev_ops ops = {
 
 static int
 eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
-                    const unsigned numa_node)
+                    const unsigned numa_node, uint64_t flags)
 {
        struct rte_eth_dev_data *data = NULL;
        struct pmd_internal *internal = NULL;
@@ -700,7 +714,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;
 
@@ -729,6 +743,7 @@ eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
        internal->iface_name = strdup(iface_name);
        if (internal->iface_name == NULL)
                goto error;
+       internal->flags = flags;
 
        list->eth_dev = eth_dev;
        pthread_mutex_lock(&internal_list_lock);
@@ -793,18 +808,15 @@ open_iface(const char *key __rte_unused, const char *value, void *extra_args)
 }
 
 static inline int
-open_queues(const char *key __rte_unused, const char *value, void *extra_args)
+open_int(const char *key __rte_unused, const char *value, void *extra_args)
 {
-       uint16_t *q = extra_args;
+       uint16_t *n = extra_args;
 
        if (value == NULL || extra_args == NULL)
                return -EINVAL;
 
-       *q = (uint16_t)strtoul(value, NULL, 0);
-       if (*q == USHRT_MAX && errno == ERANGE)
-               return -1;
-
-       if (*q > RTE_MAX_QUEUES_PER_PORT)
+       *n = (uint16_t)strtoul(value, NULL, 0);
+       if (*n == USHRT_MAX && errno == ERANGE)
                return -1;
 
        return 0;
@@ -817,6 +829,8 @@ rte_pmd_vhost_devinit(const char *name, const char *params)
        int ret = 0;
        char *iface_name;
        uint16_t queues;
+       uint64_t flags = 0;
+       int client_mode = 0;
 
        RTE_LOG(INFO, PMD, "Initializing pmd_vhost for %s\n", name);
 
@@ -836,14 +850,24 @@ rte_pmd_vhost_devinit(const char *name, const char *params)
 
        if (rte_kvargs_count(kvlist, ETH_VHOST_QUEUES_ARG) == 1) {
                ret = rte_kvargs_process(kvlist, ETH_VHOST_QUEUES_ARG,
-                                        &open_queues, &queues);
-               if (ret < 0)
+                                        &open_int, &queues);
+               if (ret < 0 || queues > RTE_MAX_QUEUES_PER_PORT)
                        goto out_free;
 
        } else
                queues = 1;
 
-       eth_dev_vhost_create(name, iface_name, queues, rte_socket_id());
+       if (rte_kvargs_count(kvlist, ETH_VHOST_CLIENT_ARG) == 1) {
+               ret = rte_kvargs_process(kvlist, ETH_VHOST_CLIENT_ARG,
+                                        &open_int, &client_mode);
+               if (ret < 0)
+                       goto out_free;
+
+               if (client_mode)
+                       flags |= RTE_VHOST_USER_CLIENT;
+       }
+
+       eth_dev_vhost_create(name, iface_name, queues, rte_socket_id(), flags);
 
 out_free:
        rte_kvargs_free(kvlist);
@@ -901,10 +925,12 @@ rte_pmd_vhost_devuninit(const char *name)
 }
 
 static struct rte_driver pmd_vhost_drv = {
-       .name = "eth_vhost",
        .type = PMD_VDEV,
        .init = rte_pmd_vhost_devinit,
        .uninit = rte_pmd_vhost_devuninit,
 };
 
-PMD_REGISTER_DRIVER(pmd_vhost_drv);
+PMD_REGISTER_DRIVER(pmd_vhost_drv, net_vhost);
+DRIVER_REGISTER_PARAM_STRING(net_vhost,
+       "iface=<ifc> "
+       "queues=<int>");