From 669ccf4ed5b6906983edbcc0e35e87a44a0457b2 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 21 Jun 2013 06:20:00 +0200 Subject: [PATCH 04/21] hmp/qmp: add block_set_io_throttle RH-Author: Fam Zheng Message-id: <1371795611-7208-5-git-send-email-famz@redhat.com> Patchwork-id: 52078 O-Subject: [PATCH RHEL-6.5 qemu-kvm v3 04/15] hmp/qmp: add block_set_io_throttle Bugzilla: 956825 RH-Acked-by: Paolo Bonzini RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Laszlo Ersek From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 727f005e6a5416ea903d0ccc2428cbdc663aa1d2) QMP API convert not backported in RHEL. Manually merged qmp, hmp changes onto current implementation: block.c:{bdrv_info,bdrv_print_dict} Signed-off-by: Fam Zheng --- block.c | 26 +++++++++++++++++++++++-- blockdev.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ blockdev.h | 2 ++ qemu-monitor.hx | 30 ++++++++++++++++++++++++++++- qerror.c | 4 ++++ qerror.h | 3 +++ 6 files changed, 121 insertions(+), 3 deletions(-) Signed-off-by: Miroslav Rezanina --- block.c | 26 ++++++++++++++++++++++- blockdev.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ blockdev.h | 2 + qemu-monitor.hx | 30 +++++++++++++++++++++++++++- qerror.c | 4 +++ qerror.h | 3 ++ 6 files changed, 121 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index c1eda27..c6da89c 100644 --- a/block.c +++ b/block.c @@ -2768,6 +2768,17 @@ static void bdrv_print_dict(QObject *obj, void *opaque) qdict_get_bool(qdict, "ro"), qdict_get_str(qdict, "drv"), qdict_get_bool(qdict, "encrypted")); + + monitor_printf(mon, " bps=%" PRId64 " bps_rd=%" PRId64 + " bps_wr=%" PRId64 " iops=%" PRId64 + " iops_rd=%" PRId64 " iops_wr=%" PRId64, + qdict_get_int(qdict, "bps"), + qdict_get_int(qdict, "bps_rd"), + qdict_get_int(qdict, "bps_wr"), + qdict_get_int(qdict, "iops"), + qdict_get_int(qdict, "iops_rd"), + qdict_get_int(qdict, "iops_wr")); + } else { monitor_printf(mon, " [not inserted]"); } @@ -2818,10 +2829,21 @@ void bdrv_info(Monitor *mon, QObject **ret_data) QObject *obj; obj = qobject_from_jsonf("{ 'file': %s, 'ro': %i, 'drv': %s, " - "'encrypted': %i }", + "'encrypted': %i, " + "'bps': %" PRId64 ", 'bps_rd': %" PRId64 + ", 'bps_wr': %" PRId64 ", 'iops': %" PRId64 + ", 'iops_rd': %" PRId64 + ", 'iops_wr': %" PRId64 " }", bs->filename, bs->read_only, bs->drv->format_name, - bdrv_is_encrypted(bs)); + bdrv_is_encrypted(bs), + bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL], + bs->io_limits.bps[BLOCK_IO_LIMIT_READ], + bs->io_limits.bps[BLOCK_IO_LIMIT_WRITE], + bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL], + bs->io_limits.iops[BLOCK_IO_LIMIT_READ], + bs->io_limits.iops[BLOCK_IO_LIMIT_WRITE] + ); if (bs->backing_file[0] != '\0') { QDict *qdict = qobject_to_qdict(obj); qdict_put(qdict, "backing_file", diff --git a/blockdev.c b/blockdev.c index a518ef2..2b7969a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1228,6 +1228,65 @@ int do_change_block(Monitor *mon, const char *device, return monitor_read_bdrv_key_start(mon, bs, NULL, NULL); } +/* throttling disk I/O limits */ +int do_block_set_io_throttle(Monitor *mon, + const QDict *qdict, QObject **ret_data) +{ + BlockIOLimit io_limits; + const char *devname = qdict_get_str(qdict, "device"); + BlockDriverState *bs; + + io_limits.bps[BLOCK_IO_LIMIT_TOTAL] + = qdict_get_try_int(qdict, "bps", -1); + io_limits.bps[BLOCK_IO_LIMIT_READ] + = qdict_get_try_int(qdict, "bps_rd", -1); + io_limits.bps[BLOCK_IO_LIMIT_WRITE] + = qdict_get_try_int(qdict, "bps_wr", -1); + io_limits.iops[BLOCK_IO_LIMIT_TOTAL] + = qdict_get_try_int(qdict, "iops", -1); + io_limits.iops[BLOCK_IO_LIMIT_READ] + = qdict_get_try_int(qdict, "iops_rd", -1); + io_limits.iops[BLOCK_IO_LIMIT_WRITE] + = qdict_get_try_int(qdict, "iops_wr", -1); + + bs = bdrv_find(devname); + if (!bs) { + qerror_report(QERR_DEVICE_NOT_FOUND, devname); + return -1; + } + + if ((io_limits.bps[BLOCK_IO_LIMIT_TOTAL] == -1) + || (io_limits.bps[BLOCK_IO_LIMIT_READ] == -1) + || (io_limits.bps[BLOCK_IO_LIMIT_WRITE] == -1) + || (io_limits.iops[BLOCK_IO_LIMIT_TOTAL] == -1) + || (io_limits.iops[BLOCK_IO_LIMIT_READ] == -1) + || (io_limits.iops[BLOCK_IO_LIMIT_WRITE] == -1)) { + qerror_report(QERR_MISSING_PARAMETER, + "bps/bps_rd/bps_wr/iops/iops_rd/iops_wr"); + return -1; + } + + if (!do_check_io_limits(&io_limits)) { + qerror_report(QERR_INVALID_PARAMETER_COMBINATION); + return -1; + } + + bs->io_limits = io_limits; + bs->slice_time = BLOCK_IO_SLICE_TIME; + + if (!bs->io_limits_enabled && bdrv_io_limits_enabled(bs)) { + bdrv_io_limits_enable(bs); + } else if (bs->io_limits_enabled && !bdrv_io_limits_enabled(bs)) { + bdrv_io_limits_disable(bs); + } else { + if (bs->block_timer) { + qemu_mod_timer(bs->block_timer, qemu_get_clock(vm_clock)); + } + } + + return 0; +} + int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *id = qdict_get_str(qdict, "id"); diff --git a/blockdev.h b/blockdev.h index 0783241..670702d 100644 --- a/blockdev.h +++ b/blockdev.h @@ -73,6 +73,8 @@ int do_change_block(Monitor *mon, const char *device, const char *filename, const char *fmt); int simple_drive_add(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data); +int do_block_set_io_throttle(Monitor *mon, + const QDict *qdict, QObject **ret_data); int do_block_stream(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_block_job_set_speed(Monitor *mon, const QDict *params, QObject **ret_data); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index ea163bb..be47357 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1997,6 +1997,21 @@ Example: EQMP +STEXI +@item block_set_io_throttle @var{device} @var{bps} @var{bps_rd} @var{bps_wr} @var{iops} @var{iops_rd} @var{iops_wr} +@findex block_set_io_throttle +Change I/O throttle limits for a block drive to @var{bps} @var{bps_rd} @var{bps_wr} @var{iops} @var{iops_rd} @var{iops_wr} +ETEXI + + { + .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", + .params = "device bps bps_rd bps_wr iops iops_rd iops_wr", + .help = "change I/O throttle limits for a block drive", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_block_set_io_throttle, + }, + { .name = "cpu_set", .args_type = "cpu:i,state:s", @@ -2565,6 +2580,13 @@ Each json-object contain the following: "tftp", "vdi", "vmdk", "vpc", "vvfat" - "backing_file": backing file name (json-string, optional) - "encrypted": true if encrypted, false otherwise (json-bool) + - "bps": limit total bytes per second (json-int) + - "bps_rd": limit read bytes per second (json-int) + - "bps_wr": limit write bytes per second (json-int) + - "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) + - "io-status": I/O operation status, only present if the device supports it and the VM is configured to stop on errors. It's always reset to "ok" when the "cont" command is issued (json_string, optional) @@ -2584,7 +2606,13 @@ Example: "ro":false, "drv":"qcow2", "encrypted":false, - "file":"disks/test.img" + "file":"disks/test.img", + "bps":1000000, + "bps_rd":0, + "bps_wr":0, + "iops":1000000, + "iops_rd":0, + "iops_wr":0, }, "type":"unknown" }, diff --git a/qerror.c b/qerror.c index cc26e61..30194d1 100644 --- a/qerror.c +++ b/qerror.c @@ -283,6 +283,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Guest agent command failed, error was '%(message)'", }, { + .error_fmt = QERR_INVALID_PARAMETER_COMBINATION, + .desc = "Invalid paramter combination", + }, + { .error_fmt = QERR_SOCKET_CONNECT_FAILED, .desc = "Failed to connect to socket", }, diff --git a/qerror.h b/qerror.h index d3acc94..5f21ccb 100644 --- a/qerror.h +++ b/qerror.h @@ -235,6 +235,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_QGA_COMMAND_FAILED \ "{ 'class': 'QgaCommandFailed', 'data': { 'message': %s } }" +#define QERR_INVALID_PARAMETER_COMBINATION \ + "{ 'class': 'InvalidParameterCombination', 'data': {} }" + #define QERR_SOCKET_CONNECT_FAILED \ "{ 'class': 'SockConnectFailed', 'data': {} }" -- 1.7.1