Re: [PATCH V2 8/8] vhost: rename vhost_work_dev_flush

2022-05-17 Thread Stefano Garzarella

On Sun, May 15, 2022 at 03:29:22PM -0500, Mike Christie wrote:

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 
---
drivers/vhost/net.c   |  4 ++--
drivers/vhost/scsi.c  |  2 +-
drivers/vhost/test.c  |  2 +-
drivers/vhost/vhost.c | 10 +-
drivers/vhost/vhost.h |  2 +-
drivers/vhost/vsock.c |  2 +-
6 files changed, 11 insertions(+), 11 deletions(-)


Reviewed-by: Stefano Garzarella 

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization


Re: [PATCH V2 8/8] vhost: rename vhost_work_dev_flush

2022-05-16 Thread Jason Wang


在 2022/5/16 04:29, Mike Christie 写道:

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 



Acked-by: Jason Wang 



---
  drivers/vhost/net.c   |  4 ++--
  drivers/vhost/scsi.c  |  2 +-
  drivers/vhost/test.c  |  2 +-
  drivers/vhost/vhost.c | 10 +-
  drivers/vhost/vhost.h |  2 +-
  drivers/vhost/vsock.c |  2 +-
  6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 047b7b05109a..0e4ff6a08f5f 100644
--- 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(>dev);
+   vhost_dev_flush(>dev);
if (n->vqs[VHOST_NET_VQ_TX].ubufs) {
mutex_lock(>vqs[VHOST_NET_VQ_TX].vq.mutex);
n->tx_flush = true;
@@ -1566,7 +1566,7 @@ static long vhost_net_set_backend(struct vhost_net *n, 
unsigned index, int fd)
}
  
  	if (oldsock) {

-   vhost_work_dev_flush(>dev);
+   vhost_dev_flush(>dev);
sockfd_put(oldsock);
}
  
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c

index 94535c813ef7..ffd9e6c2ffc1 100644
--- 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(_inflight[i]->kref, vhost_scsi_done_inflight);
  
  	/* Flush both the vhost poll and vhost work */

-   vhost_work_dev_flush(>dev);
+   vhost_dev_flush(>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 a63a626a554e..87498c1109fe 100644
--- 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(>dev);
+   vhost_dev_flush(>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 9f8de04bb673..716a80c61fa9 100644
--- 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(_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(, vhost_attach_cgroups_work);
vhost_work_queue(dev, );
-   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(>vqs[i]->poll);
}
  
-	vhost_work_dev_flush(dev);

+   vhost_dev_flush(dev);
  }
  EXPORT_SYMBOL_GPL(vhost_dev_stop);
  
@@ -1711,7 +1711,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg

mutex_unlock(>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 aeb8e1ad1496..d02adf1b2bf8 100644
--- 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 96be63697117..368330417bde 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -705,7 +705,7 @@ static int vhost_vsock_dev_open(struct inode *inode, struct 
file *file)
  
  static void vhost_vsock_flush(struct vhost_vsock *vsock)

  {
-   vhost_work_dev_flush(>dev);
+   vhost_dev_flush(>dev);
  }
  
  static void vhost_vsock_reset_orphans(struct sock *sk)



[PATCH V2 8/8] vhost: rename vhost_work_dev_flush

2022-05-15 Thread Mike Christie
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 
---
 drivers/vhost/net.c   |  4 ++--
 drivers/vhost/scsi.c  |  2 +-
 drivers/vhost/test.c  |  2 +-
 drivers/vhost/vhost.c | 10 +-
 drivers/vhost/vhost.h |  2 +-
 drivers/vhost/vsock.c |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 047b7b05109a..0e4ff6a08f5f 100644
--- 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(>dev);
+   vhost_dev_flush(>dev);
if (n->vqs[VHOST_NET_VQ_TX].ubufs) {
mutex_lock(>vqs[VHOST_NET_VQ_TX].vq.mutex);
n->tx_flush = true;
@@ -1566,7 +1566,7 @@ static long vhost_net_set_backend(struct vhost_net *n, 
unsigned index, int fd)
}
 
if (oldsock) {
-   vhost_work_dev_flush(>dev);
+   vhost_dev_flush(>dev);
sockfd_put(oldsock);
}
 
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 94535c813ef7..ffd9e6c2ffc1 100644
--- 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(_inflight[i]->kref, vhost_scsi_done_inflight);
 
/* Flush both the vhost poll and vhost work */
-   vhost_work_dev_flush(>dev);
+   vhost_dev_flush(>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 a63a626a554e..87498c1109fe 100644
--- 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(>dev);
+   vhost_dev_flush(>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 9f8de04bb673..716a80c61fa9 100644
--- 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(_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(, vhost_attach_cgroups_work);
vhost_work_queue(dev, );
-   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(>vqs[i]->poll);
}
 
-   vhost_work_dev_flush(dev);
+   vhost_dev_flush(dev);
 }
 EXPORT_SYMBOL_GPL(vhost_dev_stop);
 
@@ -1711,7 +1711,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int 
ioctl, void __user *arg
mutex_unlock(>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 aeb8e1ad1496..d02adf1b2bf8 100644
--- 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 96be63697117..368330417bde 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -705,7 +705,7 @@ static int vhost_vsock_dev_open(struct inode *inode, struct 
file *file)
 
 static void vhost_vsock_flush(struct vhost_vsock *vsock)
 {
-   vhost_work_dev_flush(>dev);
+   vhost_dev_flush(>dev);
 }
 
 static void vhost_vsock_reset_orphans(struct sock *sk)
-- 
2.25.1

___
Virtualization mailing list