Skip to content

Commit 5dcd0fd

Browse files
James MorseMarc Zyngier
authored andcommitted
KVM: arm64: Defer guest entry when an asynchronous exception is pending
SError that occur during world-switch's entry to the guest will be accounted to the guest, as the exception is masked until we enter the guest... but we want to attribute the SError as precisely as possible. Reading DISR_EL1 before guest entry requires free registers, and using ESB+DISR_EL1 to consume and read back the ESR would leave KVM holding a host SError... We would rather leave the SError pending and let the host take it once we exit world-switch. To do this, we need to defer guest-entry if an SError is pending. Read the ISR to see if SError (or an IRQ) is pending. If so fake an exit. Place this check between __guest_enter()'s save of the host registers, and restore of the guest's. SError that occur between here and the eret into the guest must have affected the guest's registers, which we can naturally attribute to the guest. The dsb is needed to ensure any previous writes have been done before we read ISR_EL1. On systems without the v8.2 RAS extensions this doesn't give us anything as we can't contain errors, and the ESR bits to describe the severity are all implementation-defined. Replace this with a nop for these systems. Signed-off-by: James Morse <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
1 parent 0e5b9c0 commit 5dcd0fd

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

arch/arm64/kvm/hyp/entry.S

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <linux/linkage.h>
88

9+
#include <asm/alternative.h>
910
#include <asm/asm-offsets.h>
1011
#include <asm/assembler.h>
1112
#include <asm/fpsimdmacros.h>
@@ -52,6 +53,20 @@ ENTRY(__guest_enter)
5253
// Store the host regs
5354
save_callee_saved_regs x1
5455

56+
// Now the host state is stored if we have a pending RAS SError it must
57+
// affect the host. If any asynchronous exception is pending we defer
58+
// the guest entry. The DSB isn't necessary before v8.2 as any SError
59+
// would be fatal.
60+
alternative_if ARM64_HAS_RAS_EXTN
61+
dsb nshst
62+
isb
63+
alternative_else_nop_endif
64+
mrs x1, isr_el1
65+
cbz x1, 1f
66+
mov x0, #ARM_EXCEPTION_IRQ
67+
ret
68+
69+
1:
5570
add x18, x0, #VCPU_CONTEXT
5671

5772
// Macro ptrauth_switch_to_guest format:

0 commit comments

Comments
 (0)