From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest Date: Fri, 10 Dec 2010 09:41:23 +0100 Message-ID: <4D01E7B3.30400@siemens.com> References: <4D007E2C.4070308@cn.fujitsu.com> <4D00845F.9000503@siemens.com> <4D01D9FD.8020801@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Avi Kivity , "qemu-devel@nongnu.org" , "kvm@vger.kernel.org" To: Lai Jiangshan Return-path: Received: from thoth.sbs.de ([192.35.17.2]:22139 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752207Ab0LJIlr (ORCPT ); Fri, 10 Dec 2010 03:41:47 -0500 In-Reply-To: <4D01D9FD.8020801@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org List-ID: Am 10.12.2010 08:42, Lai Jiangshan wrote: > > Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the > user space raised them. (example: qemu monitor's "nmi" command) > > Signed-off-by: Lai Jiangshan > --- > diff --git a/configure b/configure > index 2917874..f6f9362 100755 > --- a/configure > +++ b/configure > @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then > #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) > #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS > #endif > +#if !defined(KVM_CAP_USER_NMI) > +#error Missing KVM capability KVM_CAP_USER_NMI > +#endif > int main(void) { return 0; } > EOF > if test "$kerneldir" != "" ; then That's what I meant. We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be overkill. So... > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 7dfc357..755f8c9 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env) > > int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) > { > + /* Inject NMI */ > + if (env->interrupt_request & CPU_INTERRUPT_NMI) { > + env->interrupt_request &= ~CPU_INTERRUPT_NMI; > + DPRINTF("injected NMI\n"); > + kvm_vcpu_ioctl(env, KVM_NMI); > + } > + > /* Try to inject an interrupt if the guest can accept it */ > if (run->ready_for_interrupt_injection && > (env->interrupt_request & CPU_INTERRUPT_HARD) && Acked-by: Jan Kiszka Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36545 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQyXp-0006st-Ug for qemu-devel@nongnu.org; Fri, 10 Dec 2010 03:41:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQyXo-0001KG-L9 for qemu-devel@nongnu.org; Fri, 10 Dec 2010 03:41:37 -0500 Received: from thoth.sbs.de ([192.35.17.2]:22053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQyXo-0001K5-9l for qemu-devel@nongnu.org; Fri, 10 Dec 2010 03:41:36 -0500 Message-ID: <4D01E7B3.30400@siemens.com> Date: Fri, 10 Dec 2010 09:41:23 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <4D007E2C.4070308@cn.fujitsu.com> <4D00845F.9000503@siemens.com> <4D01D9FD.8020801@cn.fujitsu.com> In-Reply-To: <4D01D9FD.8020801@cn.fujitsu.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH V2] qemu, kvm: Enable user space NMI injection for kvm guest List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Lai Jiangshan Cc: Avi Kivity , "kvm@vger.kernel.org" , "qemu-devel@nongnu.org" Am 10.12.2010 08:42, Lai Jiangshan wrote: > > Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the > user space raised them. (example: qemu monitor's "nmi" command) > > Signed-off-by: Lai Jiangshan > --- > diff --git a/configure b/configure > index 2917874..f6f9362 100755 > --- a/configure > +++ b/configure > @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then > #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) > #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS > #endif > +#if !defined(KVM_CAP_USER_NMI) > +#error Missing KVM capability KVM_CAP_USER_NMI > +#endif > int main(void) { return 0; } > EOF > if test "$kerneldir" != "" ; then That's what I meant. We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be overkill. So... > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 7dfc357..755f8c9 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env) > > int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) > { > + /* Inject NMI */ > + if (env->interrupt_request & CPU_INTERRUPT_NMI) { > + env->interrupt_request &= ~CPU_INTERRUPT_NMI; > + DPRINTF("injected NMI\n"); > + kvm_vcpu_ioctl(env, KVM_NMI); > + } > + > /* Try to inject an interrupt if the guest can accept it */ > if (run->ready_for_interrupt_injection && > (env->interrupt_request & CPU_INTERRUPT_HARD) && Acked-by: Jan Kiszka Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux