diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-12-08 13:43:52 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2023-12-12 07:43:15 -0500 |
| commit | 755ae3811fec77d94e92398632cbfe23c4ecffd5 (patch) | |
| tree | de06871358c7f697dc0b6cf9c4b6b20d6c443dbf /blockdev.c | |
| parent | eaae59af4035770975b0ce9364b587223a909501 (diff) | |
| download | focaccia-qemu-755ae3811fec77d94e92398632cbfe23c4ecffd5.tar.gz focaccia-qemu-755ae3811fec77d94e92398632cbfe23c4ecffd5.zip | |
block: Fix AioContext locking in qmp_block_resize()
The AioContext must be unlocked before calling blk_co_unref(), because it takes the AioContext lock internally in blk_unref_bh(), which is scheduled in the main thread. If we don't unlock, the AioContext is locked twice and nested event loops such as in bdrv_graph_wrlock() will deadlock. Cc: <qemu-stable@nongnu.org> Fixes: https://issues.redhat.com/browse/RHEL-15965 Fixes: 0c7d204f50c382c6baac8c94bd57af4a022b3888 Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-ID: <20231208124352.30295-1-kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 4c1177e8db..c91f49e7b6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2400,8 +2400,9 @@ void coroutine_fn qmp_block_resize(const char *device, const char *node_name, bdrv_co_lock(bs); bdrv_drained_end(bs); - blk_co_unref(blk); bdrv_co_unlock(bs); + + blk_co_unref(blk); } void qmp_block_stream(const char *job_id, const char *device, |