From patchwork Wed Jan 28 09:22:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 4195 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0S9MLav022273 for ; Wed, 28 Jan 2009 09:22:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752390AbZA1JWR (ORCPT ); Wed, 28 Jan 2009 04:22:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752877AbZA1JWR (ORCPT ); Wed, 28 Jan 2009 04:22:17 -0500 Received: from ns1.suse.de ([195.135.220.2]:36959 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752390AbZA1JWP (ORCPT ); Wed, 28 Jan 2009 04:22:15 -0500 Received: from Relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 7ACEC44BC4; Wed, 28 Jan 2009 10:22:14 +0100 (CET) From: Alexander Graf To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH 2/2] Add FFXSR support to KVM Date: Wed, 28 Jan 2009 10:22:13 +0100 Message-Id: <1233134533-3255-3-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1233134533-3255-2-git-send-email-agraf@suse.de> References: <1233134533-3255-1-git-send-email-agraf@suse.de> <1233134533-3255-2-git-send-email-agraf@suse.de> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org AMD K10 CPUs implement the FFXSR feature that gets enabled using EFER. Let's check if the virtual CPU description includes that CPUID feature bit and allow enabling it then. This is required for Windows Server 2008 in Hyper-V mode. Signed-off-by: Alexander Graf --- arch/x86/kvm/svm.c | 3 +++ arch/x86/kvm/x86.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index db5021b..1c4a018 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -417,6 +417,9 @@ static __init int svm_hardware_setup(void) if (boot_cpu_has(X86_FEATURE_NX)) kvm_enable_efer_bits(EFER_NX); + if (boot_cpu_has(X86_FEATURE_FXSR_OPT)) + kvm_enable_efer_bits(EFER_FFXSR); + if (nested) { printk(KERN_INFO "kvm: Nested Virtualization enabled\n"); kvm_enable_efer_bits(EFER_SVME); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e96edda..cb3529d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -490,6 +490,17 @@ static void set_efer(struct kvm_vcpu *vcpu, u64 efer) return; } + if (efer & EFER_FFXSR) { + struct kvm_cpuid_entry2 *feat; + + feat = kvm_find_cpuid_entry(vcpu, 0x80000001, 0); + if (!feat || !(feat->edx & bit(X86_FEATURE_FXSR_OPT))) { + printk(KERN_DEBUG "set_efer: #GP, enable FFXSR w/o CPUID capability\n"); + kvm_inject_gp(vcpu, 0); + return; + } + } + if (efer & EFER_SVME) { struct kvm_cpuid_entry2 *feat;