OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

oslib-posix: take lock before qemu_cond_broadcast

Browse Source 
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>
This commit is contained in:
Bauerchen 2020-04-06 10:36:54 +08:00 committed by Paolo Bonzini
parent 9a709f06c8
commit 278fb16273
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/oslib-posix.c
View File

@ -492,8 +492,11 @@ static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
QEMU_THREAD_JOINABLE); QEMU_THREAD_JOINABLE);
addr += memset_thread[i].numpages * hpagesize; addr += memset_thread[i].numpages * hpagesize;
} }
qemu_mutex_lock(&page_mutex);
threads_created_flag = true; threads_created_flag = true;
qemu_cond_broadcast(&page_cond); qemu_cond_broadcast(&page_cond);
qemu_mutex_unlock(&page_mutex);
for (i = 0; i < memset_num_threads; i++) { for (i = 0; i < memset_num_threads; i++) {
qemu_thread_join(&memset_thread[i].pgthread); qemu_thread_join(&memset_thread[i].pgthread);