[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 18/23] block: avoid recursive AioContext acquire i
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 18/23] block: avoid recursive AioContext acquire in bdrv_inactivate_all() |
Date: |
Tue, 19 Dec 2017 15:11:39 +0000 |
From: Paolo Bonzini <address@hidden>
BDRV_POLL_WHILE() does not support recursive AioContext locking. It
only releases the AioContext lock once regardless of how many times the
caller has acquired it. This results in a hang since the IOThread does
not make progress while the AioContext is still locked.
The following steps trigger the hang:
$ qemu-system-x86_64 -M accel=kvm -m 1G -cpu host \
-object iothread,id=iothread0 \
-device virtio-scsi-pci,iothread=iothread0 \
-drive if=none,id=drive0,file=test.img,format=raw \
-device scsi-hd,drive=drive0 \
-drive if=none,id=drive1,file=test.img,format=raw \
-device scsi-hd,drive=drive1
$ qemu-system-x86_64 ...same options... \
-incoming tcp::1234
(qemu) migrate tcp:127.0.0.1:1234
...hang...
Tested-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 9a1a0d1e73..1c37ce4554 100644
--- a/block.c
+++ b/block.c
@@ -4320,9 +4320,15 @@ int bdrv_inactivate_all(void)
BdrvNextIterator it;
int ret = 0;
int pass;
+ GSList *aio_ctxs = NULL, *ctx;
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
- aio_context_acquire(bdrv_get_aio_context(bs));
+ AioContext *aio_context = bdrv_get_aio_context(bs);
+
+ if (!g_slist_find(aio_ctxs, aio_context)) {
+ aio_ctxs = g_slist_prepend(aio_ctxs, aio_context);
+ aio_context_acquire(aio_context);
+ }
}
/* We do two passes of inactivation. The first pass calls to drivers'
@@ -4340,9 +4346,11 @@ int bdrv_inactivate_all(void)
}
out:
- for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
- aio_context_release(bdrv_get_aio_context(bs));
+ for (ctx = aio_ctxs; ctx != NULL; ctx = ctx->next) {
+ AioContext *aio_context = ctx->data;
+ aio_context_release(aio_context);
}
+ g_slist_free(aio_ctxs);
return ret;
}
--
2.14.3
- [Qemu-devel] [PULL v2 06/23] qdev: drop unused #include "sysemu/iothread.h", (continued)
- [Qemu-devel] [PULL v2 06/23] qdev: drop unused #include "sysemu/iothread.h", Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 07/23] blockdev: hold AioContext for bdrv_unref() in external_snapshot_clean(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 08/23] block: don't keep AioContext acquired after external_snapshot_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 10/23] block: don't keep AioContext acquired after blockdev_backup_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 11/23] block: don't keep AioContext acquired after internal_snapshot_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 09/23] block: don't keep AioContext acquired after drive_backup_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 12/23] block: drop unused BlockDirtyBitmapState->aio_context field, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 13/23] iothread: add iothread_by_id() API, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 14/23] blockdev: add x-blockdev-set-iothread testing command, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 15/23] qemu-iotests: add 202 external snapshots IOThread test, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 18/23] block: avoid recursive AioContext acquire in bdrv_inactivate_all(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 16/23] virtio-blk: make queue size configurable, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 17/23] virtio-blk: reject configs with logical block size > physical block size, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 20/23] blockdev: add x-blockdev-set-iothread force boolean, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 19/23] docs: mark nested AioContext locking as a legacy API, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 21/23] iotests: add VM.add_object(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 23/23] qemu-iotests: add 203 savevm with IOThreads test, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 22/23] iothread: fix iothread_stop() race condition, Stefan Hajnoczi, 2017/12/19
- Re: [Qemu-devel] [PULL v2 00/23] Block patches, Peter Maydell, 2017/12/20