Changeset 50000 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Dec 24, 2013 9:03:10 PM (11 years ago)

Author:

vboxsync

Message:

pdmR3R0CritSectEnterContended: That worked but wasn't entirely correct, so next attempt.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (3 diffs)

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

@@ -114 +114 @@
  * @retval  VINF_SUCCESS on success.
  * @retval  VERR_SEM_DESTROYED if destroyed.
- * @retval  VERR_INTERRUPTED in ring-0 if we should return rcBusy or jump to
- *          ring-3.
  *
  * @param   pCritSect           The critsect.
@@ -184 +182 @@
             return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
         AssertMsg(rc == VERR_INTERRUPTED, ("rc=%Rrc\n", rc));
+
 # ifdef IN_RING0
-        return VERR_INTERRUPTED;
+        /* Something is pending (signal, APC, debugger, whatever), just go back
+           to ring-3 so the kernel can deal with it when leaving kernel context.
+
+           Note! We've incremented cLockers already and cannot safely decrement
+                 it without creating a race with PDMCritSectLeave, resulting in
+                 spurious wakeups. */
+        PVM     pVM   = pCritSect->s.CTX_SUFF(pVM); AssertPtr(pVM);
+        PVMCPU  pVCpu = VMMGetCpu(pVM);             AssertPtr(pVCpu);
+        rc = VMMRZCallRing3(pVM, pVCpu, VMMCALLRING3_VM_R0_PREEMPT, NULL);
+        AssertRC(rc);
 # endif
     }
@@ -306 +314 @@
     if (   RTThreadPreemptIsEnabled(NIL_RTTHREAD)
         && ASMIntAreEnabled())
-    {
-        int rc = pdmR3R0CritSectEnterContended(pCritSect, hNativeSelf, pSrcPos);
-        if (rc != VERR_INTERRUPTED)
-            return rc;
-    }
+        return pdmR3R0CritSectEnterContended(pCritSect, hNativeSelf, pSrcPos);
 #  endif
 #endif /* IN_RING0 */