| Message ID | 1374596968-20181-4-git-send-email-benoit@irqsave.net |
|---|---|
| State | New |
| Headers | show |
On Tue, 07/23 18:29, Benoît Canet wrote: > The thresholds of the leaky bucket algorithm can be used to allow some > burstiness. > > Signed-off-by: Benoit Canet <benoit@irqsave.net> > --- > block/qapi.c | 24 +++++++++++++ > blockdev.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++------- > hmp.c | 32 +++++++++++++++-- > qapi-schema.json | 34 ++++++++++++++++-- > qemu-options.hx | 2 +- > qmp-commands.hx | 30 ++++++++++++++-- > 6 files changed, 205 insertions(+), 22 deletions(-) > > diff --git a/block/qapi.c b/block/qapi.c > index a4bc411..03f1604 100644 > --- a/block/qapi.c > +++ b/block/qapi.c > @@ -235,6 +235,30 @@ void bdrv_query_info(BlockDriverState *bs, > bs->io_limits.iops[BLOCK_IO_LIMIT_READ]; > info->inserted->iops_wr = > bs->io_limits.iops[BLOCK_IO_LIMIT_WRITE]; > + info->inserted->has_bps_threshold = > + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL]; > + info->inserted->bps_threshold = > + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL]; > + info->inserted->has_bps_rd_threshold = > + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_READ]; > + info->inserted->bps_rd_threshold = > + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_READ]; > + info->inserted->has_bps_wr_threshold = > + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE]; > + info->inserted->bps_wr_threshold = > + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE]; > + info->inserted->has_iops_threshold = > + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL]; > + info->inserted->iops_threshold = > + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL]; > + info->inserted->iops_rd_threshold = > + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_READ]; > + info->inserted->has_iops_rd_threshold = > + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_READ]; > + info->inserted->has_iops_wr_threshold = > + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE]; > + info->inserted->iops_wr_threshold = > + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE]; > } > > bs0 = bs; > diff --git a/blockdev.c b/blockdev.c > index 491e4d0..241ebe8 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -341,6 +341,17 @@ static bool do_check_io_limits(BlockIOLimit *io_limits, Error **errp) > return false; > } > > + if (io_limits->bps_threshold[BLOCK_IO_LIMIT_TOTAL] < 0 || > + io_limits->bps_threshold[BLOCK_IO_LIMIT_WRITE] < 0 || > + io_limits->bps_threshold[BLOCK_IO_LIMIT_READ] < 0 || > + io_limits->iops_threshold[BLOCK_IO_LIMIT_TOTAL] < 0 || > + io_limits->iops_threshold[BLOCK_IO_LIMIT_WRITE] < 0 || > + io_limits->iops_threshold[BLOCK_IO_LIMIT_READ] < 0) { > + error_setg(errp, > + "threshold values must be 0 or greater"); > + return false; > + } > + > return true; > } > > @@ -523,24 +534,34 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) > qemu_opt_get_number(opts, "bps_rd", 0); > io_limits.bps[BLOCK_IO_LIMIT_WRITE] = > qemu_opt_get_number(opts, "bps_wr", 0); > + /* bps thresholds */ > + io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL] = > + qemu_opt_get_number(opts, "bps_threshold", > + io_limits.bps[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ); > + io_limits.bps_threshold[BLOCK_IO_LIMIT_READ] = > + qemu_opt_get_number(opts, "bps_rd_threshold", > + io_limits.bps[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ); > + io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE] = > + qemu_opt_get_number(opts, "bps_wr_threshold", > + io_limits.bps[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ); > + > io_limits.iops[BLOCK_IO_LIMIT_TOTAL] = > qemu_opt_get_number(opts, "iops", 0); > io_limits.iops[BLOCK_IO_LIMIT_READ] = > qemu_opt_get_number(opts, "iops_rd", 0); > io_limits.iops[BLOCK_IO_LIMIT_WRITE] = > qemu_opt_get_number(opts, "iops_wr", 0); > - io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL] = > - io_limits.bps[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ; > - io_limits.bps_threshold[BLOCK_IO_LIMIT_READ] = > - io_limits.bps[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ; > - io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE] = > - io_limits.bps[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ; > - io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL] = > - io_limits.iops[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ; > + > + /* iops thresholds */ > + io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL] = > + qemu_opt_get_number(opts, "iops_threshold", > + io_limits.iops[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ); > io_limits.iops_threshold[BLOCK_IO_LIMIT_READ] = > - io_limits.iops[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ; > - io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = > - io_limits.iops[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ; > + qemu_opt_get_number(opts, "iops_rd_threshold", > + io_limits.iops[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ); > + io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = > + qemu_opt_get_number(opts, "iops_wr_threshold", > + io_limits.iops[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ); > > if (!do_check_io_limits(&io_limits, &error)) { > error_report("%s", error_get_pretty(error)); > @@ -1224,8 +1245,22 @@ void qmp_change_blockdev(const char *device, const char *filename, > > /* throttling disk I/O limits */ > void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, > - int64_t bps_wr, int64_t iops, int64_t iops_rd, > - int64_t iops_wr, Error **errp) > + int64_t bps_wr, > + int64_t iops, > + int64_t iops_rd, > + int64_t iops_wr, > + bool has_bps_threshold, > + int64_t bps_threshold, > + bool has_bps_rd_threshold, > + int64_t bps_rd_threshold, > + bool has_bps_wr_threshold, > + int64_t bps_wr_threshold, > + bool has_iops_threshold, > + int64_t iops_threshold, > + bool has_iops_rd_threshold, > + int64_t iops_rd_threshold, > + bool has_iops_wr_threshold, > + int64_t iops_wr_threshold, Error **errp) > { > BlockIOLimit io_limits; > BlockDriverState *bs; > @@ -1249,6 +1284,26 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, > io_limits.iops_threshold[BLOCK_IO_LIMIT_READ] = iops_rd / THROTTLE_HZ; > io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = iops_wr / THROTTLE_HZ; > > + /* override them with givens values if present */ > + if (has_bps_threshold) { > + io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL] = bps_threshold; > + } > + if (has_bps_rd_threshold) { > + io_limits.bps_threshold[BLOCK_IO_LIMIT_READ] = bps_rd_threshold; > + } > + if (has_bps_wr_threshold) { > + io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE] = bps_wr_threshold; > + } > + if (has_iops_threshold) { > + io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL] = iops_threshold; > + } > + if (has_iops_rd_threshold) { > + io_limits.iops_threshold[BLOCK_IO_LIMIT_READ] = iops_rd_threshold; > + } > + if (has_iops_wr_threshold) { > + io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = iops_wr_threshold; > + } > + > if (!do_check_io_limits(&io_limits, errp)) { > return; > } > @@ -1916,6 +1971,18 @@ QemuOptsList qemu_common_drive_opts = { > .type = QEMU_OPT_NUMBER, > .help = "limit write operations per second", > },{ > + .name = "iops_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "total I/O operations threshold", > + },{ > + .name = "iops_rd_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "read operations threshold", > + },{ > + .name = "iops_wr_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "write operations threshold", > + },{ > .name = "bps", > .type = QEMU_OPT_NUMBER, > .help = "limit total bytes per second", > @@ -1928,6 +1995,18 @@ QemuOptsList qemu_common_drive_opts = { > .type = QEMU_OPT_NUMBER, > .help = "limit write bytes per second", > },{ > + .name = "bps_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "total bytes threshold", > + },{ > + .name = "bps_rd_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "read bytes threshold", > + },{ > + .name = "bps_wr_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "write bytes threshold", > + },{ > .name = "copy-on-read", > .type = QEMU_OPT_BOOL, > .help = "copy read data from backing file into image file", > diff --git a/hmp.c b/hmp.c > index dc4d8d4..d75aa99 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -340,14 +340,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_threshold=%" PRId64 > + " bps_rd_threshold=%" PRId64 > + " bps_wr_threshold=%" PRId64 > " iops=%" PRId64 " iops_rd=%" PRId64 > - " iops_wr=%" PRId64 "\n", > + " iops_wr=%" PRId64 > + " iops_threshold=%" PRId64 > + " iops_rd_threshold=%" PRId64 > + " iops_wr_threshold=%" PRId64 "\n", > info->value->inserted->bps, > info->value->inserted->bps_rd, > info->value->inserted->bps_wr, > + info->value->inserted->bps_threshold, > + info->value->inserted->bps_rd_threshold, > + info->value->inserted->bps_wr_threshold, > info->value->inserted->iops, > info->value->inserted->iops_rd, > - info->value->inserted->iops_wr); > + info->value->inserted->iops_wr, > + info->value->inserted->iops_threshold, > + info->value->inserted->iops_rd_threshold, > + info->value->inserted->iops_wr_threshold); > + } else { > + monitor_printf(mon, " [not inserted]"); > } > > if (verbose) { > @@ -1094,7 +1108,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 threshold via QMP */ > + 0, > + false, > + 0, > + false, > + 0, > + false, > + 0, > + false, > + 0, > + false, > + 0, &err); > hmp_handle_error(mon, &err); > } > > diff --git a/qapi-schema.json b/qapi-schema.json > index 7b9fef1..a6f3792 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -769,6 +769,18 @@ > # > # @image: the info of image used (since: 1.6) > # > +# @bps_threshold: #optional total threshold in bytes (Since 1.6) Could you document how is @bps_threshold used and what is the difference with @bps, please? Maybe it's obvious in "leaky bucket" context, but users doesn't care the implementation algorithm, they may ask why they need @bps and @bps_threshold? And my understanding on this is: after setting @iops_threshold to 10000, the very first 10000 ops are guaranteed not throttled, in just one shot. After that, throttling algorithm is enabled, and @iops_threshold is reset to ineffective. Is it so? > +# > +# @bps_rd_threshold: #optional read threshold in bytes (Since 1.6) > +# > +# @bps_wr_threshold: #optional write threshold in bytes (Since 1.6) > +# > +# @iops_threshold: #optional total I/O operations threshold (Since 1.6) > +# > +# @iops_rd_threshold: #optional read I/O operations threshold (Since 1.6) > +# > +# @iops_wr_threshold: #optional write I/O operations threshold (Since 1.6) > +# > # Since: 0.14.0 > # > # Notes: This interface is only found in @BlockInfo. > @@ -779,7 +791,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_threshold': 'int', '*bps_rd_threshold': 'int', > + '*bps_wr_threshold': 'int', '*iops_threshold': 'int', > + '*iops_rd_threshold': 'int', '*iops_wr_threshold': 'int' }} > > ## > # @BlockDeviceIoStatus: > @@ -2158,6 +2173,18 @@ > # > # @iops_wr: write I/O operations per second > # > +# @bps_threshold: #optional total threshold in bytes (Since 1.6) > +# > +# @bps_rd_threshold: #optional read threshold in bytes (Since 1.6) > +# > +# @bps_wr_threshold: #optional write threshold in bytes (Since 1.6) > +# > +# @iops_threshold: #optional total I/O operations threshold (Since 1.6) > +# > +# @iops_rd_threshold: #optional read I/O operations threshold (Since 1.6) > +# > +# @iops_wr_threshold: #optional write I/O operations threshold (Since 1.6) > +# > # Returns: Nothing on success > # If @device is not a valid block device, DeviceNotFound > # > @@ -2165,7 +2192,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_threshold': 'int', '*bps_rd_threshold': 'int', > + '*bps_wr_threshold': 'int', '*iops_threshold': 'int', > + '*iops_rd_threshold': 'int', '*iops_wr_threshold': 'int' }} > > ## > # @block-stream: > diff --git a/qemu-options.hx b/qemu-options.hx > index 4e98b4f..4d5ee66 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -409,7 +409,7 @@ 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][,iops_wr=w][,bps_threshold=bt]|[[,bps_rd_threshold=rt][,bps_wr_threshold=wt]]][[,iops_threshold=it]|[[,iops_rd_threshold=rt][,iops_wr_threshold=wt]]\n" This line is so long, can you wrap it? > " use 'file' as a drive image\n", QEMU_ARCH_ALL) > STEXI > @item -drive @var{option}[,@var{option}[,@var{option}[,...]]] > diff --git a/qmp-commands.hx b/qmp-commands.hx > index e075df4..11c638a 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -1385,7 +1385,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_threshold:l?,bps_rd_threshold:l?,bps_wr_threshold:l?,iops_threshold:l?,iops_rd_threshold:l?,iops_wr_threshold:l?", Same here. > .mhandler.cmd_new = qmp_marshal_input_block_set_io_throttle, > }, > > @@ -1400,10 +1400,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_threshold": total threshold in bytes(json-int) > +- "bps_rd_threshold": read threshold in bytes(json-int) > +- "bps_wr_threshold": write threshold in bytes(json-int) > +- "iops_threshold": total I/O operations threshold(json-int) > +- "iops_rd_threshold": read I/O operations threshold(json-int) > +- "iops_wr_threshold": write I/O operations threshold(json-int) > > Example: > > @@ -1413,7 +1419,13 @@ Example: > "bps_wr": "0", > "iops": "0", > "iops_rd": "0", > - "iops_wr": "0" } } > + "iops_wr": "0", > + "bps_threshold": "8000000", > + "bps_rd_threshold": "0", > + "bps_wr_threshold": "0", > + "iops_threshold": "0", > + "iops_rd_threshold": "0", > + "iops_wr_threshold": "0" } } > <- { "return": {} } > > EQMP > @@ -1754,6 +1766,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_threshold": total threshold in bytes(json-int) > + - "bps_rd_threshold": read threshold in bytes(json-int) > + - "bps_wr_threshold": write threshold in bytes(json-int) > + - "iops_threshold": total I/O operations threshold(json-int) > + - "iops_rd_threshold": read I/O operations threshold(json-int) > + - "iops_wr_threshold": write I/O operations threshold(json-int) > - "image": the detail of the image, it is a json-object containing > the following: > - "filename": image file name (json-string) > @@ -1823,6 +1841,12 @@ Example: > "iops":1000000, > "iops_rd":0, > "iops_wr":0, > + "bps_threshold": "8000000", > + "bps_rd_threshold": "0", > + "bps_wr_threshold": "0", > + "iops_threshold": "0", > + "iops_rd_threshold": "0", > + "iops_wr_threshold": "0", > "image":{ > "filename":"disks/test.qcow2", > "format":"qcow2", > -- > 1.7.10.4 > >
On 07/23/2013 10:29 AM, Benoît Canet wrote: > The thresholds of the leaky bucket algorithm can be used to allow some > burstiness. > > Signed-off-by: Benoit Canet <benoit@irqsave.net> > --- > block/qapi.c | 24 +++++++++++++ > blockdev.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++------- > hmp.c | 32 +++++++++++++++-- > qapi-schema.json | 34 ++++++++++++++++-- > qemu-options.hx | 2 +- > qmp-commands.hx | 30 ++++++++++++++-- > 6 files changed, 205 insertions(+), 22 deletions(-) > > @@ -1916,6 +1971,18 @@ QemuOptsList qemu_common_drive_opts = { > .type = QEMU_OPT_NUMBER, > .help = "limit write operations per second", > },{ > + .name = "iops_threshold", > + .type = QEMU_OPT_NUMBER, > + .help = "total I/O operations threshold", > + },{ Kevin's series renamed these to have a dash in the name, and also moved all the throttling parameters into a sub-struct. Does it make more sense to have just '*throttling' with that sub-struct containing 12 parameters, 6 for limits and 6 for thresholds, or would it be better to have '*throttling' with 6 members for limits, as well as '*throttling-threshold' with the other 6 members? Naming-wise, throttling.bps-total and throttling-threshold.bps-total convey as much information as throttling.bps-total and throttling.bps-total-threshold. > +++ b/qapi-schema.json > @@ -769,6 +769,18 @@ > # > # @image: the info of image used (since: 1.6) > # > +# @bps_threshold: #optional total threshold in bytes (Since 1.6) As others have stated, it would be worth explaining at the high level the difference between limit and threshold (ie. why I need two different parameters), as well as what the threshold defaults to if omitted (which WILL be the case when driven by older management tools). > +++ b/qemu-options.hx > @@ -409,7 +409,7 @@ 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][,iops_wr=w][,bps_threshold=bt]|[[,bps_rd_threshold=rt][,bps_wr_threshold=wt]]][[,iops_threshold=it]|[[,iops_rd_threshold=rt][,iops_wr_threshold=wt]]\n" Is it worth line-wrapping this, so the help text doesn't pass 80 columns?
> Kevin's series renamed these to have a dash in the name, and also moved > all the throttling parameters into a sub-struct. Does it make more > sense to have just '*throttling' with that sub-struct containing 12 > parameters, 6 for limits and 6 for thresholds, or would it be better to > have '*throttling' with 6 members for limits, as well as > '*throttling-threshold' with the other 6 members? Naming-wise, > throttling.bps-total and throttling-threshold.bps-total convey as much > information as throttling.bps-total and throttling.bps-total-threshold. In fact my series add up to 13 parameters. The last one is iops_sector_count so maybe I'll go the big sub-struct way. Best regards Benoît
> Kevin's series renamed these to have a dash in the name, and also moved > all the throttling parameters into a sub-struct. Does it make more > sense to have just '*throttling' with that sub-struct containing 12 > parameters, 6 for limits and 6 for thresholds, or would it be better to > have '*throttling' with 6 members for limits, as well as > '*throttling-threshold' with the other 6 members? Naming-wise, > throttling.bps-total and throttling-threshold.bps-total convey as much > information as throttling.bps-total and throttling.bps-total-threshold. Eric & Kevin: Should compatible old style values be added for the new throttling options in order to avoid a mixed style mess in qemu-options.hx ? Best regards Benoît
Am 08.08.2013 um 15:37 hat Benoît Canet geschrieben: > > Kevin's series renamed these to have a dash in the name, and also moved > > all the throttling parameters into a sub-struct. Does it make more > > sense to have just '*throttling' with that sub-struct containing 12 > > parameters, 6 for limits and 6 for thresholds, or would it be better to > > have '*throttling' with 6 members for limits, as well as > > '*throttling-threshold' with the other 6 members? Naming-wise, > > throttling.bps-total and throttling-threshold.bps-total convey as much > > information as throttling.bps-total and throttling.bps-total-threshold. > > Eric & Kevin: > > Should compatible old style values be added for the new throttling options in > order to avoid a mixed style mess in qemu-options.hx ? No, I don't think new options should get an old-style alias. We should simply convert the documentation in qemu-options.hx consistently to the new style. Kevin
diff --git a/block/qapi.c b/block/qapi.c index a4bc411..03f1604 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -235,6 +235,30 @@ void bdrv_query_info(BlockDriverState *bs, bs->io_limits.iops[BLOCK_IO_LIMIT_READ]; info->inserted->iops_wr = bs->io_limits.iops[BLOCK_IO_LIMIT_WRITE]; + info->inserted->has_bps_threshold = + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL]; + info->inserted->bps_threshold = + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL]; + info->inserted->has_bps_rd_threshold = + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_READ]; + info->inserted->bps_rd_threshold = + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_READ]; + info->inserted->has_bps_wr_threshold = + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE]; + info->inserted->bps_wr_threshold = + bs->io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE]; + info->inserted->has_iops_threshold = + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL]; + info->inserted->iops_threshold = + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL]; + info->inserted->iops_rd_threshold = + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_READ]; + info->inserted->has_iops_rd_threshold = + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_READ]; + info->inserted->has_iops_wr_threshold = + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE]; + info->inserted->iops_wr_threshold = + bs->io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE]; } bs0 = bs; diff --git a/blockdev.c b/blockdev.c index 491e4d0..241ebe8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -341,6 +341,17 @@ static bool do_check_io_limits(BlockIOLimit *io_limits, Error **errp) return false; } + if (io_limits->bps_threshold[BLOCK_IO_LIMIT_TOTAL] < 0 || + io_limits->bps_threshold[BLOCK_IO_LIMIT_WRITE] < 0 || + io_limits->bps_threshold[BLOCK_IO_LIMIT_READ] < 0 || + io_limits->iops_threshold[BLOCK_IO_LIMIT_TOTAL] < 0 || + io_limits->iops_threshold[BLOCK_IO_LIMIT_WRITE] < 0 || + io_limits->iops_threshold[BLOCK_IO_LIMIT_READ] < 0) { + error_setg(errp, + "threshold values must be 0 or greater"); + return false; + } + return true; } @@ -523,24 +534,34 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) qemu_opt_get_number(opts, "bps_rd", 0); io_limits.bps[BLOCK_IO_LIMIT_WRITE] = qemu_opt_get_number(opts, "bps_wr", 0); + /* bps thresholds */ + io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL] = + qemu_opt_get_number(opts, "bps_threshold", + io_limits.bps[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ); + io_limits.bps_threshold[BLOCK_IO_LIMIT_READ] = + qemu_opt_get_number(opts, "bps_rd_threshold", + io_limits.bps[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ); + io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE] = + qemu_opt_get_number(opts, "bps_wr_threshold", + io_limits.bps[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ); + io_limits.iops[BLOCK_IO_LIMIT_TOTAL] = qemu_opt_get_number(opts, "iops", 0); io_limits.iops[BLOCK_IO_LIMIT_READ] = qemu_opt_get_number(opts, "iops_rd", 0); io_limits.iops[BLOCK_IO_LIMIT_WRITE] = qemu_opt_get_number(opts, "iops_wr", 0); - io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL] = - io_limits.bps[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ; - io_limits.bps_threshold[BLOCK_IO_LIMIT_READ] = - io_limits.bps[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ; - io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE] = - io_limits.bps[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ; - io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL] = - io_limits.iops[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ; + + /* iops thresholds */ + io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL] = + qemu_opt_get_number(opts, "iops_threshold", + io_limits.iops[BLOCK_IO_LIMIT_TOTAL] / THROTTLE_HZ); io_limits.iops_threshold[BLOCK_IO_LIMIT_READ] = - io_limits.iops[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ; - io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = - io_limits.iops[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ; + qemu_opt_get_number(opts, "iops_rd_threshold", + io_limits.iops[BLOCK_IO_LIMIT_READ] / THROTTLE_HZ); + io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = + qemu_opt_get_number(opts, "iops_wr_threshold", + io_limits.iops[BLOCK_IO_LIMIT_WRITE] / THROTTLE_HZ); if (!do_check_io_limits(&io_limits, &error)) { error_report("%s", error_get_pretty(error)); @@ -1224,8 +1245,22 @@ void qmp_change_blockdev(const char *device, const char *filename, /* throttling disk I/O limits */ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, - int64_t bps_wr, int64_t iops, int64_t iops_rd, - int64_t iops_wr, Error **errp) + int64_t bps_wr, + int64_t iops, + int64_t iops_rd, + int64_t iops_wr, + bool has_bps_threshold, + int64_t bps_threshold, + bool has_bps_rd_threshold, + int64_t bps_rd_threshold, + bool has_bps_wr_threshold, + int64_t bps_wr_threshold, + bool has_iops_threshold, + int64_t iops_threshold, + bool has_iops_rd_threshold, + int64_t iops_rd_threshold, + bool has_iops_wr_threshold, + int64_t iops_wr_threshold, Error **errp) { BlockIOLimit io_limits; BlockDriverState *bs; @@ -1249,6 +1284,26 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, io_limits.iops_threshold[BLOCK_IO_LIMIT_READ] = iops_rd / THROTTLE_HZ; io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = iops_wr / THROTTLE_HZ; + /* override them with givens values if present */ + if (has_bps_threshold) { + io_limits.bps_threshold[BLOCK_IO_LIMIT_TOTAL] = bps_threshold; + } + if (has_bps_rd_threshold) { + io_limits.bps_threshold[BLOCK_IO_LIMIT_READ] = bps_rd_threshold; + } + if (has_bps_wr_threshold) { + io_limits.bps_threshold[BLOCK_IO_LIMIT_WRITE] = bps_wr_threshold; + } + if (has_iops_threshold) { + io_limits.iops_threshold[BLOCK_IO_LIMIT_TOTAL] = iops_threshold; + } + if (has_iops_rd_threshold) { + io_limits.iops_threshold[BLOCK_IO_LIMIT_READ] = iops_rd_threshold; + } + if (has_iops_wr_threshold) { + io_limits.iops_threshold[BLOCK_IO_LIMIT_WRITE] = iops_wr_threshold; + } + if (!do_check_io_limits(&io_limits, errp)) { return; } @@ -1916,6 +1971,18 @@ QemuOptsList qemu_common_drive_opts = { .type = QEMU_OPT_NUMBER, .help = "limit write operations per second", },{ + .name = "iops_threshold", + .type = QEMU_OPT_NUMBER, + .help = "total I/O operations threshold", + },{ + .name = "iops_rd_threshold", + .type = QEMU_OPT_NUMBER, + .help = "read operations threshold", + },{ + .name = "iops_wr_threshold", + .type = QEMU_OPT_NUMBER, + .help = "write operations threshold", + },{ .name = "bps", .type = QEMU_OPT_NUMBER, .help = "limit total bytes per second", @@ -1928,6 +1995,18 @@ QemuOptsList qemu_common_drive_opts = { .type = QEMU_OPT_NUMBER, .help = "limit write bytes per second", },{ + .name = "bps_threshold", + .type = QEMU_OPT_NUMBER, + .help = "total bytes threshold", + },{ + .name = "bps_rd_threshold", + .type = QEMU_OPT_NUMBER, + .help = "read bytes threshold", + },{ + .name = "bps_wr_threshold", + .type = QEMU_OPT_NUMBER, + .help = "write bytes threshold", + },{ .name = "copy-on-read", .type = QEMU_OPT_BOOL, .help = "copy read data from backing file into image file", diff --git a/hmp.c b/hmp.c index dc4d8d4..d75aa99 100644 --- a/hmp.c +++ b/hmp.c @@ -340,14 +340,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_threshold=%" PRId64 + " bps_rd_threshold=%" PRId64 + " bps_wr_threshold=%" PRId64 " iops=%" PRId64 " iops_rd=%" PRId64 - " iops_wr=%" PRId64 "\n", + " iops_wr=%" PRId64 + " iops_threshold=%" PRId64 + " iops_rd_threshold=%" PRId64 + " iops_wr_threshold=%" PRId64 "\n", info->value->inserted->bps, info->value->inserted->bps_rd, info->value->inserted->bps_wr, + info->value->inserted->bps_threshold, + info->value->inserted->bps_rd_threshold, + info->value->inserted->bps_wr_threshold, info->value->inserted->iops, info->value->inserted->iops_rd, - info->value->inserted->iops_wr); + info->value->inserted->iops_wr, + info->value->inserted->iops_threshold, + info->value->inserted->iops_rd_threshold, + info->value->inserted->iops_wr_threshold); + } else { + monitor_printf(mon, " [not inserted]"); } if (verbose) { @@ -1094,7 +1108,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 threshold via QMP */ + 0, + false, + 0, + false, + 0, + false, + 0, + false, + 0, + false, + 0, &err); hmp_handle_error(mon, &err); } diff --git a/qapi-schema.json b/qapi-schema.json index 7b9fef1..a6f3792 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -769,6 +769,18 @@ # # @image: the info of image used (since: 1.6) # +# @bps_threshold: #optional total threshold in bytes (Since 1.6) +# +# @bps_rd_threshold: #optional read threshold in bytes (Since 1.6) +# +# @bps_wr_threshold: #optional write threshold in bytes (Since 1.6) +# +# @iops_threshold: #optional total I/O operations threshold (Since 1.6) +# +# @iops_rd_threshold: #optional read I/O operations threshold (Since 1.6) +# +# @iops_wr_threshold: #optional write I/O operations threshold (Since 1.6) +# # Since: 0.14.0 # # Notes: This interface is only found in @BlockInfo. @@ -779,7 +791,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_threshold': 'int', '*bps_rd_threshold': 'int', + '*bps_wr_threshold': 'int', '*iops_threshold': 'int', + '*iops_rd_threshold': 'int', '*iops_wr_threshold': 'int' }} ## # @BlockDeviceIoStatus: @@ -2158,6 +2173,18 @@ # # @iops_wr: write I/O operations per second # +# @bps_threshold: #optional total threshold in bytes (Since 1.6) +# +# @bps_rd_threshold: #optional read threshold in bytes (Since 1.6) +# +# @bps_wr_threshold: #optional write threshold in bytes (Since 1.6) +# +# @iops_threshold: #optional total I/O operations threshold (Since 1.6) +# +# @iops_rd_threshold: #optional read I/O operations threshold (Since 1.6) +# +# @iops_wr_threshold: #optional write I/O operations threshold (Since 1.6) +# # Returns: Nothing on success # If @device is not a valid block device, DeviceNotFound # @@ -2165,7 +2192,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_threshold': 'int', '*bps_rd_threshold': 'int', + '*bps_wr_threshold': 'int', '*iops_threshold': 'int', + '*iops_rd_threshold': 'int', '*iops_wr_threshold': 'int' }} ## # @block-stream: diff --git a/qemu-options.hx b/qemu-options.hx index 4e98b4f..4d5ee66 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -409,7 +409,7 @@ 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][,iops_wr=w][,bps_threshold=bt]|[[,bps_rd_threshold=rt][,bps_wr_threshold=wt]]][[,iops_threshold=it]|[[,iops_rd_threshold=rt][,iops_wr_threshold=wt]]\n" " use 'file' as a drive image\n", QEMU_ARCH_ALL) STEXI @item -drive @var{option}[,@var{option}[,@var{option}[,...]]] diff --git a/qmp-commands.hx b/qmp-commands.hx index e075df4..11c638a 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1385,7 +1385,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_threshold:l?,bps_rd_threshold:l?,bps_wr_threshold:l?,iops_threshold:l?,iops_rd_threshold:l?,iops_wr_threshold:l?", .mhandler.cmd_new = qmp_marshal_input_block_set_io_throttle, }, @@ -1400,10 +1400,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_threshold": total threshold in bytes(json-int) +- "bps_rd_threshold": read threshold in bytes(json-int) +- "bps_wr_threshold": write threshold in bytes(json-int) +- "iops_threshold": total I/O operations threshold(json-int) +- "iops_rd_threshold": read I/O operations threshold(json-int) +- "iops_wr_threshold": write I/O operations threshold(json-int) Example: @@ -1413,7 +1419,13 @@ Example: "bps_wr": "0", "iops": "0", "iops_rd": "0", - "iops_wr": "0" } } + "iops_wr": "0", + "bps_threshold": "8000000", + "bps_rd_threshold": "0", + "bps_wr_threshold": "0", + "iops_threshold": "0", + "iops_rd_threshold": "0", + "iops_wr_threshold": "0" } } <- { "return": {} } EQMP @@ -1754,6 +1766,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_threshold": total threshold in bytes(json-int) + - "bps_rd_threshold": read threshold in bytes(json-int) + - "bps_wr_threshold": write threshold in bytes(json-int) + - "iops_threshold": total I/O operations threshold(json-int) + - "iops_rd_threshold": read I/O operations threshold(json-int) + - "iops_wr_threshold": write I/O operations threshold(json-int) - "image": the detail of the image, it is a json-object containing the following: - "filename": image file name (json-string) @@ -1823,6 +1841,12 @@ Example: "iops":1000000, "iops_rd":0, "iops_wr":0, + "bps_threshold": "8000000", + "bps_rd_threshold": "0", + "bps_wr_threshold": "0", + "iops_threshold": "0", + "iops_rd_threshold": "0", + "iops_wr_threshold": "0", "image":{ "filename":"disks/test.qcow2", "format":"qcow2",
The thresholds of the leaky bucket algorithm can be used to allow some burstiness. Signed-off-by: Benoit Canet <benoit@irqsave.net> --- block/qapi.c | 24 +++++++++++++ blockdev.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++------- hmp.c | 32 +++++++++++++++-- qapi-schema.json | 34 ++++++++++++++++-- qemu-options.hx | 2 +- qmp-commands.hx | 30 ++++++++++++++-- 6 files changed, 205 insertions(+), 22 deletions(-)