[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 2/6] blkdebug: move post-resume handling to resume_req_by_tag
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v5 2/6] blkdebug: move post-resume handling to resume_req_by_tag |
Date: |
Mon, 14 Jun 2021 10:29:27 +0200 |
We want to move qemu_coroutine_yield() after the loop on rules,
because QLIST_FOREACH_SAFE is wrong if the rule list is modified
while the coroutine has yielded. Therefore move the suspended
request to the heap and clean it up from the remove side.
All that is left is for blkdebug_debug_event to handle the
yielding.
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>
---
block/blkdebug.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 5ccbfcab42..e8fdf7b056 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -775,25 +775,20 @@ static void blkdebug_close(BlockDriverState *bs)
static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule)
{
BDRVBlkdebugState *s = bs->opaque;
- BlkdebugSuspendedReq r;
+ BlkdebugSuspendedReq *r;
- r = (BlkdebugSuspendedReq) {
- .co = qemu_coroutine_self(),
- .tag = g_strdup(rule->options.suspend.tag),
- };
+ r = g_new(BlkdebugSuspendedReq, 1);
+
+ r->co = qemu_coroutine_self();
+ r->tag = g_strdup(rule->options.suspend.tag);
remove_rule(rule);
- QLIST_INSERT_HEAD(&s->suspended_reqs, &r, next);
+ QLIST_INSERT_HEAD(&s->suspended_reqs, r, next);
if (!qtest_enabled()) {
- printf("blkdebug: Suspended request '%s'\n", r.tag);
+ printf("blkdebug: Suspended request '%s'\n", r->tag);
}
qemu_coroutine_yield();
- if (!qtest_enabled()) {
- printf("blkdebug: Resuming request '%s'\n", r.tag);
- }
-
- g_free(r.tag);
}
static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
@@ -880,8 +875,18 @@ retry:
*/
QLIST_FOREACH(r, &s->suspended_reqs, next) {
if (!strcmp(r->tag, tag)) {
+ Coroutine *co = r->co;
+
+ if (!qtest_enabled()) {
+ printf("blkdebug: Resuming request '%s'\n", r->tag);
+ }
+
QLIST_REMOVE(r, next);
- qemu_coroutine_enter(r->co);
+ g_free(r->tag);
+ g_free(r);
+
+ qemu_coroutine_enter(co);
+
if (all) {
goto retry;
}
--
2.31.1
- [PATCH v5 0/6] blkdebug: fix racing condition when iterating on, Emanuele Giuseppe Esposito, 2021/06/14
- [PATCH v5 1/6] blkdebug: refactor removal of a suspended request, Emanuele Giuseppe Esposito, 2021/06/14
- [PATCH v5 2/6] blkdebug: move post-resume handling to resume_req_by_tag,
Emanuele Giuseppe Esposito <=
- [PATCH v5 3/6] blkdebug: track all actions, Emanuele Giuseppe Esposito, 2021/06/14
- [PATCH v5 4/6] blkdebug: do not suspend in the middle of QLIST_FOREACH_SAFE, Emanuele Giuseppe Esposito, 2021/06/14
- [PATCH v5 5/6] block/blkdebug: remove new_state field and instead use a local variable, Emanuele Giuseppe Esposito, 2021/06/14
- [PATCH v5 6/6] blkdebug: protect rules and suspended_reqs with a lock, Emanuele Giuseppe Esposito, 2021/06/14