From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 23/76] block/null: Latency simulation by adding new option "latency-ns"
Date: Tue, 28 Apr 2015 17:00:05 +0200 [thread overview]
Message-ID: <1430233258-31807-24-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1430233258-31807-1-git-send-email-kwolf@redhat.com>
From: Fam Zheng <famz@redhat.com>
Aio context switch should just work because the requests will be
drained, so the scheduled timer(s) on the old context will be freed.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1427852740-24315-2-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/null.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++------
qapi/block-core.json | 5 ++++-
2 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/block/null.c b/block/null.c
index ec2bd27..267d3e6 100644
--- a/block/null.c
+++ b/block/null.c
@@ -12,8 +12,11 @@
#include "block/block_int.h"
+#define NULL_OPT_LATENCY "latency-ns"
+
typedef struct {
int64_t length;
+ int64_t latency_ns;
} BDRVNullState;
static QemuOptsList runtime_opts = {
@@ -30,6 +33,12 @@ static QemuOptsList runtime_opts = {
.type = QEMU_OPT_SIZE,
.help = "size of the null block",
},
+ {
+ .name = NULL_OPT_LATENCY,
+ .type = QEMU_OPT_NUMBER,
+ .help = "nanoseconds (approximated) to wait "
+ "before completing request",
+ },
{ /* end of list */ }
},
};
@@ -39,13 +48,20 @@ static int null_file_open(BlockDriverState *bs, QDict *options, int flags,
{
QemuOpts *opts;
BDRVNullState *s = bs->opaque;
+ int ret = 0;
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, options, &error_abort);
s->length =
qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 1 << 30);
+ s->latency_ns =
+ qemu_opt_get_number(opts, NULL_OPT_LATENCY, 0);
+ if (s->latency_ns < 0) {
+ error_setg(errp, "latency-ns is invalid");
+ ret = -EINVAL;
+ }
qemu_opts_del(opts);
- return 0;
+ return ret;
}
static void null_close(BlockDriverState *bs)
@@ -58,28 +74,40 @@ static int64_t null_getlength(BlockDriverState *bs)
return s->length;
}
+static coroutine_fn int null_co_common(BlockDriverState *bs)
+{
+ BDRVNullState *s = bs->opaque;
+
+ if (s->latency_ns) {
+ co_aio_sleep_ns(bdrv_get_aio_context(bs), QEMU_CLOCK_REALTIME,
+ s->latency_ns);
+ }
+ return 0;
+}
+
static coroutine_fn int null_co_readv(BlockDriverState *bs,
int64_t sector_num, int nb_sectors,
QEMUIOVector *qiov)
{
- return 0;
+ return null_co_common(bs);
}
static coroutine_fn int null_co_writev(BlockDriverState *bs,
int64_t sector_num, int nb_sectors,
QEMUIOVector *qiov)
{
- return 0;
+ return null_co_common(bs);
}
static coroutine_fn int null_co_flush(BlockDriverState *bs)
{
- return 0;
+ return null_co_common(bs);
}
typedef struct {
BlockAIOCB common;
QEMUBH *bh;
+ QEMUTimer timer;
} NullAIOCB;
static const AIOCBInfo null_aiocb_info = {
@@ -94,15 +122,33 @@ static void null_bh_cb(void *opaque)
qemu_aio_unref(acb);
}
+static void null_timer_cb(void *opaque)
+{
+ NullAIOCB *acb = opaque;
+ acb->common.cb(acb->common.opaque, 0);
+ timer_deinit(&acb->timer);
+ qemu_aio_unref(acb);
+}
+
static inline BlockAIOCB *null_aio_common(BlockDriverState *bs,
BlockCompletionFunc *cb,
void *opaque)
{
NullAIOCB *acb;
+ BDRVNullState *s = bs->opaque;
acb = qemu_aio_get(&null_aiocb_info, bs, cb, opaque);
- acb->bh = aio_bh_new(bdrv_get_aio_context(bs), null_bh_cb, acb);
- qemu_bh_schedule(acb->bh);
+ /* Only emulate latency after vcpu is running. */
+ if (s->latency_ns) {
+ aio_timer_init(bdrv_get_aio_context(bs), &acb->timer,
+ QEMU_CLOCK_REALTIME, SCALE_NS,
+ null_timer_cb, acb);
+ timer_mod_ns(&acb->timer,
+ qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + s->latency_ns);
+ } else {
+ acb->bh = aio_bh_new(bdrv_get_aio_context(bs), null_bh_cb, acb);
+ qemu_bh_schedule(acb->bh);
+ }
return &acb->common;
}
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7873084..e158a7c 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1310,11 +1310,14 @@
# Driver specific block device options for the null backend.
#
# @size: #optional size of the device in bytes.
+# @latency-ns: #optional emulated latency (in nanoseconds) in processing
+# requests. Default to zero which completes requests immediately.
+# (Since 2.4)
#
# Since: 2.2
##
{ 'type': 'BlockdevOptionsNull',
- 'data': { '*size': 'int' } }
+ 'data': { '*size': 'int', '*latency-ns': 'uint64' } }
##
# @BlockdevOptionsVVFAT
--
1.8.3.1
next prev parent reply other threads:[~2015-04-28 15:02 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-28 14:59 [Qemu-devel] [PULL 00/76] Block patches Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 01/76] savevm: create snapshot failed when id_str already exists Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 02/76] MAINTAINERS: Add myself as the maintainer of the Quorum driver Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 03/76] bt-sdp: fix broken uuids power-of-2 calculation Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 04/76] hw/arm/nseries: convert ffs(3) to ctz32() Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 05/76] uninorth: " Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 06/76] Convert (ffs(val) - 1) to ctz32(val) Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 07/76] Convert ffs() != 0 callers to ctz32() Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 08/76] sd: convert sd_normal_command() ffs(3) call " Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 09/76] omap_intc: convert ffs(3) to ctz32() in omap_inth_sir_update() Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 10/76] os-win32: drop ffs(3) prototype Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 11/76] checkpatch: complain about ffs(3) calls Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 12/76] block: Switch to host monotonic clock for IO throttling Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 13/76] aio-posix: move pollfds to thread-local storage Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 14/76] AioContext: acquire/release AioContext during aio_poll Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 15/76] iothread: release iothread around aio_poll Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 16/76] block-backend: Expose bdrv_write_zeroes() Kevin Wolf
2015-04-28 14:59 ` [Qemu-devel] [PULL 17/76] qemu-img convert: Rewrite copying logic Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 18/76] qemu-iotests: Some qemu-img convert tests Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 19/76] blkdebug: Add bdrv_truncate() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 20/76] vhdx: Fix zero-fill iov length Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 21/76] thread-pool: clean up thread_pool_completion_bh() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 22/76] scripts: add 'qemu coroutine' command to qemu-gdb.py Kevin Wolf
2015-04-28 15:00 ` Kevin Wolf [this message]
2015-04-28 15:00 ` [Qemu-devel] [PULL 24/76] block/null: Support reopen Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 25/76] MAINTAINERS: Add Fam Zheng as Null block driver maintainer Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 26/76] blockjob: Allow nested pause Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 27/76] block: Pause block jobs in bdrv_drain_all Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 28/76] qemu-iotests: Test that "stop" doesn't drain block jobs Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 29/76] blockjob: Update function name in comments Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 30/76] block: avoid unnecessary bottom halves Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 31/76] virtio_blk: comment fix Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 32/76] m25p80: add missing blk_attach_dev_nofail Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 33/76] m25p80: fix s->blk usage before assignment Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 34/76] block: document block-stream in qmp-commands.hx Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 35/76] block: add bdrv_get_device_or_node_name() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 36/76] block: use bdrv_get_device_or_node_name() in error messages Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 37/76] block: add 'node-name' field to BLOCK_IMAGE_CORRUPTED Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 38/76] Revert "hmp: fix crash in 'info block -n -v'" Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 39/76] qmp: fill in the image field in BlockDeviceInfo Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 40/76] block/iscsi: do not forget to logout from target Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 41/76] block/iscsi: change all iscsilun properties from uint8_t to bool Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 42/76] block/iscsi: rename iscsi_write_protected and let it return void Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 43/76] block/iscsi: store DPOFUA bit from the modesense command Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 44/76] block/iscsi: optimize WRITE10/16 if cache.writeback is not set Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 45/76] block/iscsi: increase retry count Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 46/76] block/iscsi: handle SCSI_STATUS_TASK_SET_FULL Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 47/76] block/iscsi: bump year in copyright notice Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 48/76] block/iscsi: use the allocationmap also if cache.direct=on Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 49/76] docs: incremental backup documentation Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 50/76] qapi: Add optional field "name" to block dirty bitmap Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 51/76] qmp: Ensure consistent granularity type Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 52/76] qmp: Add block-dirty-bitmap-add and block-dirty-bitmap-remove Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 53/76] block: Introduce bdrv_dirty_bitmap_granularity() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 54/76] hbitmap: cache array lengths Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 55/76] hbitmap: add hbitmap_merge Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 56/76] block: Add bitmap disabled status Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 57/76] block: Add bitmap successors Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 58/76] qmp: Add support of "dirty-bitmap" sync mode for drive-backup Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 59/76] qmp: add block-dirty-bitmap-clear Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 60/76] qmp: Add dirty bitmap status field in query-block Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 61/76] block: add BdrvDirtyBitmap documentation Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 62/76] block: Ensure consistent bitmap function prototypes Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 63/76] block: Resize bitmaps on bdrv_truncate Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 64/76] hbitmap: truncate tests Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 65/76] iotests: add invalid input incremental backup tests Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 66/76] iotests: add QMP event waiting queue Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 67/76] iotests: add simple incremental backup case Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 68/76] iotests: add incremental backup failure recovery test Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 69/76] iotests: add incremental backup granularity tests Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 70/76] block/mirror: Always call block_job_sleep_ns() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 71/76] block/dmg: make it modular Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 72/76] vmdk: Widen before shifting 32 bit header field Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 73/76] block: replace bdrv_states iteration with bdrv_next() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 74/76] block: add bdrv_set_dirty()/bdrv_reset_dirty() to block_int.h Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 75/76] block: extract bdrv_setup_io_funcs() Kevin Wolf
2015-04-28 15:00 ` [Qemu-devel] [PULL 76/76] block: move I/O request processing to block/io.c Kevin Wolf
2015-04-28 17:15 ` [Qemu-devel] [Qemu-block] " Eric Blake
2015-04-29 8:27 ` Kevin Wolf
2015-04-28 17:58 ` [Qemu-devel] [PULL 00/76] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430233258-31807-24-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).