From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] KVM: x86: Check KVM_REQ_IMMEDIATE_EXIT after enable_irq_window Date: Sun, 28 Apr 2013 09:23:58 +0200 Message-ID: <517CCE8E.6010805@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm , "Nakajima, Jun" , "Ren, Yongjie" To: Gleb Natapov , Marcelo Tosatti Return-path: Received: from mout.web.de ([212.227.17.11]:49796 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751151Ab3D1HYD (ORCPT ); Sun, 28 Apr 2013 03:24:03 -0400 Sender: kvm-owner@vger.kernel.org List-ID: From: Jan Kiszka The VMX implementation of enable_irq_window will raise KVM_REQ_IMMEDIATE_EXIT if an interrupt window shall be opened during nested vmrun. We have to transfer this request into the local variable to avoid looping over a continuously re-asserted request on vmentry. This issue only affects nested VMX scenarios. Signed-off-by: Jan Kiszka --- arch/x86/kvm/x86.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2a434bf..57ff14a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5759,6 +5759,9 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) else if (kvm_cpu_has_injectable_intr(vcpu) || req_int_win) kvm_x86_ops->enable_irq_window(vcpu); + req_immediate_exit = + kvm_check_request(KVM_REQ_IMMEDIATE_EXIT, vcpu); + if (kvm_lapic_enabled(vcpu)) { /* * Update architecture specific hints for APIC -- 1.7.3.4