Skip to content

Commit 4ce6e2d

Browse files
Yi Sunaxboe
authored andcommitted
virtio-blk: Ensure no requests in virtqueues before deleting vqs.
Ensure no remaining requests in virtqueues before resetting vdev and deleting virtqueues. Otherwise these requests will never be completed. It may cause the system to become unresponsive. Function blk_mq_quiesce_queue() can ensure that requests have become in_flight status, but it cannot guarantee that requests have been processed by the device. Virtqueues should never be deleted before all requests become complete status. Function blk_mq_freeze_queue() ensure that all requests in virtqueues become complete status. And no requests can enter in virtqueues. Signed-off-by: Yi Sun <yi.sun@unisoc.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Link: https://lore.kernel.org/r/20240129085250.1550594-1-yi.sun@unisoc.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 2a427b4 commit 4ce6e2d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/block/virtio_blk.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,14 +1593,15 @@ static int virtblk_freeze(struct virtio_device *vdev)
15931593
{
15941594
struct virtio_blk *vblk = vdev->priv;
15951595

1596+
/* Ensure no requests in virtqueues before deleting vqs. */
1597+
blk_mq_freeze_queue(vblk->disk->queue);
1598+
15961599
/* Ensure we don't receive any more interrupts */
15971600
virtio_reset_device(vdev);
15981601

15991602
/* Make sure no work handler is accessing the device. */
16001603
flush_work(&vblk->config_work);
16011604

1602-
blk_mq_quiesce_queue(vblk->disk->queue);
1603-
16041605
vdev->config->del_vqs(vdev);
16051606
kfree(vblk->vqs);
16061607

@@ -1618,7 +1619,7 @@ static int virtblk_restore(struct virtio_device *vdev)
16181619

16191620
virtio_device_ready(vdev);
16201621

1621-
blk_mq_unquiesce_queue(vblk->disk->queue);
1622+
blk_mq_unfreeze_queue(vblk->disk->queue);
16221623
return 0;
16231624
}
16241625
#endif

0 commit comments

Comments
 (0)