Continuous Leaky Bucket Throttling
v9 cover Continuous Leaky Bucket Throttling
This patchset implement continous leaky bucket throttling.
It use two requests queue to enable to do silly unbalanced throttling like block_set_io_throttle 0 0 0 0 6000 1
It use two timer to get the timer callbacks and the throttle.c code simple
in this version:
Apply Reviewed-By by Eric
Rebased on top of "qmp: fix integer usage in examples" by Eric (Please apply it
first)
v8:
rearm timer only when it's not pending [Stefan] Schedule next request right after accouting it [Stefan]
v7:
honor max values if specified [Paolo] s/cfg/Linux CFQ/ [Stefan]
revert throttle_get_config to it's old prototype [Stefan] s/size/@size/ [Stefan]
s/acccount/account/ [Stefan]
remove tracked_request_end uneeded hunk [Stefan] Spaces before (json-int)s [Stefan]
Benoît Canet (5):
throttle: Add a new throttling API implementing continuous leaky
bucket.
throttle: Add units tests
block: Enable the new throttling code in the block layer.
block: Add support for throttling burst max in QMP and the command
line.
block: Add iops_size to do the iops accounting for a given io size.
block.c | 338 +++++++++---------------------- block/qapi.c | 50 +++-- blockdev.c | 205 ++++++++++++++----- hmp.c | 36 +++- include/block/block.h | 1 - include/block/block_int.h | 32 +-- include/qemu/throttle.h | 103 ++++++++++ qapi-schema.json | 40 +++- qemu-options.hx | 4 +- qmp-commands.hx | 34 +++- tests/Makefile | 2 + tests/test-throttle.c | 481 +++++++++++++++++++++++++++++++++++++++++++++ util/Makefile.objs | 1 + util/throttle.c | 396 +++++++++++++++++++++++++++++++++++++ 14 files changed, 1384 insertions(+), 339 deletions(-) create mode 100644 include/qemu/throttle.h create mode 100644 tests/test-throttle.c create mode 100644 util/throttle.c
Signature · 1 line
1.7.10.4
PATCH v9 1/5 throttle: Add a new throttling API implementing continuous leaky bucket.
Implement the continuous leaky bucket algorithm devised on IRC as a separate module.
--- include/qemu/throttle.h | 103 ++++++++++++ util/Makefile.objs | 1 + util/throttle.c | 396 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 500 insertions(+) create mode 100644 include/qemu/throttle.h create mode 100644 util/throttle.c
include/qemu/throttle.h new file +103 -0
@@ -0,0 +1,103 @@ +/* +* QEMU throttling infrastructure +* +* Copyright (C) Nodalink, SARL. 2013 +* +* Author: +* Benoît Canet <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 or +* (at your option) version 3 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef THROTTLE_H +#define THROTTLE_H + +#include <stdint.h> +#include "qemu-common.h" +#include "qemu/timer.h" + +#define NANOSECONDS_PER_SECOND 1000000000.0 + +typedef enum { +THROTTLE_BPS_TOTAL , +THROTTLE_BPS_READ , +THROTTLE_BPS_WRITE , +THROTTLE_OPS_TOTAL , +THROTTLE_OPS_READ , +THROTTLE_OPS_WRITE , +BUCKETS_COUNT , +}BucketType ; + +typedef struct LeakyBucket { +double avg;/* average goal in units per second */ +double max;/* leaky bucket max burst in units */ +double level;/* bucket level in units */ +}LeakyBucket ; + +/* The following structure is used to configure a ThrottleState +* It contains a bit of state: the bucket field of the LeakyBucket structure. +* However it allows to keep the code clean and the bucket field is reset to +* zero at the right time. +*/ +typedef struct ThrottleConfig { +LeakyBucket buckets[BUCKETS_COUNT ];/* leaky buckets */ +uint64_t op_size;/* size of an operation in bytes */ +}ThrottleConfig ; + +typedef struct ThrottleState { +ThrottleConfig cfg;/* configuration */ +int64_t previous_leak;/* timestamp of the last leak done */ +QEMUTimer * timers[2 ];/* timers used to do the throttling */ +QEMUClockType clock_type;/* the clock used */ +}ThrottleState ; + +/* operations on single leaky buckets */ +void throttle_leak_bucket (LeakyBucket *bkt,int64_t delta); + +int64_t throttle_compute_wait (LeakyBucket *bkt); + +/* expose timer computation function for unit tests */ +bool throttle_compute_timer (ThrottleState *ts, +bool is_write, +int64_t now, +int64_t *next_timestamp); + +/* init/destroy cycle */ +void throttle_init (ThrottleState *ts, +QEMUClockType clock_type, +void (read_timer )(void *), +void (write_timer )(void *), +void *timer_opaque); + +void throttle_destroy (ThrottleState *ts); + +bool throttle_have_timer (ThrottleState *ts); + +/* configuration */ +bool throttle_enabled (ThrottleConfig *cfg); + +bool throttle_conflicting (ThrottleConfig *cfg); + +bool throttle_is_valid (ThrottleConfig *cfg); + +void throttle_config (ThrottleState *ts,ThrottleConfig *cfg); + +void throttle_get_config (ThrottleState *ts,ThrottleConfig *cfg); + +/* usage */ +bool throttle_schedule_timer (ThrottleState *ts,bool is_write); + +void throttle_account (ThrottleState *ts,bool is_write,uint64_t size); + +#endif
util/Makefile.objs +1 -0
@@ -11,3 +11,4 @@ util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o util-obj-y += qemu-option.o qemu-progress.o util-obj-y += hexdump.o util-obj-y += crc32c.o +util-obj-y += throttle.o
util/throttle.c new file +396 -0
396 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v9 2/5 throttle: Add units tests
In reply to Benoît Canet--- tests/Makefile | 2 + tests/test-throttle.c | 481 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 483 insertions(+) create mode 100644 tests/test-throttle.c
tests/Makefile +2 -0
@@ -29,6 +29,7 @@ check-unit-y += tests/test-visitor-serialization$(EXESUF) check-unit-y += tests/test-iov$(EXESUF) gcov-files-test-iov-y = util/iov.c check-unit-y += tests/test-aio$(EXESUF) +check-unit-y += tests/test-throttle$(EXESUF) gcov-files-test-aio-$(CONFIG_WIN32) = aio-win32.c gcov-files-test-aio-$(CONFIG_POSIX) = aio-posix.c check-unit-y += tests/test-thread-pool$(EXESUF)
@@ -117,6 +118,7 @@ tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a +tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-iov$(EXESUF): tests/test-iov.o libqemuutil.a tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o libqemuutil.a libqemustub.a
tests/test-throttle.c new file +481 -0
481 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v9 3/5 block: Enable the new throttling code in the block layer.
In reply to Benoît Canet--- block.c | 338 +++++++++++++-------------------------------- block/qapi.c | 21 ++- blockdev.c | 100 ++++++++------ include/block/block.h | 1 - include/block/block_int.h | 32 +---- 5 files changed, 164 insertions(+), 328 deletions(-)
block.c +95 -243
@@ -86,13 +86,6 @@ static void coroutine_fn bdrv_co_do_rw(void *opaque); static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,int64_t sector_num,int nb_sectors); -static bool bdrv_exceed_bps_limits (BlockDriverState *bs,int nb_sectors, -bool is_write,double elapsed_time,uint64_t *wait); -static bool bdrv_exceed_iops_limits (BlockDriverState *bs,bool is_write, -double elapsed_time,uint64_t *wait); -static bool bdrv_exceed_io_limits (BlockDriverState *bs,int nb_sectors, -bool is_write,int64_t *wait); - static QTAILQ_HEAD(, BlockDriverState) bdrv_states =QTAILQ_HEAD_INITIALIZER (bdrv_states);
@@ -123,69 +116,101 @@ int is_windows_drive(const char *filename)#endif /* throttling disk I/O limits */ -void bdrv_io_limits_disable (BlockDriverState *bs) +void bdrv_set_io_limits (BlockDriverState *bs, +ThrottleConfig *cfg) { - bs->io_limits_enabled = false; +int i; -do {}while (qemu_co_enter_next (&bs->throttled_reqs)); +throttle_config (&bs->throttle_state, cfg); -if (bs->block_timer) { -timer_del (bs->block_timer); -timer_free (bs->block_timer); - bs->block_timer =NULL ; +for (i =0 ; i <2 ; i++) { +qemu_co_enter_next (&bs->throttled_reqs[i]); } +} + +/* this function drain all the throttled IOs */ +static bool bdrv_start_throttled_reqs (BlockDriverState *bs) +{ +bool drained = false; +bool enabled = bs->io_limits_enabled; +int i; + + bs->io_limits_enabled = false; + +for (i =0 ; i <2 ; i++) { +while (qemu_co_enter_next (&bs->throttled_reqs[i])) { + drained = true; + } + } + + bs->io_limits_enabled = enabled; - bs->slice_start =0 ; - bs->slice_end =0 ; +return drained; } -static void bdrv_block_timer (void *opaque) +void bdrv_io_limits_disable (BlockDriverState *bs) { -BlockDriverState *bs = opaque; + bs->io_limits_enabled = false; -qemu_co_enter_next (&bs->throttled_reqs); +bdrv_start_throttled_reqs (bs); + +throttle_destroy (&bs->throttle_state); } -void bdrv_io_limits_enable (BlockDriverState *bs) +static void bdrv_throttle_read_timer_cb (void *opaque) { - bs->block_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , bdrv_block_timer, bs); - bs->io_limits_enabled = true; +BlockDriverState *bs = opaque; +qemu_co_enter_next (&bs->throttled_reqs[0 ]); } -bool bdrv_io_limits_enabled (BlockDriverState *bs) +static void bdrv_throttle_write_timer_cb (void *opaque) { -BlockIOLimit *io_limits = &bs->io_limits; -return io_limits->bps[BLOCK_IO_LIMIT_READ ] - || io_limits->bps[BLOCK_IO_LIMIT_WRITE ] - || io_limits->bps[BLOCK_IO_LIMIT_TOTAL ] - || io_limits->iops[BLOCK_IO_LIMIT_READ ] - || io_limits->iops[BLOCK_IO_LIMIT_WRITE ] - || io_limits->iops[BLOCK_IO_LIMIT_TOTAL ]; +BlockDriverState *bs = opaque; +qemu_co_enter_next (&bs->throttled_reqs[1 ]); } +/* should be called before bdrv_set_io_limits if a limit is set */ +void bdrv_io_limits_enable (BlockDriverState *bs) +{ +assert (!bs->io_limits_enabled); +throttle_init (&bs->throttle_state, +QEMU_CLOCK_VIRTUAL , + bdrv_throttle_read_timer_cb, + bdrv_throttle_write_timer_cb, + bs); + bs->io_limits_enabled = true; +} + +/* This function makes an IO wait if needed +* +* @nb_sectors: the number of sectors of the IO +* @is_write: is the IO a write +*/ static void bdrv_io_limits_intercept (BlockDriverState *bs, -bool is_write,int nb_sectors) +int nb_sectors, +bool is_write) { -int64_t wait_time =-1 ; +/* does this io must wait */ +bool must_wait =throttle_schedule_timer (&bs->throttle_state, is_write); -if (!qemu_co_queue_empty (&bs->throttled_reqs)) { -qemu_co_queue_wait (&bs->throttled_reqs); +/* if must wait or any request of this type throttled queue the IO */ +if (must_wait || + !qemu_co_queue_empty (&bs->throttled_reqs[is_write])) { +qemu_co_queue_wait (&bs->throttled_reqs[is_write]); } -/* In fact, we hope to keep each request's timing, in FIFO mode. The next -* throttled requests will not be dequeued until the current request is -* allowed to be serviced. So if the current request still exceeds the -* limits, it will be inserted to the head. All requests followed it will -* be still in throttled_reqs queue. -*/ +/* the IO will be executed, do the accounting */ +throttle_account (&bs->throttle_state, + is_write, + nb_sectors *BDRV_SECTOR_SIZE ); -while (bdrv_exceed_io_limits (bs, nb_sectors, is_write, &wait_time)) { -timer_mod (bs->block_timer, - wait_time +qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )); -qemu_co_queue_wait_insert_head (&bs->throttled_reqs); +/* if the next request must wait -> do nothing */ +if (throttle_schedule_timer (&bs->throttle_state, is_write)) { +return ; } -qemu_co_queue_next (&bs->throttled_reqs); +/* else queue next request for execution */ +qemu_co_queue_next (&bs->throttled_reqs[is_write]); }/* check if the path starts with "<protocol>:" */
@@ -305,7 +330,8 @@ BlockDriverState *bdrv_new(const char *device_name)bdrv_iostatus_disable (bs);notifier_list_init (&bs->close_notifiers);notifier_with_return_list_init (&bs->before_write_notifiers); -qemu_co_queue_init (&bs->throttled_reqs); +qemu_co_queue_init (&bs->throttled_reqs[0 ]); +qemu_co_queue_init (&bs->throttled_reqs[1 ]);return bs; }
@@ -1113,11 +1139,6 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options,bdrv_dev_change_media_cb (bs, true); } -/* throttling disk I/O limits */ -if (bs->io_limits_enabled) { -bdrv_io_limits_enable (bs); - } -return 0 ; unlink_and_fail:
@@ -1436,7 +1457,10 @@ static bool bdrv_requests_pending(BlockDriverState *bs)if (!QLIST_EMPTY (&bs->tracked_requests)) {return true; } -if (!qemu_co_queue_empty (&bs->throttled_reqs)) { +if (!qemu_co_queue_empty (&bs->throttled_reqs[0 ])) { +return true; + } +if (!qemu_co_queue_empty (&bs->throttled_reqs[1 ])) {return true; }if (bs->file &&bdrv_requests_pending (bs->file)) {
@@ -1482,7 +1506,7 @@ void bdrv_drain_all(void)* a busy wait. */ QTAILQ_FOREACH(bs, &bdrv_states, list) { -while (qemu_co_enter_next (&bs->throttled_reqs)) { +if (bdrv_start_throttled_reqs (bs)) { busy = true; } }
@@ -1524,13 +1548,12 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest, bs_dest->enable_write_cache = bs_src->enable_write_cache; -/* i/o timing parameters */ - bs_dest->slice_start = bs_src->slice_start; - bs_dest->slice_end = bs_src->slice_end; - bs_dest->slice_submitted = bs_src->slice_submitted; - bs_dest->io_limits = bs_src->io_limits; - bs_dest->throttled_reqs = bs_src->throttled_reqs; - bs_dest->block_timer = bs_src->block_timer; +/* i/o throttled req */ +memcpy (&bs_dest->throttle_state, + &bs_src->throttle_state, +sizeof (ThrottleState)); + bs_dest->throttled_reqs[0 ] = bs_src->throttled_reqs[0 ]; + bs_dest->throttled_reqs[1 ] = bs_src->throttled_reqs[1 ]; bs_dest->io_limits_enabled = bs_src->io_limits_enabled;/* r/w error */
@@ -1577,7 +1600,7 @@ void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old)assert (bs_new->dev ==NULL );assert (bs_new->in_use ==0 );assert (bs_new->io_limits_enabled == false); -assert (bs_new->block_timer ==NULL ); +assert (!throttle_have_timer (&bs_new->throttle_state)); tmp = *bs_new; *bs_new = *bs_old;
@@ -1596,7 +1619,7 @@ void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old)assert (bs_new->job ==NULL );assert (bs_new->in_use ==0 );assert (bs_new->io_limits_enabled == false); -assert (bs_new->block_timer ==NULL ); +assert (!throttle_have_timer (&bs_new->throttle_state));bdrv_rebind (bs_new);bdrv_rebind (bs_old);
@@ -2539,11 +2562,6 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs,return -EIO ; } -/* throttling disk read I/O */ -if (bs->io_limits_enabled) { -bdrv_io_limits_intercept (bs, false, nb_sectors); - } -if (bs->copy_on_read) { flags |=BDRV_REQ_COPY_ON_READ ; }
@@ -2555,6 +2573,11 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs,wait_for_overlapping_requests (bs, sector_num, nb_sectors); } +/* throttling disk I/O */ +if (bs->io_limits_enabled) { +bdrv_io_limits_intercept (bs, nb_sectors, false); + } +tracked_request_begin (&req, bs, sector_num, nb_sectors, false);if (flags &BDRV_REQ_COPY_ON_READ ) {
@@ -2680,15 +2703,15 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,return -EIO ; } -/* throttling disk write I/O */ -if (bs->io_limits_enabled) { -bdrv_io_limits_intercept (bs, true, nb_sectors); - } -if (bs->copy_on_read_in_flight) {wait_for_overlapping_requests (bs, sector_num, nb_sectors); } +/* throttling disk I/O */ +if (bs->io_limits_enabled) { +bdrv_io_limits_intercept (bs, nb_sectors, true); + } +tracked_request_begin (&req, bs, sector_num, nb_sectors, true); ret =notifier_with_return_list_notify (&bs->before_write_notifiers, &req);
@@ -2806,14 +2829,6 @@ void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr) *nb_sectors_ptr = length; } -/* throttling disk io limits */ -void bdrv_set_io_limits (BlockDriverState *bs, -BlockIOLimit *io_limits) -{ - bs->io_limits = *io_limits; - bs->io_limits_enabled =bdrv_io_limits_enabled (bs); -} -void bdrv_set_on_error (BlockDriverState *bs,BlockdevOnError on_read_error,BlockdevOnError on_write_error) {
@@ -3623,169 +3638,6 @@ void bdrv_aio_cancel(BlockDriverAIOCB *acb) acb->aiocb_info->cancel (acb); } -/* block I/O throttling */ -static bool bdrv_exceed_bps_limits (BlockDriverState *bs,int nb_sectors, -bool is_write,double elapsed_time,uint64_t *wait) -{ -uint64_t bps_limit =0 ; -uint64_t extension; -double bytes_limit, bytes_base, bytes_res; -double slice_time, wait_time; - -if (bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL ]) { - bps_limit = bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL ]; - }else if (bs->io_limits.bps[is_write]) { - bps_limit = bs->io_limits.bps[is_write]; - }else { -if (wait) { - *wait =0 ; - } - -return false; - } - - slice_time = bs->slice_end - bs->slice_start; - slice_time /= (NANOSECONDS_PER_SECOND ); - bytes_limit = bps_limit * slice_time; - bytes_base = bs->slice_submitted.bytes[is_write]; -if (bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL ]) { - bytes_base += bs->slice_submitted.bytes[!is_write]; - } - -/* bytes_base: the bytes of data which have been read/written; and -* it is obtained from the history statistic info. -* bytes_res: the remaining bytes of data which need to be read/written. -* (bytes_base + bytes_res) / bps_limit: used to calcuate -* the total time for completing reading/writting all data. -*/ - bytes_res = (unsigned ) nb_sectors *BDRV_SECTOR_SIZE ; - -if (bytes_base + bytes_res <= bytes_limit) { -if (wait) { - *wait =0 ; - } - -return false; - } - -/* Calc approx time to dispatch */ - wait_time = (bytes_base + bytes_res) / bps_limit - elapsed_time; - -/* When the I/O rate at runtime exceeds the limits, -* bs->slice_end need to be extended in order that the current statistic -* info can be kept until the timer fire, so it is increased and tuned -* based on the result of experiment. -*/ - extension = wait_time *NANOSECONDS_PER_SECOND ; - extension =DIV_ROUND_UP (extension,BLOCK_IO_SLICE_TIME ) * -BLOCK_IO_SLICE_TIME ; - bs->slice_end += extension; -if (wait) { - *wait = wait_time *NANOSECONDS_PER_SECOND ; - } - -return true; -} - -static bool bdrv_exceed_iops_limits (BlockDriverState *bs,bool is_write, -double elapsed_time,uint64_t *wait) -{ -uint64_t iops_limit =0 ; -double ios_limit, ios_base; -double slice_time, wait_time; - -if (bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL ]) { - iops_limit = bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL ]; - }else if (bs->io_limits.iops[is_write]) { - iops_limit = bs->io_limits.iops[is_write]; - }else { -if (wait) { - *wait =0 ; - } - -return false; - } - - slice_time = bs->slice_end - bs->slice_start; - slice_time /= (NANOSECONDS_PER_SECOND ); - ios_limit = iops_limit * slice_time; - ios_base = bs->slice_submitted.ios[is_write]; -if (bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL ]) { - ios_base += bs->slice_submitted.ios[!is_write]; - } - -if (ios_base +1 <= ios_limit) { -if (wait) { - *wait =0 ; - } - -return false; - } - -/* Calc approx time to dispatch, in seconds */ - wait_time = (ios_base +1 ) / iops_limit; -if (wait_time > elapsed_time) { - wait_time = wait_time - elapsed_time; - }else { - wait_time =0 ; - } - -/* Exceeded current slice, extend it by another slice time */ - bs->slice_end +=BLOCK_IO_SLICE_TIME ; -if (wait) { - *wait = wait_time *NANOSECONDS_PER_SECOND ; - } - -return true; -} - -static bool bdrv_exceed_io_limits (BlockDriverState *bs,int nb_sectors, -bool is_write,int64_t *wait) -{ -int64_t now, max_wait; -uint64_t bps_wait =0 , iops_wait =0 ; -double elapsed_time; -int bps_ret, iops_ret; - - now =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); -if (now > bs->slice_end) { - bs->slice_start = now; - bs->slice_end = now +BLOCK_IO_SLICE_TIME ; -memset (&bs->slice_submitted,0 ,sizeof (bs->slice_submitted)); - } - - elapsed_time = now - bs->slice_start; - elapsed_time /= (NANOSECONDS_PER_SECOND ); - - bps_ret =bdrv_exceed_bps_limits (bs, nb_sectors, - is_write, elapsed_time, &bps_wait); - iops_ret =bdrv_exceed_iops_limits (bs, is_write, - elapsed_time, &iops_wait); -if (bps_ret || iops_ret) { - max_wait = bps_wait > iops_wait ? bps_wait : iops_wait; -if (wait) { - *wait = max_wait; - } - - now =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); -if (bs->slice_end < now + max_wait) { - bs->slice_end = now + max_wait; - } - -return true; - } - -if (wait) { - *wait =0 ; - } - - bs->slice_submitted.bytes[is_write] += (int64_t )nb_sectors * -BDRV_SECTOR_SIZE ; - bs->slice_submitted.ios[is_write]++; - -return false; -} -/**************************************************************/ /* async block device emulation */
block/qapi.c +9 -12
@@ -223,18 +223,15 @@ void bdrv_query_info(BlockDriverState *bs, info->inserted->backing_file_depth =bdrv_get_backing_file_depth (bs);if (bs->io_limits_enabled) { - info->inserted->bps = - bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL ]; - info->inserted->bps_rd = - bs->io_limits.bps[BLOCK_IO_LIMIT_READ ]; - info->inserted->bps_wr = - bs->io_limits.bps[BLOCK_IO_LIMIT_WRITE ]; - info->inserted->iops = - bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL ]; - info->inserted->iops_rd = - bs->io_limits.iops[BLOCK_IO_LIMIT_READ ]; - info->inserted->iops_wr = - bs->io_limits.iops[BLOCK_IO_LIMIT_WRITE ]; +ThrottleConfig cfg; +throttle_get_config (&bs->throttle_state, &cfg); + info->inserted->bps = cfg.buckets[THROTTLE_BPS_TOTAL ].avg; + info->inserted->bps_rd = cfg.buckets[THROTTLE_BPS_READ ].avg; + info->inserted->bps_wr = cfg.buckets[THROTTLE_BPS_WRITE ].avg; + + info->inserted->iops = cfg.buckets[THROTTLE_OPS_TOTAL ].avg; + info->inserted->iops_rd = cfg.buckets[THROTTLE_OPS_READ ].avg; + info->inserted->iops_wr = cfg.buckets[THROTTLE_OPS_WRITE ].avg; } bs0 = bs;
blockdev.c +54 -46
154 lines not on this page · raw message
include/block/block.h +0 -1
@@ -107,7 +107,6 @@ void bdrv_info_stats(Monitor *mon, QObject **ret_data);/* disk I/O throttling */ void bdrv_io_limits_enable (BlockDriverState *bs);void bdrv_io_limits_disable (BlockDriverState *bs); -bool bdrv_io_limits_enabled (BlockDriverState *bs);void bdrv_init (void );void bdrv_init_with_whitelist (void );
include/block/block_int.h +6 -26
@@ -35,18 +35,12 @@#include "qemu/hbitmap.h" #include "block/snapshot.h" #include "qemu/main-loop.h" +#include "qemu/throttle.h" #define BLOCK_FLAG_ENCRYPT 1#define BLOCK_FLAG_COMPAT6 4#define BLOCK_FLAG_LAZY_REFCOUNTS 8 -#define BLOCK_IO_LIMIT_READ 0 -#define BLOCK_IO_LIMIT_WRITE 1 -#define BLOCK_IO_LIMIT_TOTAL 2 - -#define BLOCK_IO_SLICE_TIME 100000000 -#define NANOSECONDS_PER_SECOND 1000000000.0 -#define BLOCK_OPT_SIZE "size"#define BLOCK_OPT_ENCRYPT "encryption"#define BLOCK_OPT_COMPAT6 "compat6"
@@ -70,17 +64,6 @@ typedef struct BdrvTrackedRequest {CoQueue wait_queue;/* coroutines blocked on this request */ } BdrvTrackedRequest; - -typedef struct BlockIOLimit { -int64_t bps[3 ]; -int64_t iops[3 ]; -}BlockIOLimit ; - -typedef struct BlockIOBaseValue { -uint64_t bytes[2 ]; -uint64_t ios[2 ]; -}BlockIOBaseValue ; -struct BlockDriver {const char *format_name;int instance_size;
@@ -264,13 +247,9 @@ struct BlockDriverState {/* number of in-flight copy-on-read requests */ unsigned int copy_on_read_in_flight; -/* the time for latest disk I/O */ -int64_t slice_start; -int64_t slice_end; -BlockIOLimit io_limits; -BlockIOBaseValue slice_submitted; -CoQueue throttled_reqs; -QEMUTimer *block_timer; +/* I/O throttling */ +ThrottleState throttle_state; +CoQueue throttled_reqs[2 ];bool io_limits_enabled;/* I/O stats (display with "info blockstats"). */
@@ -312,7 +291,8 @@ struct BlockDriverState {int get_tmp_filename (char *filename,int size);void bdrv_set_io_limits (BlockDriverState *bs, -BlockIOLimit *io_limits); +ThrottleConfig *cfg); +/** * bdrv_add_before_write_notifier:
Signature · 1 line
1.7.10.4
PATCH v9 4/5 block: Add support for throttling burst max in QMP and the command line.
In reply to Benoît CanetThe max parameter of the leaky bucket throttling algorithm can be used to allow the guest to do bursts.
The max value is a pool of I/O that the guest can use without being throttled at all. Throttling is triggered once this pool is empty.
--- block/qapi.c | 26 ++++++++++++ blockdev.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++-------- hmp.c | 32 +++++++++++++-- qapi-schema.json | 34 +++++++++++++++- qemu-options.hx | 4 +- qmp-commands.hx | 30 ++++++++++++-- 6 files changed, 219 insertions(+), 25 deletions(-)
block/qapi.c +26 -0
@@ -232,6 +232,32 @@ void bdrv_query_info(BlockDriverState *bs, info->inserted->iops = cfg.buckets[THROTTLE_OPS_TOTAL ].avg; info->inserted->iops_rd = cfg.buckets[THROTTLE_OPS_READ ].avg; info->inserted->iops_wr = cfg.buckets[THROTTLE_OPS_WRITE ].avg; + + info->inserted->has_bps_max = + cfg.buckets[THROTTLE_BPS_TOTAL ].max; + info->inserted->bps_max = + cfg.buckets[THROTTLE_BPS_TOTAL ].max; + info->inserted->has_bps_rd_max = + cfg.buckets[THROTTLE_BPS_READ ].max; + info->inserted->bps_rd_max = + cfg.buckets[THROTTLE_BPS_READ ].max; + info->inserted->has_bps_wr_max = + cfg.buckets[THROTTLE_BPS_WRITE ].max; + info->inserted->bps_wr_max = + cfg.buckets[THROTTLE_BPS_WRITE ].max; + + info->inserted->has_iops_max = + cfg.buckets[THROTTLE_OPS_TOTAL ].max; + info->inserted->iops_max = + cfg.buckets[THROTTLE_OPS_TOTAL ].max; + info->inserted->has_iops_rd_max = + cfg.buckets[THROTTLE_OPS_READ ].max; + info->inserted->iops_rd_max = + cfg.buckets[THROTTLE_OPS_READ ].max; + info->inserted->has_iops_wr_max = + cfg.buckets[THROTTLE_OPS_WRITE ].max; + info->inserted->iops_wr_max = + cfg.buckets[THROTTLE_OPS_WRITE ].max; } bs0 = bs;
blockdev.c +102 -16
154 lines not on this page · raw message
hmp.c +29 -3
@@ -344,14 +344,28 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) {monitor_printf (mon," I/O throttling: bps=%" PRId64" bps_rd=%" PRId64" bps_wr=%" PRId64 +" bps_max=%" PRId64 +" bps_rd_max=%" PRId64 +" bps_wr_max=%" PRId64" iops=%" PRId64" iops_rd=%" PRId64 -" iops_wr=%" PRId64"\n" , +" iops_wr=%" PRId64 +" iops_max=%" PRId64 +" iops_rd_max=%" PRId64 +" iops_wr_max=%" PRId64"\n" , info->value->inserted->bps, info->value->inserted->bps_rd, info->value->inserted->bps_wr, + info->value->inserted->bps_max, + info->value->inserted->bps_rd_max, + info->value->inserted->bps_wr_max, info->value->inserted->iops, info->value->inserted->iops_rd, - info->value->inserted->iops_wr); + info->value->inserted->iops_wr, + info->value->inserted->iops_max, + info->value->inserted->iops_rd_max, + info->value->inserted->iops_wr_max); + } else { +monitor_printf (mon," [not inserted]" ); }if (verbose) {
@@ -1098,7 +1112,19 @@ void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict)qdict_get_int (qdict,"bps_wr" ),qdict_get_int (qdict,"iops" ),qdict_get_int (qdict,"iops_rd" ), - qdict_get_int(qdict, "iops_wr"), &err); +qdict_get_int (qdict,"iops_wr" ), + false,/* no burst max via HMP */ +0 , + false, +0 , + false, +0 , + false, +0 , + false, +0 , + false, + 0, &err);hmp_handle_error (mon, &err); }
qapi-schema.json +32 -2
@@ -785,6 +785,18 @@ # # @image: the info of image used (since: 1.6) # +# @bps_max: #optional total max in bytes (Since 1.7) +# +# @bps_rd_max: #optional read max in bytes (Since 1.7) +# +# @bps_wr_max: #optional write max in bytes (Since 1.7) +# +# @iops_max: #optional total I/O operations max (Since 1.7) +# +# @iops_rd_max: #optional read I/O operations max (Since 1.7) +# +# @iops_wr_max: #optional write I/O operations max (Since 1.7) +# # Since: 0.14.0 # # Notes: This interface is only found in @BlockInfo.
@@ -795,7 +807,10 @@ 'encrypted': 'bool', 'encryption_key_missing': 'bool', 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int', - 'image': 'ImageInfo' } } + 'image': 'ImageInfo', + '*bps_max': 'int', '*bps_rd_max': 'int', + '*bps_wr_max': 'int', '*iops_max': 'int', + '*iops_rd_max': 'int', '*iops_wr_max': 'int' }} ## # @BlockDeviceIoStatus:
@@ -2174,6 +2189,18 @@ # # @iops_wr: write I/O operations per second # +# @bps_max: #optional total max in bytes (Since 1.7) +# +# @bps_rd_max: #optional read max in bytes (Since 1.7) +# +# @bps_wr_max: #optional write max in bytes (Since 1.7) +# +# @iops_max: #optional total I/O operations max (Since 1.7) +# +# @iops_rd_max: #optional read I/O operations max (Since 1.7) +# +# @iops_wr_max: #optional write I/O operations max (Since 1.7) +# # Returns: Nothing on success # If @device is not a valid block device, DeviceNotFound #
@@ -2181,7 +2208,10 @@ ## { 'command': 'block_set_io_throttle', 'data': { 'device': 'str', 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int', - 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int' } } + 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int', + '*bps_max': 'int', '*bps_rd_max': 'int', + '*bps_wr_max': 'int', '*iops_max': 'int', + '*iops_rd_max': 'int', '*iops_wr_max': 'int' }} ## # @block-stream:
qemu-options.hx +3 -1
@@ -409,7 +409,9 @@ DEF("drive", HAS_ARG, QEMU_OPTION_drive, " [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n" " [,serial=s][,addr=A][,id=name][,aio=threads|native]\n" " [,readonly=on|off][,copy-on-read=on|off]\n" - " [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]]\n" + " [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r]\n" + " [,iops_wr=w][,bps_max=bm]|[[,bps_rd_max=rm][,bps_wr_max=wm]]]\n" + " [[,iops_max=im]|[[,iops_rd_max=irm][,iops_wr_max=iwm]]\n" " use 'file' as a drive image\n", QEMU_ARCH_ALL) STEXI @item -drive @var{option}[,@var{option}[,@var{option}[,...]]]
qmp-commands.hx +27 -3
@@ -1389,7 +1389,7 @@ EQMP { .name = "block_set_io_throttle", - .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l", + .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?", .mhandler.cmd_new = qmp_marshal_input_block_set_io_throttle, },
@@ -1404,10 +1404,16 @@ Arguments: - "device": device name (json-string) - "bps": total throughput limit in bytes per second(json-int) - "bps_rd": read throughput limit in bytes per second(json-int) -- "bps_wr": read throughput limit in bytes per second(json-int) +- "bps_wr": write throughput limit in bytes per second (json-int) - "iops": total I/O operations per second(json-int) - "iops_rd": read I/O operations per second(json-int) - "iops_wr": write I/O operations per second(json-int) +- "bps_max": total max in bytes (json-int) +- "bps_rd_max": read max in bytes (json-int) +- "bps_wr_max": write max in bytes (json-int) +- "iops_max": total I/O operations max (json-int) +- "iops_rd_max": read I/O operations max (json-int) +- "iops_wr_max": write I/O operations max (json-int) Example:
@@ -1417,7 +1423,13 @@ Example: "bps_wr": 0, "iops": 0, "iops_rd": 0, - "iops_wr": 0 } } + "iops_wr": 0, + "bps_max": 8000000, + "bps_rd_max": 0, + "bps_wr_max": 0, + "iops_max": 0, + "iops_rd_max": 0, + "iops_wr_max": 0 } } <- { "return": {} } EQMP
@@ -1758,6 +1770,12 @@ Each json-object contain the following: - "iops": limit total I/O operations per second (json-int) - "iops_rd": limit read operations per second (json-int) - "iops_wr": limit write operations per second (json-int) + - "bps_max": total max in bytes (json-int) + - "bps_rd_max": read max in bytes (json-int) + - "bps_wr_max": write max in bytes (json-int) + - "iops_max": total I/O operations max (json-int) + - "iops_rd_max": read I/O operations max (json-int) + - "iops_wr_max": write I/O operations max (json-int) - "image": the detail of the image, it is a json-object containing the following: - "filename": image file name (json-string)
@@ -1827,6 +1845,12 @@ Example: "iops":1000000, "iops_rd":0, "iops_wr":0, + "bps_max": 8000000, + "bps_rd_max": 0, + "bps_wr_max": 0, + "iops_max": 0, + "iops_rd_max": 0, + "iops_wr_max": 0, "image":{ "filename":"disks/test.qcow2", "format":"qcow2",
Signature · 1 line
1.7.10.4
PATCH v9 5/5 block: Add iops_size to do the iops accounting for a given io size.
In reply to Benoît CanetThis feature can be used in case where users are avoiding the iops limit by doing jumbo I/Os hammering the storage backend.
--- block/qapi.c | 3 +++ blockdev.c | 21 ++++++++++++++++++--- hmp.c | 8 ++++++-- qapi-schema.json | 10 ++++++++-- qemu-options.hx | 2 +- qmp-commands.hx | 8 ++++++-- 6 files changed, 42 insertions(+), 10 deletions(-)
block/qapi.c +3 -0
@@ -258,6 +258,9 @@ void bdrv_query_info(BlockDriverState *bs, cfg.buckets[THROTTLE_OPS_WRITE ].max; info->inserted->iops_wr_max = cfg.buckets[THROTTLE_OPS_WRITE ].max; + + info->inserted->has_iops_size = cfg.op_size; + info->inserted->iops_size = cfg.op_size; } bs0 = bs;
blockdev.c +18 -3
@@ -508,7 +508,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, cfg.buckets[THROTTLE_OPS_WRITE ].max =qemu_opt_get_number (opts,"throttling.iops-write-max" ,0 ); - cfg.op_size =0 ; + cfg.op_size =qemu_opt_get_number (opts,"throttling.iops-size" ,0 );if (!check_throttle_config (&cfg, &error)) {error_report ("%s" ,error_get_pretty (error));
@@ -795,6 +795,9 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)qemu_opt_rename (all_opts,"bps_rd_max" ,"throttling.bps-read-max" );qemu_opt_rename (all_opts,"bps_wr_max" ,"throttling.bps-write-max" ); +qemu_opt_rename (all_opts, +"iops_size" ,"throttling.iops-size" ); +qemu_opt_rename (all_opts,"readonly" ,"read-only" ); value =qemu_opt_get (all_opts,"cache" );
@@ -1294,7 +1297,9 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,bool has_iops_rd_max, int64_t iops_rd_max, bool has_iops_wr_max, - int64_t iops_wr_max, Error **errp) + int64_t iops_wr_max, + bool has_iops_size, + int64_t iops_size, Error **errp) { ThrottleConfig cfg;BlockDriverState *bs;
@@ -1333,7 +1338,9 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, cfg.buckets[THROTTLE_OPS_WRITE ].max = iops_wr_max; } - cfg.op_size =0 ; +if (has_iops_size) { + cfg.op_size = iops_size; + }if (!check_throttle_config (&cfg, errp)) {return ;
@@ -2059,6 +2066,10 @@ QemuOptsList qemu_common_drive_opts = { .type = QEMU_OPT_NUMBER, .help = "total bytes write burst", },{ + .name = "throttling.iops-size", + .type = QEMU_OPT_NUMBER, + .help = "when limiting by iops max size of an I/O in bytes", + },{ .name = "copy-on-read", .type = QEMU_OPT_BOOL, .help = "copy read data from backing file into image file",
@@ -2205,6 +2216,10 @@ QemuOptsList qemu_old_drive_opts = { .type = QEMU_OPT_NUMBER, .help = "total bytes write burst", },{ + .name = "iops_size", + .type = QEMU_OPT_NUMBER, + .help = "when limiting by iops max size of an I/O in bytes", + },{ .name = "copy-on-read", .type = QEMU_OPT_BOOL, .help = "copy read data from backing file into image file",
hmp.c +6 -2
@@ -351,7 +351,8 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)" iops_wr=%" PRId64" iops_max=%" PRId64" iops_rd_max=%" PRId64 -" iops_wr_max=%" PRId64"\n" , +" iops_wr_max=%" PRId64 +" iops_size=%" PRId64"\n" , info->value->inserted->bps, info->value->inserted->bps_rd, info->value->inserted->bps_wr,
@@ -363,7 +364,8 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) info->value->inserted->iops_wr, info->value->inserted->iops_max, info->value->inserted->iops_rd_max, - info->value->inserted->iops_wr_max); + info->value->inserted->iops_wr_max, + info->value->inserted->iops_size); }else {monitor_printf (mon," [not inserted]" ); }
@@ -1124,6 +1126,8 @@ void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict) false,0 , false, +0 , + false,/* No default I/O size */ 0, &err);hmp_handle_error (mon, &err); }
qapi-schema.json +8 -2
@@ -797,6 +797,8 @@ # # @iops_wr_max: #optional write I/O operations max (Since 1.7) # +# @iops_size: #optional an I/O size in bytes (Since 1.7) +# # Since: 0.14.0 # # Notes: This interface is only found in @BlockInfo.
@@ -810,7 +812,8 @@ 'image': 'ImageInfo', '*bps_max': 'int', '*bps_rd_max': 'int', '*bps_wr_max': 'int', '*iops_max': 'int', - '*iops_rd_max': 'int', '*iops_wr_max': 'int' }} + '*iops_rd_max': 'int', '*iops_wr_max': 'int', + '*iops_size': 'int' } } ## # @BlockDeviceIoStatus:
@@ -2201,6 +2204,8 @@ # # @iops_wr_max: #optional write I/O operations max (Since 1.7) # +# @iops_size: #optional an I/O size in bytes (Since 1.7) +# # Returns: Nothing on success # If @device is not a valid block device, DeviceNotFound #
@@ -2211,7 +2216,8 @@ 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int', '*bps_max': 'int', '*bps_rd_max': 'int', '*bps_wr_max': 'int', '*iops_max': 'int', - '*iops_rd_max': 'int', '*iops_wr_max': 'int' }} + '*iops_rd_max': 'int', '*iops_wr_max': 'int', + '*iops_size': 'int' }} ## # @block-stream:
qemu-options.hx +1 -1
@@ -411,7 +411,7 @@ DEF("drive", HAS_ARG, QEMU_OPTION_drive, " [,readonly=on|off][,copy-on-read=on|off]\n" " [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r]\n" " [,iops_wr=w][,bps_max=bm]|[[,bps_rd_max=rm][,bps_wr_max=wm]]]\n" - " [[,iops_max=im]|[[,iops_rd_max=irm][,iops_wr_max=iwm]]\n" + " [[,iops_max=im]|[[,iops_rd_max=irm][,iops_wr_max=iwm][,iops_size=is]]\n" " use 'file' as a drive image\n", QEMU_ARCH_ALL) STEXI @item -drive @var{option}[,@var{option}[,@var{option}[,...]]]
qmp-commands.hx +6 -2
@@ -1389,7 +1389,7 @@ EQMP { .name = "block_set_io_throttle", - .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?", + .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,iops_size:l?", .mhandler.cmd_new = qmp_marshal_input_block_set_io_throttle, },
@@ -1414,6 +1414,7 @@ Arguments: - "iops_max": total I/O operations max (json-int) - "iops_rd_max": read I/O operations max (json-int) - "iops_wr_max": write I/O operations max (json-int) +- "iops_size": I/O size in bytes when limiting (json-int) Example:
@@ -1429,7 +1430,8 @@ Example: "bps_wr_max": 0, "iops_max": 0, "iops_rd_max": 0, - "iops_wr_max": 0 } } + "iops_wr_max": 0, + "iops_size": 0 } } <- { "return": {} } EQMP
@@ -1776,6 +1778,7 @@ Each json-object contain the following: - "iops_max": total I/O operations max (json-int) - "iops_rd_max": read I/O operations max (json-int) - "iops_wr_max": write I/O operations max (json-int) + - "iops_size": I/O size when limiting by iops (json-int) - "image": the detail of the image, it is a json-object containing the following: - "filename": image file name (json-string)
@@ -1851,6 +1854,7 @@ Example: "iops_max": 0, "iops_rd_max": 0, "iops_wr_max": 0, + "iops_size": 0, "image":{ "filename":"disks/test.qcow2", "format":"qcow2",
Signature · 1 line
1.7.10.4