Changeset 40806 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 6, 2012 9:05:19 PM (13 years ago)

Author:

vboxsync

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

77321

Message:

RTSpinlock: Redid the interface, eliminating NoInts and Tmp. Whether a spinlock is interrupt safe or not is now defined at creation time, preventing stupid bugs arrising from calling the wrong acquire and/or release methods somewhere. The saved flags are stored in the spinlock strucutre, eliminating the annoying Tmp variable. Needs testing on each platform before fixing the build burn.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/GVMMR0.cpp (modified) (9 diffs)
• VMMR3/PDMBlkCache.cpp (modified) (3 diffs)
• VMMRZ/PGMRZDynMap.cpp (modified) (3 diffs)

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

@@ -416 +416 @@
                                          &pGVMM->aHostCpus[iCpu]);
                     if (RT_SUCCESS(rc))
-                        rc = RTSpinlockCreate(&pGVMM->aHostCpus[iCpu].Ppt.hSpinlock);
+                        rc = RTSpinlockCreate(&pGVMM->aHostCpus[iCpu].Ppt.hSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_SAFE, "GVMM/CPU");
                     if (RT_FAILURE(rc))
                     {
@@ -2176 +2176 @@
      * Do the house keeping.
      */
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquireNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+    RTSpinlockAcquire(pCpu->Ppt.hSpinlock);
 
     if (++pCpu->Ppt.iTickHistorization >= pCpu->Ppt.cTicksHistoriziationInterval)
@@ -2197 +2196 @@
                 uHistMaxHz = pCpu->Ppt.aHzHistory[i];
         if (uHistMaxHz == pCpu->Ppt.uTimerHz)
-            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock);
         else if (uHistMaxHz)
         {
@@ -2214 +2213 @@
             else
                 pCpu->Ppt.cTicksHistoriziationInterval = 1;
-            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock);
 
             /*SUPR0Printf("Cpu%u: change to %u Hz / %u ns\n", pCpu->idxCpuSet, uHistMaxHz, cNsInterval);*/
@@ -2227 +2226 @@
             pCpu->Ppt.uTimerHz    = 0;
             pCpu->Ppt.cNsInterval = 0;
-            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock);
 
             /*SUPR0Printf("Cpu%u: stopping (%u Hz)\n", pCpu->idxCpuSet, uHistMaxHz);*/
@@ -2234 +2233 @@
     }
     else
-        RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock);
 }
 #endif /* GVMM_SCHED_WITH_PPT */
@@ -2281 +2280 @@
                     && !pCpu->Ppt.fStarting /* solaris paranoia */))
     {
-        RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-        RTSpinlockAcquireNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+        RTSpinlockAcquire(pCpu->Ppt.hSpinlock);
 
         pCpu->Ppt.uDesiredHz = uHz;
@@ -2302 +2300 @@
         }
 
-        RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock);
 
         if (cNsInterval)
@@ -2310 +2308 @@
             AssertRC(rc);
 
-            RTSpinlockAcquireNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+            RTSpinlockAcquire(pCpu->Ppt.hSpinlock);
             if (RT_FAILURE(rc))
                 pCpu->Ppt.fStarted = false;
             pCpu->Ppt.fStarting = false;
-            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pCpu->Ppt.hSpinlock);
         }
     }

trunk/src/VBox/VMM/VMMR3/PDMBlkCache.cpp

@@ -657 +657 @@
     /* The list is moved to a new header to reduce locking overhead. */
     RTLISTANCHOR ListDirtyNotCommitted;
-    RTSPINLOCKTMP Tmp;
 
     RTListInit(&ListDirtyNotCommitted);
-    RTSpinlockAcquire(pBlkCache->LockList, &Tmp);
+    RTSpinlockAcquire(pBlkCache->LockList);
     RTListMove(&ListDirtyNotCommitted, &pBlkCache->ListDirtyNotCommitted);
-    RTSpinlockRelease(pBlkCache->LockList, &Tmp);
+    RTSpinlockRelease(pBlkCache->LockList);
 
     if (!RTListIsEmpty(&ListDirtyNotCommitted))
@@ -755 +754 @@
         pEntry->fFlags |= PDMBLKCACHE_ENTRY_IS_DIRTY;
 
-        RTSPINLOCKTMP Tmp;
-        RTSpinlockAcquire(pBlkCache->LockList, &Tmp);
+        RTSpinlockAcquire(pBlkCache->LockList);
         RTListAppend(&pBlkCache->ListDirtyNotCommitted, &pEntry->NodeNotCommitted);
-        RTSpinlockRelease(pBlkCache->LockList, &Tmp);
+        RTSpinlockRelease(pBlkCache->LockList);
 
         uint32_t cbDirty = ASMAtomicAddU32(&pCache->cbDirty, pEntry->cbData);
@@ -1220 +1218 @@
             RTListInit(&pBlkCache->ListDirtyNotCommitted);
 
-            rc = RTSpinlockCreate(&pBlkCache->LockList);
+            rc = RTSpinlockCreate(&pBlkCache->LockList, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "pdmR3BlkCacheRetain");
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp

@@ -88 +88 @@
  */
 # define PGMRZDYNMAP_SPINLOCK_ACQUIRE(pThis) \
-    RTSPINLOCKTMP   MySpinlockTmp = RTSPINLOCKTMP_INITIALIZER; \
-    RTSpinlockAcquire((pThis)->hSpinlock, &MySpinlockTmp)
+    RTSpinlockAcquire((pThis)->hSpinlock)
+
 /**
  * Releases the spinlock.
  */
 # define PGMRZDYNMAP_SPINLOCK_RELEASE(pThis) \
-    RTSpinlockRelease((pThis)->hSpinlock, &MySpinlockTmp)
+    RTSpinlockRelease((pThis)->hSpinlock)
 
 /**
@@ -100 +100 @@
  */
 # define PGMRZDYNMAP_SPINLOCK_REACQUIRE(pThis) \
-    RTSpinlockAcquire((pThis)->hSpinlock, &MySpinlockTmp)
+    RTSpinlockAcquire((pThis)->hSpinlock)
 #else
 # define PGMRZDYNMAP_SPINLOCK_ACQUIRE(pThis)   do { } while (0)
@@ -408 +408 @@
         if (RT_SUCCESS(rc))
         {
-            rc = RTSpinlockCreate(&pThis->hSpinlock);
+            rc = RTSpinlockCreate(&pThis->hSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "PGMR0DynMap");
             if (RT_SUCCESS(rc))
             {