[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/16] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb
From: |
Richard Henderson |
Subject: |
[PULL 09/16] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb |
Date: |
Tue, 21 Jan 2020 16:49:39 -1000 |
We do not need the entire CPUArchState to compute these values.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
accel/tcg/cputlb.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 500c56d74d..cc6f4c994b 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -80,14 +80,14 @@ QEMU_BUILD_BUG_ON(sizeof(target_ulong) >
sizeof(run_on_cpu_data));
QEMU_BUILD_BUG_ON(NB_MMU_MODES > 16);
#define ALL_MMUIDX_BITS ((1 << NB_MMU_MODES) - 1)
-static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
+static inline size_t tlb_n_entries(CPUTLBDescFast *fast)
{
- return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
+ return (fast->mask >> CPU_TLB_ENTRY_BITS) + 1;
}
-static inline size_t sizeof_tlb(CPUArchState *env, uintptr_t mmu_idx)
+static inline size_t sizeof_tlb(CPUTLBDescFast *fast)
{
- return env_tlb(env)->f[mmu_idx].mask + (1 << CPU_TLB_ENTRY_BITS);
+ return fast->mask + (1 << CPU_TLB_ENTRY_BITS);
}
static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
@@ -156,7 +156,7 @@ static void tlb_dyn_init(CPUArchState *env)
static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
{
CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
- size_t old_size = tlb_n_entries(env, mmu_idx);
+ size_t old_size = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
size_t rate;
size_t new_size = old_size;
int64_t now = get_clock_realtime();
@@ -236,7 +236,8 @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env,
int mmu_idx)
env_tlb(env)->d[mmu_idx].large_page_addr = -1;
env_tlb(env)->d[mmu_idx].large_page_mask = -1;
env_tlb(env)->d[mmu_idx].vindex = 0;
- memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
+ memset(env_tlb(env)->f[mmu_idx].table, -1,
+ sizeof_tlb(&env_tlb(env)->f[mmu_idx]));
memset(env_tlb(env)->d[mmu_idx].vtable, -1,
sizeof(env_tlb(env)->d[0].vtable));
}
@@ -719,7 +720,7 @@ void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1,
ram_addr_t length)
qemu_spin_lock(&env_tlb(env)->c.lock);
for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
unsigned int i;
- unsigned int n = tlb_n_entries(env, mmu_idx);
+ unsigned int n = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
for (i = 0; i < n; i++) {
tlb_reset_dirty_range_locked(&env_tlb(env)->f[mmu_idx].table[i],
--
2.20.1
- [PULL 00/16] tcg patch queue, Richard Henderson, 2020/01/21
- [PULL 01/16] cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN, Richard Henderson, 2020/01/21
- [PULL 02/16] util/cacheinfo: fix crash when compiling with uClibc, Richard Henderson, 2020/01/21
- [PULL 03/16] vl: Remove unused variable in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 04/16] vl: Reduce scope of variables in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 05/16] vl: Remove useless test in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 06/16] vl: Only choose enabled accelerators in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 07/16] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked, Richard Henderson, 2020/01/21
- [PULL 08/16] cputlb: Make tlb_n_entries private to cputlb.c, Richard Henderson, 2020/01/21
- [PULL 09/16] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb,
Richard Henderson <=
- [PULL 10/16] cputlb: Hoist tlb portions in tlb_mmu_resize_locked, Richard Henderson, 2020/01/21
- [PULL 11/16] cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked, Richard Henderson, 2020/01/21
- [PULL 12/16] cputlb: Split out tlb_mmu_flush_locked, Richard Henderson, 2020/01/21
- [PULL 13/16] cputlb: Partially merge tlb_dyn_init into tlb_init, Richard Henderson, 2020/01/21
- [PULL 15/16] cputlb: Hoist timestamp outside of loops over tlbs, Richard Henderson, 2020/01/21
- [PULL 14/16] cputlb: Initialize tlbs as flushed, Richard Henderson, 2020/01/21
- [PULL 16/16] scripts/git.orderfile: Display decodetree before C source, Richard Henderson, 2020/01/21
- Re: [PULL 00/16] tcg patch queue, Peter Maydell, 2020/01/23