diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2024-01-19 08:57:47 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2024-01-26 11:16:58 +0100 |
| commit | ea0736d7f84ead109a6b701427991828f97724c3 (patch) | |
| tree | b21dc4c0a21dd64307c83b194271ef3d50bbf473 /hw | |
| parent | 71ee0cdd14cc01a8b51aa4e9577dd0a1bb2f8e19 (diff) | |
| download | qemu-ea0736d7f84ead109a6b701427991828f97724c3.zip qemu-ea0736d7f84ead109a6b701427991828f97724c3.tar.gz qemu-ea0736d7f84ead109a6b701427991828f97724c3.tar.bz2 | |
virtio-blk: tolerate failure to set BlockBackend AioContext
We no longer rely on setting the AioContext since the block layer
IO_CODE APIs can be called from any thread. Now it's just a hint to help
block jobs and other operations co-locate themselves in a thread with
the guest I/O requests. Keep going if setting the AioContext fails.
Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240119135748.270944-6-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/virtio-blk.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 4525988..73248d1 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -1786,11 +1786,14 @@ static int virtio_blk_start_ioeventfd(VirtIODevice *vdev) memory_region_transaction_commit(); + /* + * Try to change the AioContext so that block jobs and other operations can + * co-locate their activity in the same AioContext. If it fails, nevermind. + */ r = blk_set_aio_context(s->conf.conf.blk, s->vq_aio_context[0], &local_err); if (r < 0) { - error_report_err(local_err); - goto fail_aio_context; + warn_report_err(local_err); } /* @@ -1819,18 +1822,6 @@ static int virtio_blk_start_ioeventfd(VirtIODevice *vdev) } return 0; - fail_aio_context: - memory_region_transaction_begin(); - - for (i = 0; i < nvqs; i++) { - virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false); - } - - memory_region_transaction_commit(); - - for (i = 0; i < nvqs; i++) { - virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i); - } fail_host_notifiers: k->set_guest_notifiers(qbus->parent, nvqs, false); fail_guest_notifiers: |