]> git.proxmox.com Git - mirror_qemu.git/commit
blockjob: drop AioContext lock before calling bdrv_graph_wrlock()
authorFiona Ebner <f.ebner@proxmox.com>
Thu, 19 Oct 2023 13:19:34 +0000 (15:19 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 31 Oct 2023 12:51:36 +0000 (13:51 +0100)
commit67446e605dc2cc3e14a4d212bc97e6a2038e8f6a
tree279cfdb78ea9df71cdf01c2d1f2b47a73e37ca2c
parent3be5762294bb03f6a8a284ada6cca7af3a3aeb20
blockjob: drop AioContext lock before calling bdrv_graph_wrlock()

Same rationale as in 31b2ddfea3 ("graph-lock: Unlock the AioContext
while polling"). Otherwise, a deadlock can happen.

The alternative would be to pass a BlockDriverState along to
bdrv_graph_wrlock(), but there is no BlockDriverState readily
available and it's also better conceptually, because the lock is held
for the job.

The function is always called with the job's AioContext lock held, via
one of the .abort, .clean, .free or .prepare job driver functions.
Thus, it's safe to drop it.

While mirror_exit_common() does hold a second AioContext lock while
calling block_job_remove_all_bdrv(), that is for the main thread's
AioContext and does not need to be dropped (bdrv_graph_wrlock(bs) also
skips dropping the lock if bdrv_get_aio_context(bs) ==
qemu_get_aio_context()).

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20231019131936.414246-2-f.ebner@proxmox.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
blockjob.c