vhost: refactor virtio ready check

This patch is a small refactoring, as preliminary work
for adding support to Virtio status support.

No functional change here.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index f156199..8351d7e 100644 (file)
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -712,6 +712,7 @@ vhost_enable_dequeue_zero_copy(int vid)
                return;
 
        dev->dequeue_zero_copy = 1;
+       VHOST_LOG_CONFIG(INFO, "dequeue zero copy is enabled\n");
 }
 
 void

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index bac3e89..257a035 100644 (file)
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1340,6 +1340,9 @@ virtio_is_ready(struct virtio_net *dev)
        struct vhost_virtqueue *vq;
        uint32_t i;
 
+       if (dev->flags & VIRTIO_DEV_READY)
+               return 1;
+
        if (dev->nr_vring < VIRTIO_DEV_NUM_VQS_TO_BE_READY)
                return 0;
 
@@ -1350,6 +1353,8 @@ virtio_is_ready(struct virtio_net *dev)
                        return 0;
        }
 
+       dev->flags |= VIRTIO_DEV_READY;
+
        if (!(dev->flags & VIRTIO_DEV_RUNNING))
                VHOST_LOG_CONFIG(INFO,
                        "virtio is now ready for processing.\n");
@@ -2842,28 +2847,32 @@ skip_to_post_handle:
        }
 
 
-       if (!(dev->flags & VIRTIO_DEV_READY) && virtio_is_ready(dev)) {
-               dev->flags |= VIRTIO_DEV_READY;
+       if (!virtio_is_ready(dev))
+               goto out;
 
-               if (!(dev->flags & VIRTIO_DEV_RUNNING)) {
-                       if (dev->dequeue_zero_copy) {
-                               VHOST_LOG_CONFIG(INFO,
-                                               "dequeue zero copy is enabled\n");
-                       }
+       /*
+        * Virtio is now ready. If not done already, it is time
+        * to notify the application it can process the rings and
+        * configure the vDPA device if present.
+        */
 
-                       if (dev->notify_ops->new_device(dev->vid) == 0)
-                               dev->flags |= VIRTIO_DEV_RUNNING;
-               }
+       if (!(dev->flags & VIRTIO_DEV_RUNNING)) {
+               if (dev->notify_ops->new_device(dev->vid) == 0)
+                       dev->flags |= VIRTIO_DEV_RUNNING;
        }
 
        vdpa_dev = dev->vdpa_dev;
-       if (vdpa_dev && virtio_is_ready(dev) &&
-           !(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) {
+       if (!vdpa_dev)
+               goto out;
+
+       if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) {
                if (vdpa_dev->ops->dev_conf)
                        vdpa_dev->ops->dev_conf(dev->vid);
+
                dev->flags |= VIRTIO_DEV_VDPA_CONFIGURED;
        }
 
+out:
        return 0;
 }