Changeset 17639 in vbox

Timestamp:

Mar 10, 2009 3:31:20 PM (16 years ago)

Author:

vboxsync

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

44119

Message:

More locking required for dynamic mappings in RC.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp (modified) (5 diffs)

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

@@ -245 +245 @@
                 PX86PD pShw32BitPd = pgmShwGet32BitPDPtr(&pVM->pgm.s);
                 AssertFatal(pShw32BitPd);
-
+#ifdef IN_RC    /* Lock mapping to prevent it from being reused during pgmPoolFree. */
+                PGMDynLockHCPage(pVM, (uint8_t *)pShw32BitPd);
+#endif
                 if (    pShw32BitPd->a[iNewPDE].n.u1Present
                     &&  !(pShw32BitPd->a[iNewPDE].u & PGM_PDFLAGS_MAPPING))
@@ -256 +258 @@
                 Pde.u = PGM_PDFLAGS_MAPPING | X86_PDE_P | X86_PDE_A | X86_PDE_RW | X86_PDE_US | (uint32_t)pMap->aPTs[i].HCPhysPT;
                 pShw32BitPd->a[iNewPDE]   = Pde;
+#ifdef IN_RC
+                /* Unlock dynamic mappings again. */
+                PGMDynUnlockHCPage(pVM, (uint8_t *)pShw32BitPd);
+#endif
                 break;
             }
@@ -269 +275 @@
                 pShwPdpt  = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
                 Assert(pShwPdpt);
+#ifdef IN_RC    /* Lock mapping to prevent it from being reused during pgmShwSyncPaePDPtr. */
+                PGMDynLockHCPage(pVM, (uint8_t *)pShwPdpt);
+#endif
                 pShwPaePd = pgmShwGetPaePDPtr(&pVM->pgm.s, (iPdPt << X86_PDPT_SHIFT));
                 if (!pShwPaePd)
@@ -297 +306 @@
                 }
                 Assert(pShwPaePd);
-
+#ifdef IN_RC    /* Lock mapping to prevent it from being reused during pgmPoolFree. */
+                PGMDynLockHCPage(pVM, (uint8_t *)pShwPaePd);
+#endif
                 PPGMPOOLPAGE pPoolPagePd = pgmPoolGetPageByHCPhys(pVM, pShwPdpt->a[iPdPt].u & X86_PDPE_PG_MASK);
                 AssertFatal(pPoolPagePd);
@@ -342 +353 @@
                 /* Set the PGM_PDFLAGS_MAPPING flag in the page directory pointer entry. (legacy PAE guest mode) */
                 pShwPdpt->a[iPdPt].u |= PGM_PLXFLAGS_MAPPING;
+
+#ifdef IN_RC
+                /* Unlock dynamic mappings again. */
+                PGMDynUnlockHCPage(pVM, (uint8_t *)pShwPaePd);
+                PGMDynUnlockHCPage(pVM, (uint8_t *)pShwPdpt);
+#endif
                 break;
             }