bdaf61259a
Update to v2.4.0 OBS-URL: https://build.opensuse.org/request/show/329598 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=271
160 lines
4.1 KiB
Diff
160 lines
4.1 KiB
Diff
From 66d948dc1ca00cf95af18a77f0db061f657956a9 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Thu, 5 Jul 2012 17:31:39 +0200
|
|
Subject: [PATCH] linux-user: lock tcg
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The tcg code generator is not thread safe. Lock its generation between
|
|
different threads.
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
[AF: Rebased onto exec.c/translate-all.c split for 1.4]
|
|
[AF: Rebased for v2.1.0-rc0]
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
linux-user/mmap.c | 3 +++
|
|
tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++--
|
|
tcg/tcg.h | 6 ++++++
|
|
3 files changed, 43 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
|
|
index 5fd32f1..38f1cdd 100644
|
|
--- a/linux-user/mmap.c
|
|
+++ b/linux-user/mmap.c
|
|
@@ -30,6 +30,7 @@
|
|
|
|
#include "qemu.h"
|
|
#include "qemu-common.h"
|
|
+#include "tcg.h"
|
|
#include "translate-all.h"
|
|
|
|
//#define DEBUG_MMAP
|
|
@@ -41,6 +42,7 @@ void mmap_lock(void)
|
|
{
|
|
if (mmap_lock_count++ == 0) {
|
|
pthread_mutex_lock(&mmap_mutex);
|
|
+ tcg_lock();
|
|
}
|
|
}
|
|
|
|
@@ -48,6 +50,7 @@ void mmap_unlock(void)
|
|
{
|
|
if (--mmap_lock_count == 0) {
|
|
pthread_mutex_unlock(&mmap_mutex);
|
|
+ tcg_unlock();
|
|
}
|
|
}
|
|
|
|
diff --git a/tcg/tcg.c b/tcg/tcg.c
|
|
index 0892a9b..f67c38c 100644
|
|
--- a/tcg/tcg.c
|
|
+++ b/tcg/tcg.c
|
|
@@ -39,6 +39,8 @@
|
|
#include "qemu-common.h"
|
|
#include "qemu/host-utils.h"
|
|
#include "qemu/timer.h"
|
|
+#include "config-host.h"
|
|
+#include "qemu/thread.h"
|
|
|
|
/* Note: the long term plan is to reduce the dependencies on the QEMU
|
|
CPU definitions. Currently they are used for qemu_ld/st
|
|
@@ -123,6 +125,29 @@ const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
|
|
static TCGRegSet tcg_target_available_regs[2];
|
|
static TCGRegSet tcg_target_call_clobber_regs;
|
|
|
|
+#ifdef CONFIG_USER_ONLY
|
|
+static __thread int tcg_lock_count;
|
|
+#endif
|
|
+void tcg_lock(void)
|
|
+{
|
|
+#ifdef CONFIG_USER_ONLY
|
|
+ TCGContext *s = &tcg_ctx;
|
|
+ if (tcg_lock_count++ == 0) {
|
|
+ qemu_mutex_lock(&s->lock);
|
|
+ }
|
|
+#endif
|
|
+}
|
|
+
|
|
+void tcg_unlock(void)
|
|
+{
|
|
+#ifdef CONFIG_USER_ONLY
|
|
+ TCGContext *s = &tcg_ctx;
|
|
+ if (--tcg_lock_count == 0) {
|
|
+ qemu_mutex_unlock(&s->lock);
|
|
+ }
|
|
+#endif
|
|
+}
|
|
+
|
|
#if TCG_TARGET_INSN_UNIT_SIZE == 1
|
|
static __attribute__((unused)) inline void tcg_out8(TCGContext *s, uint8_t v)
|
|
{
|
|
@@ -333,7 +358,8 @@ void tcg_context_init(TCGContext *s)
|
|
|
|
memset(s, 0, sizeof(*s));
|
|
s->nb_globals = 0;
|
|
-
|
|
+ qemu_mutex_init(&s->lock);
|
|
+
|
|
/* Count total number of arguments and allocate the corresponding
|
|
space */
|
|
total_args = 0;
|
|
@@ -2422,10 +2448,12 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
|
|
}
|
|
#endif
|
|
|
|
+ tcg_lock();
|
|
tcg_gen_code_common(s, gen_code_buf, -1);
|
|
|
|
/* flush instruction cache */
|
|
flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr);
|
|
+ tcg_unlock();
|
|
|
|
return tcg_current_code_size(s);
|
|
}
|
|
@@ -2437,7 +2465,11 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
|
|
int tcg_gen_code_search_pc(TCGContext *s, tcg_insn_unit *gen_code_buf,
|
|
long offset)
|
|
{
|
|
- return tcg_gen_code_common(s, gen_code_buf, offset);
|
|
+ int r;
|
|
+ tcg_lock();
|
|
+ r = tcg_gen_code_common(s, gen_code_buf, offset);
|
|
+ tcg_unlock();
|
|
+ return r;
|
|
}
|
|
|
|
#ifdef CONFIG_PROFILER
|
|
diff --git a/tcg/tcg.h b/tcg/tcg.h
|
|
index 231a781..e0806f9 100644
|
|
--- a/tcg/tcg.h
|
|
+++ b/tcg/tcg.h
|
|
@@ -27,6 +27,7 @@
|
|
|
|
#include "qemu-common.h"
|
|
#include "qemu/bitops.h"
|
|
+#include "qemu/thread.h"
|
|
#include "tcg-target.h"
|
|
|
|
#define CPU_TEMP_BUF_NLONGS 128
|
|
@@ -572,6 +573,8 @@ struct TCGContext {
|
|
target_ulong gen_opc_pc[OPC_BUF_SIZE];
|
|
uint16_t gen_opc_icount[OPC_BUF_SIZE];
|
|
uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
|
|
+
|
|
+ QemuMutex lock;
|
|
};
|
|
|
|
extern TCGContext tcg_ctx;
|
|
@@ -760,6 +763,9 @@ void tcg_gen_callN(TCGContext *s, void *func,
|
|
void tcg_op_remove(TCGContext *s, TCGOp *op);
|
|
void tcg_optimize(TCGContext *s);
|
|
|
|
+extern void tcg_lock(void);
|
|
+extern void tcg_unlock(void);
|
|
+
|
|
/* only used for debugging purposes */
|
|
void tcg_dump_ops(TCGContext *s);
|
|
|