26bac7170d
Update to 2.5.0 OBS-URL: https://build.opensuse.org/request/show/354829 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=284
123 lines
3.7 KiB
Diff
123 lines
3.7 KiB
Diff
From 0ca59d2290fa0a06cf51a159549461ab0b71bf5e Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Wed, 11 Jul 2012 16:47:42 +0200
|
|
Subject: [PATCH] linux-user: lock tb flushing too
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
[AF: Rebased onto exec.c/translate-all.c split for 1.4]
|
|
[AF: Rebased onto tb_alloc() changes for v2.5.0-rc0]
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
translate-all.c | 20 ++++++++++++++++++--
|
|
1 file changed, 18 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/translate-all.c b/translate-all.c
|
|
index 042a857..8d0d1a6 100644
|
|
--- a/translate-all.c
|
|
+++ b/translate-all.c
|
|
@@ -767,17 +767,21 @@ static TranslationBlock *tb_alloc(target_ulong pc)
|
|
{
|
|
TranslationBlock *tb;
|
|
|
|
+ tcg_lock();
|
|
if (tcg_ctx.tb_ctx.nb_tbs >= tcg_ctx.code_gen_max_blocks) {
|
|
+ tcg_unlock();
|
|
return NULL;
|
|
}
|
|
tb = &tcg_ctx.tb_ctx.tbs[tcg_ctx.tb_ctx.nb_tbs++];
|
|
tb->pc = pc;
|
|
tb->cflags = 0;
|
|
+ tcg_unlock();
|
|
return tb;
|
|
}
|
|
|
|
void tb_free(TranslationBlock *tb)
|
|
{
|
|
+ tcg_lock();
|
|
/* In practice this is mostly used for single use temporary TB
|
|
Ignore the hard cases and just back up if this TB happens to
|
|
be the last one generated. */
|
|
@@ -786,6 +790,7 @@ void tb_free(TranslationBlock *tb)
|
|
tcg_ctx.code_gen_ptr = tb->tc_ptr;
|
|
tcg_ctx.tb_ctx.nb_tbs--;
|
|
}
|
|
+ tcg_unlock();
|
|
}
|
|
|
|
static inline void invalidate_page_bitmap(PageDesc *p)
|
|
@@ -839,6 +844,7 @@ void tb_flush(CPUState *cpu)
|
|
((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)) /
|
|
tcg_ctx.tb_ctx.nb_tbs : 0);
|
|
#endif
|
|
+ tcg_lock();
|
|
if ((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)
|
|
> tcg_ctx.code_gen_buffer_size) {
|
|
cpu_abort(cpu, "Internal error: code buffer overflow\n");
|
|
@@ -856,6 +862,7 @@ void tb_flush(CPUState *cpu)
|
|
/* XXX: flush processor icache at this point if cache flush is
|
|
expensive */
|
|
tcg_ctx.tb_ctx.tb_flush_count++;
|
|
+ tcg_unlock();
|
|
}
|
|
|
|
#ifdef DEBUG_TB_CHECK
|
|
@@ -1212,8 +1219,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
|
|
int current_flags = 0;
|
|
#endif /* TARGET_HAS_PRECISE_SMC */
|
|
|
|
+ tcg_lock();
|
|
p = page_find(start >> TARGET_PAGE_BITS);
|
|
if (!p) {
|
|
+ tcg_unlock();
|
|
return;
|
|
}
|
|
#if defined(TARGET_HAS_PRECISE_SMC)
|
|
@@ -1298,6 +1307,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
|
|
cpu_resume_from_signal(cpu, NULL);
|
|
}
|
|
#endif
|
|
+ tcg_unlock();
|
|
}
|
|
|
|
/* len must be <= 8 and start must be a multiple of len */
|
|
@@ -1515,13 +1525,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
|
|
{
|
|
int m_min, m_max, m;
|
|
uintptr_t v;
|
|
- TranslationBlock *tb;
|
|
+ TranslationBlock *tb, *r;
|
|
|
|
+ tcg_lock();
|
|
if (tcg_ctx.tb_ctx.nb_tbs <= 0) {
|
|
+ tcg_unlock();
|
|
return NULL;
|
|
}
|
|
if (tc_ptr < (uintptr_t)tcg_ctx.code_gen_buffer ||
|
|
tc_ptr >= (uintptr_t)tcg_ctx.code_gen_ptr) {
|
|
+ tcg_unlock();
|
|
return NULL;
|
|
}
|
|
/* binary search (cf Knuth) */
|
|
@@ -1532,6 +1545,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
|
|
tb = &tcg_ctx.tb_ctx.tbs[m];
|
|
v = (uintptr_t)tb->tc_ptr;
|
|
if (v == tc_ptr) {
|
|
+ tcg_unlock();
|
|
return tb;
|
|
} else if (tc_ptr < v) {
|
|
m_max = m - 1;
|
|
@@ -1539,7 +1553,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
|
|
m_min = m + 1;
|
|
}
|
|
}
|
|
- return &tcg_ctx.tb_ctx.tbs[m_max];
|
|
+ r = &tcg_ctx.tb_ctx.tbs[m_max];
|
|
+ tcg_unlock();
|
|
+ return r;
|
|
}
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|