| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4FEAAFFF.40401@cn.fujitsu.com>
Date: Wed, 27 Jun 2012 15:02:23 +0800
From: Wen Congyang <wency@...fujitsu.com>
To: kvm list <kvm@...r.kernel.org>, qemu-devel <qemu-devel@...gnu.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Avi Kivity <avi@...hat.com>,
"Daniel P. Berrange" <berrange@...hat.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
Jan Kiszka <jan.kiszka@...mens.com>,
Gleb Natapov <gleb@...hat.com>
Subject: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic
parameter
When the guest is panicked, it will write 0x1 to the port KVM_PV_PORT.
So if qemu reads 0x1 from this port, we can do the folloing three
things according to the parameter -onpanic:
1. emit QEVENT_GUEST_PANICKED only
2. emit QEVENT_GUEST_PANICKED and pause the guest
3. emit QEVENT_GUEST_PANICKED and poweroff the guest
4. emit QEVENT_GUEST_PANICKED and reset the guest
Note: if we emit QEVENT_GUEST_PANICKED only, and the management
application does not receive this event(the management may not
run when the event is emitted), the management won't know the
guest is panicked.
Signed-off-by: Wen Congyang <wency@...fujitsu.com>
---
kvm-all.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
kvm-stub.c | 9 +++++
kvm.h | 3 ++
qemu-options.hx | 15 ++++++++
vl.c | 10 +++++
5 files changed, 138 insertions(+), 0 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index f8e4328..9494dd2 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -19,6 +19,8 @@
#include <stdarg.h>
#include <linux/kvm.h>
+#include <linux/kvm_para.h>
+#include <asm/kvm_para.h>
#include "qemu-common.h"
#include "qemu-barrier.h"
@@ -32,6 +34,9 @@
#include "bswap.h"
#include "memory.h"
#include "exec-memory.h"
+#include "iorange.h"
+#include "qemu-objects.h"
+#include "monitor.h"
/* This check must be after config-host.h is included */
#ifdef CONFIG_EVENTFD
@@ -1931,3 +1936,99 @@ int kvm_on_sigbus(int code, void *addr)
{
return kvm_arch_on_sigbus(code, addr);
}
+
+/* Possible values for action parameter. */
+#define PANICKED_REPORT 1 /* emit QEVENT_GUEST_PANICKED only */
+#define PANICKED_PAUSE 2 /* emit QEVENT_GUEST_PANICKED and pause VM */
+#define PANICKED_POWEROFF 3 /* emit QEVENT_GUEST_PANICKED and quit VM */
+#define PANICKED_RESET 4 /* emit QEVENT_GUEST_PANICKED and reset VM */
+
+static int panicked_action = PANICKED_REPORT;
+
+static void kvm_pv_port_read(IORange *iorange, uint64_t offset, unsigned width,
+ uint64_t *data)
+{
+ *data = (1 << KVM_PV_FEATURE_PANICKED);
+}
+
+static void panicked_mon_event(const char *action)
+{
+ QObject *data;
+
+ data = qobject_from_jsonf("{ 'action': %s }", action);
+ monitor_protocol_event(QEVENT_GUEST_PANICKED, data);
+ qobject_decref(data);
+}
+
+static void panicked_perform_action(void)
+{
+ switch (panicked_action) {
+ case PANICKED_REPORT:
+ panicked_mon_event("report");
+ break;
+
+ case PANICKED_PAUSE:
+ panicked_mon_event("pause");
+ vm_stop(RUN_STATE_GUEST_PANICKED);
+ break;
+
+ case PANICKED_POWEROFF:
+ panicked_mon_event("poweroff");
+ exit(0);
+ break;
+ case PANICKED_RESET:
+ panicked_mon_event("reset");
+ qemu_system_reset_request();
+ break;
+ }
+}
+
+static void kvm_pv_port_write(IORange *iorange, uint64_t offset, unsigned width,
+ uint64_t data)
+{
+ if (data == KVM_PV_PANICKED) {
+ panicked_perform_action();
+ }
+}
+
+static void kvm_pv_port_destructor(IORange *iorange)
+{
+ g_free(iorange);
+}
+
+static IORangeOps pv_io_range_ops = {
+ .read = kvm_pv_port_read,
+ .write = kvm_pv_port_write,
+ .destructor = kvm_pv_port_destructor,
+};
+
+#if defined(KVM_PV_PORT)
+void kvm_pv_port_init(void)
+{
+ IORange *pv_io_range = g_malloc(sizeof(IORange));
+
+ iorange_init(pv_io_range, &pv_io_range_ops, KVM_PV_PORT, 1);
+ ioport_register(pv_io_range);
+}
+#else
+void kvm_pv_port_init(void)
+{
+}
+#endif
+
+int select_panicked_action(const char *p)
+{
+ if (strcasecmp(p, "none") == 0) {
+ panicked_action = PANICKED_REPORT;
+ } else if (strcasecmp(p, "pause") == 0) {
+ panicked_action = PANICKED_PAUSE;
+ } else if (strcasecmp(p, "poweroff") == 0) {
+ panicked_action = PANICKED_POWEROFF;
+ } else if (strcasecmp(p, "reset") == 0) {
+ panicked_action = PANICKED_RESET;
+ } else {
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/kvm-stub.c b/kvm-stub.c
index ec9a364..318e967 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -151,3 +151,12 @@ int kvm_irqchip_remove_irqfd(KVMState *s, int fd, int virq)
{
return -ENOSYS;
}
+
+void kvm_pv_port_init(void)
+{
+}
+
+int select_panicked_action(const char *p)
+{
+ return -1;
+}
diff --git a/kvm.h b/kvm.h
index 9c7b0ea..d174d5a 100644
--- a/kvm.h
+++ b/kvm.h
@@ -64,6 +64,9 @@ int kvm_has_gsi_routing(void);
int kvm_allows_irq0_override(void);
+void kvm_pv_port_init(void);
+int select_panicked_action(const char *p);
+
#ifdef NEED_CPU_H
int kvm_init_vcpu(CPUArchState *env);
diff --git a/qemu-options.hx b/qemu-options.hx
index 8b66264..4a061bf 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2743,6 +2743,21 @@ DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log,
"-qtest-log LOG specify tracing options\n",
QEMU_ARCH_ALL)
+DEF("onpanic", HAS_ARG, QEMU_OPTION_onpanic, \
+ "-onpanic none|pause|poweroff|reset\n" \
+ " action when the guest is panicked [default=none]",
+ QEMU_ARCH_ALL)
+STEXI
+@...m -onpanic @var{action}
+
+The @var{action} controls what QEmu will do when the guest is panicked.
+The default is @code{none} (emit QEVENT_GUEST_PANICKED only).
+Other possible actions are:
+@...e{pause} (emit QEVENT_GUEST_PANICKED and pause the guest),
+@...e{poweroff} (emit QEVENT_GUEST_PANICKED and forcefully poweroff the guest),
+@...e{reset} (emit QEVENT_GUEST_PANICKED and forcefully reset the guest).
+ETEXI
+
HXCOMM This is the last statement. Insert new options before this line!
STEXI
@end table
diff --git a/vl.c b/vl.c
index c0e5d3c..9164d29 100644
--- a/vl.c
+++ b/vl.c
@@ -3205,6 +3205,12 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_qtest_log:
qtest_log = optarg;
break;
+ case QEMU_OPTION_onpanic:
+ if (select_panicked_action(optarg) == -1) {
+ fprintf(stderr, "Unknown -onpanic parameter\n");
+ exit(1);
+ }
+ break;
default:
os_parse_cmd_args(popt->index, optarg);
}
@@ -3641,6 +3647,10 @@ int main(int argc, char **argv, char **envp)
}
}
+ if (kvm_enabled()) {
+ kvm_pv_port_init();
+ }
+
if (incoming) {
Error *errp = NULL;
int ret = qemu_start_incoming_migration(incoming, &errp);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists