kvm: notify host when the guest is panicked

PATCH Superseded Wen Congyang 4 participants 16 messages Jun 27, 2012 – Jul 3, 2012

Subsystems (8)

x86 KVM PowerPC s390 +4 more subsystems

lore

Share & tools

lore

Wen Congyang

author

2012-06-27 06:51 UTC #0 lore raw

PATCH v5 1/1 kvm: notify host when the guest is panicked

We can know the guest is panicked when the guest runs on xen. But we do not have such feature on kvm.

Another purpose of this feature is: management app(for example:
libvirt) can do auto dump when the guest is panicked. If management app does not do auto dump, the guest's user can do dump by hand if he sees the guest is panicked.

We have three solutions to implement this feature:
1. use vmcall
2. use I/O port
3. use virtio-serial.

We have decided to avoid touching hypervisor. The reason why I choose choose the I/O port is:
1. it is easier to implememt
2. it does not depend any virtual device
3. it can work when startint the kernel

Signed-off-by Wen Congyang <[email protected]>

---
 arch/ia64/include/asm/kvm_para.h    |    5 +++++
 arch/powerpc/include/asm/kvm_para.h |    5 +++++
 arch/s390/include/asm/kvm_para.h    |    5 +++++
 arch/x86/include/asm/kvm_para.h     |    7 +++++++
 arch/x86/kernel/kvm.c               |   14 ++++++++++++++
 include/linux/kvm_para.h            |   13 +++++++++++++
 6 files changed, 49 insertions(+), 0 deletions(-)

arch/ia64/include/asm/kvm_para.h +5 -0

index 2019cb9..187c0e2 100644
@@ -31,6 +31,11 @@ static inline bool kvm_check_and_clear_guest_paused(void)
 	return false;
 }
 
+static inline unsigned int kvm_arch_pv_features(void)
+{
+	return 0;
+}
+
 #endif
 
 #endif

arch/powerpc/include/asm/kvm_para.h +5 -0

index c18916b..be81aac 100644
@@ -211,6 +211,11 @@ static inline bool kvm_check_and_clear_guest_paused(void)
 	return false;
 }
 
+static inline unsigned int kvm_arch_pv_features(void)
+{
+	return 0;
+}
+
 #endif /* __KERNEL__ */
 
 #endif /* __POWERPC_KVM_PARA_H__ */

arch/s390/include/asm/kvm_para.h +5 -0

index a988329..3d993b7 100644
@@ -154,6 +154,11 @@ static inline bool kvm_check_and_clear_guest_paused(void)
 	return false;
 }
 
+static inline unsigned int kvm_arch_pv_features(void)
+{
+	return 0;
+}
+
 #endif
 
 #endif /* __S390_KVM_PARA_H */

arch/x86/include/asm/kvm_para.h +7 -0

index 63ab166..c8ad86e 100644
@@ -89,6 +89,8 @@ struct kvm_vcpu_pv_apf_data {
 	__u32 enabled;
 };
 
+#define KVM_PV_PORT	(0x505UL)
+
 #ifdef __KERNEL__
 #include <asm/processor.h>

@@ -221,6 +223,11 @@ static inline void kvm_disable_steal_time(void)
 }
 #endif
 
+static inline unsigned int kvm_arch_pv_features(void)
+{
+	return inl(KVM_PV_PORT);
+}
+
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_X86_KVM_PARA_H */

arch/x86/kernel/kvm.c +14 -0

index e554e5a..9a97f7e 100644
@@ -328,6 +328,17 @@ static struct notifier_block kvm_pv_reboot_nb = {
 	.notifier_call = kvm_pv_reboot_notify,
 };
 
+static int
+kvm_pv_panic_notify(struct notifier_block *nb, unsigned long code, void *unused)
+{
+	outl(KVM_PV_PANICKED, KVM_PV_PORT);
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block kvm_pv_panic_nb = {
+	.notifier_call = kvm_pv_panic_notify,
+};
+
 static u64 kvm_steal_clock(int cpu)
 {
 	u64 steal;

@@ -414,6 +425,9 @@ void __init kvm_guest_init(void)
 
 	paravirt_ops_setup();
 	register_reboot_notifier(&kvm_pv_reboot_nb);
+	if (kvm_pv_has_feature(KVM_PV_FEATURE_PANICKED))
+		atomic_notifier_chain_register(&panic_notifier_list,
+			&kvm_pv_panic_nb);
 	for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++)
 		spin_lock_init(&async_pf_sleepers[i].lock);
 	if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF))

