[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/17] translate-all: introduce assert_no_pages_l
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [PATCH v3 12/17] translate-all: introduce assert_no_pages_locked |
Date: |
Mon, 21 May 2018 19:39:22 -0400 |
The appended adds assertions to make sure we do not longjmp with page
locks held. Note that user-mode has nothing to check, since page_locks
are !user-mode only.
Signed-off-by: Emilio G. Cota <address@hidden>
---
include/exec/exec-all.h | 8 ++++++++
accel/tcg/cpu-exec.c | 1 +
accel/tcg/translate-all.c | 7 +++++++
3 files changed, 16 insertions(+)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 3fad93b..66902f7 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -434,6 +434,14 @@ void tb_lock(void);
void tb_unlock(void);
void tb_lock_reset(void);
+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_DEBUG_TCG)
+void assert_no_pages_locked(void);
+#else
+static inline void assert_no_pages_locked(void)
+{
+}
+#endif
+
#if !defined(CONFIG_USER_ONLY)
struct MemoryRegion *iotlb_to_region(CPUState *cpu,
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 7b934a6..ad1f0c4 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -274,6 +274,7 @@ void cpu_exec_step_atomic(CPUState *cpu)
tcg_debug_assert(!have_mmap_lock());
#endif
tb_lock_reset();
+ assert_no_pages_locked();
}
if (in_exclusive_region) {
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 8286203..f3a0ecb 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -658,6 +658,12 @@ do_assert_page_locked(const PageDesc *pd, const char
*file, int line)
#define assert_page_locked(pd) do_assert_page_locked(pd, __FILE__, __LINE__)
+void assert_no_pages_locked(void)
+{
+ ht_pages_locked_debug_init();
+ g_assert(g_hash_table_size(ht_pages_locked_debug) == 0);
+}
+
#else /* !CONFIG_DEBUG_TCG */
#define assert_page_locked(pd)
@@ -828,6 +834,7 @@ page_collection_lock(tb_page_addr_t start, tb_page_addr_t
end)
set->tree = g_tree_new_full(tb_page_addr_cmp, NULL, NULL,
page_entry_destroy);
set->max = NULL;
+ assert_no_pages_locked();
retry:
g_tree_foreach(set->tree, page_entry_lock, NULL);
--
2.7.4
- [Qemu-devel] [PATCH v3 00/17] tcg: tb_lock removal redux v3, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 04/17] tcg: move tb_ctx.tb_phys_invalidate_count to tcg_ctx, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 07/17] translate-all: remove hole in PageDesc, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 12/17] translate-all: introduce assert_no_pages_locked,
Emilio G. Cota <=
- [Qemu-devel] [PATCH v3 06/17] translate-all: make l1_map lockless, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 08/17] translate-all: work page-by-page in tb_invalidate_phys_range_1, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 15/17] cputlb: remove tb_lock from tlb_flush functions, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 05/17] translate-all: iterate over TBs in a page with PAGE_FOR_EACH_TB, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 16/17] translate-all: remove tb_lock mention from cpu_restore_state_from_tb, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 13/17] translate-all: discard TB when tb_link_page returns an existing matching TB, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 03/17] tcg: track TBs with per-region BST's, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 10/17] translate-all: use per-page locking in !user-mode, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 01/17] qht: require a default comparison function, Emilio G. Cota, 2018/05/21
- [Qemu-devel] [PATCH v3 09/17] translate-all: move tb_invalidate_phys_page_range up in the file, Emilio G. Cota, 2018/05/21