Changeset 37354 in vbox for trunk/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp

Timestamp:

Jun 7, 2011 3:05:32 PM (14 years ago)

Author:

vboxsync

Message:

PGM: Fixed locking issues in PGMR3PhysMMIORegister and PGMR3PhysMMIODeregister. Also addressed a harmless on in PGMR3PhysRomRegister (only used at init time, so no races). Fortified the code with assertions more lock assertion, replacing the incorrect PGMIsLocked() checks (we only care if the current thread is the lock owner). Cleaned up some ReturnStmt macros and adding more of them.

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp (modified) (3 diffs)

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

@@ -53 +53 @@
     Log(("PGMR0SharedModuleCheck: check %s %s base=%RGv size=%x\n", pModule->szName, pModule->szVersion, pModule->Core.Key, pModule->cbModule));
 
-    Assert(PGMIsLockOwner(pVM));    /* This cannot fail as we grab the lock in pgmR3SharedModuleRegRendezvous before calling into ring-0. */
+    PGM_LOCK_ASSERT_OWNER(pVM);     /* This cannot fail as we grab the lock in pgmR3SharedModuleRegRendezvous before calling into ring-0. */
 
     /* Check every region of the shared module. */
@@ -104 +104 @@
 
                                 /* Update the physical address and page id now. */
-                                PGM_PAGE_SET_HCPHYS(pPage, PageDesc.HCPhys);
-                                PGM_PAGE_SET_PAGEID(pPage, PageDesc.uHCPhysPageId);
+                                PGM_PAGE_SET_HCPHYS(pVM, pPage, PageDesc.HCPhys);
+                                PGM_PAGE_SET_PAGEID(pVM, pPage, PageDesc.uHCPhysPageId);
 
                                 /* Invalidate page map TLB entry for this page too. */
-                                PGMPhysInvalidatePageMapTLBEntry(pVM, PageDesc.GCPhys);
+                                pgmPhysInvalidatePageMapTLBEntry(pVM, PageDesc.GCPhys);
                                 pVM->pgm.s.cReusedSharedPages++;
                             }
@@ -115 +115 @@
                             pVM->pgm.s.cSharedPages++;
                             pVM->pgm.s.cPrivatePages--;
-                            PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_SHARED);
+                            PGM_PAGE_SET_STATE(pVM, pPage, PGM_PAGE_STATE_SHARED);
                         }
                     }