From: Avi Kivity Subject: [PATCH] KVM: SVM: Load %fs early on vmexit path, on i386 Date: Sun, 26 Dec 2010 09:55:51 +0200 Message-ID: <1293350151-22826-1-git-send-email-avi@redhat.com> To: Marcelo Tosatti , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:61830 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495Ab0LZH4F (ORCPT ); Sun, 26 Dec 2010 02:56:05 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBQ7u4Rj017950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Dec 2010 02:56:04 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBQ7u3Vd000898 for ; Sun, 26 Dec 2010 02:56:04 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Fixes an oops due to the per-cpu area being referenced with the guest's %fs. Signed-off-by: Avi Kivity --- arch/x86/kvm/svm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index c9d711f..af4b911 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1148,8 +1148,8 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) ++vcpu->stat.host_state_reload; kvm_load_ldt(svm->host.ldt); - loadsegment(fs, svm->host.fs); #ifdef CONFIG_X86_64 + loadsegment(fs, svm->host.fs); load_gs_index(svm->host.gs); wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs); #else @@ -3633,6 +3633,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) #ifdef CONFIG_X86_64 wrmsrl(MSR_GS_BASE, svm->host.gs_base); +#else + loadsegment(fs, svm->host.fs); #endif reload_tss(vcpu); -- 1.7.1