Changeset 43379 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 20, 2012 11:29:12 PM (12 years ago)

Author:

vboxsync

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

80845

Message:

SUPDrv,VMM: Prepared for SUPR0EnableVTx on darwin.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0.cpp (modified) (4 diffs)
• HWVMXR0.cpp (modified) (2 diffs)
• VMMR0.cpp (modified) (2 diffs)

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

@@ -1691 +1691 @@
  * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
+ * @param   enmSwitcher     The switcher we're about to use.
  * @param   pfVTxDisabled   Where to store whether VT-x was disabled or not.
  */
-VMMR0DECL(int) HWACCMR0EnterSwitcher(PVM pVM, bool *pfVTxDisabled)
+VMMR0DECL(int) HWACCMR0EnterSwitcher(PVM pVM, VMMSWITCHER enmSwitcher, bool *pfVTxDisabled)
 {
     Assert(!(ASMGetFlags() & X86_EFL_IF) || !RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -1699 +1700 @@
     *pfVTxDisabled = false;
 
-    if (   !g_HvmR0.fEnabled
-        || !g_HvmR0.vmx.fSupported /* no such issues with AMD-V */
-        || !g_HvmR0.fGlobalInit    /* Local init implies the CPU is currently not in VMX root mode. */)
-        return VINF_SUCCESS;    /* nothing to do */
-
-    switch (VMMGetSwitcher(pVM))
+    /* No such issues with AMD-V */
+    if (!g_HvmR0.vmx.fSupported)
+        return VINF_SUCCESS;
+
+    /* Check if the swithcing we're up to is safe. */
+    switch (enmSwitcher)
     {
         case VMMSWITCHER_32_TO_32:
@@ -1720 +1721 @@
     }
 
+    /* When using SUPR0EnableVTx we must let the host suspend and resume VT-x,
+       regardless of whether we're currently using VT-x or not. */
+    if (g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+    {
+        *pfVTxDisabled = SUPR0SuspendVTxOnCpu();
+        return VINF_SUCCESS;
+    }
+
+    /** @todo Check if this code is presumtive wrt other VT-x users on the
+     *        system... */
+
+    /* Nothing to do if we haven't enabled VT-x. */
+    if (!g_HvmR0.fEnabled)
+        return VINF_SUCCESS;
+
+    /* Local init implies the CPU is currently not in VMX root mode. */
+    if (!g_HvmR0.fGlobalInit)
+        return VINF_SUCCESS;
+
+    /* Ok, disable VT-x. */
     PHMGLOBLCPUINFO pCpu = HWACCMR0GetCurrentCpu();
     AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ, VERR_HM_IPE_2);
@@ -1734 +1755 @@
  * switcher turned off paging.
  *
- * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
  * @param   fVTxDisabled    Whether VT-x was disabled or not.
  */
-VMMR0DECL(int) HWACCMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled)
+VMMR0DECL(void) HWACCMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled)
 {
     Assert(!(ASMGetFlags() & X86_EFL_IF));
 
     if (!fVTxDisabled)
-        return VINF_SUCCESS;    /* nothing to do */
-
-    Assert(g_HvmR0.fEnabled);
+        return;         /* nothing to do */
+
     Assert(g_HvmR0.vmx.fSupported);
-    Assert(g_HvmR0.fGlobalInit);
-
-    PHMGLOBLCPUINFO pCpu = HWACCMR0GetCurrentCpu();
-    AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ, VERR_HM_IPE_2);
-
-    void           *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
-    RTHCPHYS        HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
-    return VMXR0EnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false);
+    if (g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+        SUPR0ResumeVTxOnCpu(fVTxDisabled);
+    else
+    {
+        Assert(g_HvmR0.fEnabled);
+        Assert(g_HvmR0.fGlobalInit);
+
+        PHMGLOBLCPUINFO pCpu = HWACCMR0GetCurrentCpu();
+        AssertReturnVoid(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ);
+
+        void           *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
+        RTHCPHYS        HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
+        VMXR0EnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false);
+    }
 }
 

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

@@ -137 +137 @@
          */
 
-        if (ASMGetCR4() & X86_CR4_VMXE)
-            return VERR_VMX_IN_VMX_ROOT_MODE;
-
-        ASMSetCR4(ASMGetCR4() | X86_CR4_VMXE);    /* Make sure the VMX instructions don't cause #UD faults. */
+        /** @todo r=bird: Why is this code different than the probing code earlier
+         *        on? It just sets VMXE if needed and doesn't check that it isn't
+         *        set.  Mac OS X host_vmxoff may leave this set and we'll fail here
+         *        and debug-assert in the calling code.  This is what caused the
+         *        "regression" after backing out the SUPR0EnableVTx code hours before
+         *        4.2.0GA (reboot fixed the issue).  I've changed here to do the same
+         *        as the init code. */
+        uint64_t uCr4 = ASMGetCR4();
+        if (!(uCr4 & X86_CR4_VMXE))
+            ASMSetCR4(ASMGetCR4() | X86_CR4_VMXE);    /* Make sure the VMX instructions don't cause #UD faults. */
 
         /*
@@ -148 +154 @@
         if (RT_FAILURE(rc))
         {
-            ASMSetCR4(ASMGetCR4() & ~X86_CR4_VMXE);
+            ASMSetCR4(uCr4);
             return VERR_VMX_VMXON_FAILED;
         }

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

@@ -683 +683 @@
                 /* We might need to disable VT-x if the active switcher turns off paging. */
                 bool fVTxDisabled;
-                int rc = HWACCMR0EnterSwitcher(pVM, &fVTxDisabled);
+                int rc = HWACCMR0EnterSwitcher(pVM, pVM->vmm.s.enmSwitcher, &fVTxDisabled);
                 if (RT_SUCCESS(rc))
                 {
@@ -999 +999 @@
 
             /* We might need to disable VT-x if the active switcher turns off paging. */
-            rc = HWACCMR0EnterSwitcher(pVM, &fVTxDisabled);
+            rc = HWACCMR0EnterSwitcher(pVM, pVM->vmm.s.enmSwitcher, &fVTxDisabled);
             if (RT_FAILURE(rc))
                 return rc;