[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/25] target/arm: Use get_phys_addr_with_struct in S1_ptw_tra
From: |
Richard Henderson |
Subject: |
[PATCH v3 18/25] target/arm: Use get_phys_addr_with_struct in S1_ptw_translate |
Date: |
Tue, 21 Feb 2023 16:33:29 -1000 |
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>
---
target/arm/ptw.c | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index fc4c1ccf54..8a31af60c9 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -232,29 +232,22 @@ static bool S1_ptw_translate(CPUARMState *env,
S1Translate *ptw,
* From gdbstub, do not use softmmu so that we don't modify the
* state of the cpu at all, including softmmu tlb contents.
*/
- if (regime_is_stage2(s2_mmu_idx)) {
- S1Translate s2ptw = {
- .in_mmu_idx = s2_mmu_idx,
- .in_ptw_idx = arm_space_to_phys(space),
- .in_space = space,
- .in_secure = is_secure,
- .in_debug = true,
- };
- GetPhysAddrResult s2 = { };
+ S1Translate s2ptw = {
+ .in_mmu_idx = s2_mmu_idx,
+ .in_ptw_idx = arm_space_to_phys(space),
+ .in_space = space,
+ .in_secure = is_secure,
+ .in_debug = true,
+ };
+ GetPhysAddrResult s2 = { };
- if (get_phys_addr_lpae(env, &s2ptw, addr, MMU_DATA_LOAD,
- false, &s2, fi)) {
- goto fail;
- }
- ptw->out_phys = s2.f.phys_addr;
- pte_attrs = s2.cacheattrs.attrs;
- pte_secure = s2.f.attrs.secure;
- } else {
- /* Regime is physical. */
- ptw->out_phys = addr;
- pte_attrs = 0;
- pte_secure = is_secure;
+ if (get_phys_addr_with_struct(env, &s2ptw, addr,
+ MMU_DATA_LOAD, &s2, fi)) {
+ goto fail;
}
+ ptw->out_phys = s2.f.phys_addr;
+ pte_attrs = s2.cacheattrs.attrs;
+ pte_secure = s2.f.attrs.secure;
ptw->out_host = NULL;
ptw->out_rw = false;
} else {
--
2.34.1
- Re: [PATCH v3 12/25] target/arm: Introduce ARMMMUIdx_Phys_{Realm,Root}, (continued)
- [PATCH v3 11/25] target/arm: Adjust the order of Phys and Stage2 ARMMMUIdx, Richard Henderson, 2023/02/21
- [PATCH v3 14/25] target/arm: Pipe ARMSecuritySpace through ptw.c, Richard Henderson, 2023/02/21
- [PATCH v3 22/25] target/arm: Implement GPC exceptions, Richard Henderson, 2023/02/21
- [PATCH v3 15/25] target/arm: NSTable is RES0 for the RME EL3 regime, Richard Henderson, 2023/02/21
- [PATCH v3 19/25] target/arm: Move s1_is_el0 into S1Translate, Richard Henderson, 2023/02/21
- [PATCH v3 16/25] target/arm: Handle Block and Page bits for security space, Richard Henderson, 2023/02/21
- [PATCH v3 18/25] target/arm: Use get_phys_addr_with_struct in S1_ptw_translate,
Richard Henderson <=
- [PATCH v3 17/25] target/arm: Handle no-execute for Realm and Root regimes, Richard Henderson, 2023/02/21
- [PATCH v3 20/25] target/arm: Use get_phys_addr_with_struct for stage2, Richard Henderson, 2023/02/21
- [PATCH NOTFORMERGE v3 24/25] target/arm: Enable RME for -cpu max, Richard Henderson, 2023/02/21
- [PATCH v3 21/25] target/arm: Add GPC syndrome, Richard Henderson, 2023/02/21
- [PATCH v3 23/25] target/arm: Implement the granule protection check, Richard Henderson, 2023/02/21
- [PATCH NOTFORMERGE v3 25/25] hw/arm/virt: Add some memory for Realm Management Monitor, Richard Henderson, 2023/02/21