From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] KVM: nVMX: Fix injection of PENDING_INTERRUPT and NMI_WINDOW exits to L1 Date: Sat, 16 Feb 2013 12:51:20 +0100 Message-ID: <511F72B8.6060305@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm , Nadav Har'El , "Nakajima, Jun" To: Gleb Natapov , Marcelo Tosatti Return-path: Received: from mout.web.de ([212.227.17.12]:58633 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753164Ab3BPLva (ORCPT ); Sat, 16 Feb 2013 06:51:30 -0500 Sender: kvm-owner@vger.kernel.org List-ID: From: Jan Kiszka The comment was wrong: enable_irq_window might be called after prepare_vmcs02 when we left L2 to prepare IRQ injecting for L1. Same for NMIs. Signed-off-by: Jan Kiszka --- arch/x86/kvm/vmx.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 81a25de..68a045ae 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6113,14 +6113,10 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) case EXIT_REASON_TRIPLE_FAULT: return 1; case EXIT_REASON_PENDING_INTERRUPT: + return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING); case EXIT_REASON_NMI_WINDOW: - /* - * prepare_vmcs02() set the CPU_BASED_VIRTUAL_INTR_PENDING bit - * (aka Interrupt Window Exiting) only when L1 turned it on, - * so if we got a PENDING_INTERRUPT exit, this must be for L1. - * Same for NMI Window Exiting. - */ - return 1; + return vmcs12->pin_based_vm_exec_control & + PIN_BASED_NMI_EXITING; case EXIT_REASON_TASK_SWITCH: return 1; case EXIT_REASON_CPUID: -- 1.7.3.4