From: Christoph Egger Subject: [PATCH 10/18] Nested Virtualization: efer Date: Thu, 15 Apr 2010 14:33:51 +0200 Message-ID: <201004151433.51607.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_vewxLR7iZz208aL" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-00=_vewxLR7iZz208aL Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_vewxLR7iZz208aL Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_nh10_efer.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_nh10_efer.diff" # HG changeset patch # User cegger # Date 1271330303 -7200 Allow guest to enable SVM in EFER diff -r c7f560bcc31f -r e905f1d81e63 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -587,6 +588,7 @@ static bool_t hvm_efer_valid(uint64_t va { return !((value & ~efer_validbits) || ((sizeof(long) != 8) && (value & EFER_LME)) || + (!cpu_has_svm && (value & EFER_SVME)) || (!cpu_has_nx && (value & EFER_NX)) || (!cpu_has_syscall && (value & EFER_SCE)) || (!cpu_has_ffxsr && (value & EFER_FFXSE)) || @@ -600,6 +602,7 @@ static int hvm_load_cpu_ctxt(struct doma struct hvm_hw_cpu ctxt; struct segment_register seg; struct vcpu_guest_context *vc; + uint64_t efer_validbits; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -639,8 +642,11 @@ static int hvm_load_cpu_ctxt(struct doma return -EINVAL; } - if ( !hvm_efer_valid( - ctxt.msr_efer, EFER_FFXSE | EFER_LME | EFER_LMA | EFER_NX | EFER_SCE) ) + efer_validbits = EFER_FFXSE | EFER_LME | EFER_LMA | EFER_NX | EFER_SCE; + if ( nestedhvm_enabled(v->domain) ) + efer_validbits |= EFER_SVME; + + if ( !hvm_efer_valid(ctxt.msr_efer, efer_validbits) ) { gdprintk(XENLOG_ERR, "HVM restore: bad EFER 0x%"PRIx64"\n", ctxt.msr_efer); @@ -992,10 +998,15 @@ bool_t hvm_hap_nested_page_fault(unsigne int hvm_set_efer(uint64_t value) { struct vcpu *v = current; + uint64_t efer_validbits; value &= ~EFER_LMA; - if ( !hvm_efer_valid(value, EFER_FFXSE | EFER_LME | EFER_NX | EFER_SCE) ) + efer_validbits = EFER_FFXSE | EFER_LME | EFER_NX | EFER_SCE; + if ( nestedhvm_enabled(v->domain) ) + efer_validbits |= EFER_SVME; + + if ( !hvm_efer_valid(value, efer_validbits) ) { gdprintk(XENLOG_WARNING, "Trying to set reserved bit in " "EFER: %"PRIx64"\n", value); diff -r c7f560bcc31f -r e905f1d81e63 xen/include/asm-x86/cpufeature.h --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -198,6 +198,8 @@ #define cpu_has_rdtscp boot_cpu_has(X86_FEATURE_RDTSCP) +#define cpu_has_svm boot_cpu_has(X86_FEATURE_SVME) + #endif /* __ASM_I386_CPUFEATURE_H */ /* --Boundary-00=_vewxLR7iZz208aL Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_vewxLR7iZz208aL--