Changeset 51940 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 8, 2014 5:45:51 PM (11 years ago)

Author:

vboxsync

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

94833

Message:

GMMR0: Switched from fast mutex to critical section for the giant GMMR0 lock to avoid running into unnecessary trouble with the windows driver verifier. Required making the critical section code compile and link in the ring-0 environment.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• generic/critsect-generic.cpp (modified) (12 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1755 +1755 @@
         common/time/timesup.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
+        generic/critsect-generic.cpp \
         \
         $(RuntimeNoCrt_SOURCES)
@@ -1935 +1936 @@
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
+        generic/critsect-generic.cpp \
         generic/errvars-generic.cpp \
         generic/uuid-generic.cpp \

trunk/src/VBox/Runtime/generic/critsect-generic.cpp

@@ -59 +59 @@
      */
     pCritSect->u32Magic             = RTCRITSECT_MAGIC;
-    pCritSect->fFlags               = fFlags;
+#ifdef IN_RING0
+    pCritSect->fFlags               = fFlags | RTCRITSECT_FLAGS_RING0;
+#else
+    pCritSect->fFlags               = fFlags & ~RTCRITSECT_FLAGS_RING0;
+#endif
     pCritSect->cNestings            = 0;
     pCritSect->cLockers             = -1;
@@ -87 +91 @@
     if (RT_SUCCESS(rc))
     {
+#ifdef IN_RING0
+        rc = RTSemEventCreate(&pCritSect->EventSem);
+
+#else
         rc = RTSemEventCreateEx(&pCritSect->EventSem,
                                 fFlags & RTCRITSECT_FLAGS_BOOTSTRAP_HACK
@@ -93 +101 @@
                                 NIL_RTLOCKVALCLASS,
                                 NULL);
+#endif
         if (RT_SUCCESS(rc))
             return VINF_SUCCESS;
+#ifdef RTCRITSECT_STRICT
         RTLockValidatorRecExclDestroy(&pCritSect->pValidatorRec);
+#endif
     }
 
@@ -108 +119 @@
 RTDECL(uint32_t) RTCritSectSetSubClass(PRTCRITSECT pCritSect, uint32_t uSubClass)
 {
-#ifdef RTCRITSECT_STRICT
+# ifdef RTCRITSECT_STRICT
     AssertPtrReturn(pCritSect, RTLOCKVAL_SUB_CLASS_INVALID);
     AssertReturn(pCritSect->u32Magic == RTCRITSECT_MAGIC, RTLOCKVAL_SUB_CLASS_INVALID);
     AssertReturn(!(pCritSect->fFlags & RTCRITSECT_FLAGS_NOP), RTLOCKVAL_SUB_CLASS_INVALID);
     return RTLockValidatorRecExclSetSubClass(pCritSect->pValidatorRec, uSubClass);
-#else
+# else
     return RTLOCKVAL_SUB_CLASS_INVALID;
-#endif
+# endif
 }
 
@@ -124 +135 @@
     Assert(pCritSect->u32Magic == RTCRITSECT_MAGIC);
     /*AssertReturn(pCritSect->u32Magic == RTCRITSECT_MAGIC, VERR_SEM_DESTROYED);*/
+#ifdef IN_RING0
+    Assert(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0);
+#else
+    Assert(!(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0));
+#endif
 
     /*
@@ -196 +212 @@
     AssertPtr(pCritSect);
     AssertReturn(pCritSect->u32Magic == RTCRITSECT_MAGIC, VERR_SEM_DESTROYED);
+#ifdef IN_RING0
+    Assert(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0);
+#else
+    Assert(!(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0));
+#endif
 
     /*
@@ -267 +288 @@
                 return rc9;
             }
-#else
+#elif defined(IN_RING3)
             RTThreadBlocking(hThreadSelf, RTTHREADSTATE_CRITSECT, false);
 #endif
             int rc = RTSemEventWait(pCritSect->EventSem, RT_INDEFINITE_WAIT);
+#ifdef IN_RING3
             RTThreadUnblocked(hThreadSelf, RTTHREADSTATE_CRITSECT);
+#endif
 
             if (pCritSect->u32Magic != RTCRITSECT_MAGIC)
@@ -322 +345 @@
     Assert(pCritSect);
     Assert(pCritSect->u32Magic == RTCRITSECT_MAGIC);
+#ifdef IN_RING0
+    Assert(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0);
+#else
+    Assert(!(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0));
+#endif
     if (pCritSect->fFlags & RTCRITSECT_FLAGS_NOP)
         return VINF_SUCCESS;
@@ -363 +391 @@
 
 
-
+#ifdef IN_RING3
 
 static int rtCritSectEnterMultiple(size_t cCritSects, PRTCRITSECT *papCritSects, PCRTLOCKVALSRCPOS pSrcPos)
@@ -477 +505 @@
 RT_EXPORT_SYMBOL(RTCritSectLeaveMultiple);
 
+#endif /* IN_RING3 */
+
+
 
 RTDECL(int) RTCritSectDelete(PRTCRITSECT pCritSect)
@@ -488 +519 @@
     Assert(pCritSect->cLockers == -1);
     Assert(pCritSect->NativeThreadOwner == NIL_RTNATIVETHREAD);
+#ifdef IN_RING0
+    Assert(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0);
+#else
+    Assert(!(pCritSect->fFlags & RTCRITSECT_FLAGS_RING0));
+#endif
 
     /*
@@ -506 +542 @@
     AssertRC(rc);
 
+#ifdef RTCRITSECT_STRICT
     RTLockValidatorRecExclDestroy(&pCritSect->pValidatorRec);
+#endif
 
     return rc;