04929fcdcd
Add xen_disk discard support (olh), backport VMDK SCSI change from v1.6.2 maintenance update and update syscall numbers OBS-URL: https://build.opensuse.org/request/show/221154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=179
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From a49f495d192db43703e5e5f567673c27d96a720e Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Fri, 13 Jan 2012 17:05:41 +0100
|
|
Subject: [PATCH] linux-user: fix segfault deadlock
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When entering the guest we take a lock to ensure that nobody else messes
|
|
with our TB chaining while we're doing it. If we get a segfault inside that
|
|
code, we manage to work on, but will not unlock the lock.
|
|
|
|
This patch forces unlocking of that lock in the segv handler. I'm not sure
|
|
this is the right approach though. Maybe we should rather make sure we don't
|
|
segfault in the code? I would greatly appreciate someone more intelligible
|
|
than me to look at this :).
|
|
|
|
Example code to trigger this is at: http://csgraf.de/tmp/conftest.c
|
|
|
|
Reported-by: Fabio Erculiani <lxnay@sabayon.org>
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
include/exec/spinlock.h | 10 ++++++++++
|
|
user-exec.c | 4 ++++
|
|
2 files changed, 14 insertions(+)
|
|
|
|
diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
|
|
index a72edda..e460e12 100644
|
|
--- a/include/exec/spinlock.h
|
|
+++ b/include/exec/spinlock.h
|
|
@@ -24,6 +24,12 @@
|
|
#include <pthread.h>
|
|
#define spin_lock pthread_mutex_lock
|
|
#define spin_unlock pthread_mutex_unlock
|
|
+static inline void spin_unlock_safe(pthread_mutex_t *lock)
|
|
+{
|
|
+ /* unlocking an unlocked mutex results in undefined behavior */
|
|
+ pthread_mutex_trylock(lock);
|
|
+ pthread_mutex_unlock(lock);
|
|
+}
|
|
#define spinlock_t pthread_mutex_t
|
|
#define SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
|
|
|
|
@@ -46,4 +52,8 @@ static inline void spin_unlock(spinlock_t *lock)
|
|
{
|
|
}
|
|
|
|
+static inline void spin_unlock_safe(spinlock_t *lock)
|
|
+{
|
|
+}
|
|
+
|
|
#endif
|
|
diff --git a/user-exec.c b/user-exec.c
|
|
index 82bfa66..dd46019 100644
|
|
--- a/user-exec.c
|
|
+++ b/user-exec.c
|
|
@@ -89,6 +89,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
|
|
qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
|
|
pc, address, is_write, *(unsigned long *)old_set);
|
|
#endif
|
|
+
|
|
+ /* Maybe we're still holding the TB fiddling lock? */
|
|
+ spin_unlock_safe(&tcg_ctx.tb_ctx.tb_lock);
|
|
+
|
|
/* XXX: locking issue */
|
|
if (is_write && h2g_valid(address)
|
|
&& page_unprotect(h2g(address), pc, puc)) {
|