From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Bauerchen <bauerchen@tencent.com>
Subject: [PULL 2/8] oslib-posix: take lock before qemu_cond_broadcast
Date: Sat, 11 Apr 2020 09:03:24 -0400 [thread overview]
Message-ID: <20200411130330.1993-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20200411130330.1993-1-pbonzini@redhat.com>
From: Bauerchen <bauerchen@tencent.com>
In touch_all_pages, if the mutex is not taken around qemu_cond_broadcast,
qemu_cond_broadcast may be called before all touch page threads enter
qemu_cond_wait. In this case, the touch page threads wait forever for the
main thread to wake them up, causing a deadlock.
Signed-off-by: Bauerchen <bauerchen@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
util/oslib-posix.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 4dd6d7d4b4..062236a1ab 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -492,8 +492,11 @@ static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
QEMU_THREAD_JOINABLE);
addr += memset_thread[i].numpages * hpagesize;
}
+
+ qemu_mutex_lock(&page_mutex);
threads_created_flag = true;
qemu_cond_broadcast(&page_cond);
+ qemu_mutex_unlock(&page_mutex);
for (i = 0; i < memset_num_threads; i++) {
qemu_thread_join(&memset_thread[i].pgthread);
--
2.18.2
next prev parent reply other threads:[~2020-04-11 13:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-11 13:03 [PULL 0/8] Misc patches for QEMU 5.0-rc3 Paolo Bonzini
2020-04-11 13:03 ` [PULL 1/8] piix: fix xenfv regression, add compat machine xenfv-4.2 Paolo Bonzini
2020-04-11 13:03 ` Paolo Bonzini [this message]
2020-04-11 13:03 ` [PULL 3/8] atomics: convert to reStructuredText Paolo Bonzini
2020-04-11 13:03 ` [PULL 4/8] atomics: update documentation Paolo Bonzini
2020-04-11 13:03 ` [PULL 5/8] rcu: do not mention atomic_mb_read/set in documentation Paolo Bonzini
2020-04-11 13:03 ` [PULL 6/8] vl.c: error out if -mem-path is used together with -M memory-backend Paolo Bonzini
2020-04-11 13:03 ` [PULL 7/8] memory: Do not allow direct write access to rom_device regions Paolo Bonzini
2020-04-11 13:03 ` [PULL 8/8] module: increase dirs array size by one Paolo Bonzini
2020-04-11 16:54 ` [PULL 0/8] Misc patches for QEMU 5.0-rc3 Peter Maydell
2020-04-14 7:36 ` Igor Mammedov
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=20200411130330.1993-3-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=bauerchen@tencent.com \
--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).