From patchwork Sun Apr 14 19:04:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 2442681 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F2B323FCA5 for ; Sun, 14 Apr 2013 19:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753385Ab3DNTEd (ORCPT ); Sun, 14 Apr 2013 15:04:33 -0400 Received: from mout.web.de ([212.227.15.4]:64832 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753106Ab3DNTEc (ORCPT ); Sun, 14 Apr 2013 15:04:32 -0400 Received: from mchn199C.mchp.siemens.de ([95.157.56.37]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0M7KN0-1UnmEH00O6-00x90F; Sun, 14 Apr 2013 21:04:27 +0200 Message-ID: <516AFDBA.9050805@web.de> Date: Sun, 14 Apr 2013 21:04:26 +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: Gleb Natapov CC: Marcelo Tosatti , kvm , Paolo Bonzini , Nadav Har'El Subject: [PATCH v5 5/6] KVM: nVMX: Fix conditions for NMI injection References: <523b4691a695525a22102c496a078fda6a13d392.1365934368.git.jan.kiszka@web.de> <20130414152359.GT17919@redhat.com> <516AD0E1.5000000@web.de> <20130414161806.GA6542@redhat.com> <516ADAC2.7090306@web.de> <20130414164321.GB6542@redhat.com> In-Reply-To: <20130414164321.GB6542@redhat.com> X-Enigmail-Version: 1.5.1 X-Provags-ID: V02:K0:ag64uvJcE/Ot2J/JtyyBzxMhRmltSML+QBGK+fxzGDt 9nSEYuBCeCYE4S2T0YyKiyfF0AAJ15uEcuuUQuKJTSAoWiM0ao zD7B8YnHLgg5//vhOCuNllzRsGO4O2mH4KJuk1ZnRs8p57WCA9 Y4TyrvOkUPhOj5k0J3fWiNJpmpKXvZbHznAwUnecltnZVCUrMM 1RsTGU6qEONXav0l7ay8g== Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Jan Kiszka The logic for checking if interrupts can be injected has to be applied also on NMIs. The difference is that if NMI interception is on these events are consumed and blocked by the VM exit. Signed-off-by: Jan Kiszka Reviewed-by: Gleb Natapov --- arch/x86/kvm/vmx.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 74dea94..9ad30d8 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4190,6 +4190,12 @@ static bool nested_exit_on_intr(struct kvm_vcpu *vcpu) PIN_BASED_EXT_INTR_MASK; } +static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu) +{ + return get_vmcs12(vcpu)->pin_based_vm_exec_control & + PIN_BASED_NMI_EXITING; +} + static void enable_irq_window(struct kvm_vcpu *vcpu) { u32 cpu_based_vm_exec_control; @@ -4315,6 +4321,26 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked) static int vmx_nmi_allowed(struct kvm_vcpu *vcpu) { + if (is_guest_mode(vcpu)) { + struct vmcs12 *vmcs12 = get_vmcs12(vcpu); + + if (to_vmx(vcpu)->nested.nested_run_pending) + return 0; + if (nested_exit_on_nmi(vcpu)) { + nested_vmx_vmexit(vcpu); + vmcs12->vm_exit_reason = EXIT_REASON_EXCEPTION_NMI; + vmcs12->vm_exit_intr_info = NMI_VECTOR | + INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK; + /* + * The NMI-triggered VM exit counts as injection: + * clear this one and block further NMIs. + */ + vcpu->arch.nmi_pending = 0; + vmx_set_nmi_mask(vcpu, true); + return 0; + } + } + if (!cpu_has_virtual_nmis() && to_vmx(vcpu)->soft_vnmi_blocked) return 0;