Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio_blk: enable VQs early on restore

Browse Source 
virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after restore returns, virtio block violated
this rule on restore by restarting queues, which might in theory
cause the VQ to be used directly within restore.

To fix, call virtio_device_ready before using starting queues.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Michael S. Tsirkin 2014-10-15 10:22:32 +10:30 committed by Rusty Russell
parent cd67904895
commit 6d62c37f19
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/block/virtio_blk.c
View File

@ -804,10 +804,13 @@ static int virtblk_restore(struct virtio_device *vdev)
int ret; int ret;
ret = init_vq(vdev->priv); ret = init_vq(vdev->priv);
if (!ret) if (ret)
blk_mq_start_stopped_hw_queues(vblk->disk->queue, true); return ret;
return ret; virtio_device_ready(vdev);
blk_mq_start_stopped_hw_queues(vblk->disk->queue, true);
return 0;
} }
#endif #endif