From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gleb Natapov <gleb@qumranet.com>
Subject: [PATCH] don't enter guest after SIPI was received by a CPU
Date: Mon, 22 Sep 2008 14:28:53 +0300
Message-ID: <20080922112853.GF27089@minantech.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org
To: avi@redhat.com
Return-path: <kvm-owner@vger.kernel.org>
Received: from il.qumranet.com ([212.179.150.194]:56741 "EHLO il.qumranet.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751765AbYIVL2z (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 22 Sep 2008 07:28:55 -0400
Content-Disposition: inline
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Don't enter guest after SIPI was issued.

CPU should process SIPI message before entering a guest mode again.
kvm_arch_vcpu_runnable() return true if CPU is in SIPI state, so
we can't call it here.

Signed-off-by: Gleb Natapov <gleb@qumranet.com>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 61eddbe..612099f 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3239,7 +3239,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
 	r = 1;
 	while (r > 0) {
-		if (kvm_arch_vcpu_runnable(vcpu))
+		if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE)
 			r = vcpu_enter_guest(vcpu, kvm_run);
 		else {
 			up_read(&vcpu->kvm->slots_lock);
--
			Gleb.