From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFPoY-0007xf-Cm for qemu-devel@nongnu.org; Fri, 30 Aug 2013 10:36:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFPoT-0004on-5a for qemu-devel@nongnu.org; Fri, 30 Aug 2013 10:36:42 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:57844 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFPoS-0004od-AH for qemu-devel@nongnu.org; Fri, 30 Aug 2013 10:36:36 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 30 Aug 2013 16:36:29 +0200 Message-Id: <1377873389-9712-6-git-send-email-benoit@irqsave.net> In-Reply-To: <1377873389-9712-1-git-send-email-benoit@irqsave.net> References: <1377873389-9712-1-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] =?utf-8?q?=5BPATCH_V8_5/5=5D_block=3A_Add_iops=5Fsiz?= =?utf-8?q?e_to_do_the_iops_accounting_for_a_given_io_size=2E?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com, pbonzini@redhat.com This feature can be used in case where users are avoiding the iops limit = by doing jumbo I/Os hammering the storage backend. Signed-off-by: Benoit Canet --- 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(-) diff --git a/block/qapi.c b/block/qapi.c index b1edc66..782051c 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -258,6 +258,9 @@ void bdrv_query_info(BlockDriverState *bs, cfg.buckets[THROTTLE_OPS_WRITE].max; info->inserted->iops_wr_max =3D cfg.buckets[THROTTLE_OPS_WRITE].max; + + info->inserted->has_iops_size =3D cfg.op_size; + info->inserted->iops_size =3D cfg.op_size; } =20 bs0 =3D bs; diff --git a/blockdev.c b/blockdev.c index dc0637d..eccff63 100644 --- a/blockdev.c +++ b/blockdev.c @@ -508,7 +508,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, cfg.buckets[THROTTLE_OPS_WRITE].max =3D qemu_opt_get_number(opts, "throttling.iops-write-max", 0); =20 - cfg.op_size =3D 0; + cfg.op_size =3D qemu_opt_get_number(opts, "throttling.iops-size", 0)= ; =20 if (!check_throttle_config(&cfg, &error)) { error_report("%s", error_get_pretty(error)); @@ -795,6 +795,9 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterf= aceType 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"); =20 + qemu_opt_rename(all_opts, + "iops_size", "throttling.iops-size"); + qemu_opt_rename(all_opts, "readonly", "read-only"); =20 value =3D 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 =3D iops_wr_max; } =20 - cfg.op_size =3D 0; + if (has_iops_size) { + cfg.op_size =3D iops_size; + } =20 if (!check_throttle_config(&cfg, errp)) { return; @@ -2059,6 +2066,10 @@ QemuOptsList qemu_common_drive_opts =3D { .type =3D QEMU_OPT_NUMBER, .help =3D "total bytes write burst", },{ + .name =3D "throttling.iops-size", + .type =3D QEMU_OPT_NUMBER, + .help =3D "when limiting by iops max size of an I/O in bytes= ", + },{ .name =3D "copy-on-read", .type =3D QEMU_OPT_BOOL, .help =3D "copy read data from backing file into image file"= , @@ -2205,6 +2216,10 @@ QemuOptsList qemu_old_drive_opts =3D { .type =3D QEMU_OPT_NUMBER, .help =3D "total bytes write burst", },{ + .name =3D "iops_size", + .type =3D QEMU_OPT_NUMBER, + .help =3D "when limiting by iops max size of an I/O in bytes= ", + },{ .name =3D "copy-on-read", .type =3D QEMU_OPT_BOOL, .help =3D "copy read data from backing file into image file"= , diff --git a/hmp.c b/hmp.c index 85a6c16..2bd31d1 100644 --- a/hmp.c +++ b/hmp.c @@ -351,7 +351,8 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) " iops_wr=3D%" PRId64 " iops_max=3D%" PRId64 " iops_rd_max=3D%" PRId64 - " iops_wr_max=3D%" PRId64 "\n", + " iops_wr_max=3D%" PRId64 + " iops_size=3D%" 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); } diff --git a/qapi-schema.json b/qapi-schema.json index 5e5461e..cd4effa 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -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' } } =20 ## # @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' }} =20 ## # @block-stream: diff --git a/qemu-options.hx b/qemu-options.hx index 8df7f1f..05495d6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -411,7 +411,7 @@ DEF("drive", HAS_ARG, QEMU_OPTION_drive, " [,readonly=3Don|off][,copy-on-read=3Don|off]\n" " [[,bps=3Db]|[[,bps_rd=3Dr][,bps_wr=3Dw]]][[,iops=3Di]|[[,iop= s_rd=3Dr]\n" " [,iops_wr=3Dw][,bps_max=3Dbm]|[[,bps_rd_max=3Drm][,bps_wr_m= ax=3Dwm]]]\n" - " [[,iops_max=3Dim]|[[,iops_rd_max=3Dirm][,iops_wr_max=3Diwm]]= \n" + " [[,iops_max=3Dim]|[[,iops_rd_max=3Dirm][,iops_wr_max=3Diwm][= ,iops_size=3Dis]]\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 54368d2..6f7c143 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1389,7 +1389,7 @@ EQMP =20 { .name =3D "block_set_io_throttle", - .args_type =3D "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_m= ax:l?,iops_wr_max:l?", + .args_type =3D "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_m= ax:l?,iops_wr_max:l?,iops_size:l?", .mhandler.cmd_new =3D qmp_marshal_input_block_set_io_throttle, }, =20 @@ -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) =20 Example: =20 @@ -1429,7 +1430,8 @@ Example: "bps_wr_max": "0", "iops_max": "0", "iops_rd_max": "0", - "iops_wr_max": "0" }=C2=A0= } + "iops_wr_max": "0", + "iops_size": "0" } } <- { "return": {} } =20 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 contain= ing 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", --=20 1.7.10.4