diff options
| author |   Mike Christie <michael.christie@oracle.com> | 2021-05-25 12:47:31 -0500 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2021-07-03 04:50:54 -0400 |
| commit | d60146c161befc8d62cba427be869b2231224347 (patch) | |
| tree | d450ad44caf0396f4a37273dc76955c0a950b601 | |
| parent | vhost-scsi: remove extra flushes (diff) | |
| download | linux-dev-d60146c161befc8d62cba427be869b2231224347.tar.xz linux-dev-d60146c161befc8d62cba427be869b2231224347.zip | |
vhost-scsi: reduce flushes during endpoint clearing
vhost_scsi_flush will flush everything, so we can clear the backends then
flush, then destroy. We don't need to flush before each vq destruction
because after the flush we will have made sure there can be no new cmds
started and there are no running cmds.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20210525174733.6212-4-michael.christie@oracle.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | drivers/vhost/scsi.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index b3e6fe9b1767..46f897e41217 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1732,11 +1732,12 @@ vhost_scsi_clear_endpoint(struct vhost_scsi *vs, mutex_lock(&vq->mutex); vhost_vq_set_backend(vq, NULL); mutex_unlock(&vq->mutex); - /* - * Make sure cmds are not running before tearing them - * down. - */ - vhost_scsi_flush(vs); + } + /* Make sure cmds are not running before tearing them down. */ + vhost_scsi_flush(vs); + + for (i = 0; i < VHOST_SCSI_MAX_VQ; i++) { + vq = &vs->vqs[i].vq; vhost_scsi_destroy_vq_cmds(vq); } } |