[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/15] cpus: be more paranoid in avoiding deadlocks
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 15/15] cpus: be more paranoid in avoiding deadlocks |
Date: |
Mon, 2 Mar 2015 11:08:54 +0100 |
For good measure, ensure that the following sequence:
thread 1 calls qemu_mutex_lock_iothread
thread 2 calls qemu_mutex_lock_iothread
VCPU thread are created
VCPU thread enters execution loop
results in the VCPU threads letting the other two threads run
and obeying iothread_requesting_mutex even if the VCPUs are
not halted. To do this, check iothread_requesting_mutex
before execution starts.
Tested-by: Leon Alrae <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpus.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cpus.c b/cpus.c
index 83c078e..0fac143 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1025,6 +1025,9 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
}
}
+ /* process any pending work */
+ exit_request = 1;
+
while (1) {
tcg_exec_all();
@@ -1115,10 +1118,11 @@ bool qemu_in_vcpu_thread(void)
void qemu_mutex_lock_iothread(void)
{
+ atomic_inc(&iothread_requesting_mutex);
if (!tcg_enabled() || !first_cpu) {
qemu_mutex_lock(&qemu_global_mutex);
+ atomic_dec(&iothread_requesting_mutex);
} else {
- atomic_inc(&iothread_requesting_mutex);
if (qemu_mutex_trylock(&qemu_global_mutex)) {
qemu_cpu_kick_thread(first_cpu);
qemu_mutex_lock(&qemu_global_mutex);
--
2.3.0
- [Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd', (continued)
- [Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd', Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 06/15] Add specific config options for PCI-E bridges, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 07/15] Create specific config option for "platform-bus", Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 08/15] Give ivshmem its own config option, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 01/15] scsi: give device a parent before setting properties, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 09/15] iscsi: Handle write protected case in reopen, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 13/15] virtio-scsi: Allocate op blocker reason before blocking, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 10/15] Makefile: fix up parallel building under MSYS+MinGW, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 11/15] Makefile: don't silence mak file test with V=1, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 14/15] cpus: fix deadlock and segfault in qemu_mutex_lock_iothread, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 15/15] cpus: be more paranoid in avoiding deadlocks,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/15] Makefile.target: binary depends on config-devices, Paolo Bonzini, 2015/03/02
- Re: [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02, Eric Blake, 2015/03/02
- Re: [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02, Peter Maydell, 2015/03/03