Changeset 48426 in vbox

Timestamp:

Sep 11, 2013 11:52:56 AM (11 years ago)

Author:

vboxsync

Message:

VMM: Fixed strict build assertion assumption with thread-context hooks. More assertions, slight cleanup.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/VMMAll.cpp (modified) (1 diff)
• VMMR0/HMR0.cpp (modified) (9 diffs)
• VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -201 +201 @@
      */
     /* RTMpCpuId had better be cheap. */
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     RTCPUID idHostCpu = RTMpCpuId();
 

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

@@ -800 +800 @@
 {
     PHMR0FIRSTRC pFirstRc = (PHMR0FIRSTRC)pvUser1;
-    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /// @todo fix idCpu == index assumption (rainy day)
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     NOREF(pvUser2);
@@ -862 +862 @@
 {
     PHMR0FIRSTRC pFirstRc = (PHMR0FIRSTRC)pvUser1;
-    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /// @todo fix idCpu == index assumption (rainy day)
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
     NOREF(pvUser2);
 
@@ -908 +909 @@
     PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[idCpu];
 
-    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu));  /** @todo fix idCpu == index assumption (rainy day) */
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
     Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
     Assert(!pCpu->fConfigured);
@@ -1062 +1063 @@
  * @returns VBox status code.
  * @param   idCpu       The identifier for the CPU the function is called on.
+ *
+ * @remarks Must be called with preemption disabled.
  */
 static int hmR0DisableCpu(RTCPUID idCpu)
@@ -1068 +1071 @@
 
     Assert(!g_HvmR0.vmx.fSupported || !g_HvmR0.vmx.fUsingSUPR0EnableVTx);
-    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /// @todo fix idCpu == index assumption (rainy day)
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
     Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
     Assert(!pCpu->fConfigured || pCpu->hMemObj != NIL_RTR0MEMOBJ);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     if (pCpu->hMemObj == NIL_RTR0MEMOBJ)
@@ -1080 +1084 @@
         void    *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
         RTHCPHYS HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
-        if (idCpu == RTMpCpuId())
-        {
-            rc = g_HvmR0.pfnDisableCpu(pCpu, pvCpuPage, HCPhysCpuPage);
-            AssertRCReturn(rc, rc);
-        }
-        else
-        {
-            pCpu->fIgnoreAMDVInUseError = true;
-            rc = VINF_SUCCESS;
-        }
+
+        rc = g_HvmR0.pfnDisableCpu(pCpu, pvCpuPage, HCPhysCpuPage);
+        AssertRCReturn(rc, rc);
 
         pCpu->fConfigured = false;
@@ -1102 +1099 @@
 
 /**
- * Worker function passed to RTMpOnAll, RTMpOnOthers and RTMpOnSpecific that
- * is to be called on the target CPUs.
+ * Worker function passed to RTMpOnAll() that is to be called on the target
+ * CPUs.
  *
  * @param   idCpu       The identifier for the CPU the function is called on.
@@ -1517 +1514 @@
  * @param   pVCpu       Pointer to the VMCPU.
  *
- * @remarks Called with preemption disabled and after first having called
- *          HMR0Enter.
+ * @remarks Can be called with preemption enabled if thread-context hooks are
+ *          used!!!
  */
 VMMR0_INT_DECL(int) HMR0RunGuestCode(PVM pVM, PVMCPU pVCpu)
 {
 #ifdef VBOX_STRICT
-    PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[RTMpCpuId()];
-    Assert(!VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL));
-    Assert(pCpu->fConfigured);
-    AssertReturn(!ASMAtomicReadBool(&g_HvmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
+    /* With thread-context hooks we would be running this code with preemption enabled. */
+    if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
+    {
+        PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[RTMpCpuId()];
+        Assert(!VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL));
+        Assert(pCpu->fConfigured);
+        AssertReturn(!ASMAtomicReadBool(&g_HvmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
+    }
 #endif
 
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
     AssertReturn(!VMMR0ThreadCtxHooksAreRegistered(pVCpu), VERR_HM_IPE_4);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     PGMRZDynMapStartAutoSet(pVCpu);
 #endif
@@ -1622 +1624 @@
 VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void)
 {
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     RTCPUID idCpu = RTMpCpuId();
     Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));

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

@@ -6197 +6197 @@
     {
         int rc2 = hmR0VmxLeave(pVM, pVCpu, pMixedCtx, true /* fSaveGuestState */);
-        AssertRCReturn(rc2, rc2);
+        AssertRCReturnStmt(rc2, HM_RESTORE_PREEMPT_IF_NEEDED(), rc2);
         pVCpu->hm.s.fLeaveDone = true;
     }
@@ -6285 +6285 @@
     /* Save guest state and restore host state bits. */
     int rc = hmR0VmxLeaveSession(pVM, pVCpu, pMixedCtx);
+    AssertRCReturn(rc, rc);
     STAM_COUNTER_DEC(&pVCpu->hm.s.StatSwitchLongJmpToR3);