[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v14 10/24] tcg: enable tb_lock() for SoftMMU
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v14 10/24] tcg: enable tb_lock() for SoftMMU |
Date: |
Thu, 23 Feb 2017 18:29:13 +0000 |
tb_lock() has long been used for linux-user mode to protect code
generation. By enabling it now we prepare for MTTCG and ensure all code
generation is serialised by this lock. The other major structure that
needs protecting is the l1_map and its PageDesc structures. For the
SoftMMU case we also use tb_lock() to protect these structures instead
of linux-user mmap_lock() which as the name suggests serialises updates
to the structure as a result of guest mmap operations.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
v4
- split from main tcg: enable thread-per-vCPU patch
v7
- fixed up with Pranith's tcg_debug_assert() changes
---
translate-all.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/translate-all.c b/translate-all.c
index f810259c41..9bac061c9b 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -75,7 +75,7 @@
* mmap_lock.
*/
#ifdef CONFIG_SOFTMMU
-#define assert_memory_lock() do { /* nothing */ } while (0)
+#define assert_memory_lock() tcg_debug_assert(have_tb_lock)
#else
#define assert_memory_lock() tcg_debug_assert(have_mmap_lock())
#endif
@@ -135,9 +135,7 @@ TCGContext tcg_ctx;
bool parallel_cpus;
/* translation block context */
-#ifdef CONFIG_USER_ONLY
__thread int have_tb_lock;
-#endif
static void page_table_config_init(void)
{
@@ -159,40 +157,29 @@ static void page_table_config_init(void)
assert(v_l2_levels >= 0);
}
-#ifdef CONFIG_USER_ONLY
#define assert_tb_locked() tcg_debug_assert(have_tb_lock)
#define assert_tb_unlocked() tcg_debug_assert(!have_tb_lock)
-#else
-#define assert_tb_locked() do { /* nothing */ } while (0)
-#define assert_tb_unlocked() do { /* nothing */ } while (0)
-#endif
void tb_lock(void)
{
-#ifdef CONFIG_USER_ONLY
assert_tb_unlocked();
qemu_mutex_lock(&tcg_ctx.tb_ctx.tb_lock);
have_tb_lock++;
-#endif
}
void tb_unlock(void)
{
-#ifdef CONFIG_USER_ONLY
assert_tb_locked();
have_tb_lock--;
qemu_mutex_unlock(&tcg_ctx.tb_ctx.tb_lock);
-#endif
}
void tb_lock_reset(void)
{
-#ifdef CONFIG_USER_ONLY
if (have_tb_lock) {
qemu_mutex_unlock(&tcg_ctx.tb_ctx.tb_lock);
have_tb_lock = 0;
}
-#endif
}
static TranslationBlock *tb_find_pc(uintptr_t tc_ptr);
--
2.11.0
- [Qemu-devel] [PATCH v14 00/24] MTTCG Base enabling patches with ARM enablement, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 02/24] mttcg: translate-all: Enable locking debug in a debug build, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 04/24] tcg: move TCG_MO/BAR types into own file, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 03/24] mttcg: Add missing tb_lock/unlock() in cpu_exec_step(), Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 01/24] docs: new design document multi-thread-tcg.txt, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 06/24] tcg: add kick timer for single-threaded vCPU emulation, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 05/24] tcg: add options for enabling MTTCG, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 11/24] tcg: enable thread-per-vCPU, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 12/24] tcg: handle EXCP_ATOMIC exception for system emulation, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 07/24] tcg: rename tcg_current_cpu to tcg_current_rr_cpu, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 10/24] tcg: enable tb_lock() for SoftMMU,
Alex Bennée <=
- [Qemu-devel] [PATCH v14 13/24] cputlb: add assert_cpu_is_self checks, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 09/24] tcg: remove global exit_request, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 14/24] cputlb: tweak qemu_ram_addr_from_host_nofail reporting, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 08/24] tcg: drop global lock during TCG code execution, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 18/24] cputlb: atomically update tlb fields used by tlb_reset_dirty, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 15/24] cputlb: introduce tlb_flush_* async work., Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 16/24] cputlb and arm/sparc targets: convert mmuidx flushes from varg to bitmap, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 21/24] target-arm: don't generate WFE/YIELD calls for MTTCG, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 24/24] tcg: enable MTTCG by default for ARM on x86 hosts, Alex Bennée, 2017/02/23
- [Qemu-devel] [PATCH v14 17/24] cputlb: add tlb_flush_by_mmuidx async routines, Alex Bennée, 2017/02/23