[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/22] throttle-groups: do not use qemu_co_enter_n
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v2 12/22] throttle-groups: do not use qemu_co_enter_next |
Date: |
Fri, 2 Jun 2017 16:11:10 +0800 |
From: Paolo Bonzini <address@hidden>
Prepare for removing this function; always restart throttled requests
from coroutine context. This will matter when restarting throttled
requests will have to acquire a CoMutex.
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
block/throttle-groups.c | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 85169ec..8bf1031 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -260,6 +260,20 @@ static bool throttle_group_schedule_timer(BlockBackend
*blk, bool is_write)
return must_wait;
}
+/* Start the next pending I/O request for a BlockBackend. Return whether
+ * any request was actually pending.
+ *
+ * @blk: the current BlockBackend
+ * @is_write: the type of operation (read/write)
+ */
+static bool coroutine_fn throttle_group_co_restart_queue(BlockBackend *blk,
+ bool is_write)
+{
+ BlockBackendPublic *blkp = blk_get_public(blk);
+
+ return qemu_co_queue_next(&blkp->throttled_reqs[is_write]);
+}
+
/* Look for the next pending I/O request and schedule it.
*
* This assumes that tg->lock is held.
@@ -287,7 +301,7 @@ static void schedule_next_request(BlockBackend *blk, bool
is_write)
if (!must_wait) {
/* Give preference to requests from the current blk */
if (qemu_in_coroutine() &&
- qemu_co_queue_next(&blkp->throttled_reqs[is_write])) {
+ throttle_group_co_restart_queue(blk, is_write)) {
token = blk;
} else {
ThrottleTimers *tt = &blk_get_public(token)->throttle_timers;
@@ -340,15 +354,21 @@ void coroutine_fn
throttle_group_co_io_limits_intercept(BlockBackend *blk,
qemu_mutex_unlock(&tg->lock);
}
-static void throttle_group_restart_queue(BlockBackend *blk, bool is_write)
+typedef struct {
+ BlockBackend *blk;
+ bool is_write;
+} RestartData;
+
+static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
{
+ RestartData *data = opaque;
+ BlockBackend *blk = data->blk;
+ bool is_write = data->is_write;
BlockBackendPublic *blkp = blk_get_public(blk);
ThrottleGroup *tg = container_of(blkp->throttle_state, ThrottleGroup, ts);
bool empty_queue;
- aio_context_acquire(blk_get_aio_context(blk));
- empty_queue = !qemu_co_enter_next(&blkp->throttled_reqs[is_write]);
- aio_context_release(blk_get_aio_context(blk));
+ empty_queue = !throttle_group_co_restart_queue(blk, is_write);
/* If the request queue was empty then we have to take care of
* scheduling the next one */
@@ -359,6 +379,18 @@ static void throttle_group_restart_queue(BlockBackend
*blk, bool is_write)
}
}
+static void throttle_group_restart_queue(BlockBackend *blk, bool is_write)
+{
+ Coroutine *co;
+ RestartData rd = {
+ .blk = blk,
+ .is_write = is_write
+ };
+
+ co = qemu_coroutine_create(throttle_group_restart_queue_entry, &rd);
+ aio_co_enter(blk_get_aio_context(blk), co);
+}
+
void throttle_group_restart_blk(BlockBackend *blk)
{
BlockBackendPublic *blkp = blk_get_public(blk);
--
2.9.4
- [Qemu-devel] [PULL v2 02/22] docker: Add bzip2 and hostname to fedora image, (continued)
- [Qemu-devel] [PULL v2 02/22] docker: Add bzip2 and hostname to fedora image, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 03/22] docker: Add libaio to fedora image, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 04/22] docker: Add flex and bison to centos6 image, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 05/22] block: access copy_on_read with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 06/22] block: access quiesce_counter with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 07/22] block: access io_limits_disabled with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 10/22] block: access io_plugged with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 08/22] block: access serialising_in_flight with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 09/22] block: access wakeup with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 11/22] throttle-groups: only start one coroutine from drained_begin, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 12/22] throttle-groups: do not use qemu_co_enter_next,
Fam Zheng <=
- [Qemu-devel] [PULL v2 13/22] throttle-groups: protect throttled requests with a CoMutex, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 14/22] util: add stats64 module, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 15/22] block: use Stat64 for wr_highest_offset, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 17/22] block: protect tracked_requests and flush_queue with reqs_lock, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 19/22] migration/block: reset dirty bitmap before reading, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 18/22] block: introduce dirty_bitmap_mutex, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 16/22] block: access write_gen with atomics, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 20/22] block: protect modification of dirty bitmaps with a mutex, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 22/22] block: make accounting thread-safe, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 21/22] block: introduce block_account_one_io, Fam Zheng, 2017/06/02