The appended adds assertions to make sure we do not longjmp with page
locks held. Some notes:
- user-mode has nothing to check, since page_locks are !user-mode only.
- The checks only apply to page collections, since these have relatively
complex callers.
- Some simple page_lock/unlock callers have been left unchecked --
namely page_lock_tb, tb_phys_invalidate and tb_link_page.
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
Signed-off-by: Emilio G. Cota <c...@braap.org>
---
include/exec/exec-all.h | 8 ++++++++
accel/tcg/cpu-exec.c | 1 +
accel/tcg/translate-all.c | 20 ++++++++++++++++++++
3 files changed, 29 insertions(+)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index aeaa127..7911e69 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -431,6 +431,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_page_collection_locked(bool val);
+#else
+static inline void assert_page_collection_locked(bool val)
+{
+}
+#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 778801a..6a3a21d 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -271,6 +271,7 @@ void cpu_exec_step_atomic(CPUState *cpu)
tcg_debug_assert(!have_mmap_lock());
#endif
tb_lock_reset();
+ assert_page_collection_locked(false);
}
if (in_exclusive_region) {
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 29bc1da..f8862f6 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -666,6 +666,18 @@ do_assert_page_locked(const PageDesc *pd, const char
*file, int line)
#define assert_page_locked(pd) do_assert_page_locked(pd, __FILE__, __LINE__)
+static __thread bool page_collection_locked;
+
+void assert_page_collection_locked(bool val)
+{
+ tcg_debug_assert(page_collection_locked == val);
+}
+
+static inline void set_page_collection_locked(bool val)
+{
+ page_collection_locked = val;
+}
+
#else /* !CONFIG_DEBUG_TCG */
#define assert_page_locked(pd)
@@ -678,6 +690,10 @@ static inline void page_unlock__debug(const PageDesc *pd)
{
}
+static inline void set_page_collection_locked(bool val)
+{
+}
+
#endif /* CONFIG_DEBUG_TCG */
static inline void page_lock(PageDesc *pd)
@@ -754,6 +770,7 @@ static void do_page_entry_lock(struct page_entry *pe)
page_lock(pe->pd);
g_assert(!pe->locked);
pe->locked = true;
+ set_page_collection_locked(true);
}
static gboolean page_entry_lock(gpointer key, gpointer value, gpointer data)
@@ -846,6 +863,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_page_collection_locked(false);
retry:
g_tree_foreach(set->tree, page_entry_lock, NULL);
@@ -864,6 +882,7 @@ page_collection_lock(tb_page_addr_t start, tb_page_addr_t
end)
page_trylock_add(set, tb->page_addr[1]))) {
/* drop all locks, and reacquire in order */
g_tree_foreach(set->tree, page_entry_unlock, NULL);
+ set_page_collection_locked(false);
goto retry;
}
}
@@ -876,6 +895,7 @@ void page_collection_unlock(struct page_collection *set)
/* entries are unlocked and freed via page_entry_destroy */
g_tree_destroy(set->tree);
g_free(set);
+ set_page_collection_locked(false);
}
#endif /* !CONFIG_USER_ONLY */
--
2.7.4
