[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/13] block: Move actual I/O throttling to Block
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 06/13] block: Move actual I/O throttling to BlockBackend |
Date: |
Fri, 22 Apr 2016 19:42:35 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
block/block-backend.c | 10 ++++++++++
block/io.c | 10 ----------
block/throttle-groups.c | 5 ++---
include/block/throttle-groups.h | 2 +-
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 087e60a..b1a176e 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -716,6 +716,11 @@ static int coroutine_fn blk_co_preadv(BlockBackend *blk,
int64_t offset,
return ret;
}
+ /* throttling disk I/O */
+ if (blk->public.throttle_state) {
+ throttle_group_co_io_limits_intercept(blk, bytes, false);
+ }
+
return bdrv_co_do_preadv(blk_bs(blk), offset, bytes, qiov, flags);
}
@@ -730,6 +735,11 @@ static int coroutine_fn blk_co_pwritev(BlockBackend *blk,
int64_t offset,
return ret;
}
+ /* throttling disk I/O */
+ if (blk->public.throttle_state) {
+ throttle_group_co_io_limits_intercept(blk, bytes, true);
+ }
+
if (!blk->enable_write_cache) {
flags |= BDRV_REQ_FUA;
}
diff --git a/block/io.c b/block/io.c
index 34d1bf6..ccc6a76 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1007,11 +1007,6 @@ int coroutine_fn bdrv_co_do_preadv(BlockDriverState *bs,
flags |= BDRV_REQ_COPY_ON_READ;
}
- /* throttling disk I/O */
- if (bs->blk && blk_get_public(bs->blk)->throttle_state) {
- throttle_group_co_io_limits_intercept(bs, bytes, false);
- }
-
/* Align read if necessary by padding qiov */
if (offset & (align - 1)) {
head_buf = qemu_blockalign(bs, align);
@@ -1357,11 +1352,6 @@ int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs,
return ret;
}
- /* throttling disk I/O */
- if (bs->blk && blk_get_public(bs->blk)->throttle_state) {
- throttle_group_co_io_limits_intercept(bs, bytes, true);
- }
-
/*
* Align write if necessary by performing a read-modify-write cycle.
* Pad qiov with the read parts and be sure to have a tracked request not
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 5bd5c3b..6e6939e 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -284,18 +284,17 @@ static void schedule_next_request(BlockBackend *blk, bool
is_write)
* if necessary, and schedule the next request using a round robin
* algorithm.
*
- * @bs: the current BlockDriverState
+ * @blk: the current BlockBackend
* @bytes: the number of bytes for this I/O
* @is_write: the type of operation (read/write)
*/
-void coroutine_fn throttle_group_co_io_limits_intercept(BlockDriverState *bs,
+void coroutine_fn throttle_group_co_io_limits_intercept(BlockBackend *blk,
unsigned int bytes,
bool is_write)
{
bool must_wait;
BlockBackend *token;
- BlockBackend *blk = bs->blk;
BlockBackendPublic *blkp = blk_get_public(blk);
ThrottleGroup *tg = container_of(blkp->throttle_state, ThrottleGroup, ts);
qemu_mutex_lock(&tg->lock);
diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h
index 840ba44..ac42248 100644
--- a/include/block/throttle-groups.h
+++ b/include/block/throttle-groups.h
@@ -40,7 +40,7 @@ void throttle_group_register_blk(BlockBackend *blk, const
char *groupname);
void throttle_group_unregister_blk(BlockBackend *blk);
void throttle_group_restart_blk(BlockBackend *blk);
-void coroutine_fn throttle_group_co_io_limits_intercept(BlockDriverState *bs,
+void coroutine_fn throttle_group_co_io_limits_intercept(BlockBackend *blk,
unsigned int bytes,
bool is_write);
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/13] block: Move I/O throttling to BlockBackend, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 01/13] block: Make sure throttled BDSes always have a BB, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 02/13] block: Introduce BlockBackendPublic, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 04/13] block: Convert throttle_group_get_name() to BlockBackend, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 03/13] block: throttle-groups: Use BlockBackend pointers internally, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 06/13] block: Move actual I/O throttling to BlockBackend,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 05/13] block: Move throttling fields from BDS to BB, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 07/13] block: Move I/O throttling configuration functions to BlockBackend, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 08/13] block: Introduce BdrvChild.opaque, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 09/13] block: Drain throttling queue with BdrvChild callback, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 10/13] block: Decouple throttling from BlockDriverState, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 12/13] Revert "block: Forbid I/O throttling on nodes with multiple parents for 2.6", Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 11/13] block: Remove bdrv_move_feature_fields(), Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 13/13] block: Don't check throttled reqs in bdrv_requests_pending(), Kevin Wolf, 2016/04/22
- Re: [Qemu-devel] [PATCH v2 00/13] block: Move I/O throttling to BlockBackend, Kevin Wolf, 2016/04/29