[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 5/5] mirror: fix early wake from sleep due to
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.0 5/5] mirror: fix early wake from sleep due to aio |
Date: |
Tue, 25 Mar 2014 15:51:35 +0100 |
The mirror blockjob coroutine rate-limits itself by sleeping. The
coroutine also performs I/O asynchronously so it's important that the
aio callback doesn't wake the coroutine early as that breaks
rate-limiting.
Reported-by: Joaquim Barrera <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/mirror.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index adb09cf..0ef41f9 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -98,7 +98,14 @@ static void mirror_iteration_done(MirrorOp *op, int ret)
qemu_iovec_destroy(&op->qiov);
g_slice_free(MirrorOp, op);
- qemu_coroutine_enter(s->common.co, NULL);
+
+ /* Enter coroutine when it is not sleeping. The coroutine sleeps to
+ * rate-limit itself. The coroutine will eventually resume since there is
+ * a sleep timeout so don't wake it early.
+ */
+ if (s->common.busy) {
+ qemu_coroutine_enter(s->common.co, NULL);
+ }
}
static void mirror_write_complete(void *opaque, int ret)
--
1.8.5.3
- [Qemu-devel] [PULL for-2.0 0/5] Block patches, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 0/5] Block patches, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 4/5] mirror: fix throttling delay calculation, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 1/5] osdep: initialize glib threads in all QEMU tools, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 5/5] mirror: fix early wake from sleep due to aio,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.0 2/5] qemu-img: mandate argument to 'qemu-img check --repair', Stefan Hajnoczi, 2014/03/25
- Re: [Qemu-devel] [PULL for-2.0 0/5] Block patches, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 3/5] Fixed various typos, Stefan Hajnoczi, 2014/03/25