vhost: rename vhost_work_dev_flush

This patch renames vhost_work_dev_flush to just vhost_dev_flush to
relfect that it flushes everything on the device and that drivers
don't know/care that polls are based on vhost_works. Drivers just
flush the entire device and polls, and works for vhost-scsi
management TMFs and IO net virtqueues, etc all are flushed.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20220517180850.198915-9-michael.christie@oracle.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 20eb076300bb21031b7eaffddfaedcda671487fc..68e4ecd1cc0e844957814c2f98d5245ba20bd177 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -1376,7 +1376,7 @@ static void vhost_net_stop(struct vhost_net *n, struct socket **tx_sock,
 
 static void vhost_net_flush(struct vhost_net *n)
 {
-       vhost_work_dev_flush(&n->dev);
+       vhost_dev_flush(&n->dev);
        if (n->vqs[VHOST_NET_VQ_TX].ubufs) {
                mutex_lock(&n->vqs[VHOST_NET_VQ_TX].vq.mutex);
                n->tx_flush = true;
@@ -1565,7 +1565,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
        }
 
        if (oldsock) {
-               vhost_work_dev_flush(&n->dev);
+               vhost_dev_flush(&n->dev);
                sockfd_put(oldsock);
        }
 

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 94535c813ef77d521cee1641a0b1cf6c7462673d..ffd9e6c2ffc154167e08e9d70fed80c3e617c5f5 100644 (file)
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1436,7 +1436,7 @@ static void vhost_scsi_flush(struct vhost_scsi *vs)
                kref_put(&old_inflight[i]->kref, vhost_scsi_done_inflight);
 
        /* Flush both the vhost poll and vhost work */
-       vhost_work_dev_flush(&vs->dev);
+       vhost_dev_flush(&vs->dev);
 
        /* Wait for all reqs issued before the flush to be finished */
        for (i = 0; i < VHOST_SCSI_MAX_VQ; i++)

diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 6c139f18bc54ec1bb4745a920cc333dcddfefe0b..bc8e7fb1e635717d639cc3c692ee2934a09f1b1f 100644 (file)
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -146,7 +146,7 @@ static void vhost_test_stop(struct vhost_test *n, void **privatep)
 
 static void vhost_test_flush(struct vhost_test *n)
 {
-       vhost_work_dev_flush(&n->dev);
+       vhost_dev_flush(&n->dev);
 }
 
 static int vhost_test_release(struct inode *inode, struct file *f)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index d82b9394d89a46f66be5743d5787c1b1504b60d1..40097826cff0b10533c825ace8fb807128fd3cf1 100644 (file)
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -231,7 +231,7 @@ void vhost_poll_stop(struct vhost_poll *poll)
 }
 EXPORT_SYMBOL_GPL(vhost_poll_stop);
 
-void vhost_work_dev_flush(struct vhost_dev *dev)
+void vhost_dev_flush(struct vhost_dev *dev)
 {
        struct vhost_flush_struct flush;
 
@@ -243,7 +243,7 @@ void vhost_work_dev_flush(struct vhost_dev *dev)
                wait_for_completion(&flush.wait_event);
        }
 }
-EXPORT_SYMBOL_GPL(vhost_work_dev_flush);
+EXPORT_SYMBOL_GPL(vhost_dev_flush);
 
 void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work)
 {
@@ -530,7 +530,7 @@ static int vhost_attach_cgroups(struct vhost_dev *dev)
        attach.owner = current;
        vhost_work_init(&attach.work, vhost_attach_cgroups_work);
        vhost_work_queue(dev, &attach.work);
-       vhost_work_dev_flush(dev);
+       vhost_dev_flush(dev);
        return attach.ret;
 }
 
@@ -657,7 +657,7 @@ void vhost_dev_stop(struct vhost_dev *dev)
                        vhost_poll_stop(&dev->vqs[i]->poll);
        }
 
-       vhost_work_dev_flush(dev);
+       vhost_dev_flush(dev);
 }
 EXPORT_SYMBOL_GPL(vhost_dev_stop);
 
@@ -1724,7 +1724,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg
        mutex_unlock(&vq->mutex);
 
        if (pollstop && vq->handle_kick)
-               vhost_work_dev_flush(vq->poll.dev);
+               vhost_dev_flush(vq->poll.dev);
        return r;
 }
 EXPORT_SYMBOL_GPL(vhost_vring_ioctl);

diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index b8541012430595aeaf2ce587e1d2eb8a6d5a019b..d9109107af087fc18e031b2f0fc93d6659cfcfee 100644 (file)
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -45,7 +45,7 @@ void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn,
 int vhost_poll_start(struct vhost_poll *poll, struct file *file);
 void vhost_poll_stop(struct vhost_poll *poll);
 void vhost_poll_queue(struct vhost_poll *poll);
-void vhost_work_dev_flush(struct vhost_dev *dev);
+void vhost_dev_flush(struct vhost_dev *dev);
 
 struct vhost_log {
        u64 addr;

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 96be63697117c74063e072ea00f3e6b7b044bcdf..368330417bde2910174c81c56edf4297f2c7c0fb 100644 (file)
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -705,7 +705,7 @@ out:
 
 static void vhost_vsock_flush(struct vhost_vsock *vsock)
 {
-       vhost_work_dev_flush(&vsock->dev);
+       vhost_dev_flush(&vsock->dev);
 }
 
 static void vhost_vsock_reset_orphans(struct sock *sk)