include/linux/kvm_para.h +13 -0

index ff476dd..e73efcf 100644
@@ -20,6 +20,12 @@
 #define KVM_HC_FEATURES			3
 #define KVM_HC_PPC_MAP_MAGIC_PAGE	4
 
+/* The bit of the value read from KVM_PV_PORT */
+#define KVM_PV_FEATURE_PANICKED	0
+
+/* The value writen to KVM_PV_PORT */
+#define KVM_PV_PANICKED		1
+
 /*
  * hypercalls use architecture specific
  */

@@ -33,5 +39,12 @@ static inline int kvm_para_has_feature(unsigned int feature)
 		return 1;
 	return 0;
 }
+
+static inline int kvm_pv_has_feature(unsigned int feature)
+{
+	if (kvm_arch_pv_features() & (1UL << feature))
+		return 1;
+	return 0;
+}
 #endif /* __KERNEL__ */
 #endif /* __LINUX_KVM_PARA_H */

Signature · 1 line

1.7.1

Wen Congyang

author

2012-06-27 06:53 UTC #1 lore raw

PATCH v5 1/6 start vm after reseting it

The guest should run after reseting it, but it does not run if its old state is RUN_STATE_INTERNAL_ERROR or RUN_STATE_PAUSED.

Signed-off-by Wen Congyang <[email protected]>

---
 block.h |    2 ++
 qmp.c   |    2 +-
 vl.c    |    3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

block.h +2 -0

index d135652..d9570dd 100644
@@ -365,6 +365,8 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs);
 void bdrv_set_in_use(BlockDriverState *bs, int in_use);
 int bdrv_in_use(BlockDriverState *bs);
 
+void iostatus_bdrv_it(void *opaque, BlockDriverState *bs);
+
 enum BlockAcctType {
     BDRV_ACCT_READ,
     BDRV_ACCT_WRITE,

qmp.c +1 -1

index fee9fb2..a111dff 100644
@@ -125,7 +125,7 @@ SpiceInfo *qmp_query_spice(Error **errp)
 };
 #endif
 
-static void iostatus_bdrv_it(void *opaque, BlockDriverState *bs)
+void iostatus_bdrv_it(void *opaque, BlockDriverState *bs)
 {
     bdrv_iostatus_reset(bs);
 }

vl.c +2 -1

index 1329c30..b38aa5f 100644
@@ -1532,7 +1532,8 @@ static bool main_loop_should_exit(void)
         resume_all_vcpus();
         if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
             runstate_check(RUN_STATE_SHUTDOWN)) {
-            runstate_set(RUN_STATE_PAUSED);
+            bdrv_iterate(iostatus_bdrv_it, NULL);
+            vm_start();
         }
     }
     if (qemu_powerdown_requested()) {

Signature · 1 line

1.7.1

Wen Congyang

author

2012-06-27 06:53 UTC #2 lore raw

PATCH v5 2/6 update linux headers

In reply to Wen Congyang

Signed-off-by Wen Congyang <[email protected]>

---
 linux-headers/asm-x86/kvm_para.h |    2 ++
 linux-headers/linux/kvm_para.h   |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

linux-headers/asm-x86/kvm_para.h +2 -0

index f2ac46a..f9d858f 100644
@@ -89,5 +89,7 @@ struct kvm_vcpu_pv_apf_data {
 	__u32 enabled;
 };
 
+#define KVM_PV_PORT	(0x505UL)
+
 
 #endif /* _ASM_X86_KVM_PARA_H */

linux-headers/linux/kvm_para.h +6 -0

index 7bdcf93..4fbd625 100644
@@ -20,6 +20,12 @@
 #define KVM_HC_FEATURES			3
 #define KVM_HC_PPC_MAP_MAGIC_PAGE	4
 
+/* The bit of the value read from KVM_PV_PORT */
+#define KVM_PV_FEATURE_PANICKED	0
+
+/* The value writen to KVM_PV_PORT */
+#define KVM_PV_PANICKED		1
+
 /*
  * hypercalls use architecture specific
  */

Signature · 1 line

1.7.1

Wen Congyang

author

2012-06-27 06:55 UTC #3 lore raw

PATCH v5 3/6 add a new runstate: RUN_STATE_GUEST_PANICKED

In reply to Wen Congyang

Add a new runstate RUN_STATE_GUEST_PANICKED. The guest can be in this state if it is paused due to panicked event.

Signed-off-by Wen Congyang <[email protected]>

---
 qapi-schema.json |    6 +++++-
 qmp.c            |    3 ++-
 vl.c             |    7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

qapi-schema.json +5 -1

index 3b6e346..009f653 100644
@@ -119,11 +119,15 @@
 # @suspended: guest is suspended (ACPI S3)
 #
 # @watchdog: the watchdog action is configured to pause and has been triggered
+#
+# @guest-panicked: the panicked action is configured to pause and has been
+# triggered.
 ##
 { 'enum': 'RunState',
   'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',
             'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',
-            'running', 'save-vm', 'shutdown', 'suspended', 'watchdog' ] }
+            'running', 'save-vm', 'shutdown', 'suspended', 'watchdog',
+            'guest-panicked' ] }
 
 ##
 # @StatusInfo:

