Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
virtio-scsi: avoid dangling host notifier in ->ioeventfd_stop()
virtio_scsi_dataplane_stop() calls blk_drain_all(), which invokes
->drained_begin()/->drained_end() after we've already detached the host
notifier. virtio_scsi_drained_end() currently attaches the host notifier
again and leaves it dangling after dataplane has stopped.

This results in the following assertion failure because
virtio_scsi_defer_to_dataplane() is called from the IOThread instead of
the main loop thread:

  qemu-system-x86_64: ../softmmu/memory.c:1111: memory_region_transaction_commit: Assertion `qemu_mutex_iothread_locked()' failed.

Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1680
Reported-by: Jean-Louis Dupond <jean-louis@dupond.be>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20230611193924.2444914-1-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Stefan Hajnoczi authored and mstsirkin committed Jun 26, 2023
1 parent abe1003 commit 535a3d9
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions hw/scsi/virtio-scsi.c
Expand Up @@ -1125,7 +1125,16 @@ static void virtio_scsi_drained_begin(SCSIBus *bus)
uint32_t total_queues = VIRTIO_SCSI_VQ_NUM_FIXED +
s->parent_obj.conf.num_queues;

if (!s->dataplane_started) {
/*
* Drain is called when stopping dataplane but the host notifier has
* already been detached. Detaching multiple times is a no-op if nothing
* else is using the monitoring same file descriptor, but avoid it just in
* case.
*
* Also, don't detach if dataplane has not even been started yet because
* the host notifier isn't attached.
*/
if (s->dataplane_stopping || !s->dataplane_started) {
return;
}

Expand All @@ -1143,7 +1152,14 @@ static void virtio_scsi_drained_end(SCSIBus *bus)
uint32_t total_queues = VIRTIO_SCSI_VQ_NUM_FIXED +
s->parent_obj.conf.num_queues;

if (!s->dataplane_started) {
/*
* Drain is called when stopping dataplane. Keep the host notifier detached
* so it's not left dangling after dataplane is stopped.
*
* Also, don't attach if dataplane has not even been started yet. We're not
* ready.
*/
if (s->dataplane_stopping || !s->dataplane_started) {
return;
}

Expand Down

0 comments on commit 535a3d9

Please sign in to comment.