path: root/arch/arm64/kernel/hyp-stub.S
diff options
authorJames Morse <james.morse@arm.com>2016-04-27 17:47:04 +0100
committerAlex Shi <alex.shi@linaro.org>2016-11-17 09:49:38 +0800
commit6f7056c069f26c3dca1d94778708b91d5dbdb8a0 (patch)
tree0eae06840e0e42fdb0c5b5881f6c6ec52f8f28d0 /arch/arm64/kernel/hyp-stub.S
parent1520ad1a147e2edd7cd65dd9ddcbbd222fdbe5cc (diff)
arm64: hyp/kvm: Make hyp-stub reject kvm_call_hyp()
A later patch implements kvm_arch_hardware_disable(), to remove kvm from el2, and re-instate the hyp-stub. This can happen while guests are running, particularly when kvm_reboot() calls kvm_arch_hardware_disable() on each cpu. This can interrupt a guest, remove kvm, then allow the guest to be scheduled again. This causes kvm_call_hyp() to be run against the hyp-stub. Change the hyp-stub to return a new exception type when this happens, and add code to kvm's handle_exit() to tell userspace we failed to enter the guest. Signed-off-by: James Morse <james.morse@arm.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> (cherry picked from commit c94b0cf28281d483c8b43b4874fcb7ab14ade1b1) Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch/arm64/kernel/hyp-stub.S')
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 894fb40fb378..8727f4490772 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -23,6 +23,7 @@
#include <asm/assembler.h>
#include <asm/kvm_arm.h>
+#include <asm/kvm_asm.h>
#include <asm/ptrace.h>
#include <asm/virt.h>
@@ -70,8 +71,8 @@ el1_sync:
msr vbar_el2, x1
b 9f
- /* Unrecognised call type */
-2: mov x0, xzr
+ /* Someone called kvm_call_hyp() against the hyp-stub... */
9: eret