Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755612Ab2HXGWR (ORCPT ); Fri, 24 Aug 2012 02:22:17 -0400 Received: from mout.web.de ([212.227.17.12]:60700 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753120Ab2HXGWO (ORCPT ); Fri, 24 Aug 2012 02:22:14 -0400 Message-ID: <50371D85.1080601@web.de> Date: Fri, 24 Aug 2012 08:21:57 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Wen Congyang CC: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Gleb Natapov , Blue Swirl , Eric Blake , Andrew Jones , Marcelo Tosatti Subject: Re: [PATCH v9 5/6] introduce a new qom device to deal with panicked event References: <50359561.9070001@cn.fujitsu.com> <5035962D.8050907@cn.fujitsu.com> <50360B4D.5070403@siemens.com> <503719C1.4080304@cn.fujitsu.com> In-Reply-To: <503719C1.4080304@cn.fujitsu.com> X-Enigmail-Version: 1.4.3 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig679891DE041921E93FAC7E9B" X-Provags-ID: V02:K0:2nBbiY6NyZzA44eey1WYNgFRy3uZml7dIG6bPp68je1 s9Y3eXLle6/aQkXll2INDFRR+IAzJ9+5zkMAzFYSc6kAmDmXXI nQW3Xxy0dlrbLGqKTpsR/tcUarLjHOHoG5w0VaVSJuHtwvKp4u 7I49zrjWWp3r2ski2Xx0N3AhXQR6YbnhVIQZlgCK33d7B42ybI CGUxkIn+wQ3ny3KomgWrg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9868 Lines: 328 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig679891DE041921E93FAC7E9B Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 2012-08-24 08:05, Wen Congyang wrote: > At 08/23/2012 06:51 PM, Jan Kiszka Wrote: >> On 2012-08-23 04:32, Wen Congyang wrote: >>> If the target is x86/x86_64, the guest's kernel will write 0x01 to th= e >>> port KVM_PV_EVENT_PORT when it is panciked. This patch introduces a n= ew >>> qom device kvm_pv_ioport to listen this I/O port, and deal with panic= ked >>> 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= =2Ec >>> 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 | 190 ++++++++++++++++++++++++++++++++++++++++= ++++++++++ >>> hw/pc_piix.c | 9 +++ >>> kvm.h | 2 + >>> 4 files changed, 202 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) +=3D clock.o apic.o i8259.o ioapic.o i8254.o >>> +obj-$(CONFIG_KVM) +=3D clock.o apic.o i8259.o ioapic.o i8254.o pv_ev= ent.o >>> diff --git a/hw/kvm/pv_event.c b/hw/kvm/pv_event.c >>> new file mode 100644 >>> index 0000000..c03dd22 >>> --- /dev/null >>> +++ b/hw/kvm/pv_event.c >>> @@ -0,0 +1,190 @@ >>> +/* >>> + * 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 o= r 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 pa= use VM */ >>> +#define PANICKED_POWEROFF 3 /* emit QEVENT_GUEST_PANICKED and qu= it VM */ >>> +#define PANICKED_RESET 4 /* emit QEVENT_GUEST_PANICKED and re= set 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_act= ion) >>> + >>> +static void panicked_mon_event(const char *action) >>> +{ >>> + QObject *data; >>> + >>> + data =3D 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 =3D=3D 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 =3D PANICKED_REPORT; >>> + } else if (strcasecmp(conf->panicked_action, "none") =3D=3D 0) {= >>> + conf->panicked_action_value =3D PANICKED_REPORT; >>> + } else if (strcasecmp(conf->panicked_action, "pause") =3D=3D 0) = { >>> + conf->panicked_action_value =3D PANICKED_PAUSE; >>> + } else if (strcasecmp(conf->panicked_action, "poweroff") =3D=3D = 0) { >>> + conf->panicked_action_value =3D PANICKED_POWEROFF; >>> + } else if (strcasecmp(conf->panicked_action, "reset") =3D=3D 0) = { >>> + conf->panicked_action_value =3D 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, un= signed size) >>> +{ >>> + return supported_event(); >>> +} >>> + >>> +static void pv_io_write(void *opaque, target_phys_addr_t addr, uint6= 4_t val, >>> + unsigned size) >>> +{ >>> + PVIOPortState *s =3D opaque; >>> + >>> + handle_event(val, &s->conf); >>> +} >>> + >>> +static const MemoryRegionOps pv_io_ops =3D { >>> + .read =3D pv_io_read, >>> + .write =3D pv_io_write, >>> + .impl =3D { >>> + .min_access_size =3D 4, >>> + .max_access_size =3D 4, >>> + }, >>> +}; >>> + >>> +static int pv_ioport_initfn(ISADevice *dev) >>> +{ >>> + PVIOPortState *s =3D 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[] =3D { >>> + DEFINE_PV_EVENT_PROPERTIES(PVIOPortState, conf), >>> + DEFINE_PROP_END_OF_LIST(), >>> +}; >>> + >>> +static void pv_ioport_class_init(ObjectClass *klass, void *data) >>> +{ >>> + DeviceClass *dc =3D DEVICE_CLASS(klass); >>> + ISADeviceClass *ic =3D ISA_DEVICE_CLASS(klass); >>> + >>> + ic->init =3D pv_ioport_initfn; >>> + dc->no_user =3D 1; >>> + dc->props =3D pv_ioport_properties; >>> +} >>> + >>> +static TypeInfo pv_ioport_info =3D { >>> + .name =3D PV_EVENT_DRIVER, >>> + .parent =3D TYPE_ISA_DEVICE, >>> + .instance_size =3D sizeof(PVIOPortState), >>> + .class_init =3D 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 =3D opaque; >>> + ISADevice *dev; >>> + >>> + dev =3D isa_create(bus, PV_EVENT_DRIVER); >>> + qdev_init_nofail(&dev->qdev); >>> +} >>> + >>> +#else >>> +void kvm_pv_event_init(void *opaque) >>> +{ >> >> Some comment that this stub requires an implementation whenever it is >> actually built would be helpful. Something that explains a different >> transport than PIO will be needed. >=20 > OK >=20 >> >>> +} >>> +#endif >>> diff --git a/hw/pc_piix.c b/hw/pc_piix.c >>> index 88ff041..f73fb85 100644 >>> --- a/hw/pc_piix.c >>> +++ b/hw/pc_piix.c >>> @@ -46,6 +46,9 @@ >>> #ifdef CONFIG_XEN >>> # include >>> #endif >>> +#ifdef CONFIG_KVM >>> +# include >>> +#endif >>> =20 >>> #define MAX_IDE_BUS 2 >>> =20 >>> @@ -285,6 +288,12 @@ static void pc_init1(MemoryRegion *system_memory= , >>> if (pci_enabled) { >>> pc_pci_device_init(pci_bus); >>> } >>> + >>> +#ifdef KVM_PV_EVENT_PORT >> >> This file is x86-only, and there we have KVM_PV_EVENT_PORT >> unconditionally. So drop the #ifdef. >> >>> + if (kvm_enabled()) { >>> + kvm_pv_event_init(isa_bus); >> >> But you are missing a kvm-stub entry for kvm_pv_event_init. A >> --disable-kvm build should be broken for that reason. >=20 > Hmm, KVM_PV_EVENT_PORT is defined in asm/kvm_para.h, and I include > this file only when CONFIG_KVM is defined. So --disable-kvm build > does not be broken in my test. Yeah, but that is a bit ugly and another reason to go for a proper kvm-st= ub. Jan --------------enig679891DE041921E93FAC7E9B Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAlA3HYUACgkQitSsb3rl5xQQtQCePh2FRJV7ehx6xb5OU5D21CzH xpYAoIs+YC4JkX2OQNyh7mky83e51RP6 =s2fG -----END PGP SIGNATURE----- --------------enig679891DE041921E93FAC7E9B-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/