diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-11-30 09:23:57 +0000 |
---|---|---|
committer | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-11-30 09:23:57 +0000 |
commit | d2bddeb9d55066b0c508fd925cf578f54ffbd2f9 (patch) | |
tree | a3244c1eb7d095c5df08d83e10d899425782776e | |
parent | 6034456b6f1ab2f490966fbbe9354bb751342ad8 (diff) | |
download | xen-d2bddeb9d55066b0c508fd925cf578f54ffbd2f9.tar.gz xen-d2bddeb9d55066b0c508fd925cf578f54ffbd2f9.tar.bz2 xen-d2bddeb9d55066b0c508fd925cf578f54ffbd2f9.zip |
nested vmx: enable Descriptor-table exiting for L1 VMM
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Acked-by: Jun Nakajima <jun.nakajima@intel.com>
Committed-by: Keir Fraser <keir@xen.org>
-rw-r--r-- | xen/arch/x86/hvm/vmx/vvmx.c | 8 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/vmx/vmcs.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 14a3d62e55..23c949be9f 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1300,7 +1300,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) break; case MSR_IA32_VMX_PROCBASED_CTLS2: /* 1-seetings */ - data = 0; + data = SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING; /* 0-settings */ tmp = 0; data = (data << 32) | tmp; @@ -1507,6 +1507,12 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, if ( ctrl & CPU_BASED_MONITOR_TRAP_FLAG) nvcpu->nv_vmexit_pending = 1; break; + case EXIT_REASON_ACCESS_GDTR_OR_IDTR: + case EXIT_REASON_ACCESS_LDTR_OR_TR: + ctrl = __n2_secondary_exec_control(v); + if ( ctrl & SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING ) + nvcpu->nv_vmexit_pending = 1; + break; /* L1 has priority handling several other types of exits */ case EXIT_REASON_HLT: ctrl = __n2_exec_control(v); diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 4f58991d8b..053de17e4f 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -179,6 +179,7 @@ extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 #define SECONDARY_EXEC_ENABLE_EPT 0x00000002 +#define SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING 0x00000004 #define SECONDARY_EXEC_ENABLE_RDTSCP 0x00000008 #define SECONDARY_EXEC_ENABLE_VPID 0x00000020 #define SECONDARY_EXEC_WBINVD_EXITING 0x00000040 |