Changeset 11756 in vbox

Timestamp:

Aug 28, 2008 12:28:57 PM (16 years ago)

Author:

vboxsync

Message:

Use the wbinvd intercept if it's present in the secondary control.

Location:

trunk

Files:

• include/VBox/hwacc_vmx.h (modified) (1 diff)
• src/VBox/VMM/HWACCMInternal.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -235 +235 @@
 /** 43 TPR below threshold. Guest software executed MOV to CR8. */
 #define VMX_EXIT_TPR                43
+/** 54 WBINVD. Guest software attempted to execute WBINVD. */
+#define VMX_EXIT_WBINVD             54
 
 /** @} */

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -255 +255 @@
         /** Current VMX_VMCS_CTRL_PROC_EXEC_CONTROLS. */
         uint64_t                    proc_ctls;
+
+        /** Current VMX_VMCS_CTRL_PROC_EXEC_CONTROLS2. */
+        uint64_t                    proc_ctls2;
 
         /** Current CR0 mask. */

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

@@ -320 +320 @@
 #endif
 
+    /* We will use the secondary control if it's present. */
+    val |= VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL;
+
     /* Mask away the bits that the CPU doesn't support */
     /** @todo make sure they don't conflict with the above requirements. */
@@ -327 +330 @@
     rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, val);
     AssertRC(rc);
+
+    if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL)
+    {
+        /* VMX_VMCS_CTRL_PROC_EXEC_CONTROLS2
+         * Set required bits to one and zero according to the MSR capabilities.
+         */
+        val  = pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.disallowed0;
+        val |= VMX_VMCS_CTRL_PROC_EXEC2_WBINVD_EXIT;
+
+        /* Mask away the bits that the CPU doesn't support */
+        /** @todo make sure they don't conflict with the above requirements. */
+        val &= pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1;
+        pVM->hwaccm.s.vmx.proc_ctls2 = val;
+
+        rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS2, val);
+        AssertRC(rc);
+    }
 
     /* VMX_VMCS_CTRL_CR3_TARGET_COUNT
@@ -1752 +1772 @@
         goto ResumeExecution;   /* we check for pending guest interrupts there */
 
-    case VMX_EXIT_INVD:                 /* 13 Guest software attempted to execute INVD. */
+    case VMX_EXIT_WBINVD:               /* 54 Guest software attempted to execute WBINVD. (conditional) */
+    case VMX_EXIT_INVD:                 /* 13 Guest software attempted to execute INVD. (unconditional) */
         STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitInvd);
         /* Skip instruction and continue directly. */