EPT support breakage on: KVM: VMX: Zero ept module parameter if ept is not present

[Andrew Theurer <habanero@linux.vnet.ibm.com>]

I cannot get EPT support to work on commit:
21f65ab2c582594a69dcb1484afa9f88b3414b4f
KVM: VMX: Zero ept module parameter if ept is not present

I see tons of pf_guest from kvm_stat, where as the previous commit has none.
I am using "ept=1" module option for kvm-intel.

This is on Nehalem processors.

-Andrew


commit diff:

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 8b1b9b8..96a19f8 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -265,7 +265,7 @@ static inline int cpu_has_vmx_ept(void)
 
 static inline int vm_need_ept(void)
 {
-       return (cpu_has_vmx_ept() && enable_ept);
+       return enable_ept;
 }
 
 static inline int vm_need_virtualize_apic_accesses(struct kvm *kvm)
@@ -1205,6 +1205,9 @@ static __init int setup_vmcs_config(struct 
vmcs_config *vmcs_conf)
        if (!cpu_has_vmx_vpid())
                enable_vpid = 0;
 
+       if (!cpu_has_vmx_ept())
+               enable_ept = 0;
+
        min = 0;
 #ifdef CONFIG_X86_64
        min |= VM_EXIT_HOST_ADDR_SPACE_SIZE;