From patchwork Sun Jun 11 01:14:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manos Pitsidianakis X-Patchwork-Id: 9779995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B692E6031B for ; Sun, 11 Jun 2017 01:18:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A48F0285B6 for ; Sun, 11 Jun 2017 01:18:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96001285CA; Sun, 11 Jun 2017 01:18:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E289F285B6 for ; Sun, 11 Jun 2017 01:18:30 +0000 (UTC) Received: from localhost ([::1]:60732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJrWP-00021J-Ts for patchwork-qemu-devel@patchwork.kernel.org; Sat, 10 Jun 2017 21:18:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJrTb-0000AA-8g for qemu-devel@nongnu.org; Sat, 10 Jun 2017 21:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJrTY-00036U-R3 for qemu-devel@nongnu.org; Sat, 10 Jun 2017 21:15:35 -0400 Received: from smtp1.ntua.gr ([2001:648:2000:de::183]:21485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJrTS-00035g-Nq; Sat, 10 Jun 2017 21:15:27 -0400 Received: from mail.ntua.gr (ppp141255063244.access.hol.gr [141.255.63.244]) (authenticated bits=0) by smtp1.ntua.gr (8.15.2/8.15.2) with ESMTPSA id v5B1EqvM016114 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 11 Jun 2017 04:14:52 +0300 (EEST) (envelope-from el13635@mail.ntua.gr) X-Authentication-Warning: smtp1.ntua.gr: Host ppp141255063244.access.hol.gr [141.255.63.244] claimed to be mail.ntua.gr From: Manos Pitsidianakis To: qemu-devel Date: Sun, 11 Jun 2017 04:14:27 +0300 Message-Id: <20170611011427.6713-3-el13635@mail.ntua.gr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170611011427.6713-1-el13635@mail.ntua.gr> References: <20170611011427.6713-1-el13635@mail.ntua.gr> MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by smtp1.ntua.gr id v5B1EqvM016114 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:648:2000:de::183 Subject: [Qemu-devel] [PATCH RFC v2 2/2] block: add throttle block filter driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP block/throttle.c uses existing I/O throttle infrastructure inside a block filter driver. I/O operations are intercepted in the filter's read/write coroutines, and referred to block/throttle-groups.c The driver can be used with the command -drive driver=throttle,file.filename=foo.qcow2,iops-total=... The configuration flags and semantics are identical to the hardcoded throttling ones. Signed-off-by: Manos Pitsidianakis --- block/Makefile.objs | 1 + block/throttle-groups.c | 16 +- block/throttle.c | 364 ++++++++++++++++++++++++++++++++++++++++ include/block/throttle-groups.h | 6 +- include/qemu/throttle-options.h | 60 ++++--- 5 files changed, 419 insertions(+), 28 deletions(-) create mode 100644 block/throttle.c diff --git a/block/Makefile.objs b/block/Makefile.objs index ea955302c8..bb811a4d01 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -25,6 +25,7 @@ block-obj-y += accounting.o dirty-bitmap.o block-obj-y += write-threshold.o block-obj-y += backup.o block-obj-$(CONFIG_REPLICATION) += replication.o +block-obj-y += throttle.o block-obj-y += crypto.o diff --git a/block/throttle-groups.c b/block/throttle-groups.c index d8bf990ccb..9008b73cc9 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -29,11 +29,11 @@ #include "qemu/thread.h" #include "sysemu/qtest.h" - -static QemuMutex throttle_groups_lock; -static QTAILQ_HEAD(, ThrottleGroup) throttle_groups = +QemuMutex throttle_groups_lock; +QTAILQ_HEAD(throttle_groups_head, ThrottleGroup) throttle_groups = QTAILQ_HEAD_INITIALIZER(throttle_groups); + /* Increments the reference count of a ThrottleGroup given its name. * * If no ThrottleGroup is found with the given name a new one is @@ -117,7 +117,7 @@ const char *throttle_group_get_name(ThrottleGroupMember *tgm) * @tgm: the current ThrottleGroupMember * @ret: the next ThrottleGroupMember in the sequence */ -static ThrottleGroupMember *throttle_group_next_tgm(ThrottleGroupMember *tgm) +ThrottleGroupMember *throttle_group_next_tgm(ThrottleGroupMember *tgm) { ThrottleState *ts = tgm->throttle_state; ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts); @@ -229,7 +229,7 @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm, * @tgm: the current ThrottleGroupMember * @is_write: the type of operation (read/write) */ -static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write) +void schedule_next_request(ThrottleGroupMember *tgm, bool is_write) { ThrottleState *ts = tgm->throttle_state; ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts); @@ -358,7 +358,7 @@ void throttle_group_get_config(ThrottleGroupMember *tgm, ThrottleConfig *cfg) * @tgm: the ThrottleGroupMember whose request had been throttled * @is_write: the type of operation (read/write) */ -static void timer_cb(ThrottleGroupMember *tgm, bool is_write) +void timer_cb(ThrottleGroupMember *tgm, bool is_write) { ThrottleState *ts = tgm->throttle_state; ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts); @@ -383,12 +383,12 @@ static void timer_cb(ThrottleGroupMember *tgm, bool is_write) } } -static void read_timer_cb(void *opaque) +void read_timer_cb(void *opaque) { timer_cb(opaque, false); } -static void write_timer_cb(void *opaque) +void write_timer_cb(void *opaque) { timer_cb(opaque, true); } diff --git a/block/throttle.c b/block/throttle.c new file mode 100644 index 0000000000..6be5d3de59 --- /dev/null +++ b/block/throttle.c @@ -0,0 +1,364 @@ +/* + * QEMU block throttling filter driver infrastructure + * + * Copyright (C) Nodalink, EURL. 2014 + * Copyright (C) Igalia, S.L. 2015 + * + * Authors: + * Benoît Canet + * Alberto Garcia + * + * 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 . + */ + +#include "qemu/osdep.h" +#include "block/throttle-groups.h" +#include "qemu/throttle-options.h" +#include "qapi/error.h" + + +static QemuOptsList throttle_opts = { + .name = "throttle", + .head = QTAILQ_HEAD_INITIALIZER(throttle_opts.head), + .desc = { + { + .name = QEMU_OPT_IOPS_TOTAL, + .type = QEMU_OPT_NUMBER, + .help = "limit total I/O operations per second", + },{ + .name = QEMU_OPT_IOPS_READ, + .type = QEMU_OPT_NUMBER, + .help = "limit read operations per second", + },{ + .name = QEMU_OPT_IOPS_WRITE, + .type = QEMU_OPT_NUMBER, + .help = "limit write operations per second", + },{ + .name = QEMU_OPT_BPS_TOTAL, + .type = QEMU_OPT_NUMBER, + .help = "limit total bytes per second", + },{ + .name = QEMU_OPT_BPS_READ, + .type = QEMU_OPT_NUMBER, + .help = "limit read bytes per second", + },{ + .name = QEMU_OPT_BPS_WRITE, + .type = QEMU_OPT_NUMBER, + .help = "limit write bytes per second", + },{ + .name = QEMU_OPT_IOPS_TOTAL_MAX, + .type = QEMU_OPT_NUMBER, + .help = "I/O operations burst", + },{ + .name = QEMU_OPT_IOPS_READ_MAX, + .type = QEMU_OPT_NUMBER, + .help = "I/O operations read burst", + },{ + .name = QEMU_OPT_IOPS_WRITE_MAX, + .type = QEMU_OPT_NUMBER, + .help = "I/O operations write burst", + },{ + .name = QEMU_OPT_BPS_TOTAL_MAX, + .type = QEMU_OPT_NUMBER, + .help = "total bytes burst", + },{ + .name = QEMU_OPT_BPS_READ_MAX, + .type = QEMU_OPT_NUMBER, + .help = "total bytes read burst", + },{ + .name = QEMU_OPT_BPS_WRITE_MAX, + .type = QEMU_OPT_NUMBER, + .help = "total bytes write burst", + },{ + .name = QEMU_OPT_IOPS_TOTAL_MAX_LENGTH, + .type = QEMU_OPT_NUMBER, + .help = "length of the iopstotalmax burst period, in seconds", + },{ + .name = QEMU_OPT_IOPS_READ_MAX_LENGTH, + .type = QEMU_OPT_NUMBER, + .help = "length of the iopsreadmax burst period, in seconds", + },{ + .name = QEMU_OPT_IOPS_WRITE_MAX_LENGTH, + .type = QEMU_OPT_NUMBER, + .help = "length of the iopswritemax burst period, in seconds", + },{ + .name = QEMU_OPT_BPS_TOTAL_MAX_LENGTH, + .type = QEMU_OPT_NUMBER, + .help = "length of the bpstotalmax burst period, in seconds", + },{ + .name = QEMU_OPT_BPS_READ_MAX_LENGTH, + .type = QEMU_OPT_NUMBER, + .help = "length of the bpsreadmax burst period, in seconds", + },{ + .name = QEMU_OPT_BPS_WRITE_MAX_LENGTH, + .type = QEMU_OPT_NUMBER, + .help = "length of the bpswritemax burst period, in seconds", + },{ + .name = QEMU_OPT_IOPS_SIZE, + .type = QEMU_OPT_NUMBER, + .help = "when limiting by iops max size of an I/O in bytes", + }, + { + .name = QEMU_OPT_THROTTLE_GROUP_NAME, + .type = QEMU_OPT_STRING, + .help = "throttle group name", + }, + { /* end of list */ } + }, +}; + +static int throttle_open(BlockDriverState *bs, QDict *options, + int flags, Error **errp) +{ + int ret = 0; + ThrottleGroupMember *tgm = bs->opaque; + Error *local_err = NULL; + QemuOpts *opts = NULL; + const char *group_name = NULL; + + bs->file = bdrv_open_child(NULL, options, "file", + bs, &child_file, false, &local_err); + + if (local_err) { + ret = -EINVAL; + error_propagate(errp, local_err); + return ret; + } + + qdict_flatten(options); + opts = qemu_opts_create(&throttle_opts, NULL, 0, &error_abort); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret = -EINVAL; + goto fin; + } + + group_name = qemu_opt_get(opts, QEMU_OPT_THROTTLE_GROUP_NAME); + if (!group_name) { + group_name = bdrv_get_device_or_node_name(bs); + if (!strlen(group_name)) { + error_setg(&local_err, + "A group name must be specified for this device."); + error_propagate(errp, local_err); + ret = -EINVAL; + goto fin; + } + } + + tgm->aio_context = bdrv_get_aio_context(bs); + throttle_group_register_tgm(tgm, group_name); + ThrottleState *ts = tgm->throttle_state; + ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts); + ThrottleConfig *throttle_cfg = &ts->cfg; + + + qemu_mutex_lock(&tg->lock); + if (qemu_opt_get(opts, QEMU_OPT_BPS_TOTAL)) { + throttle_cfg->buckets[THROTTLE_BPS_TOTAL].avg = + qemu_opt_get_number(opts, QEMU_OPT_BPS_TOTAL, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_READ)) { + throttle_cfg->buckets[THROTTLE_BPS_READ].avg = + qemu_opt_get_number(opts, QEMU_OPT_BPS_READ, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_WRITE)) { + throttle_cfg->buckets[THROTTLE_BPS_WRITE].avg = + qemu_opt_get_number(opts, QEMU_OPT_BPS_WRITE, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_TOTAL)) { + throttle_cfg->buckets[THROTTLE_OPS_TOTAL].avg = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_TOTAL, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_READ)) { + throttle_cfg->buckets[THROTTLE_OPS_READ].avg = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_READ, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_WRITE)) { + throttle_cfg->buckets[THROTTLE_OPS_WRITE].avg = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_WRITE, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_TOTAL_MAX)) { + throttle_cfg->buckets[THROTTLE_BPS_TOTAL].max = + qemu_opt_get_number(opts, QEMU_OPT_BPS_TOTAL_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_READ_MAX)) { + throttle_cfg->buckets[THROTTLE_BPS_READ].max = + qemu_opt_get_number(opts, QEMU_OPT_BPS_READ_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_WRITE_MAX)) { + throttle_cfg->buckets[THROTTLE_BPS_WRITE].max = + qemu_opt_get_number(opts, QEMU_OPT_BPS_WRITE_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_TOTAL_MAX)) { + throttle_cfg->buckets[THROTTLE_OPS_TOTAL].max = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_TOTAL_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_READ_MAX)) { + throttle_cfg->buckets[THROTTLE_OPS_READ].max = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_READ_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_WRITE_MAX)) { + throttle_cfg->buckets[THROTTLE_OPS_WRITE].max = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_WRITE_MAX, 0); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_TOTAL_MAX_LENGTH)) { + throttle_cfg->buckets[THROTTLE_BPS_TOTAL].burst_length = + qemu_opt_get_number(opts, QEMU_OPT_BPS_TOTAL_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_READ_MAX_LENGTH)) { + throttle_cfg->buckets[THROTTLE_BPS_READ].burst_length = + qemu_opt_get_number(opts, QEMU_OPT_BPS_READ_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_BPS_WRITE_MAX_LENGTH)) { + throttle_cfg->buckets[THROTTLE_BPS_WRITE].burst_length = + qemu_opt_get_number(opts, QEMU_OPT_BPS_WRITE_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_TOTAL_MAX_LENGTH)) { + throttle_cfg->buckets[THROTTLE_OPS_TOTAL].burst_length = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_TOTAL_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_READ_MAX_LENGTH)) { + throttle_cfg->buckets[THROTTLE_OPS_READ].burst_length = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_READ_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_WRITE_MAX_LENGTH)) { + throttle_cfg->buckets[THROTTLE_OPS_WRITE].burst_length = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_WRITE_MAX_LENGTH, 1); + } + if (qemu_opt_get(opts, QEMU_OPT_IOPS_SIZE)) { + throttle_cfg->op_size = + qemu_opt_get_number(opts, QEMU_OPT_IOPS_SIZE, 0); + } + + if (!throttle_is_valid(throttle_cfg, &local_err)) { + error_propagate(errp, local_err); + throttle_group_unregister_tgm(tgm); + ret = -EINVAL; + goto fin; + } + + qemu_mutex_unlock(&tg->lock); + + qemu_co_queue_init(&tgm->throttled_reqs[0]); + qemu_co_queue_init(&tgm->throttled_reqs[1]); + +fin: + qemu_opts_del(opts); + return ret; +} + +static void throttle_close(BlockDriverState *bs) +{ + ThrottleGroupMember *tgm = bs->opaque; + throttle_group_unregister_tgm(tgm); + return; +} + + +static int64_t throttle_getlength(BlockDriverState *bs) +{ + return bdrv_getlength(bs->file->bs); +} + + +static int coroutine_fn throttle_co_preadv(BlockDriverState *bs, uint64_t offset, + uint64_t bytes, QEMUIOVector *qiov, + int flags) +{ + + ThrottleGroupMember *tgm = bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, false); + + return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags); +} + +static int coroutine_fn throttle_co_pwritev(BlockDriverState *bs, uint64_t offset, + uint64_t bytes, QEMUIOVector *qiov, + int flags) +{ + ThrottleGroupMember *tgm = bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, true); + + return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags); +} + +static int coroutine_fn throttle_co_pwrite_zeroes(BlockDriverState *bs, + int64_t offset, int bytes, BdrvRequestFlags flags) +{ + ThrottleGroupMember *tgm = bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, true); + + return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags); +} + +static int coroutine_fn throttle_co_pdiscard(BlockDriverState *bs, + int64_t offset, int bytes) +{ + ThrottleGroupMember *tgm = bs->opaque; + throttle_group_co_io_limits_intercept(tgm, bytes, true); + + return bdrv_co_pdiscard(bs->file->bs, offset, bytes); +} + +static int throttle_co_flush(BlockDriverState *bs) +{ + return bdrv_co_flush(bs->file->bs); +} + +static void throttle_detach_aio_context(BlockDriverState *bs) +{ + ThrottleGroupMember *tgm = bs->opaque; + throttle_timers_detach_aio_context(&tgm->throttle_timers); +} + +static void throttle_attach_aio_context(BlockDriverState *bs, + AioContext *new_context) +{ + ThrottleGroupMember *tgm = bs->opaque; + throttle_timers_attach_aio_context(&tgm->throttle_timers, new_context); +} +static BlockDriver bdrv_throttle = { + .format_name = "throttle", + .protocol_name = "throttle", + .instance_size = sizeof(ThrottleGroupMember), + + .bdrv_file_open = throttle_open, + .bdrv_close = throttle_close, + .bdrv_co_flush = throttle_co_flush, + + .bdrv_child_perm = bdrv_filter_default_perms, + + .bdrv_getlength = throttle_getlength, + + .bdrv_co_preadv = throttle_co_preadv, + .bdrv_co_pwritev = throttle_co_pwritev, + + .bdrv_co_pwrite_zeroes = throttle_co_pwrite_zeroes, + .bdrv_co_pdiscard = throttle_co_pdiscard, + + .bdrv_recurse_is_first_non_filter = bdrv_recurse_is_first_non_filter, + + .bdrv_attach_aio_context = throttle_attach_aio_context, + .bdrv_detach_aio_context = throttle_detach_aio_context, + + .is_filter = true, +}; + +static void bdrv_throttle_init(void) +{ + bdrv_register(&bdrv_throttle); +} + +block_init(bdrv_throttle_init); diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h index 487b2da461..67b6c69fe4 100644 --- a/include/block/throttle-groups.h +++ b/include/block/throttle-groups.h @@ -44,5 +44,9 @@ void throttle_group_restart_tgm(ThrottleGroupMember *tgm); void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm, unsigned int bytes, bool is_write); - +ThrottleGroupMember *throttle_group_next_tgm(ThrottleGroupMember *tgm); +void schedule_next_request(struct ThrottleGroupMember *tgm, bool is_write); +void timer_cb(ThrottleGroupMember *tgm, bool is_write); +void read_timer_cb(void *opaque); +void write_timer_cb(void *opaque); #endif diff --git a/include/qemu/throttle-options.h b/include/qemu/throttle-options.h index 3133d1ca40..3528a8f4a2 100644 --- a/include/qemu/throttle-options.h +++ b/include/qemu/throttle-options.h @@ -10,81 +10,103 @@ #ifndef THROTTLE_OPTIONS_H #define THROTTLE_OPTIONS_H +#define QEMU_OPT_IOPS_TOTAL "iops-total" +#define QEMU_OPT_IOPS_TOTAL_MAX "iops-total-max" +#define QEMU_OPT_IOPS_TOTAL_MAX_LENGTH "iops-total-max-length" +#define QEMU_OPT_IOPS_READ "iops-read" +#define QEMU_OPT_IOPS_READ_MAX "iops-read-max" +#define QEMU_OPT_IOPS_READ_MAX_LENGTH "iops-read-max-length" +#define QEMU_OPT_IOPS_WRITE "iops-write" +#define QEMU_OPT_IOPS_WRITE_MAX "iops-write-max" +#define QEMU_OPT_IOPS_WRITE_MAX_LENGTH "iops-write-max-length" +#define QEMU_OPT_BPS_TOTAL "bps-total" +#define QEMU_OPT_BPS_TOTAL_MAX "bps-total-max" +#define QEMU_OPT_BPS_TOTAL_MAX_LENGTH "bps-total-max-length" +#define QEMU_OPT_BPS_READ "bps-read" +#define QEMU_OPT_BPS_READ_MAX "bps-read-max" +#define QEMU_OPT_BPS_READ_MAX_LENGTH "bps-read-max-length" +#define QEMU_OPT_BPS_WRITE "bps-write" +#define QEMU_OPT_BPS_WRITE_MAX "bps-write-max" +#define QEMU_OPT_BPS_WRITE_MAX_LENGTH "bps-write-max-length" +#define QEMU_OPT_IOPS_SIZE "iops-size" +#define QEMU_OPT_THROTTLE_GROUP_NAME "throttle-group" + +#define THROTTLE_OPT_PREFIX "throttling." #define THROTTLE_OPTS \ { \ - .name = "throttling.iops-total",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_TOTAL,\ .type = QEMU_OPT_NUMBER,\ .help = "limit total I/O operations per second",\ },{ \ - .name = "throttling.iops-read",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_READ,\ .type = QEMU_OPT_NUMBER,\ .help = "limit read operations per second",\ },{ \ - .name = "throttling.iops-write",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_WRITE,\ .type = QEMU_OPT_NUMBER,\ .help = "limit write operations per second",\ },{ \ - .name = "throttling.bps-total",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_TOTAL,\ .type = QEMU_OPT_NUMBER,\ .help = "limit total bytes per second",\ },{ \ - .name = "throttling.bps-read",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_READ,\ .type = QEMU_OPT_NUMBER,\ .help = "limit read bytes per second",\ },{ \ - .name = "throttling.bps-write",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_WRITE,\ .type = QEMU_OPT_NUMBER,\ .help = "limit write bytes per second",\ },{ \ - .name = "throttling.iops-total-max",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_TOTAL_MAX,\ .type = QEMU_OPT_NUMBER,\ .help = "I/O operations burst",\ },{ \ - .name = "throttling.iops-read-max",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_READ_MAX,\ .type = QEMU_OPT_NUMBER,\ .help = "I/O operations read burst",\ },{ \ - .name = "throttling.iops-write-max",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_WRITE_MAX,\ .type = QEMU_OPT_NUMBER,\ .help = "I/O operations write burst",\ },{ \ - .name = "throttling.bps-total-max",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_TOTAL_MAX,\ .type = QEMU_OPT_NUMBER,\ .help = "total bytes burst",\ },{ \ - .name = "throttling.bps-read-max",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_READ_MAX,\ .type = QEMU_OPT_NUMBER,\ .help = "total bytes read burst",\ },{ \ - .name = "throttling.bps-write-max",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_WRITE_MAX,\ .type = QEMU_OPT_NUMBER,\ .help = "total bytes write burst",\ },{ \ - .name = "throttling.iops-total-max-length",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_TOTAL_MAX_LENGTH,\ .type = QEMU_OPT_NUMBER,\ .help = "length of the iops-total-max burst period, in seconds",\ },{ \ - .name = "throttling.iops-read-max-length",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_READ_MAX_LENGTH,\ .type = QEMU_OPT_NUMBER,\ .help = "length of the iops-read-max burst period, in seconds",\ },{ \ - .name = "throttling.iops-write-max-length",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_WRITE_MAX_LENGTH,\ .type = QEMU_OPT_NUMBER,\ .help = "length of the iops-write-max burst period, in seconds",\ },{ \ - .name = "throttling.bps-total-max-length",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_TOTAL_MAX_LENGTH,\ .type = QEMU_OPT_NUMBER,\ .help = "length of the bps-total-max burst period, in seconds",\ },{ \ - .name = "throttling.bps-read-max-length",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_READ_MAX_LENGTH,\ .type = QEMU_OPT_NUMBER,\ .help = "length of the bps-read-max burst period, in seconds",\ },{ \ - .name = "throttling.bps-write-max-length",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_BPS_WRITE_MAX_LENGTH,\ .type = QEMU_OPT_NUMBER,\ .help = "length of the bps-write-max burst period, in seconds",\ },{ \ - .name = "throttling.iops-size",\ + .name = THROTTLE_OPT_PREFIX QEMU_OPT_IOPS_SIZE,\ .type = QEMU_OPT_NUMBER,\ .help = "when limiting by iops max size of an I/O in bytes",\ }