Changeset 46379 in vbox

Timestamp:

Jun 4, 2013 1:01:04 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86199

Message:

VMM/HMVMXR0: Added VMFUNC feature recognition.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMR0.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -805 +805 @@
 /** Highest field index. */
 #define MSR_IA32_VMX_VMCS_ENUM_HIGHEST_INDEX(a)                 (((a) >> 1) & 0x1FF)
-
 /** @} */
 
@@ -1128 +1127 @@
 /** @} */
 
+
+/** @name VMX_VMCS_CTRL_VMFUNC
+ * @{
+ */
+/** EPTP-switching function changes the value of the EPTP to one chosen from the EPTP list. */
+#define VMX_VMCS_CTRL_VMFUNC_EPTP_SWITCHING            RT_BIT_64(0)
+/** @} */
+
+
 /**  @name VMCS field encoding - 32 Bits read-only fields
  * @{

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -136 +136 @@
             uint64_t                vmx_cr4_fixed1;
             uint64_t                vmx_vmcs_enum;
+            uint64_t                vmx_vmfunc;
             uint64_t                vmx_ept_vpid_caps;
         } msr;
@@ -429 +430 @@
                         g_HvmR0.vmx.msr.vmx_ept_vpid_caps = ASMRdMsr(MSR_IA32_VMX_EPT_VPID_CAP);
                     }
+
+                    if (g_HvmR0.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VMFUNC)
+                        g_HvmR0.vmx.msr.vmx_vmfunc        = ASMRdMsr(MSR_IA32_VMX_VMFUNC);
                 }
 
@@ -1253 +1257 @@
     pVM->hm.s.vmx.msr.vmx_cr4_fixed1    = g_HvmR0.vmx.msr.vmx_cr4_fixed1;
     pVM->hm.s.vmx.msr.vmx_vmcs_enum     = g_HvmR0.vmx.msr.vmx_vmcs_enum;
+    pVM->hm.s.vmx.msr.vmx_vmfunc        = g_HvmR0.vmx.msr.vmx_vmfunc;
     pVM->hm.s.vmx.msr.vmx_ept_vpid_caps = g_HvmR0.vmx.msr.vmx_ept_vpid_caps;
     pVM->hm.s.svm.msrHwcr               = g_HvmR0.svm.msrHwcr;

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -284 +284 @@
     } while (0)
 
+#define HMVMX_REPORT_ALLOWED_FEATURE(allowed1, featflag) \
+    do { \
+        if ((allowed1) & (featflag)) \
+            LogRel(("HM:    " #featflag "\n")); \
+        else \
+            LogRel(("HM:    " #featflag " not supported\n")); \
+    } while (0)
+
 #define HMVMX_REPORT_CAPABILITY(msrcaps, cap) \
     do { \
@@ -1099 +1107 @@
     LogRel(("HM:    MSR_IA32_VMX_MISC_MSEG_ID                = %x\n", MSR_IA32_VMX_MISC_MSEG_ID(pVM->hm.s.vmx.msr.vmx_misc)));
 
+    /* Paranoia */
+    AssertRelease(MSR_IA32_VMX_MISC_MAX_MSR(pVM->hm.s.vmx.msr.vmx_misc) >= 512);
+
     LogRel(("HM: MSR_IA32_VMX_CR0_FIXED0       = %RX64\n", pVM->hm.s.vmx.msr.vmx_cr0_fixed0));
     LogRel(("HM: MSR_IA32_VMX_CR0_FIXED1       = %RX64\n", pVM->hm.s.vmx.msr.vmx_cr0_fixed1));
@@ -1104 +1115 @@
     LogRel(("HM: MSR_IA32_VMX_CR4_FIXED1       = %RX64\n", pVM->hm.s.vmx.msr.vmx_cr4_fixed1));
     LogRel(("HM: MSR_IA32_VMX_VMCS_ENUM        = %RX64\n", pVM->hm.s.vmx.msr.vmx_vmcs_enum));
+    LogRel(("HM:    MSR_IA32_VMX_VMCS_ENUM_HIGHEST_INDEX     = %x\n", MSR_IA32_VMX_VMCS_ENUM_HIGHEST_INDEX(pVM->hm.s.vmx.msr.vmx_vmcs_enum)));
+
+    val = pVM->hm.s.vmx.msr.vmx_vmfunc;
+    if (val)
+    {
+        LogRel(("HM: MSR_A32_VMX_VMFUNC            = %RX64\n", val));
+        HMVMX_REPORT_ALLOWED_FEATURE(val, VMX_VMCS_CTRL_VMFUNC_EPTP_SWITCHING);
+    }
 
     LogRel(("HM: APIC-access page physaddr     = %RHp\n", pVM->hm.s.vmx.HCPhysApicAccess));
-
-    /* Paranoia */
-    AssertRelease(MSR_IA32_VMX_MISC_MAX_MSR(pVM->hm.s.vmx.msr.vmx_misc) >= 512);
 
     for (VMCPUID i = 0; i < pVM->cCpus; i++)