| Message ID | 20190618151809.259038-2-james.morse@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dad6321ffacadbd1235faaf84897b63050b81a5f |
| Headers | show |
| Series | KVM: arm64: Skip more of the SError vaxorcism | expand |
diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index d9a55503fab7..017ec4189a08 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -186,6 +186,8 @@ abort_guest_exit_start: .global abort_guest_exit_end abort_guest_exit_end: + msr daifset, #4 // Mask aborts + // If the exception took place, restore the EL1 exception // context so that we can report some information. // Merge the exception code with the SError pending bit.
KVM consumes any SError that were pending during guest exit with a dsb/isb and unmasking SError. It currently leaves SError unmasked for the rest of world-switch. This means any SError that occurs during this part of world-switch will cause a hyp-panic. We'd much prefer it to remain pending until we return to the host. Signed-off-by: James Morse <james.morse@arm.com> --- arch/arm64/kvm/hyp/entry.S | 2 ++ 1 file changed, 2 insertions(+)