From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCH v2 1/5] KVM: nVMX: Fix injection of PENDING_INTERRUPT and NMI_WINDOW exits to L1 Date: Sun, 17 Mar 2013 15:47:01 +0200 Message-ID: <20130317134701.GJ11223@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Marcelo Tosatti , kvm , Paolo Bonzini , "Nadav Har'El" To: Jan Kiszka Return-path: Received: from mx1.redhat.com ([209.132.183.28]:18669 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753962Ab3CQNrG (ORCPT ); Sun, 17 Mar 2013 09:47:06 -0400 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Sat, Mar 16, 2013 at 11:23:15AM +0100, Jan Kiszka wrote: > From: Jan Kiszka > > Check if the interrupt or NMI window exit is for L1 by testing if it has > the corresponding controls enabled. This is required when we allow > direct injection from L0 to L2 > > Signed-off-by: Jan Kiszka Reviewed-by: Gleb Natapov > --- > arch/x86/kvm/vmx.c | 9 ++------- > 1 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index ad978a6..126d047 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -6111,14 +6111,9 @@ 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 nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING); > case EXIT_REASON_TASK_SWITCH: > return 1; > case EXIT_REASON_CPUID: > -- > 1.7.3.4 -- Gleb.