[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] translate-all: add DEBUG_LOCKING asserts
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/14] translate-all: add DEBUG_LOCKING asserts |
Date: |
Mon, 31 Oct 2016 15:13:24 +0100 |
From: Alex Bennée <address@hidden>
This adds asserts to check the locking on the various translation
engines structures. There are two sets of structures that are protected
by locks.
The first the l1map and PageDesc structures used to track which
translation blocks are associated with which physical addresses. In
user-mode this is covered by the mmap_lock.
The second case are TB context related structures which are protected by
tb_lock which is also user-mode only.
Currently the asserts do nothing in SoftMMU mode but this will change
for MTTCG.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
bsd-user/mmap.c | 5 +++++
include/exec/exec-all.h | 1 +
linux-user/mmap.c | 5 +++++
translate-all.c | 41 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 52 insertions(+)
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 610f91b..ee59073 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -42,6 +42,11 @@ void mmap_unlock(void)
}
}
+bool have_mmap_lock(void)
+{
+ return mmap_lock_count > 0 ? true : false;
+}
+
/* Grab lock to make sure things are in a consistent state after fork(). */
void mmap_fork_start(void)
{
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index cb624e4..4d36ee3 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -369,6 +369,7 @@ void tlb_fill(CPUState *cpu, target_ulong addr,
MMUAccessType access_type,
#if defined(CONFIG_USER_ONLY)
void mmap_lock(void);
void mmap_unlock(void);
+bool have_mmap_lock(void);
static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1,
target_ulong addr)
{
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index ffd099d..61685bf 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -41,6 +41,11 @@ void mmap_unlock(void)
}
}
+bool have_mmap_lock(void)
+{
+ return mmap_lock_count > 0 ? true : false;
+}
+
/* Grab lock to make sure things are in a consistent state after fork(). */
void mmap_fork_start(void)
{
diff --git a/translate-all.c b/translate-all.c
index f35522e..5aded3d 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -31,6 +31,7 @@
#include "tcg.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
+#include "exec/exec-all.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/param.h>
#if __FreeBSD_version >= 700104
@@ -58,6 +59,7 @@
/* #define DEBUG_TB_INVALIDATE */
/* #define DEBUG_TB_FLUSH */
+/* #define DEBUG_LOCKING */
/* make various TB consistency checks */
/* #define DEBUG_TB_CHECK */
@@ -66,6 +68,28 @@
#undef DEBUG_TB_CHECK
#endif
+/* Access to the various translations structures need to be serialised via
locks
+ * for consistency. This is automatic for SoftMMU based system
+ * emulation due to its single threaded nature. In user-mode emulation
+ * access to the memory related structures are protected with the
+ * mmap_lock.
+ */
+#ifdef DEBUG_LOCKING
+#define DEBUG_MEM_LOCKS 1
+#else
+#define DEBUG_MEM_LOCKS 0
+#endif
+
+#ifdef CONFIG_SOFTMMU
+#define assert_memory_lock() do { /* nothing */ } while (0)
+#else
+#define assert_memory_lock() do { \
+ if (DEBUG_MEM_LOCKS) { \
+ g_assert(have_mmap_lock()); \
+ } \
+ } while (0)
+#endif
+
#define SMC_BITMAP_USE_THRESHOLD 10
typedef struct PageDesc {
@@ -173,6 +197,23 @@ void tb_lock_reset(void)
#endif
}
+#ifdef DEBUG_LOCKING
+#define DEBUG_TB_LOCKS 1
+#else
+#define DEBUG_TB_LOCKS 0
+#endif
+
+#ifdef CONFIG_SOFTMMU
+#define assert_tb_lock() do { /* nothing */ } while (0)
+#else
+#define assert_tb_lock() do { \
+ if (DEBUG_TB_LOCKS) { \
+ g_assert(have_tb_lock); \
+ } \
+ } while (0)
+#endif
+
+
static TranslationBlock *tb_find_pc(uintptr_t tc_ptr);
void cpu_gen_init(void)
--
2.7.4
- [Qemu-devel] [PULL 00/14] MTTCG patches for 2016-10-31, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 04/14] cpu-exec: include cpu_index in CPU_LOG_EXEC messages, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 03/14] translate-all: add DEBUG_LOCKING asserts,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/14] linux-user/elfload: ensure mmap_lock() held while setting up, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 05/14] tcg: comment on which functions have to be called with tb_lock held, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 02/14] translate_all: DEBUG_FLUSH -> DEBUG_TB_FLUSH, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 01/14] cpus: make all_vcpus_paused() return bool, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 08/14] tcg: protect translation related stuff with tb_lock., Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 07/14] translate-all: Add assert_(memory|tb)_lock annotations, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 11/14] tcg: cpus rm tcg_exec_all(), Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 10/14] tcg: move tcg_exec_all and helpers above thread fn, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 12/14] cpus: re-factor out handle_icount_deadline, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 09/14] target-arm/arm-powerctl: wake up sleeping CPUs, Paolo Bonzini, 2016/10/31