qmp.c +2 -1

index a111dff..3b0c9bc 100644
@@ -148,7 +148,8 @@ void qmp_cont(Error **errp)
         error_set(errp, QERR_MIGRATION_EXPECTED);
         return;
     } else if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
-               runstate_check(RUN_STATE_SHUTDOWN)) {
+               runstate_check(RUN_STATE_SHUTDOWN) ||
+               runstate_check(RUN_STATE_GUEST_PANICKED)) {
         error_set(errp, QERR_RESET_REQUIRED);
         return;
     } else if (runstate_check(RUN_STATE_SUSPENDED)) {

vl.c +6 -1

index b38aa5f..c0e5d3c 100644
@@ -361,6 +361,7 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_RUNNING, RUN_STATE_SAVE_VM },
     { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },
     { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },
+    { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED },
 
     { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },

@@ -375,6 +376,9 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
     { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
 
+    { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED },
+    { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },
+
     { RUN_STATE_MAX, RUN_STATE_MAX },
 };

@@ -1531,7 +1535,8 @@ static bool main_loop_should_exit(void)
         qemu_system_reset(VMRESET_REPORT);
         resume_all_vcpus();
         if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
-            runstate_check(RUN_STATE_SHUTDOWN)) {
+            runstate_check(RUN_STATE_SHUTDOWN) ||
+            runstate_check(RUN_STATE_GUEST_PANICKED)) {
             bdrv_iterate(iostatus_bdrv_it, NULL);
             vm_start();
         }

Signature · 1 line

1.7.1

Wen Congyang

author

2012-06-27 06:57 UTC #4 lore raw

PATCH v5 4/6 add a new qevent: QEVENT_GUEST_PANICKED

In reply to Wen Congyang

Add a new qevent QEVENT_GUEST_PANICKED. QEMU will emit this event if the guest is panicked.

Signed-off-by Wen Congyang <[email protected]>

---
 monitor.c |    1 +
 monitor.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

monitor.c +1 -0

index f6107ba..28f7482 100644
@@ -458,6 +458,7 @@ static const char *monitor_event_names[] = {
     [QEVENT_SUSPEND] = "SUSPEND",
     [QEVENT_WAKEUP] = "WAKEUP",
     [QEVENT_BALLOON_CHANGE] = "BALLOON_CHANGE",
+    [QEVENT_GUEST_PANICKED] = "GUEST_PANICKED",
 };
 QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX)

monitor.h +1 -0

index 5f4de1b..cb7de8c 100644
@@ -42,6 +42,7 @@ typedef enum MonitorEvent {
     QEVENT_SUSPEND,
     QEVENT_WAKEUP,
     QEVENT_BALLOON_CHANGE,
+    QEVENT_GUEST_PANICKED,
 
     /* Add to 'monitor_event_names' array in monitor.c when
      * defining new events here */

Signature · 1 line

1.7.1

Wen Congyang

author

2012-06-27 06:58 UTC #5 lore raw

PATCH v5 5/6 deal with guest panicked event accoring to -onpanic parameter

In reply to Wen Congyang

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 <[email protected]>

---
 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(-)

kvm-all.c +101 -0

index f8e4328..9494dd2 100644
@@ -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;
+}

kvm-stub.c +9 -0

index ec9a364..318e967 100644
@@ -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;
+}

kvm.h +3 -0

index 9c7b0ea..d174d5a 100644
@@ -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);

qemu-options.hx +15 -0

