[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 29/29] block: Switch bdrv_io_limits_intercept() t
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v3 29/29] block: Switch bdrv_io_limits_intercept() to byte granularity |
Date: |
Fri, 17 Jan 2014 15:15:19 +0100 |
Request sizes used to be rounded down to the next sector boundary,
allowing to bypass the I/O limit. Now all requests are accounted for
with their exact byte size.
Reported-by: Wenchao Xia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index 12af7fb..d3e3291 100644
--- a/block.c
+++ b/block.c
@@ -188,7 +188,7 @@ void bdrv_io_limits_enable(BlockDriverState *bs)
* @is_write: is the IO a write
*/
static void bdrv_io_limits_intercept(BlockDriverState *bs,
- int nb_sectors,
+ unsigned int bytes,
bool is_write)
{
/* does this io must wait */
@@ -201,9 +201,8 @@ static void bdrv_io_limits_intercept(BlockDriverState *bs,
}
/* the IO will be executed, do the accounting */
- throttle_account(&bs->throttle_state,
- is_write,
- nb_sectors * BDRV_SECTOR_SIZE);
+ throttle_account(&bs->throttle_state, is_write, bytes);
+
/* if the next request must wait -> do nothing */
if (throttle_schedule_timer(&bs->throttle_state, is_write)) {
@@ -2788,8 +2787,7 @@ static int coroutine_fn
bdrv_co_do_preadv(BlockDriverState *bs,
/* throttling disk I/O */
if (bs->io_limits_enabled) {
- /* TODO Switch to byte granularity */
- bdrv_io_limits_intercept(bs, bytes >> BDRV_SECTOR_BITS, false);
+ bdrv_io_limits_intercept(bs, bytes, false);
}
/* Align read if necessary by padding qiov */
@@ -3013,8 +3011,7 @@ static int coroutine_fn
bdrv_co_do_pwritev(BlockDriverState *bs,
/* throttling disk I/O */
if (bs->io_limits_enabled) {
- /* TODO Switch to byte granularity */
- bdrv_io_limits_intercept(bs, bytes >> BDRV_SECTOR_BITS, true);
+ bdrv_io_limits_intercept(bs, bytes, true);
}
/*
--
1.8.1.4
- [Qemu-devel] [PATCH v3 24/29] block: Make bdrv_pwrite() a bdrv_prwv_co() wrapper, (continued)
- [Qemu-devel] [PATCH v3 24/29] block: Make bdrv_pwrite() a bdrv_prwv_co() wrapper, Kevin Wolf, 2014/01/17
- [Qemu-devel] [PATCH v3 26/29] blkdebug: Make required alignment configurable, Kevin Wolf, 2014/01/17
- [Qemu-devel] [PATCH v3 27/29] qemu-io: New command 'sleep', Kevin Wolf, 2014/01/17
- [Qemu-devel] [PATCH v3 28/29] qemu-iotests: Test pwritev RMW logic, Kevin Wolf, 2014/01/17
- [Qemu-devel] [PATCH v3 29/29] block: Switch bdrv_io_limits_intercept() to byte granularity,
Kevin Wolf <=
- Re: [Qemu-devel] [PATCH v3 00/29] block: Support for 512b-on-4k emulation, Christian Borntraeger, 2014/01/22