Changeset 20709 in vbox

Timestamp:

Jun 19, 2009 10:13:17 AM (16 years ago)

Author:

vboxsync

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

48815

Message:

More locking

Location:

trunk/src/VBox/VMM

Files:

• PGMPhys.cpp (modified) (14 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1608 +1608 @@
                  * Since there is no particular order, just push it.
                  */
+                pgmLock(pVM);
                 pNew->pNextR3 = pVM->pgm.s.pMmio2RangesR3;
                 pVM->pgm.s.pMmio2RangesR3 = pNew;
+                pgmUnlock(pVM);
 
                 *ppv = pvPages;
@@ -1647 +1649 @@
     AssertReturn(iRegion <= UINT8_MAX || iRegion == UINT32_MAX, VERR_INVALID_PARAMETER);
 
+    pgmLock(pVM);
     int rc = VINF_SUCCESS;
     unsigned cFound = 0;
@@ -1716 +1719 @@
         }
     }
-
+    pgmUnlock(pVM);
     return !cFound && iRegion != UINT32_MAX ? VERR_NOT_FOUND : rc;
 }
@@ -1962 +1965 @@
      * Search the list.
      */
+    pgmLock(pVM);
     for (PPGMMMIO2RANGE pCur = pVM->pgm.s.pMmio2RangesR3; pCur; pCur = pCur->pNextR3)
         if (pCur->RamRange.GCPhys == GCPhys)
         {
             Assert(pCur->fMapped);
+            pgmUnlock(pVM);
             return true;
         }
+    pgmUnlock(pVM);
     return false;
 }
@@ -1994 +2000 @@
     AssertReturn(iRegion <= UINT8_MAX, VERR_INVALID_PARAMETER);
 
+    pgmLock(pVM);
     PPGMMMIO2RANGE pCur = pgmR3PhysMMIO2Find(pVM, pDevIns, iRegion);
     AssertReturn(pCur, VERR_NOT_FOUND);
@@ -2000 +2007 @@
     PCPGMPAGE pPage = &pCur->RamRange.aPages[off >> PAGE_SHIFT];
     *pHCPhys = PGM_PAGE_GET_HCPHYS(pPage);
+    pgmUnlock(pVM);
     return VINF_SUCCESS;
 }
@@ -2512 +2520 @@
 int pgmR3PhysRomReset(PVM pVM)
 {
+    Assert(PGMIsLockOwner(pVM));
     for (PPGMROMRANGE pRom = pVM->pgm.s.pRomRangesR3; pRom; pRom = pRom->pNextR3)
     {
@@ -2727 +2736 @@
 static DECLCALLBACK(int) pgmR3PhysChunkAgeingRolloverCallback(PAVLU32NODECORE pNode, void *pvUser)
 {
+    Assert(PGMIsLockOwner((PVM)pvUser));
     /* Age compression - ASSUMES iNow == 4. */
     PPGMCHUNKR3MAP pChunk = (PPGMCHUNKR3MAP)pNode;
@@ -2773 +2783 @@
 VMMR3DECL(void) PGMR3PhysChunkAgeing(PVM pVM)
 {
+    pgmLock(pVM);
     pVM->pgm.s.ChunkR3Map.AgeingCountdown = RT_MIN(pVM->pgm.s.ChunkR3Map.cMax / 4, 1024);
     pVM->pgm.s.ChunkR3Map.iNow++;
@@ -2782 +2793 @@
     else
         RTAvlU32DoWithAll(&pVM->pgm.s.ChunkR3Map.pTree, true /*fFromLeft*/, pgmR3PhysChunkAgeingCallback, pVM);
+    pgmUnlock(pVM);
 }
 
@@ -2849 +2861 @@
 static int32_t pgmR3PhysChunkFindUnmapCandidate(PVM pVM)
 {
+    Assert(PGMIsLockOwner(pVM));
+
     /*
      * Do tree ageing first?
@@ -2883 +2897 @@
     int rc;
 
+    Assert(PGMIsLockOwner(pVM));
     /*
      * Allocate a new tracking structure first.
@@ -2968 +2983 @@
 {
     PPGMCHUNKR3MAP pChunk;
-    return pgmR3PhysChunkMap(pVM, idChunk, &pChunk);
+    int rc;
+
+    pgmLock(pVM);
+    rc = pgmR3PhysChunkMap(pVM, idChunk, &pChunk);
+    pgmUnlock(pVM);
+    return rc;
 }
 
@@ -3128 +3148 @@
      * Assert sanity.
      */
-    Assert(PDMCritSectIsOwner(&pVM->pgm.s.CritSect));
+    Assert(PGMIsLockOwner(pVM));
     if (RT_UNLIKELY(    PGM_PAGE_GET_TYPE(pPage) != PGMPAGETYPE_RAM
                     &&  PGM_PAGE_GET_TYPE(pPage) != PGMPAGETYPE_ROM_SHADOW))

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

@@ -272 +272 @@
         pgmHandlerPhysicalResetRamFlags(pVM, pCur);
         pgmHandlerPhysicalDeregisterNotifyREM(pVM, pCur);
+        MMHyperFree(pVM, pCur);
         pgmUnlock(pVM);
         HWACCMFlushTLBOnAllVCpus(pVM);
-        MMHyperFree(pVM, pCur);
         return VINF_SUCCESS;
     }
@@ -748 +748 @@
                         LogFlow(("PGMHandlerPhysicalJoin: %RGp-%RGp %RGp-%RGp\n",
                                  pCur1->Core.Key, pCur1->Core.KeyLast, pCur2->Core.Key, pCur2->Core.KeyLast));
+                        MMHyperFree(pVM, pCur2);
                         pgmUnlock(pVM);
-                        MMHyperFree(pVM, pCur2);
                         return VINF_SUCCESS;
                     }