From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgiV-0003l2-B3 for qemu-devel@nongnu.org; Tue, 11 Oct 2011 14:06:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDgiT-0000cI-Nn for qemu-devel@nongnu.org; Tue, 11 Oct 2011 14:06:15 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:55566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgiT-0000c0-Ar for qemu-devel@nongnu.org; Tue, 11 Oct 2011 14:06:13 -0400 Message-ID: <4E94858C.7060307@web.de> Date: Tue, 11 Oct 2011 20:06:04 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <20110913093835.GB4265@localhost.localdomain> <20110914093441.e2bb305c.kamezawa.hiroyu@jp.fujitsu.com> <4E705BC3.5000508@cn.fujitsu.com> <20110915164704.9cacd407.kamezawa.hiroyu@jp.fujitsu.com> <4E71B28F.7030201@cn.fujitsu.com> <4E72F3BA.2000603@jp.fujitsu.com> <4E73200A.7040908@jp.fujitsu.com> <4E76C6AA.9080403@cn.fujitsu.com> <4E7B04DC.1030407@cn.fujitsu.com> <4E7B4B8F.507@siemens.com> <4E7C51E4.2000503@cn.fujitsu.com> <4E7F3585.40108@redhat.com> <4E7F635E.6080009@web.de> <4E8035F9.9080908@redhat.com> <4E928B4E.2080207@cn.fujitsu.com> <4E92C86D.9000701@redhat.com> <4E947628.6020105@cn.fujitsu.com> In-Reply-To: <4E947628.6020105@cn.fujitsu.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig8EC565ED9CF31A535456C3CC" Sender: jan.kiszka@web.de Subject: Re: [Qemu-devel] [PATCH 1/1 V2] kernel/kvm: fix improper nmi emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Lai Jiangshan Cc: "qemu-devel@nongnu.org" , "kvm@vger.kernel.org" , Avi Kivity , KAMEZAWA Hiroyuki , Kenji Kaneshige This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig8EC565ED9CF31A535456C3CC Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable [ dropped unaffected seabios from CC ] On 2011-10-11 19:00, Lai Jiangshan wrote: > From: Kenji Kaneshige >=20 > Currently, NMI interrupt is blindly sent to all the vCPUs when NMI > button event happens. This doesn't properly emulate real hardware on > which NMI button event triggers LINT1. Because of this, NMI is sent to > the processor even when LINT1 is maskied in LVT. For example, this > causes the problem that kdump initiated by NMI sometimes doesn't work > on KVM, because kdump assumes NMI is masked on CPUs other than CPU0. >=20 > With this patch, KVM_NMI ioctl is handled as follows. >=20 > - When in-kernel irqchip is enabled, KVM_NMI ioctl is handled as a > request of triggering LINT1 on the processor. LINT1 is emulated in > in-kernel irqchip. >=20 > - When in-kernel irqchip is disabled, KVM_NMI ioctl is handled as a > request of injecting NMI to the processor. This assumes LINT1 is > already emulated in userland. >=20 > (laijs) Changed from v1: > Add KVM_NMI API document > Add KVM_CAP_USER_NMI >=20 > Signed-off-by: Kenji Kaneshige > Tested-by: Lai Jiangshan > --- > Documentation/virtual/kvm/api.txt | 20 ++++++++++++++++++++ > arch/x86/kvm/irq.h | 1 + > arch/x86/kvm/lapic.c | 7 +++++++ > arch/x86/kvm/x86.c | 12 ++++++++++++ > include/linux/kvm.h | 3 +++ > 5 files changed, 43 insertions(+), 0 deletions(-) >=20 > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/= kvm/api.txt > index b0e4b9c..5c24cc3 100644 > --- a/Documentation/virtual/kvm/api.txt > +++ b/Documentation/virtual/kvm/api.txt > @@ -1430,6 +1430,26 @@ is supported; 2 if the processor requires all vi= rtual machines to have > an RMA, or 1 if the processor can use an RMA but doesn't require it, > because it supports the Virtual RMA (VRMA) facility. > =20 > +4.64 KVM_NMI > + > +Capability: KVM_CAP_USER_NMI KVM_CAP_LAPIC_NMI needs to be listed here as well. > +Architectures: x86 > +Type: vcpu ioctl > +Parameters: none > +Returns: 0 on success, -1 on error > + > +This ioctl injects NMI to the vcpu. > + > +If with capability KVM_CAP_LAPIC_NMI, KVM_NMI ioctl is handled as foll= ows: > + > + - When in-kernel irqchip is enabled, KVM_NMI ioctl is handled as a > + request of triggering LINT1 on the processor. LINT1 is emulated in > + in-kernel lapic irqchip. > + > + - When in-kernel irqchip is disabled, KVM_NMI ioctl is handled as a > + request of injecting NMI to the processor. This assumes LINT1 is > + already emulated in userland lapic. Not sure if we document previous behaviour in the file as well. If we do, the !KVM_CAP_LAPIC_NMI case requires some words. > + > 5. The kvm_run structure > =20 > Application code obtains a pointer to the kvm_run structure by > diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h > index 53e2d08..0c96315 100644 > --- a/arch/x86/kvm/irq.h > +++ b/arch/x86/kvm/irq.h > @@ -95,6 +95,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s); > void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); > void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); > void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *vcpu); > +void kvm_apic_lint1_deliver(struct kvm_vcpu *vcpu); > void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); > void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); > void __kvm_migrate_timers(struct kvm_vcpu *vcpu); > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 57dcbd4..87fe36a 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1039,6 +1039,13 @@ void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *vc= pu) > kvm_apic_local_deliver(apic, APIC_LVT0); > } > =20 > +void kvm_apic_lint1_deliver(struct kvm_vcpu *vcpu) > +{ > + struct kvm_lapic *apic =3D vcpu->arch.apic; > + > + kvm_apic_local_deliver(apic, APIC_LVT1); > +} > + > static struct kvm_timer_ops lapic_timer_ops =3D { > .is_periodic =3D lapic_is_periodic, > }; > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 84a28ea..6862ef7 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -2729,12 +2729,24 @@ static int kvm_vcpu_ioctl_interrupt(struct kvm_= vcpu *vcpu, > return 0; > } > =20 > +#ifdef KVM_CAP_LAPIC_NMI Unneeded #ifdef, that CAP is always available on x86. > +static int kvm_vcpu_ioctl_nmi(struct kvm_vcpu *vcpu) > +{ > + if (irqchip_in_kernel(vcpu->kvm)) > + kvm_apic_lint1_deliver(vcpu); > + else > + kvm_inject_nmi(vcpu); > + > + return 0; > +} > +#else > static int kvm_vcpu_ioctl_nmi(struct kvm_vcpu *vcpu) > { > kvm_inject_nmi(vcpu); > =20 > return 0; > } > +#endif > =20 > static int vcpu_ioctl_tpr_access_reporting(struct kvm_vcpu *vcpu, > struct kvm_tpr_access_ctl *tac) > diff --git a/include/linux/kvm.h b/include/linux/kvm.h > index aace6b8..5253a5c 100644 > --- a/include/linux/kvm.h > +++ b/include/linux/kvm.h > @@ -554,6 +554,9 @@ struct kvm_ppc_pvinfo { > #define KVM_CAP_PPC_SMT 64 > #define KVM_CAP_PPC_RMA 65 > #define KVM_CAP_S390_GMAP 71 > +#ifdef KVM_CAP_USER_NMI #ifdef __KVM_HAVE_USER_NMI > +#define KVM_CAP_LAPIC_NMI 72 > +#endif > =20 > #ifdef KVM_CAP_IRQ_ROUTING > =20 Jan --------------enig8EC565ED9CF31A535456C3CC 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/ iEYEARECAAYFAk6UhZAACgkQitSsb3rl5xQrwACfY00gHW5NeAdChbnopgUQUe/Z 5vkAoOQ28+qEAwRVmtYB7mY7H0seplEU =xmik -----END PGP SIGNATURE----- --------------enig8EC565ED9CF31A535456C3CC--