[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.0 v4 13/21] target/arm: Handle no-execute for Realm and Roo
From: |
Richard Henderson |
Subject: |
[PATCH for-8.0 v4 13/21] target/arm: Handle no-execute for Realm and Root regimes |
Date: |
Mon, 27 Feb 2023 13:01:14 -1000 |
While Root and Realm may read and write data from other spaces,
neither may execute from other pa spaces.
This happens for Stage1 EL3, EL2, EL2&0, and Stage2 EL1&0.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/ptw.c | 52 ++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 887c91ed13..2eae7a69cb 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -911,7 +911,7 @@ do_fault:
* @xn: XN (execute-never) bits
* @s1_is_el0: true if this is S2 of an S1+2 walk for EL0
*/
-static int get_S2prot(CPUARMState *env, int s2ap, int xn, bool s1_is_el0)
+static int get_S2prot_noexecute(int s2ap)
{
int prot = 0;
@@ -921,6 +921,12 @@ static int get_S2prot(CPUARMState *env, int s2ap, int xn,
bool s1_is_el0)
if (s2ap & 2) {
prot |= PAGE_WRITE;
}
+ return prot;
+}
+
+static int get_S2prot(CPUARMState *env, int s2ap, int xn, bool s1_is_el0)
+{
+ int prot = get_S2prot_noexecute(s2ap);
if (cpu_isar_feature(any_tts2uxn, env_archcpu(env))) {
switch (xn) {
@@ -986,9 +992,39 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx,
bool is_aa64,
}
}
- if (out_pa == ARMSS_NonSecure && in_pa == ARMSS_Secure &&
- (env->cp15.scr_el3 & SCR_SIF)) {
- return prot_rw;
+ if (in_pa != out_pa) {
+ switch (in_pa) {
+ case ARMSS_Root:
+ /*
+ * R_ZWRVD: permission fault for insn fetched from non-Root,
+ * I_WWBFB: SIF has no effect in EL3.
+ */
+ return prot_rw;
+ case ARMSS_Realm:
+ /*
+ * R_PKTDS: permission fault for insn fetched from non-Realm,
+ * for Realm EL2 or EL2&0. The corresponding fault for EL1&0
+ * happens during any stage2 translation.
+ */
+ switch (mmu_idx) {
+ case ARMMMUIdx_E2:
+ case ARMMMUIdx_E20_0:
+ case ARMMMUIdx_E20_2:
+ case ARMMMUIdx_E20_2_PAN:
+ return prot_rw;
+ default:
+ break;
+ }
+ break;
+ case ARMSS_Secure:
+ if (env->cp15.scr_el3 & SCR_SIF) {
+ return prot_rw;
+ }
+ break;
+ default:
+ /* Input NonSecure must have output NonSecure. */
+ g_assert_not_reached();
+ }
}
/* TODO have_wxn should be replaced with
@@ -1565,12 +1601,16 @@ static bool get_phys_addr_lpae(CPUARMState *env,
S1Translate *ptw,
/*
* R_GYNXY: For stage2 in Realm security state, bit 55 is NS.
* The bit remains ignored for other security states.
+ * R_YMCSL: Executing an insn fetched from non-Realm causes
+ * a stage2 permission fault.
*/
if (out_space == ARMSS_Realm && extract64(attrs, 55, 1)) {
out_space = ARMSS_NonSecure;
+ result->f.prot = get_S2prot_noexecute(ap);
+ } else {
+ xn = extract64(attrs, 53, 2);
+ result->f.prot = get_S2prot(env, ap, xn, s1_is_el0);
}
- xn = extract64(attrs, 53, 2);
- result->f.prot = get_S2prot(env, ap, xn, s1_is_el0);
} else {
int nse, ns = extract32(attrs, 5, 1);
switch (out_space) {
--
2.34.1
- [PATCH for-8.0 v4 07/21] target/arm: Adjust the order of Phys and Stage2 ARMMMUIdx, (continued)
- [PATCH for-8.0 v4 07/21] target/arm: Adjust the order of Phys and Stage2 ARMMMUIdx, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 11/21] target/arm: NSTable is RES0 for the RME EL3 regime, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 10/21] target/arm: Pipe ARMSecuritySpace through ptw.c, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 16/21] target/arm: Use get_phys_addr_with_struct for stage2, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 09/21] target/arm: Remove __attribute__((nonnull)) from ptw.c, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 15/21] target/arm: Move s1_is_el0 into S1Translate, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 14/21] target/arm: Use get_phys_addr_with_struct in S1_ptw_translate, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 17/21] target/arm: Add GPC syndrome, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 12/21] target/arm: Handle Block and Page bits for security space, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 18/21] target/arm: Implement GPC exceptions, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 13/21] target/arm: Handle no-execute for Realm and Root regimes,
Richard Henderson <=
- [PATCH for-8.0 v4 21/21] NOTFORMERGE hw/arm/virt: Add some memory for Realm Management Monitor, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 19/21] target/arm: Implement the granule protection check, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 20/21] NOTFORMERGE target/arm: Enable RME for -cpu max, Richard Henderson, 2023/02/27
- Re: [PATCH for-8.0 v4 00/21] target/arm: Implement FEAT_RME, Richard Henderson, 2023/02/27