index 8b66264..4a061bf 100644
@@ -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
+@item -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:
+@code{pause} (emit QEVENT_GUEST_PANICKED and pause the guest),
+@code{poweroff} (emit QEVENT_GUEST_PANICKED and forcefully poweroff the guest),
+@code{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

vl.c +10 -0

index c0e5d3c..9164d29 100644
@@ -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);

Signature · 1 line

1.7.1

Jan Kiszka

2012-06-27 14:39 UTC #6 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

Quoted 112 lines · Wen Congyang

Signed-off-by Wen Congyang <[email protected]>

---
 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(-)

kvm-all.c +68 -0

index f8e4328..9494dd2 100644
@@ -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,

kvm-all.c int kvm_on_sigbus(int code, void *addr) · line 2011

Quoted 10 lines

kvm-all.c +10 -0

+    .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);

This modeling is still not ok. We don't open-code ports anymore, we introduce devices. And this doesn't belong inro generic code as it is x86-only. Will avoid that #ifdef as well.

Thanks
Jan

Signature · 2 lines

Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux

Wen Congyang

author

2012-06-28 01:11 UTC #7 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

At 06/27/2012 10:39 PM, Jan Kiszka Wrote:

Quoted 118 lines · Wen Congyang

Quoted 117 lines

Signed-off-by Wen Congyang <[email protected]>

---
 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(-)

kvm-all.c +73 -0

index f8e4328..9494dd2 100644
@@ -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)

Quoted 8 lines

kvm-all.c int kvm_on_sigbus(int code, void *addr) · line 2011
Quoted 5 lines
kvm-all.c +5 -0
+{
+    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);
This modeling is still not ok. We don't open-code ports anymore, we introduce devices. And this doesn't belong inro generic code as it is

Do you mean introducing a new device instead of I/O port?

Thanks
Wen Congyang

Quoted 5 lines

x86-only. Will avoid that #ifdef as well.
Thanks
Jan

Jan Kiszka

2012-06-28 08:26 UTC #8 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

Quoted 128 lines · Wen Congyang

At 06/27/2012 10:39 PM, Jan Kiszka Wrote:

Quoted 118 lines · Wen Congyang

Quoted 117 lines

Signed-off-by Wen Congyang <[email protected]>

---
 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(-)

kvm-all.c +73 -0

index f8e4328..9494dd2 100644
@@ -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)

Quoted 8 lines

kvm-all.c int kvm_on_sigbus(int code, void *addr) · line 2011
Quoted 5 lines
kvm-all.c +5 -0
+{
+    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);
This modeling is still not ok. We don't open-code ports anymore, we introduce devices. And this doesn't belong inro generic code as it is

Quoted 1 line

Do you mean introducing a new device instead of I/O port?

I mean encapsulating the I/O registration (PIO or MMIO) in a QOM device and building that device only for target archs that supports it. Already pointed you to examples in hw/kvm/.

Jan

Signature · 2 lines

Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux

Wen Congyang

author

2012-07-03 06:03 UTC #9 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

At 06/28/2012 04:26 PM, Jan Kiszka Wrote:

Quoted 129 lines · Wen Congyang

Quoted 128 lines

At 06/27/2012 10:39 PM, Jan Kiszka Wrote:

Quoted 126 lines · Wen Congyang

Quoted 112 lines

Signed-off-by Wen Congyang <[email protected]>

---
 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(-)

kvm-all.c +68 -0

index f8e4328..9494dd2 100644
@@ -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,

kvm-all.c int kvm_on_sigbus(int code, void *addr) · line 2011

Quoted 10 lines

kvm-all.c +10 -0

+    .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);

This modeling is still not ok. We don't open-code ports anymore, we introduce devices. And this doesn't belong inro generic code as it is

Quoted 3 lines

Quoted 1 line
Do you mean introducing a new device instead of I/O port?
I mean encapsulating the I/O registration (PIO or MMIO) in a QOM device

