KVM: arm64: Save ESR_EL2 on guest SError

When we exit a guest due to an SError the vcpu fault info isn't updated
with the ESR. Today this is only done for traps.

The v8.2 RAS Extensions define ISS values for SError. Update the vcpu's
fault_info with the ESR on SError so that handle_exit() can determine
if this was a RAS SError and decode its severity.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
index b425b8aab45b3aab9077045d843cf875141afb32..036e1f3d77a6be094bf4936c164612487283ea69 100644 (file)
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -239,11 +239,12 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
 
 static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu)
 {
-       u64 esr = read_sysreg_el2(esr);
-       u8 ec = ESR_ELx_EC(esr);
+       u8 ec;
+       u64 esr;
        u64 hpfar, far;
 
-       vcpu->arch.fault.esr_el2 = esr;
+       esr = vcpu->arch.fault.esr_el2;
+       ec = ESR_ELx_EC(esr);
 
        if (ec != ESR_ELx_EC_DABT_LOW && ec != ESR_ELx_EC_IABT_LOW)
                return true;
@@ -336,6 +337,8 @@ again:
        exit_code = __guest_enter(vcpu, host_ctxt);
        /* And we're baaack! */
 
+       if (ARM_EXCEPTION_CODE(exit_code) != ARM_EXCEPTION_IRQ)
+               vcpu->arch.fault.esr_el2 = read_sysreg_el2(esr);
        /*
         * We're using the raw exception code in order to only process
         * the trap if no SError is pending. We will come back to the