[PATCH 1/2] Inroduce panic hypercall KVM_HC_PANIC (host)

Daniel Gollub
2011-06-20T13:45:56Z

Introduce panic hypercall (KVM_HC_PANIC) on host-end to signal
that the guest crashed/paniced. This gets signal to userspace
with KVM API and ioctl KVM_RUN with exit_reason: KVM_EXIT_PANIC

Signed-off-by: Daniel Gollub <gollub@b1-systems.de>
---
arch/x86/kvm/x86.c | 9 +++++++++
include/linux/kvm.h | 1 +
include/linux/kvm_host.h | 1 +
include/linux/kvm_para.h | 1 +
4 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d88de56..bbe91fe 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5103,6 +5103,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
case KVM_HC_MMU_OP:
r = kvm_pv_mmu_op(vcpu, a0, hc_gpa(vcpu, a1, a2), &ret);
break;
+ case KVM_HC_PANIC:
+ set_bit(KVM_REQ_PANIC, &vcpu->requests);
+ ret = 0;
+ break;
default:
ret = -KVM_ENOSYS;
break;
@@ -5431,6 +5435,11 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
r = 1;
goto out;
}
+ if (kvm_check_request(KVM_REQ_PANIC, vcpu)) {
+ vcpu->run->exit_reason = KVM_EXIT_PANIC;
+ r = 0;
+ goto out;
+ }
}

r = kvm_mmu_reload(vcpu);
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 55ef181..8a8b609 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -161,6 +161,7 @@ struct kvm_pit_config {
#define KVM_EXIT_NMI 16
#define KVM_EXIT_INTERNAL_ERROR 17
#define KVM_EXIT_OSI 18
+#define KVM_EXIT_PANIC 19

/* For KVM_EXIT_INTERNAL_ERROR */
#define KVM_INTERNAL_ERROR_EMULATION 1
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index b9c3299..1819414 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -47,6 +47,7 @@
#define KVM_REQ_DEACTIVATE_FPU 10
#define KVM_REQ_EVENT 11
#define KVM_REQ_APF_HALT 12
+#define KVM_REQ_PANIC 13

#define KVM_USERSPACE_IRQ_SOURCE_ID 0

diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
index 47a070b..5cdf61b 100644
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -19,6 +19,7 @@
#define KVM_HC_MMU_OP 2
#define KVM_HC_FEATURES 3
#define KVM_HC_PPC_MAP_MAGIC_PAGE 4
+#define KVM_HC_PANIC 5

/*
* hypercalls use architecture specific
--
1.7.1