net/virtio-user: support Rx interrupt

[dpdk.git] / drivers / net / virtio / virtio_user_ethdev.c

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 6fcedd9..9dd55fa 100644 (file)
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -82,26 +82,29 @@ virtio_user_write_dev_config(struct virtio_hw *hw, size_t offset,
                for (i = 0; i < ETHER_ADDR_LEN; ++i)
                        dev->mac_addr[i] = ((const uint8_t *)src)[i];
        else
-               PMD_DRV_LOG(ERR, "not supported offset=%zu, len=%d\n",
+               PMD_DRV_LOG(ERR, "not supported offset=%zu, len=%d",
                            offset, length);
 }
 
 static void
-virtio_user_set_status(struct virtio_hw *hw, uint8_t status)
+virtio_user_reset(struct virtio_hw *hw)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
-       if (status & VIRTIO_CONFIG_STATUS_DRIVER_OK)
-               virtio_user_start_device(dev);
-       dev->status = status;
+       if (dev->status & VIRTIO_CONFIG_STATUS_DRIVER_OK)
+               virtio_user_stop_device(dev);
 }
 
 static void
-virtio_user_reset(struct virtio_hw *hw)
+virtio_user_set_status(struct virtio_hw *hw, uint8_t status)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
-       virtio_user_stop_device(dev);
+       if (status & VIRTIO_CONFIG_STATUS_DRIVER_OK)
+               virtio_user_start_device(dev);
+       else if (status == VIRTIO_CONFIG_STATUS_RESET)
+               virtio_user_reset(hw);
+       dev->status = status;
 }
 
 static uint8_t
@@ -117,7 +120,8 @@ virtio_user_get_features(struct virtio_hw *hw)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
-       return dev->features;
+       /* unmask feature bits defined in vhost user protocol */
+       return dev->device_features & VIRTIO_PMD_SUPPORTED_GUEST_FEATURES;
 }
 
 static void
@@ -125,7 +129,7 @@ virtio_user_set_features(struct virtio_hw *hw, uint64_t features)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
-       dev->features = features;
+       dev->features = features & dev->device_features;
 }
 
 static uint8_t
@@ -144,6 +148,15 @@ virtio_user_set_config_irq(struct virtio_hw *hw __rte_unused,
        return VIRTIO_MSI_NO_VECTOR;
 }
 
