dataplane: Fix startup race.
RFC PATCH 1/1 dataplane: Fix startup race.
Avoid trying to setup dataplane again if dataplane setup is already in progress. This may happen if an eventfd is triggered during setup.
I saw this occasionally with an experimental s390 irqfd implementation:
virtio_blk_handle_output
-> virtio_blk_data_plane_start
-> virtio_ccw_set_host_notifier
...
-> virtio_queue_set_host_notifier_fd_handler
-> virtio_queue_host_notifier_read
-> virtio_queue_notify_vq
-> virtio_blk_handle_output
-> virtio_blk_data_plane_start
-> vring_setup
-> hostmem_init
-> memory_listener_register
-> BOOM
As virtio-ccw tries to follow what virtio-pci does, it might be triggerable for other platforms as well.
--- hw/block/dataplane/virtio-blk.c | 9 +++++++++ 1 file changed, 9 insertions(+)
hw/block/dataplane/virtio-blk.c +9 -0
@@ -42,6 +42,7 @@ typedef struct {struct VirtIOBlockDataPlane {bool started; +bool starting;bool stopping;QEMUBH *start_bh;QemuThread thread;
@@ -451,8 +452,15 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s)return ; } +if (s->starting) { +return ; + } + + s->starting = true; + vq =virtio_get_queue (s->vdev,0 );if (!vring_setup (&s->vring, s->vdev,0 )) { + s->starting = false;return ; }
@@ -482,6 +490,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s) s->io_notifier = *ioq_get_notifier (&s->ioqueue);aio_set_event_notifier (s->ctx, &s->io_notifier, handle_io); + s->starting = false; s->started = true;trace_virtio_blk_data_plane_start (s);
Signature · 1 line
1.8.3.4
Stefan Hajnoczi
AppliedQuoted 19 lines · Cornelia Huck
Avoid trying to setup dataplane again if dataplane setup is already in progress. This may happen if an eventfd is triggered during setup.
I saw this occasionally with an experimental s390 irqfd implementation:
virtio_blk_handle_output
->virtio_blk_data_plane_start
->virtio_ccw_set_host_notifier
...
->virtio_queue_set_host_notifier_fd_handler
->virtio_queue_host_notifier_read
->virtio_queue_notify_vq
->virtio_blk_handle_output
->virtio_blk_data_plane_start
->vring_setup
->hostmem_init
->memory_listener_register
-> BOOM
Quoted 7 lines
As virtio-ccw tries to follow what virtio-pci does, it might be triggerable for other platforms as well.
Signed-off-by Cornelia Huck <[email protected]>--- hw/block/dataplane/virtio-blk.c | 9 +++++++++ 1 file changed, 9 insertions(+)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan