From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kWQ-0005ee-4E for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:26:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6kWK-0000X7-4p for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:26:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kWJ-0000Wv-KF for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:26:19 -0500 From: Kevin Wolf Date: Fri, 24 Jan 2014 18:22:16 +0100 Message-Id: <1390584136-24703-94-git-send-email-kwolf@redhat.com> In-Reply-To: <1390584136-24703-1-git-send-email-kwolf@redhat.com> References: <1390584136-24703-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 93/93] block: Switch bdrv_io_limits_intercept() to byte granularity List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index 932ce58..cb21a5f 100644 --- a/block.c +++ b/block.c @@ -192,7 +192,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 */ @@ -205,9 +205,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)) { @@ -2968,8 +2967,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 */ @@ -3193,8 +3191,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