Skip to contentSkip to conversation

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

PATCH Superseded Oliver Upton 2 participants 3 messages Jun 26

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
target/arm/ptw.c +6 -2
index 1470de3010..4a7aeb140c 100644
@@ -1414,9 +1414,13 @@ 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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 34 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 | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
target/arm/ptw.c +6 -2
index 1470de3010..4a7aeb140c 100644
@@ -1414,9 +1414,13 @@ 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];
  }
Quoted 1 line

base-commit: 8f1d3b586f1265023f75ea9c227c35d463321aef

Braces required for the IF. Otherwise,

r~

#2 lore raw
Quoted 33 lines · Richard Henderson
Quoted 32 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 | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
target/arm/ptw.c +6 -2
index 1470de3010..4a7aeb140c 100644
@@ -1414,9 +1414,13 @@ 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];
  }
 
Quoted 3 lines
Quoted 1 line

base-commit: 8f1d3b586f1265023f75ea9c227c35d463321aef

Braces required for the IF. Otherwise,

Kernel style, my bad.

Quoted 1 line

thanks!

Signature · 2 lines
Best,
Oliver