Imported Upstream version 16.11.1

[deb_dpdk.git] / drivers / net / virtio / virtio_user / virtio_user_dev.c

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index e239e0e..a38398b 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -148,12 +148,13 @@ virtio_user_start_device(struct virtio_user_dev *dev)
 
        /* Step 1: set features
         * Make sure VHOST_USER_F_PROTOCOL_FEATURES is added if mq is enabled,
-        * and VIRTIO_NET_F_MAC is stripped.
+        * VIRTIO_NET_F_MAC and VIRTIO_NET_F_CTRL_VQ is stripped.
         */
        features = dev->features;
        if (dev->max_queue_pairs > 1)
                features |= VHOST_USER_MQ;
        features &= ~(1ull << VIRTIO_NET_F_MAC);
+       features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
        ret = vhost_user_sock(dev->vhostfd, VHOST_USER_SET_FEATURES, &features);
        if (ret < 0)
                goto error;
@@ -181,7 +182,17 @@ error:
 
 int virtio_user_stop_device(struct virtio_user_dev *dev)
 {
-       return vhost_user_sock(dev->vhostfd, VHOST_USER_RESET_OWNER, NULL);
+       uint32_t i;
+
+       for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
+               close(dev->callfds[i]);
+               close(dev->kickfds[i]);
+       }
+
+       for (i = 0; i < dev->max_queue_pairs; ++i)
+               vhost_user_enable_queue_pair(dev->vhostfd, i, 0);
+
+       return 0;
 }
 
 static inline void
@@ -209,6 +220,8 @@ int
 virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
                     int cq, int queue_size, const char *mac)
 {
+       uint32_t i;
+
        snprintf(dev->path, PATH_MAX, "%s", path);
        dev->max_queue_pairs = queues;
        dev->queue_pairs = 1; /* mq disabled by default */
@@ -217,6 +230,11 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
        parse_mac(dev, mac);
        dev->vhostfd = -1;
 
+       for (i = 0; i < VIRTIO_MAX_VIRTQUEUES * 2 + 1; ++i) {
+               dev->kickfds[i] = -1;
+               dev->callfds[i] = -1;
+       }
+
        dev->vhostfd = vhost_user_setup(dev->path);
        if (dev->vhostfd < 0) {
                PMD_INIT_LOG(ERR, "backend set up fails");
@@ -228,29 +246,26 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
        }
 
        if (vhost_user_sock(dev->vhostfd, VHOST_USER_GET_FEATURES,
-                           &dev->features) < 0) {
+                           &dev->device_features) < 0) {
                PMD_INIT_LOG(ERR, "get_features failed: %s", strerror(errno));
                return -1;
        }
        if (dev->mac_specified)
-               dev->features |= (1ull << VIRTIO_NET_F_MAC);
+               dev->device_features |= (1ull << VIRTIO_NET_F_MAC);
 
-       if (!cq) {
-               dev->features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
-               /* Also disable features depends on VIRTIO_NET_F_CTRL_VQ */
-               dev->features &= ~(1ull << VIRTIO_NET_F_CTRL_RX);
-               dev->features &= ~(1ull << VIRTIO_NET_F_CTRL_VLAN);
-               dev->features &= ~(1ull << VIRTIO_NET_F_GUEST_ANNOUNCE);
-               dev->features &= ~(1ull << VIRTIO_NET_F_MQ);
-               dev->features &= ~(1ull << VIRTIO_NET_F_CTRL_MAC_ADDR);
-       } else {
-               /* vhost user backend does not need to know ctrl-q, so
-                * actually we need add this bit into features. However,
-                * DPDK vhost-user does send features with this bit, so we
-                * check it instead of OR it for now.
+       if (cq) {
+               /* device does not really need to know anything about CQ,
+                * so if necessary, we just claim to support CQ
                 */
-               if (!(dev->features & (1ull << VIRTIO_NET_F_CTRL_VQ)))
-                       PMD_INIT_LOG(INFO, "vhost does not support ctrl-q");
+               dev->device_features |= (1ull << VIRTIO_NET_F_CTRL_VQ);
+       } else {
+               dev->device_features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
+               /* Also disable features depends on VIRTIO_NET_F_CTRL_VQ */
+               dev->device_features &= ~(1ull << VIRTIO_NET_F_CTRL_RX);
+               dev->device_features &= ~(1ull << VIRTIO_NET_F_CTRL_VLAN);
+               dev->device_features &= ~(1ull << VIRTIO_NET_F_GUEST_ANNOUNCE);
+               dev->device_features &= ~(1ull << VIRTIO_NET_F_MQ);
+               dev->device_features &= ~(1ull << VIRTIO_NET_F_CTRL_MAC_ADDR);
        }
 
        if (dev->max_queue_pairs > 1) {
@@ -266,13 +281,6 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
 void
 virtio_user_dev_uninit(struct virtio_user_dev *dev)
 {
-       uint32_t i;
-
-       for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
-               close(dev->callfds[i]);
-               close(dev->kickfds[i]);
-       }
-
        close(dev->vhostfd);
 }