From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Kevin Wolf <kwolf@redhat.com>
Subject: [Qemu-devel] [PATCH 3/5] vl: pause vcpus before stopping iothreads
Date: Tue, 13 Feb 2018 17:34:27 +0000 [thread overview]
Message-ID: <20180213173429.19501-4-stefanha@redhat.com> (raw)
In-Reply-To: <20180213173429.19501-1-stefanha@redhat.com>
Commit dce8921b2baaf95974af8176406881872067adfa ("iothread: Stop threads
before main() quits") introduced iothread_stop_all() to avoid the
following virtio-scsi assertion failure:
assert(blk_get_aio_context(d->conf.blk) == s->ctx);
Back then the assertion failed because when bdrv_close_all() made
d->conf.blk NULL, blk_get_aio_context() returned the global AioContext
instead of s->ctx.
The same assertion can still fail today when vcpus submit new I/O
requests after iothread_stop_all() has moved the BDS to the global
AioContext.
This patch hardens the iothread_stop_all() approach by pausing vcpus
before calling iothread_stop_all().
Note that the assertion failure is a race condition. It is not possible
to reproduce it reliably.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180201110708.8080-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
vl.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index 21878496ec..7a5554bc41 100644
--- a/vl.c
+++ b/vl.c
@@ -4767,10 +4767,18 @@ int main(int argc, char **argv, char **envp)
main_loop();
replay_disable_events();
+
+ /* The ordering of the following is delicate. Stop vcpus to prevent new
+ * I/O requests being queued by the guest. Then stop IOThreads (this
+ * includes a drain operation and completes all request processing). At
+ * this point emulated devices are still associated with their IOThreads
+ * (if any) but no longer have any work to do. Only then can we close
+ * block devices safely because we know there is no more I/O coming.
+ */
+ pause_all_vcpus();
iothread_stop_all();
-
- pause_all_vcpus();
bdrv_close_all();
+
res_free();
/* vhost-user must be cleaned up before chardevs. */
--
2.14.3
next prev parent reply other threads:[~2018-02-13 17:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 17:34 [Qemu-devel] [PATCH 0/5] Block patches Stefan Hajnoczi
2018-02-13 17:34 ` [Qemu-devel] [PATCH 1/5] Add a git-publish configuration file Stefan Hajnoczi
2018-02-13 18:09 ` Daniel P. Berrangé
2018-02-14 1:01 ` Fam Zheng
2018-02-14 13:34 ` Stefan Hajnoczi
2018-02-14 13:45 ` Fam Zheng
2018-02-14 15:21 ` Eric Blake
2018-02-14 14:08 ` Paolo Bonzini
2018-02-14 14:27 ` Paolo Bonzini
2018-02-25 6:04 ` Fam Zheng
2018-02-14 17:37 ` Philippe Mathieu-Daudé
2018-02-25 6:05 ` Fam Zheng
2018-02-13 17:34 ` [Qemu-devel] [PATCH 2/5] README: Document 'git-publish' workflow Stefan Hajnoczi
2018-02-13 17:34 ` Stefan Hajnoczi [this message]
2018-02-13 17:34 ` [Qemu-devel] [PATCH 4/5] ratelimit: don't align wait time with slices Stefan Hajnoczi
2018-02-13 17:34 ` [Qemu-devel] [PATCH 5/5] misc: fix spelling Stefan Hajnoczi
2018-02-14 0:48 ` [Qemu-devel] [PATCH 0/5] Block patches Fam Zheng
2018-02-14 13:25 ` Stefan Hajnoczi
2018-02-14 13:58 ` Fam Zheng
2018-02-15 9:39 ` Stefan Hajnoczi
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=20180213173429.19501-4-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.