KVM: arm64: Sync SCTLR_EL1 when injecting an exception into a pVM
Fuad Tabba
reviewerPATCH v2 1/1 KVM: arm64: Sync SCTLR_EL1 when injecting an exception into a pVM
When pKVM injects a synchronous exception into a protected guest, enter_exception64() reads SCTLR_EL1 to set the new PSTATE's PAN and SSBS bits. pKVM refreshes VBAR_EL1 from the live value before injecting but not SCTLR_EL1, which is untrapped for protected guests, so a guest that updates it and then traps takes the exception with stale PAN/SSBS.
Sync SCTLR_EL1 alongside VBAR_EL1.
---
Changes since v1 [1]:
- Rebased onto v7.2-rc4; no functional change.
[1] https://lore.kernel.org/all/[email protected]/
arch/arm64/kvm/hyp/nvhe/sys_regs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/kvm/hyp/nvhe/sys_regs.c +3 -2
@@ -257,10 +257,11 @@ static void inject_sync64(struct kvm_vcpu *vcpu, u64 esr) *vcpu_cpsr (vcpu) =read_sysreg_el2 (SYS_SPSR );/* -* Make sure we have the latest update to VBAR_EL1, as pKVM -* handles traps very early, before sysregs are resync'ed +* Sync VBAR_EL1 and SCTLR_EL1, both read by enter_exception64(), +* as pKVM handles traps before sysregs are resync'ed. */ __vcpu_assign_sys_reg (vcpu,VBAR_EL1 ,read_sysreg_el1 (SYS_VBAR )); +__vcpu_assign_sys_reg (vcpu,SCTLR_EL1 ,read_sysreg_el1 (SYS_SCTLR ));kvm_pend_exception (vcpu,EXCEPT_AA64_EL1_SYNC );
base-commit: 1590cf0329716306e948a8fc29f1d3ee87d3989f
Signature · 1 line
2.39.5
Quoted 9 lines · Fuad Tabba
When pKVM injects a synchronous exception into a protected guest,
enter_exception64()readsSCTLR_EL1to set the new PSTATE's PAN and SSBS bits. pKVM refreshesVBAR_EL1from the live value before injecting but notSCTLR_EL1, which is untrapped for protected guests, so a guest that updates it and then traps takes the exception with stale PAN/SSBS.Sync
SCTLR_EL1alongsideVBAR_EL1.[...]
Applied to next, thanks!
[1/1] KVM: arm64: Sync SCTLR_EL1 when injecting an exception into a pVM
https://git.kernel.org/kvmarm/kvmarm/c/596289fe4836
--
Best,
Oliver