Changeset 45848 in vbox for trunk/src/VBox

Timestamp:

Apr 30, 2013 6:00:08 PM (12 years ago)

Author:

vboxsync

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

85426

Message:

VMM/HMVMX0: We're already in non-preemptible context. Too paranoid to assume CR4.VMXE can be changed by interrupt handlers. Do less work, assert instead.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (6 diffs)

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

@@ -631 +631 @@
  * @param   pvCpuPage           Pointer to the VMXON region.
  */
-DECLINLINE(int) hmR0VmxEnterRootMode(PVM pVM, RTHCPHYS HCPhysCpuPage, void *pvCpuPage)
+static int hmR0VmxEnterRootMode(PVM pVM, RTHCPHYS HCPhysCpuPage, void *pvCpuPage)
 {
     AssertReturn(HCPhysCpuPage != 0 && HCPhysCpuPage != NIL_RTHCPHYS, VERR_INVALID_PARAMETER);
     AssertReturn(pvCpuPage, VERR_INVALID_PARAMETER);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     if (pVM)
@@ -641 +642 @@
         *(uint32_t *)pvCpuPage = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(pVM->hm.s.vmx.msr.vmx_basic_info);
     }
-
-    /* Disable interrupts. Interrupts handlers might, in theory, change CR4. */
-    RTCCUINTREG fFlags = ASMIntDisableFlags();
 
     /* Enable the VMX bit in CR4 if necessary. */
@@ -651 +649 @@
 
     /* Enter VMX root mode. */
-    int rc = VMXEnable(HCPhysCpuPage);  /** @todo This would #GP(0) if we are already in VMX root mode... try skip it? */
+    int rc = VMXEnable(HCPhysCpuPage);
     if (RT_FAILURE(rc))
         ASMSetCR4(uCr4);
 
-    /* Restore interrupts. */
-    ASMSetFlags(fFlags);
     return rc;
 }
@@ -668 +664 @@
 static int hmR0VmxLeaveRootMode(void)
 {
-    /* Disable interrupts. Interrupt handlers might, in theory, change CR4. */
-    RTCCUINTREG fFlags = ASMIntDisableFlags();
-    int         rc     = VINF_SUCCESS;
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     /* If we're for some reason not in VMX root mode, then don't leave it. */
@@ -678 +672 @@
         VMXDisable();
         ASMSetCR4(ASMGetCR4() & ~X86_CR4_VMXE);
-    }
-    else
-        rc = VERR_VMX_NOT_IN_VMX_ROOT_MODE;
-
-    /* Restore interrupts. */
-    ASMSetFlags(fFlags);
-    return rc;
+        return VINF_SUCCESS;
+    }
+
+    return VERR_VMX_NOT_IN_VMX_ROOT_MODE;
 }
 
@@ -976 +967 @@
     NOREF(pvCpuPage);
     NOREF(HCPhysCpuPage);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     hmR0VmxLeaveRootMode();