[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/6] blkdebug: track all actions
From: |
Max Reitz |
Subject: |
[PULL 3/6] blkdebug: track all actions |
Date: |
Mon, 19 Jul 2021 19:26:55 +0200 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Add a counter for each action that a rule can trigger.
This is mainly used to keep track of how many coroutine_yield()
we need to perform after processing all rules in the list.
Co-developed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210614082931.24925-4-eesposit@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/blkdebug.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index e8fdf7b056..6bdeb2c7b3 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -74,6 +74,7 @@ enum {
ACTION_INJECT_ERROR,
ACTION_SET_STATE,
ACTION_SUSPEND,
+ ACTION__MAX,
};
typedef struct BlkdebugRule {
@@ -791,22 +792,22 @@ static void suspend_request(BlockDriverState *bs,
BlkdebugRule *rule)
qemu_coroutine_yield();
}
-static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
- bool injected)
+static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
+ int *action_count)
{
BDRVBlkdebugState *s = bs->opaque;
/* Only process rules for the current state */
if (rule->state && rule->state != s->state) {
- return injected;
+ return;
}
/* Take the action */
+ action_count[rule->action]++;
switch (rule->action) {
case ACTION_INJECT_ERROR:
- if (!injected) {
+ if (action_count[ACTION_INJECT_ERROR] == 1) {
QSIMPLEQ_INIT(&s->active_rules);
- injected = true;
}
QSIMPLEQ_INSERT_HEAD(&s->active_rules, rule, active_next);
break;
@@ -819,21 +820,19 @@ static bool process_rule(BlockDriverState *bs, struct
BlkdebugRule *rule,
suspend_request(bs, rule);
break;
}
- return injected;
}
static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event)
{
BDRVBlkdebugState *s = bs->opaque;
struct BlkdebugRule *rule, *next;
- bool injected;
+ int actions_count[ACTION__MAX] = { 0 };
assert((int)event >= 0 && event < BLKDBG__MAX);
- injected = false;
s->new_state = s->state;
QLIST_FOREACH_SAFE(rule, &s->rules[event], next, next) {
- injected = process_rule(bs, rule, injected);
+ process_rule(bs, rule, actions_count);
}
s->state = s->new_state;
}
--
2.31.1
- [PULL 0/6] Block patches for 6.1-rc0, Max Reitz, 2021/07/19
- [PULL 1/6] blkdebug: refactor removal of a suspended request, Max Reitz, 2021/07/19
- [PULL 2/6] blkdebug: move post-resume handling to resume_req_by_tag, Max Reitz, 2021/07/19
- [PULL 3/6] blkdebug: track all actions,
Max Reitz <=
- [PULL 4/6] blkdebug: do not suspend in the middle of QLIST_FOREACH_SAFE, Max Reitz, 2021/07/19
- [PULL 5/6] block/blkdebug: remove new_state field and instead use a local variable, Max Reitz, 2021/07/19
- [PULL 6/6] blkdebug: protect rules and suspended_reqs with a lock, Max Reitz, 2021/07/19
- Re: [PULL 0/6] Block patches for 6.1-rc0, Peter Maydell, 2021/07/20