ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm: Use get_phys_addr_with_struct in S1_ptw_translate 

Do not provide a fast-path for physical addresses,
as those will need to be validated for GPC.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230620124418.805717-15-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2023-06-23 11:15:47 +01:00 committed by Peter Maydell
parent 4a7d7702cd
commit fe4a5472cc
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/arm/ptw.c
View File

@ -264,7 +264,6 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
* From gdbstub, do not use softmmu so that we don't modify the * From gdbstub, do not use softmmu so that we don't modify the
* state of the cpu at all, including softmmu tlb contents. * state of the cpu at all, including softmmu tlb contents.
*/ */
if (regime_is_stage2(s2_mmu_idx)) {
S1Translate s2ptw = { S1Translate s2ptw = {
.in_mmu_idx = s2_mmu_idx, .in_mmu_idx = s2_mmu_idx,
.in_ptw_idx = ptw_idx_for_stage_2(env, s2_mmu_idx), .in_ptw_idx = ptw_idx_for_stage_2(env, s2_mmu_idx),
@ -276,25 +275,16 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
}; };
GetPhysAddrResult s2 = { }; GetPhysAddrResult s2 = { };
if (get_phys_addr_lpae(env, &s2ptw, addr, MMU_DATA_LOAD, if (get_phys_addr_with_struct(env, &s2ptw, addr,
false, &s2, fi)) { MMU_DATA_LOAD, &s2, fi)) {
goto fail; goto fail;
} }
ptw->out_phys = s2.f.phys_addr; ptw->out_phys = s2.f.phys_addr;
pte_attrs = s2.cacheattrs.attrs; pte_attrs = s2.cacheattrs.attrs;
ptw->out_secure = s2.f.attrs.secure;
ptw->out_space = s2.f.attrs.space;
} else {
/* Regime is physical. */
ptw->out_phys = addr;
pte_attrs = 0;
ptw->out_secure = s2_mmu_idx == ARMMMUIdx_Phys_S;
ptw->out_space = (s2_mmu_idx == ARMMMUIdx_Phys_S ? ARMSS_Secure
: space == ARMSS_Realm ? ARMSS_Realm
: ARMSS_NonSecure);
}
ptw->out_host = NULL; ptw->out_host = NULL;
ptw->out_rw = false; ptw->out_rw = false;
ptw->out_secure = s2.f.attrs.secure;
ptw->out_space = s2.f.attrs.space;
} else { } else {
#ifdef CONFIG_TCG #ifdef CONFIG_TCG
CPUTLBEntryFull *full; CPUTLBEntryFull *full;