motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-03 07:21:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/riscv: Move leaf pte processing out of level loop

Browse source 
Move the code that never loops outside of the loop.
Unchain the if-return-else statements.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
Tested-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Message-Id: <20230325105429.1142530-21-richard.henderson@linaro.org>
Message-Id: <20230412114333.118895-21-richard.henderson@linaro.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Richard Henderson 2023-04-12 13:43:28 +02:00 • committed by Alistair Francis
parent 8d6a00cdc0
commit 59688aa023
1 changed files with 125 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

100
target/riscv/cpu_helper.c
View file

@ -865,6 +865,8 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,
} }
int ptshift = (levels - 1) * ptidxbits; int ptshift = (levels - 1) * ptidxbits;
target_ulong pte;
hwaddr pte_addr;
int i; int i;
#if !TCG_OVERSIZED_GUEST #if !TCG_OVERSIZED_GUEST
@ -881,7 +883,6 @@ restart:
} }
/* check that physical address of PTE is legal */ /* check that physical address of PTE is legal */
hwaddr pte_addr;
if (two_stage && first_stage) { if (two_stage && first_stage) {
int vbase_prot; int vbase_prot;
@ -913,7 +914,6 @@ restart:
return TRANSLATE_PMP_FAIL; return TRANSLATE_PMP_FAIL;
} }
target_ulong pte;
if (riscv_cpu_mxl(env) == MXL_RV32) { if (riscv_cpu_mxl(env) == MXL_RV32) {
pte = address_space_ldl(cs->as, pte_addr, attrs, &res); pte = address_space_ldl(cs->as, pte_addr, attrs, &res);
} else { } else {
@ -938,43 +938,65 @@ restart:
if (!(pte & PTE_V)) { if (!(pte & PTE_V)) {
/* Invalid PTE */ /* Invalid PTE */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if (!pbmte && (pte & PTE_PBMT)) { }
return TRANSLATE_FAIL; if (pte & (PTE_R | PTE_W | PTE_X)) {
} else if (!(pte & (PTE_R | PTE_W | PTE_X))) { goto leaf;
}
/* Inner PTE, continue walking */ /* Inner PTE, continue walking */
if (pte & (PTE_D | PTE_A | PTE_U | PTE_ATTR)) { if (pte & (PTE_D | PTE_A | PTE_U | PTE_ATTR)) {
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} }
base = ppn << PGSHIFT; base = ppn << PGSHIFT;
} else if ((pte & (PTE_R | PTE_W | PTE_X)) == PTE_W) { }
/* Reserved leaf PTE flags: PTE_W */
/* No leaf pte at any translation level. */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if ((pte & (PTE_R | PTE_W | PTE_X)) == (PTE_W | PTE_X)) {
/* Reserved leaf PTE flags: PTE_W + PTE_X */ leaf:
return TRANSLATE_FAIL; if (ppn & ((1ULL << ptshift) - 1)) {
} else if ((pte & PTE_U) && ((mode != PRV_U) &&
(!sum || access_type == MMU_INST_FETCH))) {
/* User PTE flags when not U mode and mstatus.SUM is not set,
or the access type is an instruction fetch */
return TRANSLATE_FAIL;
} else if (!(pte & PTE_U) && (mode != PRV_S)) {
/* Supervisor PTE flags when not S mode */
return TRANSLATE_FAIL;
} else if (ppn & ((1ULL << ptshift) - 1)) {
/* Misaligned PPN */ /* Misaligned PPN */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if (access_type == MMU_DATA_LOAD && !((pte & PTE_R) || }
((pte & PTE_X) && mxr))) { if (!pbmte && (pte & PTE_PBMT)) {
/* Reserved without Svpbmt. */
return TRANSLATE_FAIL;
}
if ((pte & (PTE_R | PTE_W | PTE_X)) == PTE_W) {
/* Reserved leaf PTE flags: PTE_W */
return TRANSLATE_FAIL;
}
if ((pte & (PTE_R | PTE_W | PTE_X)) == (PTE_W | PTE_X)) {
/* Reserved leaf PTE flags: PTE_W + PTE_X */
return TRANSLATE_FAIL;
}
if ((pte & PTE_U) &&
((mode != PRV_U) && (!sum || access_type == MMU_INST_FETCH))) {
/*
* User PTE flags when not U mode and mstatus.SUM is not set,
* or the access type is an instruction fetch.
*/
return TRANSLATE_FAIL;
}
if (!(pte & PTE_U) && (mode != PRV_S)) {
/* Supervisor PTE flags when not S mode */
return TRANSLATE_FAIL;
}
if (access_type == MMU_DATA_LOAD &&
!((pte & PTE_R) || ((pte & PTE_X) && mxr))) {
/* Read access check failed */ /* Read access check failed */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if (access_type == MMU_DATA_STORE && !(pte & PTE_W)) { }
if (access_type == MMU_DATA_STORE && !(pte & PTE_W)) {
/* Write access check failed */ /* Write access check failed */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if (access_type == MMU_INST_FETCH && !(pte & PTE_X)) { }
if (access_type == MMU_INST_FETCH && !(pte & PTE_X)) {
/* Fetch access check failed */ /* Fetch access check failed */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else { }
/* if necessary, set accessed and dirty bits. */
/* If necessary, set accessed and dirty bits. */
target_ulong updated_pte = pte | PTE_A | target_ulong updated_pte = pte | PTE_A |
(access_type == MMU_DATA_STORE ? PTE_D : 0); (access_type == MMU_DATA_STORE ? PTE_D : 0);
@ -997,8 +1019,7 @@ restart:
mr = address_space_translate(cs->as, pte_addr, &addr1, &l, mr = address_space_translate(cs->as, pte_addr, &addr1, &l,
false, MEMTXATTRS_UNSPECIFIED); false, MEMTXATTRS_UNSPECIFIED);
if (memory_region_is_ram(mr)) { if (memory_region_is_ram(mr)) {
target_ulong *pte_pa = target_ulong *pte_pa = qemu_map_ram_ptr(mr->ram_block, addr1);
qemu_map_ram_ptr(mr->ram_block, addr1);
#if TCG_OVERSIZED_GUEST #if TCG_OVERSIZED_GUEST
/* /*
* MTTCG is not enabled on oversized TCG guests so * MTTCG is not enabled on oversized TCG guests so
@ -1006,27 +1027,22 @@ restart:
*/ */
*pte_pa = pte = updated_pte; *pte_pa = pte = updated_pte;
#else #else
target_ulong old_pte = target_ulong old_pte = qatomic_cmpxchg(pte_pa, pte, updated_pte);
qatomic_cmpxchg(pte_pa, pte, updated_pte);
if (old_pte != pte) { if (old_pte != pte) {
goto restart; goto restart;
} else {
pte = updated_pte;
} }
pte = updated_pte;
#endif #endif
} else { } else {
/* /*
* misconfigured PTE in ROM (AD bits are not preset) or * Misconfigured PTE in ROM (AD bits are not preset) or
* PTE is in IO space and can't be updated atomically * PTE is in IO space and can't be updated atomically.
*/ */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} }
} }
/* /* For superpage mappings, make a fake leaf PTE for the TLB's benefit. */
* for superpage mappings, make a fake leaf PTE for the TLB's
* benefit.
*/
target_ulong vpn = addr >> PGSHIFT; target_ulong vpn = addr >> PGSHIFT;
if (riscv_cpu_cfg(env)->ext_svnapot && (pte & PTE_N)) { if (riscv_cpu_cfg(env)->ext_svnapot && (pte & PTE_N)) {
@ -1049,17 +1065,13 @@ restart:
*prot |= PAGE_EXEC; *prot |= PAGE_EXEC;
} }
/* /*
* add write permission on stores or if the page is already dirty, * Add write permission on stores or if the page is already dirty,
* so that we TLB miss on later writes to update the dirty bit * so that we TLB miss on later writes to update the dirty bit.
*/ */
if ((pte & PTE_W) && if ((pte & PTE_W) && (access_type == MMU_DATA_STORE || (pte & PTE_D))) {
(access_type == MMU_DATA_STORE || (pte & PTE_D))) {
*prot |= PAGE_WRITE; *prot |= PAGE_WRITE;
} }
return TRANSLATE_SUCCESS; return TRANSLATE_SUCCESS;
}
}
return TRANSLATE_FAIL;
} }
static void raise_mmu_exception(CPURISCVState *env, target_ulong address, static void raise_mmu_exception(CPURISCVState *env, target_ulong address,