A QOM device? Do you mean introduce a new device? If so, the guest should have a driver to know such device. Another problem is: we cannot use such device when the kernel is starting(the device's driver is not ready). If we use a new device, I think virtio-serial is enough. The reason why I do not use virtio-serial is: I want the feature can also work when the kernel is starting.

Thanks
Wen Congyang

Quoted 5 lines

and building that device only for target archs that supports it. Already pointed you to examples in hw/kvm/.
Jan

Jan Kiszka

2012-07-03 06:36 UTC #10 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

Quoted 132 lines · Wen Congyang

At 06/28/2012 04:26 PM, Jan Kiszka Wrote:

Quoted 131 lines · Wen Congyang

Quoted 129 lines

At 06/27/2012 10:39 PM, Jan Kiszka Wrote:

Quoted 118 lines · Wen Congyang

Quoted 117 lines

Signed-off-by Wen Congyang <[email protected]>

---
 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(-)

kvm-all.c +73 -0

index f8e4328..9494dd2 100644
@@ -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)

Quoted 8 lines

kvm-all.c int kvm_on_sigbus(int code, void *addr) · line 2011
Quoted 5 lines
kvm-all.c +5 -0
+{
+    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);
This modeling is still not ok. We don't open-code ports anymore, we introduce devices. And this doesn't belong inro generic code as it is

Do you mean introducing a new device instead of I/O port?

Quoted 8 lines

Quoted 1 line
I mean encapsulating the I/O registration (PIO or MMIO) in a QOM device
A QOM device? Do you mean introduce a new device? If so, the guest should have a driver to know such device. Another problem is: we cannot use such device when the kernel is starting(the device's driver is not ready). If we use a new device, I think virtio-serial is enough. The reason why I do not use virtio-serial is: I want the feature can also work when the kernel is starting.

I'm not talking about changing the interface to the guest, I'm talking about how to model it in QEMU. And that difference would be transparent to the guest. I pointed you to examples like hw/kvm/clock.c.

Jan

Signature · 2 lines

Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux

Wen Congyang

author

2012-07-03 06:38 UTC #11 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

At 07/03/2012 02:36 PM, Jan Kiszka Wrote:

Quoted 142 lines · Wen Congyang

Quoted 132 lines

At 06/28/2012 04:26 PM, Jan Kiszka Wrote:

Quoted 131 lines · Wen Congyang

Quoted 129 lines

At 06/27/2012 10:39 PM, Jan Kiszka Wrote:

Quoted 118 lines · Wen Congyang

Quoted 117 lines

Signed-off-by Wen Congyang <[email protected]>

---
 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(-)

kvm-all.c +73 -0

index f8e4328..9494dd2 100644
@@ -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)

Quoted 8 lines

kvm-all.c int kvm_on_sigbus(int code, void *addr) · line 2011
Quoted 5 lines
kvm-all.c +5 -0
+{
+    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);
This modeling is still not ok. We don't open-code ports anymore, we introduce devices. And this doesn't belong inro generic code as it is

Do you mean introducing a new device instead of I/O port?

Quoted 8 lines

