Nested Virtualization: efer
PATCH 7/12 Nested Virtualization: efer
Signature · 7 lines
-- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
# HG changeset patch
# User cegger
# Date 1292839437 -3600
Allow guest to enable SVM in EFER
Signed-off-by Christoph Egger <[email protected]>
xen/arch/x86/hvm/hvm.c +14 -7
@@ -616,10 +616,15 @@ static int hvm_save_cpu_ctxt(struct domareturn 0 ; } -static bool_t hvm_efer_valid (uint64_t value,uint64_t efer_validbits) +static bool_t hvm_efer_valid (struct domain *d, +uint64_t value,uint64_t efer_validbits) { +if (nestedhvm_enabled (d) && cpu_has_svm ) + efer_validbits |=EFER_SVME ; + 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_lmsl && (value & EFER_LMSLE)) ||
@@ -634,6 +639,7 @@ static int hvm_load_cpu_ctxt(struct domastruct 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);
@@ -673,9 +679,9 @@ static int hvm_load_cpu_ctxt(struct domareturn -EINVAL ; } -if ( !hvm_efer_valid ( - ctxt.msr_efer, -EFER_FFXSE |EFER_LMSLE |EFER_LME |EFER_LMA |EFER_NX |EFER_SCE ) ) + efer_validbits =EFER_FFXSE |EFER_LMSLE |EFER_LME |EFER_LMA + |EFER_NX |EFER_SCE ; +if ( !hvm_efer_valid (d, ctxt.msr_efer, efer_validbits) ) {gdprintk (XENLOG_ERR ,"HVM restore: bad EFER 0x%" PRIx64"\n" , ctxt.msr_efer);
@@ -1214,14 +1220,15 @@ err: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_LMSLE |EFER_LME |EFER_NX |EFER_SCE ) ) + efer_validbits =EFER_FFXSE |EFER_LMSLE |EFER_LME |EFER_NX |EFER_SCE ; +if ( !hvm_efer_valid (v->domain, value, efer_validbits) ) {gdprintk (XENLOG_WARNING ,"Trying to set reserved bit in " -"EFER: %" PRIx64"\n" , value); +"EFER: 0x%" PRIx64"\n" , value);hvm_inject_exception (TRAP_gp_fault,0 ,0 );return X86EMUL_EXCEPTION ; }
xen/include/asm-x86/cpufeature.h +2 -0
@@ -204,6 +204,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 */ /*
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel