From patchwork Wed Aug 29 05:22:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 180620 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 07AF22C00B0 for ; Wed, 29 Aug 2012 15:17:17 +1000 (EST) Received: from localhost ([::1]:33094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6aeR-00077g-2l for incoming@patchwork.ozlabs.org; Wed, 29 Aug 2012 01:17:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6aeF-00077Y-LQ for qemu-devel@nongnu.org; Wed, 29 Aug 2012 01:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6ae8-0003Gq-IY for qemu-devel@nongnu.org; Wed, 29 Aug 2012 01:17:03 -0400 Received: from [222.73.24.84] (port=51391 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6ae7-0003GZ-OP for qemu-devel@nongnu.org; Wed, 29 Aug 2012 01:16:56 -0400 X-IronPort-AV: E=Sophos;i="4.80,332,1344182400"; d="scan'208";a="5744212" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 29 Aug 2012 13:15:45 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q7T5GsHL001737; Wed, 29 Aug 2012 13:16:54 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012082913164285-538081 ; Wed, 29 Aug 2012 13:16:42 +0800 Message-ID: <503DA70E.4020308@cn.fujitsu.com> Date: Wed, 29 Aug 2012 13:22:22 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov , Blue Swirl , Eric Blake , Andrew Jones , Marcelo Tosatti References: <503DA63E.40608@cn.fujitsu.com> In-Reply-To: <503DA63E.40608@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/29 13:16:42, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/29 13:16:43, Serialize complete at 2012/08/29 13:16:43 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH v10 5/6] introduce a new qom device to deal with panicked event X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the target is x86/x86_64, the guest's kernel will write 0x01 to the port KVM_PV_EVENT_PORT when it is panciked. This patch introduces a new qom device kvm_pv_ioport to listen this I/O port, and deal with panicked event according to panicked_action's value. The possible actions are: 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 I/O ports does not work for some targets(for example: s390). And you can implement another qom device, and include it's code into pv_event.c for such target. 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 --- hw/kvm/Makefile.objs | 2 +- hw/kvm/pv_event.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/pc_piix.c | 5 ++ kvm-stub.c | 4 + kvm.h | 2 + 5 files changed, 209 insertions(+), 1 deletions(-) create mode 100644 hw/kvm/pv_event.c diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs index 226497a..23e3b30 100644 --- a/hw/kvm/Makefile.objs +++ b/hw/kvm/Makefile.objs @@ -1 +1 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o +obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pv_event.o diff --git a/hw/kvm/pv_event.c b/hw/kvm/pv_event.c new file mode 100644 index 0000000..e14b030 --- /dev/null +++ b/hw/kvm/pv_event.c @@ -0,0 +1,197 @@ +/* + * QEMU KVM support, paravirtual event device + * + * Copyright Fujitsu, Corp. 2012 + * + * Authors: + * Wen Congyang + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include +#include +#include +#include +#include +#include +#include + +/* 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 */ + +#define PV_EVENT_DRIVER "kvm_pv_event" + +struct PVEventAction { + char *panicked_action; + int panicked_action_value; +}; + +#define DEFINE_PV_EVENT_PROPERTIES(_state, _conf) \ + DEFINE_PROP_STRING("panicked_action", _state, _conf.panicked_action) + +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(uint32_t panicked_action) +{ + 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"); + qemu_system_shutdown_request(); + break; + + case PANICKED_RESET: + panicked_mon_event("reset"); + qemu_system_reset_request(); + break; + } +} + +static uint64_t supported_event(void) +{ + return 1 << KVM_PV_FEATURE_PANICKED; +} + +static void handle_event(int event, struct PVEventAction *conf) +{ + if (event == KVM_PV_EVENT_PANICKED) { + panicked_perform_action(conf->panicked_action_value); + } +} + +static int pv_event_init(struct PVEventAction *conf) +{ + if (!conf->panicked_action) { + conf->panicked_action_value = PANICKED_REPORT; + } else if (strcasecmp(conf->panicked_action, "none") == 0) { + conf->panicked_action_value = PANICKED_REPORT; + } else if (strcasecmp(conf->panicked_action, "pause") == 0) { + conf->panicked_action_value = PANICKED_PAUSE; + } else if (strcasecmp(conf->panicked_action, "poweroff") == 0) { + conf->panicked_action_value = PANICKED_POWEROFF; + } else if (strcasecmp(conf->panicked_action, "reset") == 0) { + conf->panicked_action_value = PANICKED_RESET; + } else { + return -1; + } + + return 0; +} + +#if defined(KVM_PV_EVENT_PORT) + +#include "hw/isa.h" + +typedef struct { + ISADevice dev; + struct PVEventAction conf; + MemoryRegion ioport; +} PVIOPortState; + +static uint64_t pv_io_read(void *opaque, target_phys_addr_t addr, unsigned size) +{ + return supported_event(); +} + +static void pv_io_write(void *opaque, target_phys_addr_t addr, uint64_t val, + unsigned size) +{ + PVIOPortState *s = opaque; + + handle_event(val, &s->conf); +} + +static const MemoryRegionOps pv_io_ops = { + .read = pv_io_read, + .write = pv_io_write, + .impl = { + .min_access_size = 4, + .max_access_size = 4, + }, +}; + +static int pv_ioport_initfn(ISADevice *dev) +{ + PVIOPortState *s = DO_UPCAST(PVIOPortState, dev, dev); + + if (pv_event_init(&s->conf) < 0) { + return -1; + } + + memory_region_init_io(&s->ioport, &pv_io_ops, s, "pv_event", 1); + isa_register_ioport(dev, &s->ioport, KVM_PV_EVENT_PORT); + + return 0; +} + +static Property pv_ioport_properties[] = { + DEFINE_PV_EVENT_PROPERTIES(PVIOPortState, conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static void pv_ioport_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + + ic->init = pv_ioport_initfn; + dc->no_user = 1; + dc->props = pv_ioport_properties; +} + +static TypeInfo pv_ioport_info = { + .name = PV_EVENT_DRIVER, + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof(PVIOPortState), + .class_init = pv_ioport_class_init, +}; + +static void pv_ioport_register_types(void) +{ + type_register_static(&pv_ioport_info); +} + +type_init(pv_ioport_register_types) + +void kvm_pv_event_init(void *opaque) +{ + ISABus *bus = opaque; + ISADevice *dev; + + dev = isa_create(bus, PV_EVENT_DRIVER); + qdev_init_nofail(&dev->qdev); +} + +#else + +/* + * If you need a qom device to handle pv event, this device should + * be created and initialized in kvm_pv_event_init(). + * + * The parameter opaque is the device's parent bus. + */ +void kvm_pv_event_init(void *opaque) +{ +} +#endif diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 88ff041..37eca23 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -46,6 +46,7 @@ #ifdef CONFIG_XEN # include #endif +#include #define MAX_IDE_BUS 2 @@ -285,6 +286,10 @@ static void pc_init1(MemoryRegion *system_memory, if (pci_enabled) { pc_pci_device_init(pci_bus); } + + if (kvm_enabled()) { + kvm_pv_event_init(isa_bus); + } } static void pc_init_pci(ram_addr_t ram_size, diff --git a/kvm-stub.c b/kvm-stub.c index 94c9ea1..e8dc747 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -160,3 +160,7 @@ int kvm_irqchip_remove_irq_notifier(KVMState *s, EventNotifier *n, int virq) { return -ENOSYS; } + +void kvm_pv_event_init(void *opaque) +{ +} diff --git a/kvm.h b/kvm.h index 5b8f588..41ce1b2 100644 --- a/kvm.h +++ b/kvm.h @@ -276,4 +276,6 @@ int kvm_irqchip_add_irqfd(KVMState *s, int fd, int virq); int kvm_irqchip_remove_irqfd(KVMState *s, int fd, int virq); int kvm_irqchip_add_irq_notifier(KVMState *s, EventNotifier *n, int virq); int kvm_irqchip_remove_irq_notifier(KVMState *s, EventNotifier *n, int virq); + +void kvm_pv_event_init(void *opaque); #endif