net/virtio: check protocol feature in user backend

[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 670fc9d..d7cd6b0 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -111,17 +111,6 @@ virtio_user_queue_setup(struct virtio_user_dev *dev,
        return 0;
 }
 
-int
-is_vhost_user_by_type(const char *path)
-{
-       struct stat sb;
-
-       if (stat(path, &sb) == -1)
-               return 0;
-
-       return S_ISSOCK(sb.st_mode);
-}
-
 int
 virtio_user_start_device(struct virtio_user_dev *dev)
 {
@@ -144,7 +133,8 @@ virtio_user_start_device(struct virtio_user_dev *dev)
        rte_mcfg_mem_read_lock();
        pthread_mutex_lock(&dev->mutex);
 
-       if (is_vhost_user_by_type(dev->path) && dev->vhostfd < 0)
+       if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER &&
+                       dev->vhostfd < 0)
                goto error;
 
        /* Step 0: tell vhost to create queues */
@@ -360,16 +350,16 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
        dev->tapfds = NULL;
 
        if (dev->is_server) {
-               if (access(dev->path, F_OK) == 0 &&
-                   !is_vhost_user_by_type(dev->path)) {
-                       PMD_DRV_LOG(ERR, "Server mode doesn't support vhost-kernel!");
+               if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER) {
+                       PMD_DRV_LOG(ERR, "Server mode only supports vhost-user!");
                        return -1;
                }
                dev->ops = &virtio_ops_user;
        } else {
-               if (is_vhost_user_by_type(dev->path)) {
+               if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) {
                        dev->ops = &virtio_ops_user;
-               } else {
+               } else if (dev->backend_type ==
+                                       VIRTIO_USER_BACKEND_VHOST_KERNEL) {
                        dev->ops = &virtio_ops_kernel;
 
                        dev->vhostfds = malloc(dev->max_queue_pairs *
@@ -430,7 +420,8 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
 int
 virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
                     int cq, int queue_size, const char *mac, char **ifname,
-                    int server, int mrg_rxbuf, int in_order, int packed_vq)
+                    int server, int mrg_rxbuf, int in_order, int packed_vq,
+                    enum virtio_user_backend_type backend_type)
 {
        uint64_t protocol_features = 0;
 
@@ -445,6 +436,8 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
        dev->frontend_features = 0;
        dev->unsupported_features = ~VIRTIO_USER_SUPPORTED_FEATURES;
        dev->protocol_features = VIRTIO_USER_SUPPORTED_PROTOCOL_FEATURES;
+       dev->backend_type = backend_type;
+
        parse_mac(dev, mac);
 
        if (*ifname) {
@@ -457,7 +450,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
                return -1;
        }
 
-       if (!is_vhost_user_by_type(dev->path))
+       if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER)
                dev->unsupported_features |=
                        (1ULL << VHOST_USER_F_PROTOCOL_FEATURES);
 
@@ -539,7 +532,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
        }
 
        /* The backend will not report this feature, we add it explicitly */
-       if (is_vhost_user_by_type(dev->path))
+       if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER)
                dev->frontend_features |= (1ull << VIRTIO_NET_F_STATUS);
 
        /*
@@ -792,10 +785,7 @@ virtio_user_send_status_update(struct virtio_user_dev *dev, uint8_t status)
        uint64_t arg = status;
 
        /* Vhost-user only for now */
-       if (!is_vhost_user_by_type(dev->path))
-               return 0;
-
-       if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_STATUS)))
+       if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER)
                return 0;
 
        ret = dev->ops->send_request(dev, VHOST_USER_SET_STATUS, &arg);
@@ -807,3 +797,44 @@ virtio_user_send_status_update(struct virtio_user_dev *dev, uint8_t status)
 
        return 0;
 }
+
+int
+virtio_user_update_status(struct virtio_user_dev *dev)
+{
+       uint64_t ret;
+       int err;
+
+       /* Vhost-user only for now */
+       if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER)
+               return 0;
+
+       err = dev->ops->send_request(dev, VHOST_USER_GET_STATUS, &ret);
+       if (err) {
+               PMD_INIT_LOG(ERR, "VHOST_USER_GET_STATUS failed (%d): %s", err,
+                            strerror(errno));
+               return -1;
+       }
+       if (ret > UINT8_MAX) {
+               PMD_INIT_LOG(ERR, "Invalid VHOST_USER_GET_STATUS response 0x%" PRIx64 "\n", ret);
+               return -1;
+       }
+
+       dev->status = ret;
+       PMD_INIT_LOG(DEBUG, "Updated Device Status(0x%08x):\n"
+                       "\t-RESET: %u\n"
+                       "\t-ACKNOWLEDGE: %u\n"
+                       "\t-DRIVER: %u\n"
+                       "\t-DRIVER_OK: %u\n"
+                       "\t-FEATURES_OK: %u\n"
+                       "\t-DEVICE_NEED_RESET: %u\n"
+                       "\t-FAILED: %u\n",
+                       dev->status,
+                       (dev->status == VIRTIO_CONFIG_STATUS_RESET),
+                       !!(dev->status & VIRTIO_CONFIG_STATUS_ACK),
+                       !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER),
+                       !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER_OK),
+                       !!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK),
+                       !!(dev->status & VIRTIO_CONFIG_STATUS_DEV_NEED_RESET),
+                       !!(dev->status & VIRTIO_CONFIG_STATUS_FAILED));
+       return 0;
+}