[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/13] accel/tcg: Restrict page_collection structure to system TB
From: |
Richard Henderson |
Subject: |
[PULL 13/13] accel/tcg: Restrict page_collection structure to system TB maintainance |
Date: |
Fri, 16 Dec 2022 10:53:05 -0800 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Only the system emulation part of TB maintainance uses the
page_collection structure. Restrict its declaration (and the
functions requiring it) to tb-maint.c.
Convert the 'len' argument of tb_invalidate_phys_page_fast__locked()
from signed to unsigned.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221209093649.43738-6-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/internal.h | 7 -------
accel/tcg/tb-maint.c | 15 +++++++--------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
index 8f8c44d06b..6edff16fb0 100644
--- a/accel/tcg/internal.h
+++ b/accel/tcg/internal.h
@@ -36,16 +36,9 @@ void page_table_config_init(void);
#endif
#ifdef CONFIG_SOFTMMU
-struct page_collection;
-void tb_invalidate_phys_page_fast__locked(struct page_collection *pages,
- tb_page_addr_t start, int len,
- uintptr_t retaddr);
-struct page_collection *page_collection_lock(tb_page_addr_t start,
- tb_page_addr_t end);
void tb_invalidate_phys_range_fast(ram_addr_t ram_addr,
unsigned size,
uintptr_t retaddr);
-void page_collection_unlock(struct page_collection *set);
G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
#endif /* CONFIG_SOFTMMU */
diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
index d557013f00..1b8e860647 100644
--- a/accel/tcg/tb-maint.c
+++ b/accel/tcg/tb-maint.c
@@ -513,8 +513,8 @@ static gint tb_page_addr_cmp(gconstpointer ap,
gconstpointer bp, gpointer udata)
* intersecting TBs.
* Locking order: acquire locks in ascending order of page index.
*/
-struct page_collection *
-page_collection_lock(tb_page_addr_t start, tb_page_addr_t end)
+static struct page_collection *page_collection_lock(tb_page_addr_t start,
+ tb_page_addr_t end)
{
struct page_collection *set = g_malloc(sizeof(*set));
tb_page_addr_t index;
@@ -558,7 +558,7 @@ page_collection_lock(tb_page_addr_t start, tb_page_addr_t
end)
return set;
}
-void page_collection_unlock(struct page_collection *set)
+static void page_collection_unlock(struct page_collection *set)
{
/* entries are unlocked and freed via page_entry_destroy */
g_tree_destroy(set->tree);
@@ -1186,9 +1186,9 @@ void tb_invalidate_phys_range(tb_page_addr_t start,
tb_page_addr_t end)
/*
* Call with all @pages in the range [@start, @start + len[ locked.
*/
-void tb_invalidate_phys_page_fast__locked(struct page_collection *pages,
- tb_page_addr_t start, int len,
- uintptr_t retaddr)
+static void tb_invalidate_phys_page_fast__locked(struct page_collection *pages,
+ tb_page_addr_t start,
+ unsigned len, uintptr_t ra)
{
PageDesc *p;
@@ -1198,8 +1198,7 @@ void tb_invalidate_phys_page_fast__locked(struct
page_collection *pages,
}
assert_page_locked(p);
- tb_invalidate_phys_page_range__locked(pages, p, start, start + len,
- retaddr);
+ tb_invalidate_phys_page_range__locked(pages, p, start, start + len, ra);
}
/*
--
2.34.1
- [PULL 02/13] accel/tcg: Rename page_flush_tb, (continued)
- [PULL 02/13] accel/tcg: Rename page_flush_tb, Richard Henderson, 2022/12/16
- [PULL 03/13] accel/tcg: Use interval tree for TBs in user-only mode, Richard Henderson, 2022/12/16
- [PULL 05/13] accel/tcg: Move page_{get,set}_flags to user-exec.c, Richard Henderson, 2022/12/16
- [PULL 07/13] accel/tcg: Move PageDesc tree into tb-maint.c for system, Richard Henderson, 2022/12/16
- [PULL 06/13] accel/tcg: Use interval tree for user-only page tracking, Richard Henderson, 2022/12/16
- [PULL 10/13] accel/tcg: Remove trace events from trace-root.h, Richard Henderson, 2022/12/16
- [PULL 09/13] accel/tcg: Restrict cpu_io_recompile() to system emulation, Richard Henderson, 2022/12/16
- [PULL 08/13] accel/tcg: Move remainder of page locking to tb-maint.c, Richard Henderson, 2022/12/16
- [PULL 11/13] accel/tcg: Rename tb_invalidate_phys_page_fast{, __locked}(), Richard Henderson, 2022/12/16
- [PULL 12/13] accel/tcg: Factor tb_invalidate_phys_range_fast() out, Richard Henderson, 2022/12/16
- [PULL 13/13] accel/tcg: Restrict page_collection structure to system TB maintainance,
Richard Henderson <=
- Re: [PULL 00/13] accel/tcg: Rewrite user-only vma tracking, Peter Maydell, 2022/12/17