Quoted 1 line
I mean encapsulating the I/O registration (PIO or MMIO) in a QOM device
A QOM device? Do you mean introduce a new device? If so, the guest should have a driver to know such device. Another problem is: we cannot use such device when the kernel is starting(the device's driver is not ready). If we use a new device, I think virtio-serial is enough. The reason why I do not use virtio-serial is: I want the feature can also work when the kernel is starting.

Quoted 3 lines

I'm not talking about changing the interface to the guest, I'm talking about how to model it in QEMU. And that difference would be transparent to the guest. I pointed you to examples like hw/kvm/clock.c.

OK, I will read the code in hw/kvm/clock.c

Thanks for your help.

Wen Congyang

Quoted 3 lines

Jan

Jan Kiszka

2012-07-03 06:45 UTC #12 lore raw

Re: [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

Quoted 5 lines · Wen Congyang

Quoted 3 lines
I'm not talking about changing the interface to the guest, I'm talking about how to model it in QEMU. And that difference would be transparent to the guest. I pointed you to examples like hw/kvm/clock.c.
OK, I will read the code in hw/kvm/clock.c

Just to avoid confusion: That example is just good for a trivial framework. It does vmstate saving, something you don't need as your "device" is stateless. If you want to find out how to register PIO ranges, also check e.g. hw/pcspk.c.

Jan

Signature · 2 lines

Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux

Cornelia Huck

2012-06-27 14:52 UTC #13 lore raw

Re: [Qemu-devel] [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

In reply to Wen Congyang

Quoted 7 lines · On Wed, 27 Jun 2012 15:02:23 +0800 Wen Congyang <[email protected]> wrote:

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

Would it be useful to add some "dump the guest" actions here?

Quoted 49 lines

Signed-off-by Wen Congyang <[email protected]>

kvm-all.c +38 -0

+static void kvm_pv_port_read(IORange *iorange, uint64_t offset, unsigned width,
+                             uint64_t *data)
+{
+    *data = (1 << KVM_PV_FEATURE_PANICKED);
+}
 
+
+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

kvm-all.c int main(int argc, char **argv, char **envp) · line 3656

Quoted 10 lines

kvm-all.c +4 -0

@@ -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);

I/O ports won't work for s390, yet we'll likely want panic notifications there as well. This will need some more abstraction.

Cornelia

Daniel P. Berrange

2012-06-27 14:57 UTC #14 lore raw

Re: [Qemu-devel] [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter

Quoted 11 lines · Cornelia Huck

Quoted 7 lines · On Wed, 27 Jun 2012 15:02:23 +0800 Wen Congyang <[email protected]> wrote:
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

Quoted 1 line

Would it be useful to add some "dump the guest" actions here?

Better off leaving that to the mgmt layer using QEMU. If you tried to directly handle "dump the guest" in the context of the panic notifier then you add all sorts of extra complexity to this otherwise simple feature. For a start the you need to tell it what filename to use, which is not something you can necessarily decide at the time QEMU starts - you might want a separate filename each time a panic ocurrs. THe mgmt app might not even want QEMU to dump to a file - it might want to use a socket, or pass in a file descriptor at time of dump. All in all, it is better to keep the panic notifier simple, and let the mgmt app then decide whether to take a dump separately, using existing QEMU monitor commands and features.

Daniel

Signature · 4 lines

|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Wen Congyang

author

2012-06-27 07:04 UTC #15 lore raw

PATCH v5 6/6 deal with panicked event accoring to '-machine panic_action=action'

In reply to Wen Congyang

The action is the same as -onpanic parameter.

Signed-off-by Wen Congyang <[email protected]>

---
 qemu-config.c   |    4 ++++
 qemu-options.hx |    4 +++-
 vl.c            |    7 +++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

qemu-config.c +4 -0

index 5c3296b..805e7c4 100644
@@ -595,6 +595,10 @@ static QemuOptsList qemu_machine_opts = {
             .name = "dt_compatible",
             .type = QEMU_OPT_STRING,
             .help = "Overrides the \"compatible\" property of the dt root node",
+        }, {
+            .name = "panic_action",
+            .type = QEMU_OPT_STRING,
+            .help = "The action what QEMU will do when the guest is panicked",
         },
         { /* End of list */ }
     },

qemu-options.hx +3 -1

index 4a061bf..083a21d 100644
@@ -33,7 +33,9 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
     "                property accel=accel1[:accel2[:...]] selects accelerator\n"
     "                supported accelerators are kvm, xen, tcg (default: tcg)\n"
     "                kernel_irqchip=on|off controls accelerated irqchip support\n"
-    "                kvm_shadow_mem=size of KVM shadow MMU\n",
+    "                kvm_shadow_mem=size of KVM shadow MMU\n"
+    "                panic_action=none|pause|poweroff|reset controls what QEmu\n"
+    "                will do when the guest is panicked",
     QEMU_ARCH_ALL)
 STEXI
 @item -machine [type=]@var{name}[,prop=@var{value}[,...]]

vl.c +7 -0

index 9164d29..7663699 100644
@@ -2301,6 +2301,7 @@ int main(int argc, char **argv, char **envp)
     };
     const char *trace_events = NULL;
     const char *trace_file = NULL;
+    const char *panic_action = NULL;
 
     atexit(qemu_run_exit_notifiers);
     error_set_progname(argv[0]);

@@ -3372,10 +3373,16 @@ int main(int argc, char **argv, char **envp)
         kernel_filename = qemu_opt_get(machine_opts, "kernel");
         initrd_filename = qemu_opt_get(machine_opts, "initrd");
         kernel_cmdline = qemu_opt_get(machine_opts, "append");
+        panic_action = qemu_opt_get(machine_opts, "panic_action");
     } else {
         kernel_filename = initrd_filename = kernel_cmdline = NULL;
     }
 
+    if (panic_action && select_panicked_action(panic_action) == -1) {
+        fprintf(stderr, "Unknown -panic_action parameter\n");
+        exit(1);
+    }
+
     if (!kernel_cmdline) {
         kernel_cmdline = "";
     }

Signature · 1 line

1.7.1