Re: [PATCH 13/15] Add NMI injection support to SVM. - Dmitry Eremin-Solenikov

From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: kvm-owner@vger.kernel.org
Cc: avi@redhat.com, kvm@vger.kernel.org, joerg.roedel@amd.com,
	sheng@linux.intel.com, Gleb Natapov <gleb@redhat.com>
Subject: Re: [PATCH 13/15] Add NMI injection support to SVM.
Date: Fri, 17 Apr 2009 23:13:46 +0400	[thread overview]
Message-ID: <20090417191346.GA9743@doriath.ww600.siemens.net> (raw)
In-Reply-To: <1239616545-25199-14-git-send-email-gleb@redhat.com>

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

On Mon, Apr 13, 2009 at 12:55:43PM +0300, kvm-owner@vger.kernel.org wrote:
> 
> Signed-off-by: Gleb Natapov <gleb@redhat.com>

The attached patch if applied on the top of the serie fixes the NMI issue on
SVM. I did not refactor it on the top of this patch though, sorry.

-- 
With best wishes
Dmitry


[-- Attachment #2: 0001-KVM-correct-NMI-injection-logic-wrt-NMI-window-trac.patch --]
[-- Type: text/x-diff, Size: 1092 bytes --]

>From 26d7e88c84089abbe871286d54e77ff2922dc33d Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Fri, 17 Apr 2009 22:53:50 +0400
Subject: [PATCH] KVM: correct NMI injection logic wrt NMI window tracking

inject_pending_irq() calls inject_irq() which disables nmi_pending flag
if the nmi was injected. Thus for tracking we should use nmi_injected
flag. This al fin fixes NMI injection on SVM.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 arch/x86/kvm/x86.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e4cc717..eeed350 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3160,7 +3160,7 @@ static void inject_pending_irq(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 	inject_irq(vcpu);
 
 	/* enable NMI/IRQ window open exits if needed */
-	if (vcpu->arch.nmi_pending)
+	if (vcpu->arch.nmi_injected)
 		kvm_x86_ops->enable_nmi_window(vcpu);
 	else if (kvm_cpu_has_interrupt(vcpu) || req_int_win)
 		kvm_x86_ops->enable_irq_window(vcpu);
-- 
1.6.2.1

