Skip to contentSkip to conversation

target/arm: Only evaluate SCR_EL3.PIEN if ARM_FEATURE_EL3 is present

PATCH Applied Oliver Upton 2 participants 2 messages Jun 26 – Jul 3

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 target/arm: Only evaluate SCR_EL3.PIEN if ARM_FEATURE_EL3 is present

Running KVM with (as of writing, out-of-tree) support for FEAT_S2PIE on -cpu max gets stuck in an infinite loop of stage-2 permission faults due to the PTW incorrectly using an effective value of 0 for S2PIR_EL2.

Similar to how S1PIE is handled, only use the IMPLEMENTATION SPECIFIC value of 0 for S2PIR_EL2 if EL3 is implemented and PIEN=0.

Fixes a811c5dafb ("target/arm: Implement get_S2prot_indirect")
---
 target/arm/ptw.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
target/arm/ptw.c +7 -2
index 1470de3010..51affba0bf 100644
@@ -1414,9 +1414,14 @@ static int get_S2prot_indirect(CPUARMState *env, GetPhysAddrResult *result,
                   PAGE_READ | PAGE_WRITE },
     };
 
-    uint64_t pir = (env->cp15.scr_el3 & SCR_PIEN ? env->cp15.s2pir_el2 : 0);
-    int s2pi = extract64(pir, pi_index * 4, 4);
+    uint64_t pir = env->cp15.s2pir_el2;
+    int s2pi;
 
+    if (arm_feature(env, ARM_FEATURE_EL3) && !(env->cp15.scr_el3 & SCR_PIEN)) {
+	pir = 0;
+    }
+
+    s2pi = extract64(pir, pi_index * 4, 4);
     result->f.prot = perm_table[s2pi][2];
     return perm_table[s2pi][s1_is_el0];
 }

base-commit: 8f1d3b586f1265023f75ea9c227c35d463321aef

Signature · 1 line
2.47.3
#1 lore raw
Quoted 20 lines · Oliver Upton

Running KVM with (as of writing, out-of-tree) support for FEAT_S2PIE on -cpu max gets stuck in an infinite loop of stage-2 permission faults due to the PTW incorrectly using an effective value of 0 for S2PIR_EL2.

Similar to how S1PIE is handled, only use the IMPLEMENTATION SPECIFIC value of 0 for S2PIR_EL2 if EL3 is implemented and PIEN=0.

Fixes a811c5dafb ("target/arm: Implement get_S2prot_indirect")
---
 target/arm/ptw.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
target/arm/ptw.c +0 -0
index 1470de3010..51affba0bf 100644

target/arm/ptw.c static int get_S2prot_indirect(CPUARMState *env, GetPhysAddrResult *result, · line 1421

Quoted 10 lines
target/arm/ptw.c +4 -2
@@ -1414,9 +1414,14 @@ static int get_S2prot_indirect(CPUARMState *env, GetPhysAddrResult *result,
                   PAGE_READ | PAGE_WRITE },
     };
 
-    uint64_t pir = (env->cp15.scr_el3 & SCR_PIEN ? env->cp15.s2pir_el2 : 0);
-    int s2pi = extract64(pir, pi_index * 4, 4);
+    uint64_t pir = env->cp15.s2pir_el2;
+    int s2pi;
 
+    if (arm_feature(env, ARM_FEATURE_EL3) && !(env->cp15.scr_el3 & SCR_PIEN)) {
+       pir = 0;

There's a hardcoded tab lurking here. checkpatch.pl will warn you about those.

target/arm/ptw.c static int get_S2prot_indirect(CPUARMState *env, GetPhysAddrResult *result, · line 1427

Quoted 6 lines
target/arm/ptw.c +3 -0
+    }
+
+    s2pi = extract64(pir, pi_index * 4, 4);
     result->f.prot = perm_table[s2pi][2];
     return perm_table[s2pi][s1_is_el0];
 }

Applied to target-arm.next, thanks. I added a Cc:stable tag so we backport it to the stable branches later.

-- PMM