From: Wen Congyang <wency@cn.fujitsu.com>
To: kvm list <kvm@vger.kernel.org>,
qemu-devel <qemu-devel@nongnu.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Avi Kivity <avi@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
Gleb Natapov <gleb@redhat.com>
Subject: [PATCH 2/2 v2] kvm: set exit_reason to KVM_EXIT_GUEST_PANICED when guest paniced
Date: Wed, 07 Mar 2012 09:56:40 +0800 [thread overview]
Message-ID: <4F56C058.7010406@cn.fujitsu.com> (raw)
In-Reply-To: <4F56BEF2.4020405@cn.fujitsu.com>
This patch introduces new request bit KVM_REQ_GUEST_PANICED.
If this bit is set, set vcpu's exit_reason to KVM_EXIT_GUEST_PANICED.
And then the user space can know the guest paniced.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
arch/x86/kvm/x86.c | 11 +++++++++++
include/linux/kvm.h | 1 +
include/linux/kvm_host.h | 1 +
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c9d99e5..978e398 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5013,6 +5013,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
case KVM_HC_VAPIC_POLL_IRQ:
ret = 0;
break;
+ case KVM_HC_GUEST_PANICED:
+ ret = 0;
+ kvm_make_request(KVM_REQ_GUEST_PANICED, vcpu);
+ break;
default:
ret = -KVM_ENOSYS;
break;
@@ -5228,6 +5232,13 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
r = 0;
goto out;
}
+
+ if (kvm_check_request(KVM_REQ_GUEST_PANICED, vcpu)) {
+ vcpu->run->exit_reason = KVM_EXIT_GUEST_PANICED;
+ r = 0;
+ goto out;
+ }
+
if (kvm_check_request(KVM_REQ_DEACTIVATE_FPU, vcpu)) {
vcpu->fpu_active = 0;
kvm_x86_ops->fpu_deactivate(vcpu);
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index acbe429..a46052e 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -163,6 +163,7 @@ struct kvm_pit_config {
#define KVM_EXIT_OSI 18
#define KVM_EXIT_PAPR_HCALL 19
#define KVM_EXIT_S390_UCONTROL 20
+#define KVM_EXIT_GUEST_PANICED 21
/* 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 355e445..026bbe5 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -54,6 +54,7 @@
#define KVM_REQ_IMMEDIATE_EXIT 15
#define KVM_REQ_PMU 16
#define KVM_REQ_PMI 17
+#define KVM_REQ_GUEST_PANICED 18
#define KVM_USERSPACE_IRQ_SOURCE_ID 0
--
1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Wen Congyang <wency@cn.fujitsu.com>
To: kvm list <kvm@vger.kernel.org>,
qemu-devel <qemu-devel@nongnu.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Avi Kivity <avi@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
Gleb Natapov <gleb@redhat.com>
Subject: [Qemu-devel] [PATCH 2/2 v2] kvm: set exit_reason to KVM_EXIT_GUEST_PANICED when guest paniced
Date: Wed, 07 Mar 2012 09:56:40 +0800 [thread overview]
Message-ID: <4F56C058.7010406@cn.fujitsu.com> (raw)
In-Reply-To: <4F56BEF2.4020405@cn.fujitsu.com>
This patch introduces new request bit KVM_REQ_GUEST_PANICED.
If this bit is set, set vcpu's exit_reason to KVM_EXIT_GUEST_PANICED.
And then the user space can know the guest paniced.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
arch/x86/kvm/x86.c | 11 +++++++++++
include/linux/kvm.h | 1 +
include/linux/kvm_host.h | 1 +
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c9d99e5..978e398 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5013,6 +5013,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
case KVM_HC_VAPIC_POLL_IRQ:
ret = 0;
break;
+ case KVM_HC_GUEST_PANICED:
+ ret = 0;
+ kvm_make_request(KVM_REQ_GUEST_PANICED, vcpu);
+ break;
default:
ret = -KVM_ENOSYS;
break;
@@ -5228,6 +5232,13 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
r = 0;
goto out;
}
+
+ if (kvm_check_request(KVM_REQ_GUEST_PANICED, vcpu)) {
+ vcpu->run->exit_reason = KVM_EXIT_GUEST_PANICED;
+ r = 0;
+ goto out;
+ }
+
if (kvm_check_request(KVM_REQ_DEACTIVATE_FPU, vcpu)) {
vcpu->fpu_active = 0;
kvm_x86_ops->fpu_deactivate(vcpu);
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index acbe429..a46052e 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -163,6 +163,7 @@ struct kvm_pit_config {
#define KVM_EXIT_OSI 18
#define KVM_EXIT_PAPR_HCALL 19
#define KVM_EXIT_S390_UCONTROL 20
+#define KVM_EXIT_GUEST_PANICED 21
/* 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 355e445..026bbe5 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -54,6 +54,7 @@
#define KVM_REQ_IMMEDIATE_EXIT 15
#define KVM_REQ_PMU 16
#define KVM_REQ_PMI 17
+#define KVM_REQ_GUEST_PANICED 18
#define KVM_USERSPACE_IRQ_SOURCE_ID 0
--
1.7.1
next prev parent reply other threads:[~2012-03-07 1:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 1:50 [PATCH 0/2 v2] kvm: notify host when guest paniced Wen Congyang
2012-03-07 1:50 ` [Qemu-devel] " Wen Congyang
2012-03-07 1:53 ` [PATCH 1/2 " Wen Congyang
2012-03-07 1:53 ` [Qemu-devel] " Wen Congyang
2012-03-07 1:56 ` Wen Congyang [this message]
2012-03-07 1:56 ` [Qemu-devel] [PATCH 2/2 v2] kvm: set exit_reason to KVM_EXIT_GUEST_PANICED " Wen Congyang
2012-03-07 1:58 ` [PATCH v2] deal with guest paniced event Wen Congyang
2012-03-07 1:58 ` [Qemu-devel] " Wen Congyang
2012-03-07 2:40 ` Eric Blake
2012-03-07 2:40 ` [Qemu-devel] " Eric Blake
2012-03-07 2:40 ` Eric Blake
2012-03-07 2:45 ` Wen Congyang
2012-03-07 2:45 ` [Qemu-devel] " Wen Congyang
2012-03-07 2:45 ` Wen Congyang
2012-03-07 9:53 ` Jan Kiszka
2012-03-07 9:53 ` [Qemu-devel] " Jan Kiszka
2012-03-07 10:05 ` Wen Congyang
2012-03-07 10:05 ` [Qemu-devel] " Wen Congyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F56C058.7010406@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=berrange@redhat.com \
--cc=gleb@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.