[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/18] translate-all: introduce assert_no_pages_locke
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 13/18] translate-all: introduce assert_no_pages_locked |
Date: |
Thu, 14 Jun 2018 09:31:42 -1000 |
From: "Emilio G. Cota" <address@hidden>
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.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <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 a647cf8841..b9e3018aee 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -435,6 +435,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 7570c59f09..d75c35380a 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -273,6 +273,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 8b378586f4..c75298d08a 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)
@@ -829,6 +835,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.17.1
- [Qemu-devel] [PULL 03/18] qht: return existing entry when qht_insert fails, (continued)
- [Qemu-devel] [PULL 03/18] qht: return existing entry when qht_insert fails, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 02/18] qht: require a default comparison function, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 04/18] tcg: track TBs with per-region BST's, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 06/18] translate-all: iterate over TBs in a page with PAGE_FOR_EACH_TB, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 05/18] tcg: move tb_ctx.tb_phys_invalidate_count to tcg_ctx, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 07/18] translate-all: make l1_map lockless, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 09/18] translate-all: work page-by-page in tb_invalidate_phys_range_1, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 08/18] translate-all: remove hole in PageDesc, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 10/18] translate-all: move tb_invalidate_phys_page_range up in the file, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 11/18] translate-all: use per-page locking in !user-mode, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 13/18] translate-all: introduce assert_no_pages_locked,
Richard Henderson <=
- [Qemu-devel] [PULL 12/18] translate-all: add page_locked assertions, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 14/18] translate-all: discard TB when tb_link_page returns an existing matching TB, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 15/18] translate-all: protect TB jumps with a per-destination-TB lock, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 16/18] cputlb: remove tb_lock from tlb_flush functions, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 17/18] translate-all: remove tb_lock mention from cpu_restore_state_from_tb, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 18/18] tcg: remove tb_lock, Richard Henderson, 2018/06/14
- Re: [Qemu-devel] [PULL 00/18] tcg queued patches, Peter Maydell, 2018/06/15