From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Emanuele Giuseppe Esposito <eesposit@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH v3 4/5] blkdebug: do not suspend in the middle of QLIST_FOREACH_SAFE
Date: Mon, 17 May 2021 16:50:48 +0200 [thread overview]
Message-ID: <20210517145049.55268-5-eesposit@redhat.com> (raw)
In-Reply-To: <20210517145049.55268-1-eesposit@redhat.com>
That would be unsafe in case a rule other than the current one
is removed while the coroutine has yielded.
Keep FOREACH_SAFE because suspend_request deletes the current rule.
After this patch, *all* matching rules are deleted before suspending
the coroutine, rather than just one.
This doesn't affect the existing testcases.
Use actions_count to see how many yield to issue.
Co-developed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
block/blkdebug.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 388b5ed615..dffd869b32 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -789,7 +789,6 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule)
if (!qtest_enabled()) {
printf("blkdebug: Suspended request '%s'\n", r->tag);
}
- qemu_coroutine_yield();
}
static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
@@ -834,6 +833,12 @@ static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event)
QLIST_FOREACH_SAFE(rule, &s->rules[event], next, next) {
process_rule(bs, rule, actions_count);
}
+
+ while (actions_count[ACTION_SUSPEND] > 0) {
+ qemu_coroutine_yield();
+ actions_count[ACTION_SUSPEND]--;
+ }
+
s->state = s->new_state;
}
--
2.30.2
next prev parent reply other threads:[~2021-05-17 14:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 14:50 [PATCH v3 0/5] blkdebug: fix racing condition when iterating on Emanuele Giuseppe Esposito
2021-05-17 14:50 ` [PATCH v3 1/5] blkdebug: refactor removal of a suspended request Emanuele Giuseppe Esposito
2021-05-31 19:44 ` Vladimir Sementsov-Ogievskiy
2021-05-17 14:50 ` [PATCH v3 2/5] blkdebug: move post-resume handling to resume_req_by_tag Emanuele Giuseppe Esposito
2021-05-31 19:50 ` Vladimir Sementsov-Ogievskiy
2021-05-17 14:50 ` [PATCH v3 3/5] blkdebug: track all actions Emanuele Giuseppe Esposito
2021-05-31 19:57 ` Vladimir Sementsov-Ogievskiy
2021-05-17 14:50 ` Emanuele Giuseppe Esposito [this message]
2021-06-01 7:58 ` [PATCH v3 4/5] blkdebug: do not suspend in the middle of QLIST_FOREACH_SAFE Vladimir Sementsov-Ogievskiy
2021-05-17 14:50 ` [PATCH v3 5/5] blkdebug: protect rules and suspended_reqs with a lock Emanuele Giuseppe Esposito
2021-06-01 8:39 ` Vladimir Sementsov-Ogievskiy
2021-06-02 12:59 ` Emanuele Giuseppe Esposito
2021-06-02 13:24 ` Vladimir Sementsov-Ogievskiy
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=20210517145049.55268-5-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@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).