[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/18] translate-all: move tb_invalidate_phys_page_ra
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 10/18] translate-all: move tb_invalidate_phys_page_range up in the file |
Date: |
Thu, 14 Jun 2018 09:31:39 -1000 |
From: "Emilio G. Cota" <address@hidden>
This greatly simplifies next commit's diff.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
accel/tcg/translate-all.c | 77 ++++++++++++++++++++-------------------
1 file changed, 39 insertions(+), 38 deletions(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index f32904d4a3..83bb40fb20 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -1363,44 +1363,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
return tb;
}
-/*
- * Invalidate all TBs which intersect with the target physical address range
- * [start;end[. NOTE: start and end may refer to *different* physical pages.
- * 'is_cpu_write_access' should be true if called from a real cpu write
- * access: the virtual CPU will exit the current TB if code is modified inside
- * this TB.
- *
- * Called with mmap_lock held for user-mode emulation, grabs tb_lock
- * Called with tb_lock held for system-mode emulation
- */
-static void tb_invalidate_phys_range_1(tb_page_addr_t start, tb_page_addr_t
end)
-{
- tb_page_addr_t next;
-
- for (next = (start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
- start < end;
- start = next, next += TARGET_PAGE_SIZE) {
- tb_page_addr_t bound = MIN(next, end);
-
- tb_invalidate_phys_page_range(start, bound, 0);
- }
-}
-
-#ifdef CONFIG_SOFTMMU
-void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)
-{
- assert_tb_locked();
- tb_invalidate_phys_range_1(start, end);
-}
-#else
-void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)
-{
- assert_memory_lock();
- tb_lock();
- tb_invalidate_phys_range_1(start, end);
- tb_unlock();
-}
-#endif
/*
* Invalidate all TBs which intersect with the target physical address range
* [start;end[. NOTE: start and end must refer to the *same* physical page.
@@ -1500,6 +1462,45 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start,
tb_page_addr_t end,
#endif
}
+/*
+ * Invalidate all TBs which intersect with the target physical address range
+ * [start;end[. NOTE: start and end may refer to *different* physical pages.
+ * 'is_cpu_write_access' should be true if called from a real cpu write
+ * access: the virtual CPU will exit the current TB if code is modified inside
+ * this TB.
+ *
+ * Called with mmap_lock held for user-mode emulation, grabs tb_lock
+ * Called with tb_lock held for system-mode emulation
+ */
+static void tb_invalidate_phys_range_1(tb_page_addr_t start, tb_page_addr_t
end)
+{
+ tb_page_addr_t next;
+
+ for (next = (start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
+ start < end;
+ start = next, next += TARGET_PAGE_SIZE) {
+ tb_page_addr_t bound = MIN(next, end);
+
+ tb_invalidate_phys_page_range(start, bound, 0);
+ }
+}
+
+#ifdef CONFIG_SOFTMMU
+void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)
+{
+ assert_tb_locked();
+ tb_invalidate_phys_range_1(start, end);
+}
+#else
+void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)
+{
+ assert_memory_lock();
+ tb_lock();
+ tb_invalidate_phys_range_1(start, end);
+ tb_unlock();
+}
+#endif
+
#ifdef CONFIG_SOFTMMU
/* len must be <= 8 and start must be a multiple of len.
* Called via softmmu_template.h when code areas are written to with
--
2.17.1
- [Qemu-devel] [PULL 00/18] tcg queued patches, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 01/18] tcg/i386: Use byte form of xgetbv instruction, Richard Henderson, 2018/06/14
- [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 <=
- [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, 2018/06/14
- [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