diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-03-21 13:55:19 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-06-25 15:26:29 -0500 |
| commit | 0fd56fb8443d52a20d6bd8b4b543c4a8f9d0756d (patch) | |
| tree | 0cd63c5c33604d90420c69a40317efed634fd010 | |
| parent | 8211eeb7d26915d99a1d6a7eb79d09e862784f4a (diff) | |
mirror: fix early wake from sleep due to aio
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 <jbarrera@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 7b770c720b28b8ac5b82ae431f2f354b7f8add91)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | block/mirror.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c index 9bfc22f571..2d9104efc0 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -95,7 +95,14 @@ static void mirror_iteration_done(MirrorOp *op, int ret) } 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) |