X-Git-Url: https://git.proxmox.com/?p=pve-qemu.git;a=blobdiff_plain;f=debian%2Fpatches%2Fextra%2F0011-block-Fix-AioContext-locking-in-qmp_block_resize.patch;fp=debian%2Fpatches%2Fextra%2F0011-block-Fix-AioContext-locking-in-qmp_block_resize.patch;h=0000000000000000000000000000000000000000;hp=a79fa80ef59689a7d7fcee54df8709a32e7053e2;hb=4b7975e75d4c067180ddc10f94018c569d581b01;hpb=f366bb97ae67910cb36a9f6e36d26e8d6070ad57 diff --git a/debian/patches/extra/0011-block-Fix-AioContext-locking-in-qmp_block_resize.patch b/debian/patches/extra/0011-block-Fix-AioContext-locking-in-qmp_block_resize.patch deleted file mode 100644 index a79fa80..0000000 --- a/debian/patches/extra/0011-block-Fix-AioContext-locking-in-qmp_block_resize.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kevin Wolf -Date: Fri, 8 Dec 2023 13:43:52 +0100 -Subject: [PATCH] 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 -(picked up from https://lists.nongnu.org/archive/html/qemu-devel/2023-12/msg01102.html) -Signed-off-by: Fiona Ebner ---- - blockdev.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/blockdev.c b/blockdev.c -index e6eba61484..c28462a633 100644 ---- a/blockdev.c -+++ b/blockdev.c -@@ -2361,8 +2361,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,