+static uint16_t
+virtio_user_set_queue_irq(struct virtio_hw *hw __rte_unused,
+                         struct virtqueue *vq __rte_unused,
+                         uint16_t vec)
+{
+       /* pretend we have done that */
+       return vec;
+}
+
 /* This function is to get the queue size, aka, number of descs, of a specified
  * queue. Different with the VHOST_USER_GET_QUEUE_NUM, which is used to get the
  * max supported queues.
@@ -208,11 +221,11 @@ virtio_user_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
        }
 
        if (write(dev->kickfds[vq->vq_queue_index], &buf, sizeof(buf)) < 0)
-               PMD_DRV_LOG(ERR, "failed to kick backend: %s\n",
+               PMD_DRV_LOG(ERR, "failed to kick backend: %s",
                            strerror(errno));
 }
 
-static const struct virtio_pci_ops virtio_user_ops = {
+const struct virtio_pci_ops virtio_user_ops = {
        .read_dev_cfg   = virtio_user_read_dev_config,
        .write_dev_cfg  = virtio_user_write_dev_config,
        .reset          = virtio_user_reset,
@@ -222,6 +235,7 @@ static const struct virtio_pci_ops virtio_user_ops = {
        .set_features   = virtio_user_set_features,
        .get_isr        = virtio_user_get_isr,
        .set_config_irq = virtio_user_set_config_irq,
+       .set_queue_irq  = virtio_user_set_queue_irq,
        .get_queue_num  = virtio_user_get_queue_num,
        .setup_queue    = virtio_user_setup_queue,
        .del_queue      = virtio_user_del_queue,
@@ -239,6 +253,8 @@ static const char *valid_args[] = {
        VIRTIO_USER_ARG_PATH,
 #define VIRTIO_USER_ARG_QUEUE_SIZE     "queue_size"
        VIRTIO_USER_ARG_QUEUE_SIZE,
+#define VIRTIO_USER_ARG_INTERFACE_NAME "iface"
+       VIRTIO_USER_ARG_INTERFACE_NAME,
        NULL
 };
 
@@ -255,6 +271,9 @@ get_string_arg(const char *key __rte_unused,
 
        *(char **)extra_args = strdup(value);
 
+       if (!*(char **)extra_args)
+               return -ENOMEM;
+
        return 0;
 }
 
@@ -270,6 +289,8 @@ get_integer_arg(const char *key __rte_unused,
        return 0;
 }
 
+static struct rte_vdev_driver virtio_user_driver;
+
 static struct rte_eth_dev *
 virtio_user_eth_dev_alloc(const char *name)
 {
@@ -301,16 +322,18 @@ virtio_user_eth_dev_alloc(const char *name)
                return NULL;
        }
 
-       hw->vtpci_ops = &virtio_user_ops;
+       hw->port_id = data->port_id;
+       dev->port_id = data->port_id;
+       virtio_hw_internal[hw->port_id].vtpci_ops = &virtio_user_ops;
        hw->use_msix = 0;
        hw->modern   = 0;
        hw->use_simple_rxtx = 0;
        hw->virtio_user_dev = dev;
        data->dev_private = hw;
+       data->drv_name = virtio_user_driver.driver.name;
        data->numa_node = SOCKET_ID_ANY;
        data->kdrv = RTE_KDRV_NONE;
        data->dev_flags = RTE_ETH_DEV_DETACHABLE;
-       eth_dev->pci_dev = NULL;
        eth_dev->driver = NULL;
        return eth_dev;
 }
@@ -340,6 +363,7 @@ virtio_user_pmd_probe(const char *name, const char *params)
        uint64_t cq = VIRTIO_USER_DEF_CQ_EN;
        uint64_t queue_size = VIRTIO_USER_DEF_Q_SZ;
        char *path = NULL;
+       char *ifname = NULL;
        char *mac_addr = NULL;
        int ret = -1;
 
@@ -363,11 +387,27 @@ virtio_user_pmd_probe(const char *name, const char *params)
                        goto end;
                }
        } else {
-               PMD_INIT_LOG(ERR, "arg %s is mandatory for virtio_user\n",
+               PMD_INIT_LOG(ERR, "arg %s is mandatory for virtio_user",
                          VIRTIO_USER_ARG_QUEUE_SIZE);
                goto end;
        }
 
+       if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_INTERFACE_NAME) == 1) {
+               if (is_vhost_user_by_type(path)) {
+                       PMD_INIT_LOG(ERR,
+                               "arg %s applies only to vhost-kernel backend",
+                               VIRTIO_USER_ARG_INTERFACE_NAME);
+                       goto end;
+               }
+
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_INTERFACE_NAME,
+                                      &get_string_arg, &ifname) < 0) {
+                       PMD_INIT_LOG(ERR, "error to parse %s",
+                                    VIRTIO_USER_ARG_INTERFACE_NAME);
+                       goto end;
+               }
+       }
+
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MAC) == 1) {
                if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,
                                       &get_string_arg, &mac_addr) < 0) {
@@ -411,6 +451,13 @@ virtio_user_pmd_probe(const char *name, const char *params)
                goto end;
        }
 
+       if (queues > VIRTIO_MAX_VIRTQUEUE_PAIRS) {
+               PMD_INIT_LOG(ERR, "arg %s %" PRIu64 " exceeds the limit %u",
+                       VIRTIO_USER_ARG_QUEUES_NUM, queues,
+                       VIRTIO_MAX_VIRTQUEUE_PAIRS);
+               goto end;
+       }
+
        eth_dev = virtio_user_eth_dev_alloc(name);
        if (!eth_dev) {
                PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
@@ -419,7 +466,7 @@ virtio_user_pmd_probe(const char *name, const char *params)
 
        hw = eth_dev->data->dev_private;
        if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-                                queue_size, mac_addr) < 0) {
+                                queue_size, mac_addr, &ifname) < 0) {
                PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
                virtio_user_eth_dev_free(eth_dev);
                goto end;
@@ -440,6 +487,8 @@ end:
                free(path);
        if (mac_addr)
                free(mac_addr);
+       if (ifname)
+               free(ifname);
        return ret;
 }
 
@@ -454,7 +503,7 @@ virtio_user_pmd_remove(const char *name)
        if (!name)
                return -EINVAL;
 
-       PMD_DRV_LOG(INFO, "Un-Initializing %s\n", name);
+       PMD_DRV_LOG(INFO, "Un-Initializing %s", name);
        eth_dev = rte_eth_dev_allocated(name);
        if (!eth_dev)
                return -ENODEV;
@@ -478,10 +527,12 @@ static struct rte_vdev_driver virtio_user_driver = {
        .remove = virtio_user_pmd_remove,
 };
 
-DRIVER_REGISTER_VDEV(net_virtio_user, virtio_user_driver);
-DRIVER_REGISTER_PARAM_STRING(net_virtio_user,
+RTE_PMD_REGISTER_VDEV(net_virtio_user, virtio_user_driver);
+RTE_PMD_REGISTER_ALIAS(net_virtio_user, virtio_user);
+RTE_PMD_REGISTER_PARAM_STRING(net_virtio_user,
        "path=<path> "
        "mac=<mac addr> "
        "cq=<int> "
        "queue_size=<int> "
-       "queues=<int>");
+       "queues=<int> "
+       "iface=<string>");