Commit 386627d8 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall

ARM: KVM: Gracefully handle hyp-stubs being restored from under our feet

Should kvm_reboot() be invoked while guest is running, an IPI
wil be issued, forcing the guest to exit and HYP being reset to
the stubs. We will then try to reenter the guest, only to get
an error (HVC_STUB_ERR).

This patch allows this case to be gracefully handled by exiting
the run loop.
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 4d5f9c14
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define ARM_EXCEPTION_IRQ 5 #define ARM_EXCEPTION_IRQ 5
#define ARM_EXCEPTION_FIQ 6 #define ARM_EXCEPTION_FIQ 6
#define ARM_EXCEPTION_HVC 7 #define ARM_EXCEPTION_HVC 7
#define ARM_EXCEPTION_HYP_GONE HVC_STUB_ERR
/* /*
* The rr_lo_hi macro swaps a pair of registers depending on * The rr_lo_hi macro swaps a pair of registers depending on
* current endianness. It is used in conjunction with ldrd and strd * current endianness. It is used in conjunction with ldrd and strd
......
...@@ -160,6 +160,14 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, ...@@ -160,6 +160,14 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
case ARM_EXCEPTION_DATA_ABORT: case ARM_EXCEPTION_DATA_ABORT:
kvm_inject_vabt(vcpu); kvm_inject_vabt(vcpu);
return 1; return 1;
case ARM_EXCEPTION_HYP_GONE:
/*
* HYP has been reset to the hyp-stub. This happens
* when a guest is pre-empted by kvm_reboot()'s
* shutdown call.
*/
run->exit_reason = KVM_EXIT_FAIL_ENTRY;
return 0;
default: default:
kvm_pr_unimpl("Unsupported exception type: %d", kvm_pr_unimpl("Unsupported exception type: %d",
exception_index); exception_index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment