# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1275643233 -3600
# Node ID 754ae5d0077dcf318f41ba22b17209f315a12cee
# Parent d908c386a63d825d905ac2023c4d42a540629448
VMX: add EPT 2M super page feature detection
Signed-off-by: Xin Li <xin.li@xxxxxxxxx>
---
xen/arch/x86/hvm/svm/svm.c | 2 ++
xen/arch/x86/hvm/vmx/vmcs.c | 12 ++++++++++++
xen/arch/x86/hvm/vmx/vmx.c | 4 ++++
xen/arch/x86/mm/p2m.c | 4 +++-
xen/include/asm-x86/hvm/hvm.h | 12 ++++++++++++
xen/include/asm-x86/hvm/vmx/vmcs.h | 6 ++++++
xen/include/asm-x86/msr-index.h | 1 +
7 files changed, 40 insertions(+), 1 deletion(-)
diff -r d908c386a63d -r 754ae5d0077d xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c Fri Jun 04 10:20:33 2010 +0100
@@ -906,6 +906,8 @@ void start_svm(struct cpuinfo_x86 *c)
svm_function_table.hap_supported = cpu_has_svm_npt;
+ svm_function_table.hap_capabilities = HVM_HAP_SUPERPAGE_2MB;
+
hvm_enable(&svm_function_table);
}
diff -r d908c386a63d -r 754ae5d0077d xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c Fri Jun 04 10:20:33 2010 +0100
@@ -47,6 +47,7 @@ u32 vmx_secondary_exec_control __read_mo
u32 vmx_secondary_exec_control __read_mostly;
u32 vmx_vmexit_control __read_mostly;
u32 vmx_vmentry_control __read_mostly;
+u64 vmx_ept_vpid_cap __read_mostly;
bool_t cpu_has_vmx_ins_outs_instr_info __read_mostly;
static DEFINE_PER_CPU(struct vmcs_struct *, host_vmcs);
@@ -72,6 +73,9 @@ static void __init vmx_display_features(
if ( !printed )
printk(" - none\n");
+
+ if ( cpu_has_vmx_ept_2mb )
+ printk("EPT supports 2MB super page.\n");
}
static u32 adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, u32 msr)
@@ -95,6 +99,7 @@ static void vmx_init_vmcs_config(void)
u32 _vmx_pin_based_exec_control;
u32 _vmx_cpu_based_exec_control;
u32 _vmx_secondary_exec_control = 0;
+ u64 _vmx_ept_vpid_cap = 0;
u32 _vmx_vmexit_control;
u32 _vmx_vmentry_control;
@@ -159,6 +164,11 @@ static void vmx_init_vmcs_config(void)
_vmx_secondary_exec_control &= ~SECONDARY_EXEC_ENABLE_EPT;
}
+ /* The IA32_VMX_EPT_VPID_CAP MSR exists only when EPT or VPID available */
+ if ( _vmx_secondary_exec_control &
+ (SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_ENABLE_VPID) )
+ rdmsrl(MSR_IA32_VMX_EPT_VPID_CAP, _vmx_ept_vpid_cap);
+
#if defined(__i386__)
/* If we can't virtualise APIC accesses, the TPR shadow is pointless. */
if ( !(_vmx_secondary_exec_control &
@@ -186,6 +196,7 @@ static void vmx_init_vmcs_config(void)
vmx_pin_based_exec_control = _vmx_pin_based_exec_control;
vmx_cpu_based_exec_control = _vmx_cpu_based_exec_control;
vmx_secondary_exec_control = _vmx_secondary_exec_control;
+ vmx_ept_vpid_cap = _vmx_ept_vpid_cap;
vmx_vmexit_control = _vmx_vmexit_control;
vmx_vmentry_control = _vmx_vmentry_control;
cpu_has_vmx_ins_outs_instr_info = !!(vmx_basic_msr_high & (1U<<22));
@@ -198,6 +209,7 @@ static void vmx_init_vmcs_config(void)
BUG_ON(vmx_pin_based_exec_control != _vmx_pin_based_exec_control);
BUG_ON(vmx_cpu_based_exec_control != _vmx_cpu_based_exec_control);
BUG_ON(vmx_secondary_exec_control != _vmx_secondary_exec_control);
+ BUG_ON(vmx_ept_vpid_cap != _vmx_ept_vpid_cap);
BUG_ON(vmx_vmexit_control != _vmx_vmexit_control);
BUG_ON(vmx_vmentry_control != _vmx_vmentry_control);
BUG_ON(cpu_has_vmx_ins_outs_instr_info !=
diff -r d908c386a63d -r 754ae5d0077d xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c Fri Jun 04 10:20:33 2010 +0100
@@ -1419,6 +1419,10 @@ void start_vmx(void)
{
printk("VMX: EPT is available.\n");
vmx_function_table.hap_supported = 1;
+ vmx_function_table.hap_capabilities = 0;
+
+ if ( cpu_has_vmx_ept_2mb )
+ vmx_function_table.hap_capabilities |= HVM_HAP_SUPERPAGE_2MB;
}
if ( cpu_has_vmx_vpid )
diff -r d908c386a63d -r 754ae5d0077d xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/arch/x86/mm/p2m.c Fri Jun 04 10:20:33 2010 +0100
@@ -1504,7 +1504,9 @@ int set_p2m_entry(struct domain *d, unsi
while ( todo )
{
- order = (((gfn | mfn_x(mfn) | todo) & (SUPERPAGE_PAGES - 1)) == 0) ? 9
: 0;
+ order = ((((gfn | mfn_x(mfn) | todo) & (SUPERPAGE_PAGES - 1)) == 0) &&
+ hvm_hap_has_2mb(d)) ? 9 : 0;
+
rc = d->arch.p2m->set_entry(d, gfn, mfn, order, p2mt);
gfn += 1ul << order;
if ( mfn_x(mfn) != INVALID_MFN )
diff -r d908c386a63d -r 754ae5d0077d xen/include/asm-x86/hvm/hvm.h
--- a/xen/include/asm-x86/hvm/hvm.h Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/include/asm-x86/hvm/hvm.h Fri Jun 04 10:20:33 2010 +0100
@@ -56,6 +56,12 @@ enum hvm_intblk {
#define HVM_INTR_SHADOW_NMI 0x00000008
/*
+ * HAP super page capabilities:
+ * bit0: if 2MB super page is allowed?
+ */
+#define HVM_HAP_SUPERPAGE_2MB 0x00000001
+
+/*
* The hardware virtual machine (HVM) interface abstracts away from the
* x86/x86_64 CPU virtualization assist specifics. Currently this interface
* supports Intel's VT-x and AMD's SVM extensions.
@@ -65,6 +71,9 @@ struct hvm_function_table {
/* Support Hardware-Assisted Paging? */
int hap_supported;
+
+ /* Indicate HAP capabilities. */
+ int hap_capabilities;
/*
* Initialise/destroy HVM domain/vcpu resources
@@ -163,6 +172,9 @@ u64 hvm_get_guest_time(struct vcpu *v);
#define hvm_nx_enabled(v) \
(!!((v)->arch.hvm_vcpu.guest_efer & EFER_NX))
+#define hvm_hap_has_2mb(d) \
+ (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_2MB)
+
#ifdef __x86_64__
#define hvm_long_mode_enabled(v) \
((v)->arch.hvm_vcpu.guest_efer & EFER_LMA)
diff -r d908c386a63d -r 754ae5d0077d xen/include/asm-x86/hvm/vmx/vmcs.h
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h Fri Jun 04 10:20:33 2010 +0100
@@ -174,6 +174,10 @@ extern u32 vmx_secondary_exec_control;
extern bool_t cpu_has_vmx_ins_outs_instr_info;
+extern u64 vmx_ept_vpid_cap;
+
+#define VMX_EPT_SUPERPAGE_2MB 0x00010000
+
#define cpu_has_wbinvd_exiting \
(vmx_secondary_exec_control & SECONDARY_EXEC_WBINVD_EXITING)
#define cpu_has_vmx_virtualize_apic_accesses \
@@ -188,6 +192,8 @@ extern bool_t cpu_has_vmx_ins_outs_instr
(vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS)
#define cpu_has_vmx_ept \
(vmx_secondary_exec_control & SECONDARY_EXEC_ENABLE_EPT)
+#define cpu_has_vmx_ept_2mb \
+ (vmx_ept_vpid_cap & VMX_EPT_SUPERPAGE_2MB)
#define cpu_has_vmx_vpid \
(vmx_secondary_exec_control & SECONDARY_EXEC_ENABLE_VPID)
#define cpu_has_monitor_trap_flag \
diff -r d908c386a63d -r 754ae5d0077d xen/include/asm-x86/msr-index.h
--- a/xen/include/asm-x86/msr-index.h Fri Jun 04 10:20:12 2010 +0100
+++ b/xen/include/asm-x86/msr-index.h Fri Jun 04 10:20:33 2010 +0100
@@ -164,6 +164,7 @@
#define MSR_IA32_VMX_CR4_FIXED0 0x488
#define MSR_IA32_VMX_CR4_FIXED1 0x489
#define MSR_IA32_VMX_PROCBASED_CTLS2 0x48b
+#define MSR_IA32_VMX_EPT_VPID_CAP 0x48c
#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x48d
#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x48e
#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x48f
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home