| Message ID | 1542006398-30037-3-git-send-email-marcolso@amazon.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/3] blkdebug: fix one shot rule processing | expand |
On 11/12/18 2:06 AM, Marc Olson via Qemu-devel wrote: > Add a new rule type for blkdebug that instead of returning an error, can > inject latency to an IO. > > Signed-off-by: Marc Olson <marcolso@amazon.com> > --- > block/blkdebug.c | 79 +++++++++++++++++++++++++++++++++++++++++++--- > docs/devel/blkdebug.txt | 35 ++++++++++++++------ > qapi/block-core.json | 31 ++++++++++++++++++ > tests/qemu-iotests/071 | 63 ++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/071.out | 31 ++++++++++++++++++ > 5 files changed, 226 insertions(+), 13 deletions(-) > > diff --git a/block/blkdebug.c b/block/blkdebug.c > index 7739849..6b1f2d6 100644 > --- a/block/blkdebug.c > +++ b/block/blkdebug.c > @@ -65,6 +65,7 @@ typedef struct BlkdebugSuspendedReq { > > enum { > ACTION_INJECT_ERROR, > + ACTION_INJECT_DELAY, > ACTION_SET_STATE, > ACTION_SUSPEND, > }; > @@ -81,6 +82,9 @@ typedef struct BlkdebugRule { > int immediately; > } inject_error; > struct { > + int64_t latency; > + } delay; > + struct { > int new_state; > } set_state; > struct { > @@ -123,6 +127,34 @@ static QemuOptsList inject_error_opts = { > }, > }; > > +static QemuOptsList inject_delay_opts = { > + .name = "inject-delay", > + .head = QTAILQ_HEAD_INITIALIZER(inject_delay_opts.head), > + .desc = { > + { > + .name = "event", > + .type = QEMU_OPT_STRING, > + }, > + { > + .name = "state", > + .type = QEMU_OPT_NUMBER, > + }, > + { > + .name = "latency", > + .type = QEMU_OPT_NUMBER, > + }, > + { > + .name = "sector", > + .type = QEMU_OPT_NUMBER, > + }, > + { > + .name = "once", > + .type = QEMU_OPT_BOOL, > + }, > + { /* end of list */ } > + }, > +}; > + Lot of redundancy again, but ... it's just a debugging interface, so... > static QemuOptsList set_state_opts = { > .name = "set-state", > .head = QTAILQ_HEAD_INITIALIZER(set_state_opts.head), > @@ -145,6 +177,7 @@ static QemuOptsList set_state_opts = { > > static QemuOptsList *config_groups[] = { > &inject_error_opts, > + &inject_delay_opts, > &set_state_opts, > NULL > }; > @@ -194,6 +227,11 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) > qemu_opt_get_bool(opts, "immediately", 0); > break; > > + case ACTION_INJECT_DELAY: > + rule->options.delay.latency = > + qemu_opt_get_number(opts, "latency", 100) * SCALE_US; > + break; > + > case ACTION_SET_STATE: > rule->options.set_state.new_state = > qemu_opt_get_number(opts, "new_state", 0); > @@ -226,6 +264,12 @@ static void remove_rule(BlkdebugRule *rule) > g_free(rule); > } > > +static void remove_active_rule(BDRVBlkdebugState *s, BlkdebugRule *rule) > +{ > + QSIMPLEQ_REMOVE(&s->active_rules, rule, BlkdebugRule, active_next); > + remove_rule(rule); > +} > + > static int read_config(BDRVBlkdebugState *s, const char *filename, > QDict *options, Error **errp) > { > @@ -264,6 +308,14 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, > goto fail; > } > > + d.action = ACTION_INJECT_DELAY; > + qemu_opts_foreach(&inject_delay_opts, add_rule, &d, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + ret = -EINVAL; > + goto fail; > + } > + > d.action = ACTION_SET_STATE; > qemu_opts_foreach(&set_state_opts, add_rule, &d, &local_err); > if (local_err) { > @@ -275,6 +327,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, > ret = 0; > fail: > qemu_opts_reset(&inject_error_opts); > + qemu_opts_reset(&inject_delay_opts); > qemu_opts_reset(&set_state_opts); > if (f) { > fclose(f); > @@ -474,7 +527,8 @@ static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) > { > BDRVBlkdebugState *s = bs->opaque; > BlkdebugRule *rule = NULL; > - BlkdebugRule *error_rule = NULL; > + BlkdebugRule *error_rule = NULL, *delay_rule = NULL; > + int64_t latency; > int error; > bool immediately; > int ret = 0; > @@ -484,20 +538,36 @@ static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) > (bytes && rule->offset >= offset && > rule->offset < offset + bytes)) > { > - if (rule->action == ACTION_INJECT_ERROR) { > + if (!error_rule && rule->action == ACTION_INJECT_ERROR) { > error_rule = rule; > + } else if (!delay_rule && rule->action == ACTION_INJECT_DELAY) { > + delay_rule = rule; > + } > + > + if (error_rule && delay_rule) { > break; > } > } > } > > + if (delay_rule) { > + latency = delay_rule->options.delay.latency; > + > + if (delay_rule->once) { > + remove_active_rule(s, delay_rule); > + } > + > + if (latency != 0) { > + qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, latency); > + } > + } > + > if (error_rule) { > immediately = error_rule->options.inject_error.immediately; > error = error_rule->options.inject_error.error; > > if (error_rule->once) { > - QSIMPLEQ_REMOVE(&s->active_rules, error_rule, BlkdebugRule, active_next); > - remove_rule(error_rule); > + remove_active_rule(s, error_rule); > } > > if (error && !immediately) { > @@ -697,6 +767,7 @@ static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, > /* Take the action */ > switch (rule->action) { > case ACTION_INJECT_ERROR: > + case ACTION_INJECT_DELAY: > if (!injected) { > QSIMPLEQ_INIT(&s->active_rules); > injected = true; > diff --git a/docs/devel/blkdebug.txt b/docs/devel/blkdebug.txt > index 43d8e8f..1719835 100644 > --- a/docs/devel/blkdebug.txt > +++ b/docs/devel/blkdebug.txt > @@ -24,7 +24,7 @@ This way, all error paths can be tested to make sure they are correct. > Rules > ----- > The blkdebug block driver takes a list of "rules" that tell the error injection > -engine when to fail an I/O request. > +engine when to either fail or add latency to an I/O request. > > Each I/O request is evaluated against the rules. If a rule matches the request > then its "action" is executed. > @@ -33,24 +33,35 @@ Rules can be placed in a configuration file; the configuration file > follows the same .ini-like format used by QEMU's -readconfig option, and > each section of the file represents a rule. > > -The following configuration file defines a single rule: > +The following configuration file defines multiple rules: > > $ cat blkdebug.conf > [inject-error] > event = "read_aio" > errno = "28" > > -This rule fails all aio read requests with ENOSPC (28). Note that the errno > -value depends on the host. On Linux, see > + [inject-delay] > + event = "read_aio" > + sector = "2048" > + latency = "500000" > + > +The error rule fails all aio read requests with ENOSPC (28). Note that the > +errno value depends on the host. On Linux, see > /usr/include/asm-generic/errno-base.h for errno values. > > +The delay rule adds 500 ms of latency to a read I/O request containing sector > +2048. > + > +An error rule and a delay rule can overlap, and both will execute. Only one > +rule of a given type will be executed for each I/O. > + > Invoke QEMU as follows: > > $ qemu-system-x86_64 > -drive if=none,cache=none,file=blkdebug:blkdebug.conf:test.img,id=drive0 \ > -device virtio-blk-pci,drive=drive0,id=virtio-blk-pci0 > > -Rules support the following attributes: > +All rules support the following attributes: > > event - which type of operation to match (e.g. read_aio, write_aio, > flush_to_os, flush_to_disk). See the "Events" section for > @@ -60,21 +71,27 @@ Rules support the following attributes: > rule to match. See the "State transitions" section for information > on states. > > - errno - the numeric errno value to return when a request matches this rule. > - The errno values depend on the host since the numeric values are not > - standarized in the POSIX specification. > - > sector - (optional) a sector number that the request must overlap in order to > match this rule > > once - (optional, default "off") only execute this action on the first > matching request > > +Error injection rules support the following additional attributes: > + > + errno - the numeric errno value to return when a request matches this rule. > + The errno values depend on the host since the numeric values are not > + standarized in the POSIX specification. > + > immediately - (optional, default "off") return a NULL BlockAIOCB > pointer and fail without an errno instead. This > exercises the code path where BlockAIOCB fails and the > caller's BlockCompletionFunc is not invoked. > > +Delay rules support the following additional attribute: > + > + latency - the delay to add to an I/O request, in microseconds. > + > Events > ------ > Block drivers provide information about the type of I/O request they are about > diff --git a/qapi/block-core.json b/qapi/block-core.json > index d4fe710..72f7861 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -3057,6 +3057,34 @@ > '*immediately': 'bool' } } > > ## > +# @BlkdebugDelayOptions: > +# > +# Describes a single latency injection for blkdebug. > +# > +# @event: trigger event > +# > +# @state: the state identifier blkdebug needs to be in to > +# actually trigger the event; defaults to "any" > +# > +# @latency: The delay to add to an I/O, in microseconds. > +# > +# @sector: specifies the sector index which has to be affected > +# in order to actually trigger the event; defaults to "any > +# sector" > +# > +# @once: disables further events after this one has been > +# triggered; defaults to false > +# > +# Since: 3.1 Probably 3.2 at this point, sorry! > +## > +{ 'struct': 'BlkdebugDelayOptions', > + 'data': { 'event': 'BlkdebugEvent', > + '*state': 'int', > + '*latency': 'int', > + '*sector': 'int', > + '*once': 'bool' } } > + > +## Seems fine mechanically. Not sure if the QAPI lords will care about the redundancy or not. > # @BlkdebugSetStateOptions: > # > # Describes a single state-change event for blkdebug. > @@ -3115,6 +3143,8 @@ > # > # @inject-error: array of error injection descriptions > # > +# @inject-delay: array of delay injection descriptions > +# > # @set-state: array of state-change descriptions > # > # Since: 2.9 > @@ -3126,6 +3156,7 @@ > '*opt-write-zero': 'int32', '*max-write-zero': 'int32', > '*opt-discard': 'int32', '*max-discard': 'int32', > '*inject-error': ['BlkdebugInjectErrorOptions'], > + '*inject-delay': ['BlkdebugDelayOptions'], > '*set-state': ['BlkdebugSetStateOptions'] } } > > ## > diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 > index 48b4955..976f747 100755 > --- a/tests/qemu-iotests/071 > +++ b/tests/qemu-iotests/071 > @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event > -c 'read -P 42 0x38000 512' > > echo > +echo "=== Testing blkdebug latency through filename ===" > +echo > + > +$QEMU_IO -c "open -o file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 $TEST_IMG" \ > + -c 'aio_write -P 42 0x28000 512' \ > + -c 'aio_read -P 42 0x38000 512' \ > + | _filter_qemu_io > + > +echo > +echo "=== Testing blkdebug latency through file blockref ===" > +echo > + > +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" \ > + -c 'aio_write -P 42 0x28000 512' \ > + -c 'aio_read -P 42 0x38000 512' \ > + | _filter_qemu_io > + > +# Using QMP is synchronous by default, so even though we would > +# expect reordering due to using the aio_* commands, they are > +# not. The purpose of this test is to verify that the driver > +# can be setup via QMP, and IO can complete. See the qemu-io > +# test above to prove delay functionality > +echo > +echo "=== Testing blkdebug on existing block device ===" > +echo > + > +run_qemu <<EOF > +{ "execute": "qmp_capabilities" } > +{ "execute": "blockdev-add", > + "arguments": { > + "node-name": "drive0", > + "driver": "file", > + "filename": "$TEST_IMG" > + } > +} > +{ "execute": "blockdev-add", > + "arguments": { > + "driver": "$IMGFMT", > + "node-name": "drive0-debug", > + "file": { > + "driver": "blkdebug", > + "image": "drive0", > + "inject-delay": [{ > + "event": "write_aio", > + "latency": 10000 > + }] > + } > + } > +} > +{ "execute": "human-monitor-command", > + "arguments": { > + "command-line": 'qemu-io drive0-debug "aio_write 0 512"' > + } > +} > +{ "execute": "human-monitor-command", > + "arguments": { > + "command-line": 'qemu-io drive0-debug "aio_read 0 512"' > + } > +} > +{ "execute": "quit" } > +EOF > + > +echo > echo "=== Testing blkdebug on existing block device ===" > echo > > diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out > index 1d5e28d..1952990 100644 > --- a/tests/qemu-iotests/071.out > +++ b/tests/qemu-iotests/071.out > @@ -36,6 +36,37 @@ read failed: Input/output error > > read failed: Input/output error > > +=== Testing blkdebug latency through filename === > + > +read 512/512 bytes at offset 229376 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 512/512 bytes at offset 163840 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > + > +=== Testing blkdebug latency through file blockref === > + > +read 512/512 bytes at offset 229376 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 512/512 bytes at offset 163840 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > + > +=== Testing blkdebug on existing block device === > + > +Testing: > +QMP_VERSION > +{"return": {}} > +{"return": {}} > +{"return": {}} > +wrote 512/512 bytes at offset 0 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +{"return": ""} > +read 512/512 bytes at offset 0 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +{"return": ""} > +{"return": {}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}} > + > + > === Testing blkdebug on existing block device === > > Testing: > The code loop got a little messier and I'm worried it won't scale well, but mechanically it seems alright. I'll let Kevin and Max whine louder if needed :) Reviewed-by: John Snow <jsnow@redhat.com>
On 12.11.18 08:06, Marc Olson wrote: > Add a new rule type for blkdebug that instead of returning an error, can > inject latency to an IO. > > Signed-off-by: Marc Olson <marcolso@amazon.com> > --- > block/blkdebug.c | 79 +++++++++++++++++++++++++++++++++++++++++++--- > docs/devel/blkdebug.txt | 35 ++++++++++++++------ > qapi/block-core.json | 31 ++++++++++++++++++ > tests/qemu-iotests/071 | 63 ++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/071.out | 31 ++++++++++++++++++ > 5 files changed, 226 insertions(+), 13 deletions(-) > > diff --git a/block/blkdebug.c b/block/blkdebug.c > index 7739849..6b1f2d6 100644 > --- a/block/blkdebug.c > +++ b/block/blkdebug.c [...] > @@ -194,6 +227,11 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) > qemu_opt_get_bool(opts, "immediately", 0); > break; > > + case ACTION_INJECT_DELAY: > + rule->options.delay.latency = > + qemu_opt_get_number(opts, "latency", 100) * SCALE_US; Why the default of 100? I think it would be best if this option were mandatory. > + break; > + > case ACTION_SET_STATE: > rule->options.set_state.new_state = > qemu_opt_get_number(opts, "new_state", 0); [...] > @@ -484,20 +538,36 @@ static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) > (bytes && rule->offset >= offset && > rule->offset < offset + bytes)) > { > - if (rule->action == ACTION_INJECT_ERROR) { > + if (!error_rule && rule->action == ACTION_INJECT_ERROR) { > error_rule = rule; > + } else if (!delay_rule && rule->action == ACTION_INJECT_DELAY) { > + delay_rule = rule; > + } > + How about handling "once" here? (by adding: else { continue; } if (rule->once) { remove_active_rule(s, rule); } and making the QSIMPLEQ_FOREACH a QSIMPLEQ_FOREACH_SAFE. (Or maybe in that case we want to inline remove_active_rule().)) It isn't like the state here is too bad, but if we can't handle "once" in a common code path, I'm torn whether it has a place in the BlkdebugRule root. (Doing that makes parsing a bit easier, but OTOH we just shouldn't parse it for set-state at all, so I'd keep it in the "unionized structs" if it isn't handled in a common code path.) > + if (error_rule && delay_rule) { > break; > } > } > } > > + if (delay_rule) { > + latency = delay_rule->options.delay.latency; > + > + if (delay_rule->once) { > + remove_active_rule(s, delay_rule); > + } > + > + if (latency != 0) { > + qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, latency); > + } > + } > + > if (error_rule) { > immediately = error_rule->options.inject_error.immediately; > error = error_rule->options.inject_error.error; > > if (error_rule->once) { > - QSIMPLEQ_REMOVE(&s->active_rules, error_rule, BlkdebugRule, active_next); > - remove_rule(error_rule); > + remove_active_rule(s, error_rule); > } > > if (error && !immediately) { [...] > diff --git a/qapi/block-core.json b/qapi/block-core.json > index d4fe710..72f7861 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -3057,6 +3057,34 @@ > '*immediately': 'bool' } } > > ## > +# @BlkdebugDelayOptions: > +# > +# Describes a single latency injection for blkdebug. > +# > +# @event: trigger event > +# > +# @state: the state identifier blkdebug needs to be in to > +# actually trigger the event; defaults to "any" > +# > +# @latency: The delay to add to an I/O, in microseconds. > +# > +# @sector: specifies the sector index which has to be affected > +# in order to actually trigger the event; defaults to "any > +# sector" > +# > +# @once: disables further events after this one has been > +# triggered; defaults to false > +# > +# Since: 3.1 Well, 4.0 now, sorry... > +## > +{ 'struct': 'BlkdebugDelayOptions', > + 'data': { 'event': 'BlkdebugEvent', > + '*state': 'int', > + '*latency': 'int', I'd make this option mandatory. > + '*sector': 'int', > + '*once': 'bool' } } > + > +## > # @BlkdebugSetStateOptions: > # > # Describes a single state-change event for blkdebug. > @@ -3115,6 +3143,8 @@ > # > # @inject-error: array of error injection descriptions > # > +# @inject-delay: array of delay injection descriptions This needs a "(Since 4.0)". > +# > # @set-state: array of state-change descriptions > # > # Since: 2.9 [...] > diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 > index 48b4955..976f747 100755 > --- a/tests/qemu-iotests/071 > +++ b/tests/qemu-iotests/071 > @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event > -c 'read -P 42 0x38000 512' > > echo > +echo "=== Testing blkdebug latency through filename ===" > +echo > + > +$QEMU_IO -c "open -o file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 $TEST_IMG" \ > + -c 'aio_write -P 42 0x28000 512' \ > + -c 'aio_read -P 42 0x38000 512' \ > + | _filter_qemu_io > + > +echo > +echo "=== Testing blkdebug latency through file blockref ===" > +echo > + > +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" \ > + -c 'aio_write -P 42 0x28000 512' \ > + -c 'aio_read -P 42 0x38000 512' \ > + | _filter_qemu_io > + > +# Using QMP is synchronous by default, so even though we would > +# expect reordering due to using the aio_* commands, they are > +# not. The purpose of this test is to verify that the driver > +# can be setup via QMP, and IO can complete. See the qemu-io > +# test above to prove delay functionality But it doesn't prove that because the output is filtered. To prove it, you'd probably need to use null-co as the protocol (so there is as little noise as possible) and then parse the qemu-io output to show that the time is always above 10 ms. I leave it to you whether you'd like to go through that pain. [...] > diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out > index 1d5e28d..1952990 100644 > --- a/tests/qemu-iotests/071.out > +++ b/tests/qemu-iotests/071.out > @@ -36,6 +36,37 @@ read failed: Input/output error > > read failed: Input/output error > > +=== Testing blkdebug latency through filename === > + > +read 512/512 bytes at offset 229376 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 512/512 bytes at offset 163840 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > + > +=== Testing blkdebug latency through file blockref === > + > +read 512/512 bytes at offset 229376 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 512/512 bytes at offset 163840 > +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) (As you can see, the output is filtered.) Max
On 1/11/19 7:00 AM, Max Reitz wrote: > On 12.11.18 08:06, Marc Olson wrote: >> Add a new rule type for blkdebug that instead of returning an error, can >> inject latency to an IO. >> >> Signed-off-by: Marc Olson <marcolso@amazon.com> >> --- >> block/blkdebug.c | 79 +++++++++++++++++++++++++++++++++++++++++++--- >> docs/devel/blkdebug.txt | 35 ++++++++++++++------ >> qapi/block-core.json | 31 ++++++++++++++++++ >> tests/qemu-iotests/071 | 63 ++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/071.out | 31 ++++++++++++++++++ >> 5 files changed, 226 insertions(+), 13 deletions(-) >> >> diff --git a/block/blkdebug.c b/block/blkdebug.c >> index 7739849..6b1f2d6 100644 >> --- a/block/blkdebug.c >> +++ b/block/blkdebug.c > [...] > >> @@ -194,6 +227,11 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) >> qemu_opt_get_bool(opts, "immediately", 0); >> break; >> >> + case ACTION_INJECT_DELAY: >> + rule->options.delay.latency = >> + qemu_opt_get_number(opts, "latency", 100) * SCALE_US; > Why the default of 100? I think it would be best if this option were > mandatory. Ok. > >> + break; >> + >> case ACTION_SET_STATE: >> rule->options.set_state.new_state = >> qemu_opt_get_number(opts, "new_state", 0); > [...] > >> @@ -484,20 +538,36 @@ static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) >> (bytes && rule->offset >= offset && >> rule->offset < offset + bytes)) >> { >> - if (rule->action == ACTION_INJECT_ERROR) { >> + if (!error_rule && rule->action == ACTION_INJECT_ERROR) { >> error_rule = rule; >> + } else if (!delay_rule && rule->action == ACTION_INJECT_DELAY) { >> + delay_rule = rule; >> + } >> + > How about handling "once" here? > > (by adding: > > else { > continue; > } > > if (rule->once) { > remove_active_rule(s, rule); > } > > and making the QSIMPLEQ_FOREACH a QSIMPLEQ_FOREACH_SAFE. > > (Or maybe in that case we want to inline remove_active_rule().)) > > It isn't like the state here is too bad, but if we can't handle "once" > in a common code path, I'm torn whether it has a place in the > BlkdebugRule root. (Doing that makes parsing a bit easier, but OTOH we > just shouldn't parse it for set-state at all, so I'd keep it in the > "unionized structs" if it isn't handled in a common code path.) Yes, this makes sense. > >> + if (error_rule && delay_rule) { >> break; >> } >> } >> } >> >> + if (delay_rule) { >> + latency = delay_rule->options.delay.latency; >> + >> + if (delay_rule->once) { >> + remove_active_rule(s, delay_rule); >> + } >> + >> + if (latency != 0) { >> + qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, latency); >> + } >> + } >> + >> if (error_rule) { >> immediately = error_rule->options.inject_error.immediately; >> error = error_rule->options.inject_error.error; >> >> if (error_rule->once) { >> - QSIMPLEQ_REMOVE(&s->active_rules, error_rule, BlkdebugRule, active_next); >> - remove_rule(error_rule); >> + remove_active_rule(s, error_rule); >> } >> >> if (error && !immediately) { > [...] > >> diff --git a/qapi/block-core.json b/qapi/block-core.json >> index d4fe710..72f7861 100644 >> --- a/qapi/block-core.json >> +++ b/qapi/block-core.json >> @@ -3057,6 +3057,34 @@ >> '*immediately': 'bool' } } >> >> ## >> +# @BlkdebugDelayOptions: >> +# >> +# Describes a single latency injection for blkdebug. >> +# >> +# @event: trigger event >> +# >> +# @state: the state identifier blkdebug needs to be in to >> +# actually trigger the event; defaults to "any" >> +# >> +# @latency: The delay to add to an I/O, in microseconds. >> +# >> +# @sector: specifies the sector index which has to be affected >> +# in order to actually trigger the event; defaults to "any >> +# sector" >> +# >> +# @once: disables further events after this one has been >> +# triggered; defaults to false >> +# >> +# Since: 3.1 > Well, 4.0 now, sorry... Baking version numbers into code is downright silly. Every single version of this patch has made a comment along the lines of, "oops, it didn't get reviewed in time for the next version bump, so you have to resubmit." With a fast moving project, this is nonsense. If you're looking at the code, you should have access to the git history as well to determine the version. > >> +## >> +{ 'struct': 'BlkdebugDelayOptions', >> + 'data': { 'event': 'BlkdebugEvent', >> + '*state': 'int', >> + '*latency': 'int', > I'd make this option mandatory. > >> + '*sector': 'int', >> + '*once': 'bool' } } >> + >> +## >> # @BlkdebugSetStateOptions: >> # >> # Describes a single state-change event for blkdebug. >> @@ -3115,6 +3143,8 @@ >> # >> # @inject-error: array of error injection descriptions >> # >> +# @inject-delay: array of delay injection descriptions > This needs a "(Since 4.0)". > >> +# >> # @set-state: array of state-change descriptions >> # >> # Since: 2.9 > [...] > >> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 >> index 48b4955..976f747 100755 >> --- a/tests/qemu-iotests/071 >> +++ b/tests/qemu-iotests/071 >> @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event >> -c 'read -P 42 0x38000 512' >> >> echo >> +echo "=== Testing blkdebug latency through filename ===" >> +echo >> + >> +$QEMU_IO -c "open -o file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 $TEST_IMG" \ >> + -c 'aio_write -P 42 0x28000 512' \ >> + -c 'aio_read -P 42 0x38000 512' \ >> + | _filter_qemu_io >> + >> +echo >> +echo "=== Testing blkdebug latency through file blockref ===" >> +echo >> + >> +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" \ >> + -c 'aio_write -P 42 0x28000 512' \ >> + -c 'aio_read -P 42 0x38000 512' \ >> + | _filter_qemu_io >> + >> +# Using QMP is synchronous by default, so even though we would >> +# expect reordering due to using the aio_* commands, they are >> +# not. The purpose of this test is to verify that the driver >> +# can be setup via QMP, and IO can complete. See the qemu-io >> +# test above to prove delay functionality > But it doesn't prove that because the output is filtered. To prove it, > you'd probably need to use null-co as the protocol (so there is as > little noise as possible) and then parse the qemu-io output to show that > the time is always above 10 ms. > > I leave it to you whether you'd like to go through that pain. There's not a great way to prove it without doing a lot of parsing changes in testing. I'll consider an update to this patch, but I think this series has carried on long enough. > > [...] > >> diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out >> index 1d5e28d..1952990 100644 >> --- a/tests/qemu-iotests/071.out >> +++ b/tests/qemu-iotests/071.out >> @@ -36,6 +36,37 @@ read failed: Input/output error >> >> read failed: Input/output error >> >> +=== Testing blkdebug latency through filename === >> + >> +read 512/512 bytes at offset 229376 >> +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> +wrote 512/512 bytes at offset 163840 >> +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> + >> +=== Testing blkdebug latency through file blockref === >> + >> +read 512/512 bytes at offset 229376 >> +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> +wrote 512/512 bytes at offset 163840 >> +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > (As you can see, the output is filtered.) > > Max >
On 12.02.19 22:21, Marc Olson wrote: > On 1/11/19 7:00 AM, Max Reitz wrote: >> On 12.11.18 08:06, Marc Olson wrote: [...] >>> diff --git a/qapi/block-core.json b/qapi/block-core.json >>> index d4fe710..72f7861 100644 >>> --- a/qapi/block-core.json >>> +++ b/qapi/block-core.json >>> @@ -3057,6 +3057,34 @@ >>> '*immediately': 'bool' } } >>> ## >>> +# @BlkdebugDelayOptions: >>> +# >>> +# Describes a single latency injection for blkdebug. >>> +# >>> +# @event: trigger event >>> +# >>> +# @state: the state identifier blkdebug needs to be in to >>> +# actually trigger the event; defaults to "any" >>> +# >>> +# @latency: The delay to add to an I/O, in microseconds. >>> +# >>> +# @sector: specifies the sector index which has to be affected >>> +# in order to actually trigger the event; defaults to >>> "any >>> +# sector" >>> +# >>> +# @once: disables further events after this one has been >>> +# triggered; defaults to false >>> +# >>> +# Since: 3.1 >> Well, 4.0 now, sorry... > Baking version numbers into code is downright silly. Every single > version of this patch has made a comment along the lines of, "oops, it > didn't get reviewed in time for the next version bump, so you have to > resubmit." With a fast moving project, this is nonsense. If you're > looking at the code, you should have access to the git history as well > to determine the version. True, but these comments are used to generate documentation (e.g. docs/interopt/qemu-qmp-ref.7 in the build directory). So they are used by people who don't have access to the git history. It might be possible to generate that information from git-blame when generating the documentation, but how would trivial fixes be handled that are no functional changes? For instance, it seems difficult to me to distinguish between a spelling change for some parameter description and a change in behavior. (Then again, we shouldn't have such behavioral changes, hm.) To me personally, the easiest thing would seem to be some convention to write ***INSERT VERSION HERE*** into the code and then the maintainer can just find an replace all instances of that when applying the patches. But that sounds a bit silly... (I don't have an issue with adjusting the version numbers myself as they are, but it's just as hard for me to find and replace all of them as it is for you. And since you're probably going to send a v4 anyway...) In the end, it's up to the QAPI maintainers. [...] >>> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 >>> index 48b4955..976f747 100755 >>> --- a/tests/qemu-iotests/071 >>> +++ b/tests/qemu-iotests/071 >>> @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o >>> driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event >>> -c 'read -P 42 0x38000 512' >>> echo >>> +echo "=== Testing blkdebug latency through filename ===" >>> +echo >>> + >>> +$QEMU_IO -c "open -o >>> file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 >>> $TEST_IMG" \ >>> + -c 'aio_write -P 42 0x28000 512' \ >>> + -c 'aio_read -P 42 0x38000 512' \ >>> + | _filter_qemu_io >>> + >>> +echo >>> +echo "=== Testing blkdebug latency through file blockref ===" >>> +echo >>> + >>> +$QEMU_IO -c "open -o >>> driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" >>> \ >>> + -c 'aio_write -P 42 0x28000 512' \ >>> + -c 'aio_read -P 42 0x38000 512' \ >>> + | _filter_qemu_io >>> + >>> +# Using QMP is synchronous by default, so even though we would >>> +# expect reordering due to using the aio_* commands, they are >>> +# not. The purpose of this test is to verify that the driver >>> +# can be setup via QMP, and IO can complete. See the qemu-io >>> +# test above to prove delay functionality >> But it doesn't prove that because the output is filtered. To prove it, >> you'd probably need to use null-co as the protocol (so there is as >> little noise as possible) and then parse the qemu-io output to show that >> the time is always above 10 ms. >> >> I leave it to you whether you'd like to go through that pain. > There's not a great way to prove it without doing a lot of parsing > changes in testing. I'll consider an update to this patch, but I think > this series has carried on long enough. I agree in this instance, but I'd like to note still that "this series has carried on long enough" is not an argument to merge bad code (or something incomplete without promise of a follow-up). This is just a test for blkdebug, though, so it's OK (with the comment fixed, because it doesn't prove anything). (I'm sorry for not having looked at this series for so long, but qemu is not my own, so it isn't like I could pay for my wrong by accepting something incomplete -- if it were more important than this single test case.) Also, we do support Python for iotests, and parsing should be simpler there. Since blkdebug is just a debugging driver, I'm fine with not knowing whether its features work, though. Maybe I'll write the test, that would kind of pay for my wrong... Max
On 2/13/19 7:48 AM, Max Reitz wrote: > On 12.02.19 22:21, Marc Olson wrote: >> On 1/11/19 7:00 AM, Max Reitz wrote: >>> On 12.11.18 08:06, Marc Olson wrote: > [...] > >>>> diff --git a/qapi/block-core.json b/qapi/block-core.json >>>> index d4fe710..72f7861 100644 >>>> --- a/qapi/block-core.json >>>> +++ b/qapi/block-core.json >>>> @@ -3057,6 +3057,34 @@ >>>> '*immediately': 'bool' } } >>>> ## >>>> +# @BlkdebugDelayOptions: >>>> +# >>>> +# Describes a single latency injection for blkdebug. >>>> +# >>>> +# @event: trigger event >>>> +# >>>> +# @state: the state identifier blkdebug needs to be in to >>>> +# actually trigger the event; defaults to "any" >>>> +# >>>> +# @latency: The delay to add to an I/O, in microseconds. >>>> +# >>>> +# @sector: specifies the sector index which has to be affected >>>> +# in order to actually trigger the event; defaults to >>>> "any >>>> +# sector" >>>> +# >>>> +# @once: disables further events after this one has been >>>> +# triggered; defaults to false >>>> +# >>>> +# Since: 3.1 >>> Well, 4.0 now, sorry... >> Baking version numbers into code is downright silly. Every single >> version of this patch has made a comment along the lines of, "oops, it >> didn't get reviewed in time for the next version bump, so you have to >> resubmit." With a fast moving project, this is nonsense. If you're >> looking at the code, you should have access to the git history as well >> to determine the version. > True, but these comments are used to generate documentation (e.g. > docs/interopt/qemu-qmp-ref.7 in the build directory). So they are used > by people who don't have access to the git history. > > It might be possible to generate that information from git-blame when > generating the documentation, but how would trivial fixes be handled > that are no functional changes? For instance, it seems difficult to me > to distinguish between a spelling change for some parameter description > and a change in behavior. > > (Then again, we shouldn't have such behavioral changes, hm.) > > To me personally, the easiest thing would seem to be some convention to > write ***INSERT VERSION HERE*** into the code and then the maintainer > can just find an replace all instances of that when applying the > patches. But that sounds a bit silly... > > (I don't have an issue with adjusting the version numbers myself as they > are, but it's just as hard for me to find and replace all of them as it > is for you. And since you're probably going to send a v4 anyway...) > > In the end, it's up to the QAPI maintainers. IFF I submit by the end of the week, what version number shall I choose? > [...] > >>>> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 >>>> index 48b4955..976f747 100755 >>>> --- a/tests/qemu-iotests/071 >>>> +++ b/tests/qemu-iotests/071 >>>> @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o >>>> driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event >>>> -c 'read -P 42 0x38000 512' >>>> echo >>>> +echo "=== Testing blkdebug latency through filename ===" >>>> +echo >>>> + >>>> +$QEMU_IO -c "open -o >>>> file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 >>>> $TEST_IMG" \ >>>> + -c 'aio_write -P 42 0x28000 512' \ >>>> + -c 'aio_read -P 42 0x38000 512' \ >>>> + | _filter_qemu_io >>>> + >>>> +echo >>>> +echo "=== Testing blkdebug latency through file blockref ===" >>>> +echo >>>> + >>>> +$QEMU_IO -c "open -o >>>> driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" >>>> \ >>>> + -c 'aio_write -P 42 0x28000 512' \ >>>> + -c 'aio_read -P 42 0x38000 512' \ >>>> + | _filter_qemu_io >>>> + >>>> +# Using QMP is synchronous by default, so even though we would >>>> +# expect reordering due to using the aio_* commands, they are >>>> +# not. The purpose of this test is to verify that the driver >>>> +# can be setup via QMP, and IO can complete. See the qemu-io >>>> +# test above to prove delay functionality >>> But it doesn't prove that because the output is filtered. To prove it, >>> you'd probably need to use null-co as the protocol (so there is as >>> little noise as possible) and then parse the qemu-io output to show that >>> the time is always above 10 ms. >>> >>> I leave it to you whether you'd like to go through that pain. >> There's not a great way to prove it without doing a lot of parsing >> changes in testing. I'll consider an update to this patch, but I think >> this series has carried on long enough. > I agree in this instance, but I'd like to note still that "this series > has carried on long enough" is not an argument to merge bad code (or > something incomplete without promise of a follow-up). This is just a > test for blkdebug, though, so it's OK (with the comment fixed, because > it doesn't prove anything). I wasn't implying that it's ok to merge bad code, but that at some point we have to just paint the shed a color and move on. At the risk of excess drama, at what point does a small addition become a complete tear-down and rebuild? > (I'm sorry for not having looked at this series for so long, but qemu is > not my own, so it isn't like I could pay for my wrong by accepting > something incomplete -- if it were more important than this single test > case.) > > Also, we do support Python for iotests, and parsing should be simpler > there. Since blkdebug is just a debugging driver, I'm fine with not > knowing whether its features work, though. > > Maybe I'll write the test, that would kind of pay for my wrong... I think the real fix is to make QMP support async IO, but if you'd like to do more parsing, that's fine too. /marc
On 13.02.19 21:49, Marc Olson wrote: > On 2/13/19 7:48 AM, Max Reitz wrote: >> On 12.02.19 22:21, Marc Olson wrote: >>> On 1/11/19 7:00 AM, Max Reitz wrote: >>>> On 12.11.18 08:06, Marc Olson wrote: >> [...] >> >>>>> diff --git a/qapi/block-core.json b/qapi/block-core.json >>>>> index d4fe710..72f7861 100644 >>>>> --- a/qapi/block-core.json >>>>> +++ b/qapi/block-core.json >>>>> @@ -3057,6 +3057,34 @@ >>>>> '*immediately': 'bool' } } >>>>> ## >>>>> +# @BlkdebugDelayOptions: >>>>> +# >>>>> +# Describes a single latency injection for blkdebug. >>>>> +# >>>>> +# @event: trigger event >>>>> +# >>>>> +# @state: the state identifier blkdebug needs to be in to >>>>> +# actually trigger the event; defaults to "any" >>>>> +# >>>>> +# @latency: The delay to add to an I/O, in microseconds. >>>>> +# >>>>> +# @sector: specifies the sector index which has to be affected >>>>> +# in order to actually trigger the event; defaults to >>>>> "any >>>>> +# sector" >>>>> +# >>>>> +# @once: disables further events after this one has been >>>>> +# triggered; defaults to false >>>>> +# >>>>> +# Since: 3.1 >>>> Well, 4.0 now, sorry... >>> Baking version numbers into code is downright silly. Every single >>> version of this patch has made a comment along the lines of, "oops, it >>> didn't get reviewed in time for the next version bump, so you have to >>> resubmit." With a fast moving project, this is nonsense. If you're >>> looking at the code, you should have access to the git history as well >>> to determine the version. >> True, but these comments are used to generate documentation (e.g. >> docs/interopt/qemu-qmp-ref.7 in the build directory). So they are used >> by people who don't have access to the git history. >> >> It might be possible to generate that information from git-blame when >> generating the documentation, but how would trivial fixes be handled >> that are no functional changes? For instance, it seems difficult to me >> to distinguish between a spelling change for some parameter description >> and a change in behavior. >> >> (Then again, we shouldn't have such behavioral changes, hm.) >> >> To me personally, the easiest thing would seem to be some convention to >> write ***INSERT VERSION HERE*** into the code and then the maintainer >> can just find an replace all instances of that when applying the >> patches. But that sounds a bit silly... >> >> (I don't have an issue with adjusting the version numbers myself as they >> are, but it's just as hard for me to find and replace all of them as it >> is for you. And since you're probably going to send a v4 anyway...) >> >> In the end, it's up to the QAPI maintainers. > > IFF I submit by the end of the week, what version number shall I choose? 4.0 is still the next one. >> [...] >> >>>>> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 >>>>> index 48b4955..976f747 100755 >>>>> --- a/tests/qemu-iotests/071 >>>>> +++ b/tests/qemu-iotests/071 >>>>> @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o >>>>> driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event >>>>> -c 'read -P 42 0x38000 512' >>>>> echo >>>>> +echo "=== Testing blkdebug latency through filename ===" >>>>> +echo >>>>> + >>>>> +$QEMU_IO -c "open -o >>>>> file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 >>>>> >>>>> $TEST_IMG" \ >>>>> + -c 'aio_write -P 42 0x28000 512' \ >>>>> + -c 'aio_read -P 42 0x38000 512' \ >>>>> + | _filter_qemu_io >>>>> + >>>>> +echo >>>>> +echo "=== Testing blkdebug latency through file blockref ===" >>>>> +echo >>>>> + >>>>> +$QEMU_IO -c "open -o >>>>> driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" >>>>> >>>>> \ >>>>> + -c 'aio_write -P 42 0x28000 512' \ >>>>> + -c 'aio_read -P 42 0x38000 512' \ >>>>> + | _filter_qemu_io >>>>> + >>>>> +# Using QMP is synchronous by default, so even though we would >>>>> +# expect reordering due to using the aio_* commands, they are >>>>> +# not. The purpose of this test is to verify that the driver >>>>> +# can be setup via QMP, and IO can complete. See the qemu-io >>>>> +# test above to prove delay functionality >>>> But it doesn't prove that because the output is filtered. To prove it, >>>> you'd probably need to use null-co as the protocol (so there is as >>>> little noise as possible) and then parse the qemu-io output to show >>>> that >>>> the time is always above 10 ms. >>>> >>>> I leave it to you whether you'd like to go through that pain. >>> There's not a great way to prove it without doing a lot of parsing >>> changes in testing. I'll consider an update to this patch, but I think >>> this series has carried on long enough. >> I agree in this instance, but I'd like to note still that "this series >> has carried on long enough" is not an argument to merge bad code (or >> something incomplete without promise of a follow-up). This is just a >> test for blkdebug, though, so it's OK (with the comment fixed, because >> it doesn't prove anything). > I wasn't implying that it's ok to merge bad code, but that at some point > we have to just paint the shed a color and move on. At the risk of > excess drama, at what point does a small addition become a complete > tear-down and rebuild? Depends on the case whether a tear down is necessary. :-) >> (I'm sorry for not having looked at this series for so long, but qemu is >> not my own, so it isn't like I could pay for my wrong by accepting >> something incomplete -- if it were more important than this single test >> case.) >> >> Also, we do support Python for iotests, and parsing should be simpler >> there. Since blkdebug is just a debugging driver, I'm fine with not >> knowing whether its features work, though. >> >> Maybe I'll write the test, that would kind of pay for my wrong... > > I think the real fix is to make QMP support async IO, but if you'd like > to do more parsing, that's fine too. Hm, yeah, that would work, too. But that's definitely more complicated than a bit of parsing... Max
Marc Olson via Qemu-devel <qemu-devel@nongnu.org> writes: > On 2/13/19 7:48 AM, Max Reitz wrote: >> On 12.02.19 22:21, Marc Olson wrote: >>> On 1/11/19 7:00 AM, Max Reitz wrote: >>>> On 12.11.18 08:06, Marc Olson wrote: >> [...] >> >>>>> diff --git a/qapi/block-core.json b/qapi/block-core.json >>>>> index d4fe710..72f7861 100644 >>>>> --- a/qapi/block-core.json >>>>> +++ b/qapi/block-core.json >>>>> @@ -3057,6 +3057,34 @@ >>>>> '*immediately': 'bool' } } >>>>> ## >>>>> +# @BlkdebugDelayOptions: >>>>> +# >>>>> +# Describes a single latency injection for blkdebug. >>>>> +# >>>>> +# @event: trigger event >>>>> +# >>>>> +# @state: the state identifier blkdebug needs to be in to >>>>> +# actually trigger the event; defaults to "any" >>>>> +# >>>>> +# @latency: The delay to add to an I/O, in microseconds. >>>>> +# >>>>> +# @sector: specifies the sector index which has to be affected >>>>> +# in order to actually trigger the event; defaults to >>>>> "any >>>>> +# sector" >>>>> +# >>>>> +# @once: disables further events after this one has been >>>>> +# triggered; defaults to false >>>>> +# >>>>> +# Since: 3.1 >>>> Well, 4.0 now, sorry... >>> Baking version numbers into code is downright silly. Every single >>> version of this patch has made a comment along the lines of, "oops, it >>> didn't get reviewed in time for the next version bump, so you have to >>> resubmit." With a fast moving project, this is nonsense. If you're >>> looking at the code, you should have access to the git history as well >>> to determine the version. >> True, but these comments are used to generate documentation (e.g. >> docs/interopt/qemu-qmp-ref.7 in the build directory). So they are used >> by people who don't have access to the git history. Exactly. >> It might be possible to generate that information from git-blame when >> generating the documentation, but how would trivial fixes be handled >> that are no functional changes? For instance, it seems difficult to me >> to distinguish between a spelling change for some parameter description >> and a change in behavior. >> >> (Then again, we shouldn't have such behavioral changes, hm.) Gathering "since" information could be partially automated. Syntactical changes are visible in introspection. Keep a persistent map syntactical element -> first version, and a program to update it for new stuff in introspection data since the last release. Commit the map on release. Automation would be partial, because we can't rule out the need for documenting a "since" for a change that isn't syntactical. While there, have the program report any changes that aren't additions. These are potential compatibility breakers, and should be reviewed. >> To me personally, the easiest thing would seem to be some convention to >> write ***INSERT VERSION HERE*** into the code and then the maintainer >> can just find an replace all instances of that when applying the >> patches. But that sounds a bit silly... Maintainers are our bottleneck. Shifting work from submitter to maintainer makes the bottleneck narrower. >> (I don't have an issue with adjusting the version numbers myself as they >> are, but it's just as hard for me to find and replace all of them as it >> is for you. And since you're probably going to send a v4 anyway...) >> >> In the end, it's up to the QAPI maintainers. > > IFF I submit by the end of the week, what version number shall I choose? IFF you want to be taken seriously, cut the hyperbole. You raised a valid point. Don't sabotage yourself. [...]
diff --git a/block/blkdebug.c b/block/blkdebug.c index 7739849..6b1f2d6 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -65,6 +65,7 @@ typedef struct BlkdebugSuspendedReq { enum { ACTION_INJECT_ERROR, + ACTION_INJECT_DELAY, ACTION_SET_STATE, ACTION_SUSPEND, }; @@ -81,6 +82,9 @@ typedef struct BlkdebugRule { int immediately; } inject_error; struct { + int64_t latency; + } delay; + struct { int new_state; } set_state; struct { @@ -123,6 +127,34 @@ static QemuOptsList inject_error_opts = { }, }; +static QemuOptsList inject_delay_opts = { + .name = "inject-delay", + .head = QTAILQ_HEAD_INITIALIZER(inject_delay_opts.head), + .desc = { + { + .name = "event", + .type = QEMU_OPT_STRING, + }, + { + .name = "state", + .type = QEMU_OPT_NUMBER, + }, + { + .name = "latency", + .type = QEMU_OPT_NUMBER, + }, + { + .name = "sector", + .type = QEMU_OPT_NUMBER, + }, + { + .name = "once", + .type = QEMU_OPT_BOOL, + }, + { /* end of list */ } + }, +}; + static QemuOptsList set_state_opts = { .name = "set-state", .head = QTAILQ_HEAD_INITIALIZER(set_state_opts.head), @@ -145,6 +177,7 @@ static QemuOptsList set_state_opts = { static QemuOptsList *config_groups[] = { &inject_error_opts, + &inject_delay_opts, &set_state_opts, NULL }; @@ -194,6 +227,11 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) qemu_opt_get_bool(opts, "immediately", 0); break; + case ACTION_INJECT_DELAY: + rule->options.delay.latency = + qemu_opt_get_number(opts, "latency", 100) * SCALE_US; + break; + case ACTION_SET_STATE: rule->options.set_state.new_state = qemu_opt_get_number(opts, "new_state", 0); @@ -226,6 +264,12 @@ static void remove_rule(BlkdebugRule *rule) g_free(rule); } +static void remove_active_rule(BDRVBlkdebugState *s, BlkdebugRule *rule) +{ + QSIMPLEQ_REMOVE(&s->active_rules, rule, BlkdebugRule, active_next); + remove_rule(rule); +} + static int read_config(BDRVBlkdebugState *s, const char *filename, QDict *options, Error **errp) { @@ -264,6 +308,14 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, goto fail; } + d.action = ACTION_INJECT_DELAY; + qemu_opts_foreach(&inject_delay_opts, add_rule, &d, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret = -EINVAL; + goto fail; + } + d.action = ACTION_SET_STATE; qemu_opts_foreach(&set_state_opts, add_rule, &d, &local_err); if (local_err) { @@ -275,6 +327,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, ret = 0; fail: qemu_opts_reset(&inject_error_opts); + qemu_opts_reset(&inject_delay_opts); qemu_opts_reset(&set_state_opts); if (f) { fclose(f); @@ -474,7 +527,8 @@ static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) { BDRVBlkdebugState *s = bs->opaque; BlkdebugRule *rule = NULL; - BlkdebugRule *error_rule = NULL; + BlkdebugRule *error_rule = NULL, *delay_rule = NULL; + int64_t latency; int error; bool immediately; int ret = 0; @@ -484,20 +538,36 @@ static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) (bytes && rule->offset >= offset && rule->offset < offset + bytes)) { - if (rule->action == ACTION_INJECT_ERROR) { + if (!error_rule && rule->action == ACTION_INJECT_ERROR) { error_rule = rule; + } else if (!delay_rule && rule->action == ACTION_INJECT_DELAY) { + delay_rule = rule; + } + + if (error_rule && delay_rule) { break; } } } + if (delay_rule) { + latency = delay_rule->options.delay.latency; + + if (delay_rule->once) { + remove_active_rule(s, delay_rule); + } + + if (latency != 0) { + qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, latency); + } + } + if (error_rule) { immediately = error_rule->options.inject_error.immediately; error = error_rule->options.inject_error.error; if (error_rule->once) { - QSIMPLEQ_REMOVE(&s->active_rules, error_rule, BlkdebugRule, active_next); - remove_rule(error_rule); + remove_active_rule(s, error_rule); } if (error && !immediately) { @@ -697,6 +767,7 @@ static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, /* Take the action */ switch (rule->action) { case ACTION_INJECT_ERROR: + case ACTION_INJECT_DELAY: if (!injected) { QSIMPLEQ_INIT(&s->active_rules); injected = true; diff --git a/docs/devel/blkdebug.txt b/docs/devel/blkdebug.txt index 43d8e8f..1719835 100644 --- a/docs/devel/blkdebug.txt +++ b/docs/devel/blkdebug.txt @@ -24,7 +24,7 @@ This way, all error paths can be tested to make sure they are correct. Rules ----- The blkdebug block driver takes a list of "rules" that tell the error injection -engine when to fail an I/O request. +engine when to either fail or add latency to an I/O request. Each I/O request is evaluated against the rules. If a rule matches the request then its "action" is executed. @@ -33,24 +33,35 @@ Rules can be placed in a configuration file; the configuration file follows the same .ini-like format used by QEMU's -readconfig option, and each section of the file represents a rule. -The following configuration file defines a single rule: +The following configuration file defines multiple rules: $ cat blkdebug.conf [inject-error] event = "read_aio" errno = "28" -This rule fails all aio read requests with ENOSPC (28). Note that the errno -value depends on the host. On Linux, see + [inject-delay] + event = "read_aio" + sector = "2048" + latency = "500000" + +The error rule fails all aio read requests with ENOSPC (28). Note that the +errno value depends on the host. On Linux, see /usr/include/asm-generic/errno-base.h for errno values. +The delay rule adds 500 ms of latency to a read I/O request containing sector +2048. + +An error rule and a delay rule can overlap, and both will execute. Only one +rule of a given type will be executed for each I/O. + Invoke QEMU as follows: $ qemu-system-x86_64 -drive if=none,cache=none,file=blkdebug:blkdebug.conf:test.img,id=drive0 \ -device virtio-blk-pci,drive=drive0,id=virtio-blk-pci0 -Rules support the following attributes: +All rules support the following attributes: event - which type of operation to match (e.g. read_aio, write_aio, flush_to_os, flush_to_disk). See the "Events" section for @@ -60,21 +71,27 @@ Rules support the following attributes: rule to match. See the "State transitions" section for information on states. - errno - the numeric errno value to return when a request matches this rule. - The errno values depend on the host since the numeric values are not - standarized in the POSIX specification. - sector - (optional) a sector number that the request must overlap in order to match this rule once - (optional, default "off") only execute this action on the first matching request +Error injection rules support the following additional attributes: + + errno - the numeric errno value to return when a request matches this rule. + The errno values depend on the host since the numeric values are not + standarized in the POSIX specification. + immediately - (optional, default "off") return a NULL BlockAIOCB pointer and fail without an errno instead. This exercises the code path where BlockAIOCB fails and the caller's BlockCompletionFunc is not invoked. +Delay rules support the following additional attribute: + + latency - the delay to add to an I/O request, in microseconds. + Events ------ Block drivers provide information about the type of I/O request they are about diff --git a/qapi/block-core.json b/qapi/block-core.json index d4fe710..72f7861 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3057,6 +3057,34 @@ '*immediately': 'bool' } } ## +# @BlkdebugDelayOptions: +# +# Describes a single latency injection for blkdebug. +# +# @event: trigger event +# +# @state: the state identifier blkdebug needs to be in to +# actually trigger the event; defaults to "any" +# +# @latency: The delay to add to an I/O, in microseconds. +# +# @sector: specifies the sector index which has to be affected +# in order to actually trigger the event; defaults to "any +# sector" +# +# @once: disables further events after this one has been +# triggered; defaults to false +# +# Since: 3.1 +## +{ 'struct': 'BlkdebugDelayOptions', + 'data': { 'event': 'BlkdebugEvent', + '*state': 'int', + '*latency': 'int', + '*sector': 'int', + '*once': 'bool' } } + +## # @BlkdebugSetStateOptions: # # Describes a single state-change event for blkdebug. @@ -3115,6 +3143,8 @@ # # @inject-error: array of error injection descriptions # +# @inject-delay: array of delay injection descriptions +# # @set-state: array of state-change descriptions # # Since: 2.9 @@ -3126,6 +3156,7 @@ '*opt-write-zero': 'int32', '*max-write-zero': 'int32', '*opt-discard': 'int32', '*max-discard': 'int32', '*inject-error': ['BlkdebugInjectErrorOptions'], + '*inject-delay': ['BlkdebugDelayOptions'], '*set-state': ['BlkdebugSetStateOptions'] } } ## diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 48b4955..976f747 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -100,6 +100,69 @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-error.event -c 'read -P 42 0x38000 512' echo +echo "=== Testing blkdebug latency through filename ===" +echo + +$QEMU_IO -c "open -o file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000 $TEST_IMG" \ + -c 'aio_write -P 42 0x28000 512' \ + -c 'aio_read -P 42 0x38000 512' \ + | _filter_qemu_io + +echo +echo "=== Testing blkdebug latency through file blockref ===" +echo + +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.inject-delay.event=write_aio,file.inject-delay.latency=10000,file.image.filename=$TEST_IMG" \ + -c 'aio_write -P 42 0x28000 512' \ + -c 'aio_read -P 42 0x38000 512' \ + | _filter_qemu_io + +# Using QMP is synchronous by default, so even though we would +# expect reordering due to using the aio_* commands, they are +# not. The purpose of this test is to verify that the driver +# can be setup via QMP, and IO can complete. See the qemu-io +# test above to prove delay functionality +echo +echo "=== Testing blkdebug on existing block device ===" +echo + +run_qemu <<EOF +{ "execute": "qmp_capabilities" } +{ "execute": "blockdev-add", + "arguments": { + "node-name": "drive0", + "driver": "file", + "filename": "$TEST_IMG" + } +} +{ "execute": "blockdev-add", + "arguments": { + "driver": "$IMGFMT", + "node-name": "drive0-debug", + "file": { + "driver": "blkdebug", + "image": "drive0", + "inject-delay": [{ + "event": "write_aio", + "latency": 10000 + }] + } + } +} +{ "execute": "human-monitor-command", + "arguments": { + "command-line": 'qemu-io drive0-debug "aio_write 0 512"' + } +} +{ "execute": "human-monitor-command", + "arguments": { + "command-line": 'qemu-io drive0-debug "aio_read 0 512"' + } +} +{ "execute": "quit" } +EOF + +echo echo "=== Testing blkdebug on existing block device ===" echo diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out index 1d5e28d..1952990 100644 --- a/tests/qemu-iotests/071.out +++ b/tests/qemu-iotests/071.out @@ -36,6 +36,37 @@ read failed: Input/output error read failed: Input/output error +=== Testing blkdebug latency through filename === + +read 512/512 bytes at offset 229376 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 512/512 bytes at offset 163840 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=== Testing blkdebug latency through file blockref === + +read 512/512 bytes at offset 229376 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 512/512 bytes at offset 163840 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=== Testing blkdebug on existing block device === + +Testing: +QMP_VERSION +{"return": {}} +{"return": {}} +{"return": {}} +wrote 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{"return": ""} +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{"return": ""} +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}} + + === Testing blkdebug on existing block device === Testing:
Add a new rule type for blkdebug that instead of returning an error, can inject latency to an IO. Signed-off-by: Marc Olson <marcolso@amazon.com> --- block/blkdebug.c | 79 +++++++++++++++++++++++++++++++++++++++++++--- docs/devel/blkdebug.txt | 35 ++++++++++++++------ qapi/block-core.json | 31 ++++++++++++++++++ tests/qemu-iotests/071 | 63 ++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/071.out | 31 ++++++++++++++++++ 5 files changed, 226 insertions(+), 13 deletions(-)