[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/29] qed: Use a coroutine for need_check_timer
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 28/29] qed: Use a coroutine for need_check_timer |
Date: |
Fri, 26 May 2017 22:22:09 +0200 |
This fixes the last place where we degraded from AIO to actual blocking
synchronous I/O requests. Putting it into a coroutine means that instead
of blocking, the coroutine simply yields while doing I/O.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qed.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index d3f7d0c..20e81a0 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -264,11 +264,23 @@ static void qed_unplug_allocating_write_reqs(BDRVQEDState
*s)
qemu_co_enter_next(&s->allocating_write_reqs);
}
-static void qed_clear_need_check(void *opaque, int ret)
+static void qed_need_check_timer_entry(void *opaque)
{
BDRVQEDState *s = opaque;
+ int ret;
- if (ret) {
+ /* The timer should only fire when allocating writes have drained */
+ assert(!s->allocating_acb);
+
+ trace_qed_need_check_timer_cb(s);
+
+ qed_acquire(s);
+ qed_plug_allocating_write_reqs(s);
+
+ /* Ensure writes are on disk before clearing flag */
+ ret = bdrv_co_flush(s->bs->file->bs);
+ qed_release(s);
+ if (ret < 0) {
goto out;
}
@@ -276,7 +288,7 @@ static void qed_clear_need_check(void *opaque, int ret)
ret = qed_write_header(s);
(void) ret;
- ret = bdrv_flush(s->bs);
+ ret = bdrv_co_flush(s->bs);
(void) ret;
out:
@@ -285,19 +297,8 @@ out:
static void qed_need_check_timer_cb(void *opaque)
{
- BDRVQEDState *s = opaque;
-
- /* The timer should only fire when allocating writes have drained */
- assert(!s->allocating_acb);
-
- trace_qed_need_check_timer_cb(s);
-
- qed_acquire(s);
- qed_plug_allocating_write_reqs(s);
-
- /* Ensure writes are on disk before clearing flag */
- bdrv_aio_flush(s->bs->file->bs, qed_clear_need_check, s);
- qed_release(s);
+ Coroutine *co = qemu_coroutine_create(qed_need_check_timer_entry, opaque);
+ qemu_coroutine_enter(co);
}
void qed_acquire(BDRVQEDState *s)
--
1.8.3.1
- [Qemu-devel] [PATCH 22/29] qed: Add return value to qed_aio_read/write_data(), (continued)
- [Qemu-devel] [PATCH 22/29] qed: Add return value to qed_aio_read/write_data(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 24/29] qed: Remove recursion in qed_aio_next_io(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 26/29] qed: Use CoQueue for serialising allocations, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 25/29] qed: Implement .bdrv_co_readv/writev, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 27/29] qed: Simplify request handling, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 28/29] qed: Use a coroutine for need_check_timer,
Kevin Wolf <=
- [Qemu-devel] [PATCH 29/29] block: Remove bdrv_aio_readv/writev_flush(), Kevin Wolf, 2017/05/26
- Re: [Qemu-devel] [Qemu-block] [PATCH 00/29] qed: Convert to coroutines, Paolo Bonzini, 2017/05/29