[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/8] oslib-posix: take lock before qemu_cond_broadcast
From: |
Paolo Bonzini |
Subject: |
[PULL 2/8] oslib-posix: take lock before qemu_cond_broadcast |
Date: |
Sat, 11 Apr 2020 09:03:24 -0400 |
From: Bauerchen <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [PULL 0/8] Misc patches for QEMU 5.0-rc3, Paolo Bonzini, 2020/04/11
- [PULL 1/8] piix: fix xenfv regression, add compat machine xenfv-4.2, Paolo Bonzini, 2020/04/11
- [PULL 2/8] oslib-posix: take lock before qemu_cond_broadcast,
Paolo Bonzini <=
- [PULL 4/8] atomics: update documentation, Paolo Bonzini, 2020/04/11
- [PULL 6/8] vl.c: error out if -mem-path is used together with -M memory-backend, Paolo Bonzini, 2020/04/11
- [PULL 5/8] rcu: do not mention atomic_mb_read/set in documentation, Paolo Bonzini, 2020/04/11
- [PULL 8/8] module: increase dirs array size by one, Paolo Bonzini, 2020/04/11
- [PULL 7/8] memory: Do not allow direct write access to rom_device regions, Paolo Bonzini, 2020/04/11
- [PULL 3/8] atomics: convert to reStructuredText, Paolo Bonzini, 2020/04/11
- Re: [PULL 0/8] Misc patches for QEMU 5.0-rc3, Peter Maydell, 2020/04/11
- Re: [PULL 0/8] Misc patches for QEMU 5.0-rc3, Igor Mammedov, 2020/04/14