From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753448Ab2IFLbT (ORCPT ); Thu, 6 Sep 2012 07:31:19 -0400 Received: from mailxx.hitachi.co.jp ([133.145.228.50]:59512 "EHLO mailxx.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596Ab2IFLas (ORCPT ); Thu, 6 Sep 2012 07:30:48 -0400 X-AuditID: b753bd60-9395fba000007c38-a2-504888cdfa38 X-AuditID: b753bd60-9395fba000007c38-a2-504888cdfa38 From: Tomoki Sekiyama Subject: [RFC v2 PATCH 09/21] KVM: Go back to online CPU on VM exit by external interrupt To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, yrl.pp-manager.tt@hitachi.com, Tomoki Sekiyama , Avi Kivity , Marcelo Tosatti , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Date: Thu, 06 Sep 2012 20:28:06 +0900 Message-ID: <20120906112806.13320.97205.stgit@kvmdev> In-Reply-To: <20120906112718.13320.8231.stgit@kvmdev> References: <20120906112718.13320.8231.stgit@kvmdev> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the slave CPU receives an interrupt in running a guest, current implementation must once go back to onilne CPUs to handle the interupt. This behavior will be replaced by later patch, which introduces direct interrupt handling mechanism by the guest. Signed-off-by: Tomoki Sekiyama Cc: Avi Kivity Cc: Marcelo Tosatti Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/vmx.c | 1 + arch/x86/kvm/x86.c | 6 ++++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 0ea04c9..af68ffb 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -358,6 +358,7 @@ struct kvm_vcpu_arch { int sipi_vector; u64 ia32_misc_enable_msr; bool tpr_access_reporting; + bool interrupted; #ifdef CONFIG_SLAVE_CPU /* slave cpu dedicated to this vcpu */ diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 7bbfa01..d99bee6 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4408,6 +4408,7 @@ static int handle_exception(struct kvm_vcpu *vcpu) static int handle_external_interrupt(struct kvm_vcpu *vcpu) { + vcpu->arch.interrupted = true; ++vcpu->stat.irq_exits; return 1; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index b62f59c..db0be81 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5566,6 +5566,12 @@ static void __vcpu_enter_guest_slave(void *_arg) break; /* determine if slave cpu can handle the exit alone */ + if (vcpu->arch.interrupted) { + vcpu->arch.interrupted = false; + arg->ret = LOOP_ONLINE; + break; + } + r = vcpu_post_run(vcpu, arg->task, &arg->apf_pending); if (r == LOOP_SLAVE &&