Changeset 25461 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Dec 17, 2009 1:10:34 PM (15 years ago)

Author:

vboxsync

Message:

SUPDrv: RTMpOnAll should be run at PASSIVE_LEVEL on windows, so don't use fast mutexes for protection GIP on Windows.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (8 diffs)
• SUPDrvInternal.h (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -357 +357 @@
     memset(pDevExt, 0, sizeof(*pDevExt));
     rc = RTSpinlockCreate(&pDevExt->Spinlock);
-    if (!rc)
+    if (RT_SUCCESS(rc))
     {
 #ifdef SUPDRV_USE_MUTEX_FOR_LDR
@@ -364 +364 @@
         rc = RTSemFastMutexCreate(&pDevExt->mtxLdr);
 #endif
-        if (!rc)
+        if (RT_SUCCESS(rc))
         {
             rc = RTSemFastMutexCreate(&pDevExt->mtxComponentFactory);
-            if (!rc)
+            if (RT_SUCCESS(rc))
             {
+#ifdef SUPDRV_USE_MUTEX_FOR_LDR
+                rc = RTSemMutexCreate(&pDevExt->mtxGip);
+#else
                 rc = RTSemFastMutexCreate(&pDevExt->mtxGip);
-                if (!rc)
+#endif
+                if (RT_SUCCESS(rc))
                 {
                     rc = supdrvGipCreate(pDevExt);
@@ -432 +436 @@
                     }
 
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+                    RTSemMutexDestroy(pDevExt->mtxGip);
+                    pDevExt->mtxGip = NIL_RTSEMMUTEX;
+#else
                     RTSemFastMutexDestroy(pDevExt->mtxGip);
                     pDevExt->mtxGip = NIL_RTSEMFASTMUTEX;
+#endif
                 }
                 RTSemFastMutexDestroy(pDevExt->mtxComponentFactory);
@@ -471 +480 @@
      * Kill mutexes and spinlocks.
      */
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+    RTSemMutexDestroy(pDevExt->mtxGip);
+    pDevExt->mtxGip = NIL_RTSEMMUTEX;
+#else
     RTSemFastMutexDestroy(pDevExt->mtxGip);
     pDevExt->mtxGip = NIL_RTSEMFASTMUTEX;
+#endif
 #ifdef SUPDRV_USE_MUTEX_FOR_LDR
     RTSemMutexDestroy(pDevExt->mtxLdr);
@@ -2835 +2849 @@
     AssertPtrNullReturn(pHCPhysGip, VERR_INVALID_POINTER);
 
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+    RTSemMutexRequest(pDevExt->mtxGip);
+#else
     RTSemFastMutexRequest(pDevExt->mtxGip);
+#endif
     if (pDevExt->pGip)
     {
@@ -2898 +2916 @@
         Log(("SUPR0GipMap: GIP is not available!\n"));
     }
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+    RTSemMutexRelease(pDevExt->mtxGip);
+#else
     RTSemFastMutexRelease(pDevExt->mtxGip);
+#endif
 
     /*
@@ -2938 +2960 @@
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
 
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+    RTSemMutexRequest(pDevExt->mtxGip);
+#else
     RTSemFastMutexRequest(pDevExt->mtxGip);
+#endif
 
     /*
@@ -2965 +2991 @@
     }
 
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+    RTSemMutexRelease(pDevExt->mtxGip);
+#else
     RTSemFastMutexRelease(pDevExt->mtxGip);
+#endif
 
     return rc;

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -185 +185 @@
  * @todo fix the mutex implementation on linux and make this the default. */
 # define SUPDRV_USE_MUTEX_FOR_LDR
+
+/** Use a normal mutex for the GIP so we remain at the same IRQL after
+ * taking it.
+ * @todo fix the mutex implementation on linux and make this the default. */
+# define SUPDRV_USE_MUTEX_FOR_GIP
 
 /*
@@ -607 +612 @@
      * Any changes to any of the GIP members requires ownership of this mutex,
      * except on driver init and termination. */
+#ifdef SUPDRV_USE_MUTEX_FOR_GIP
+    RTSEMMUTEX                      mtxGip;
+#else
     RTSEMFASTMUTEX                  mtxGip;
+#endif
     /** Pointer to the Global Info Page (GIP). */
     PSUPGLOBALINFOPAGE              pGip;