Changeset 14659 in vbox

Timestamp:

Nov 26, 2008 6:11:25 PM (16 years ago)

Author:

vboxsync

Message:

PGMR0DynMap: Fixes and logging.

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (7 diffs)

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

@@ -23 +23 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+#define LOG_GROUP LOG_GROUP_PGM
 #include <VBox/pgm.h>
 #include "../PGMInternal.h"
@@ -1112 +1113 @@
         X86PGUINT       uOld2 = uOld; NOREF(uOld2);
         X86PGUINT       uNew  = (uOld & X86_PTE_G | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT)
-                              | X86_PTE_P | X86_PTE_A | X86_PTE_D
+                              | X86_PTE_P | X86_PTE_RW | X86_PTE_A | X86_PTE_D
                               | (HCPhys & X86_PTE_PG_MASK);
         while (!ASMAtomicCmpXchgExU32(&paPages[iFreePage].uPte.pLegacy->u, uNew, uOld, &uOld))
@@ -1122 +1123 @@
         X86PGPAEUINT    uOld2 = uOld; NOREF(uOld2);
         X86PGPAEUINT    uNew  = (uOld & X86_PTE_G | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT)
-                              | X86_PTE_P | X86_PTE_A | X86_PTE_D
+                              | X86_PTE_P | X86_PTE_RW | X86_PTE_A | X86_PTE_D
                               | (HCPhys & X86_PTE_PAE_PG_MASK);
         while (!ASMAtomicCmpXchgExU64(&paPages[iFreePage].uPte.pPae->u, uNew, uOld, &uOld))
             AssertMsgFailed(("uOld=%#llx uOld2=%#llx uNew=%#llx\n", uOld, uOld2, uNew));
+        Log6(("pgmR0DynMapPageSlow: #%x - %RHp %p %#llx\n", iFreePage, HCPhys, paPages[iFreePage].pvPage, uNew));
     }
     return iFreePage;
@@ -1239 +1241 @@
 VMMDECL(void) PGMDynMapStartAutoSet(PVMCPU pVCpu)
 {
+    Log6(("PGMDynMapStartAutoSet\n"));
     Assert(pVCpu->pgm.s.AutoSet.cEntries == PGMMAPSET_CLOSED);
     pVCpu->pgm.s.AutoSet.cEntries = 0;
@@ -1255 +1258 @@
 
     /* close the set */
-    uint32_t    i = pVCpu->pgm.s.AutoSet.cEntries;
-    AssertMsg(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries), ("%#x (%u)\n", i, i));
-    pVCpu->pgm.s.AutoSet.cEntries = PGMMAPSET_CLOSED;
+    uint32_t    i = pSet->cEntries;
+    AssertMsg(i <= RT_ELEMENTS(pSet->aEntries), ("%#x (%u)\n", i, i));
+    pSet->cEntries = PGMMAPSET_CLOSED;
 
     /* release any pages we're referencing. */
-    if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries)))
+    if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pSet->aEntries)))
     {
         PPGMR0DYNMAP    pThis = g_pPGMR0DynMap;
@@ -1281 +1284 @@
         RTSpinlockRelease(pThis->hSpinlock, &Tmp);
     }
-}
-
-
-/**
- * Migrates the automatic mapping set of the current vCPU if necessary.
+    Log6(("PGMDynMapReleaseAutoSet\n"));
+}
+
+
+/**
+ * Migrates the automatic mapping set of the current vCPU if it's active and
+ * necessary.
  *
  * This is called when re-entering the hardware assisted execution mode after a
@@ -1299 +1304 @@
 {
     PPGMMAPSET  pSet = &pVCpu->pgm.s.AutoSet;
-    uint32_t    i = pVCpu->pgm.s.AutoSet.cEntries;
-    AssertMsg(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries), ("%#x (%u)\n", i, i));
-    if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries)))
-    {
-        PPGMR0DYNMAP    pThis = g_pPGMR0DynMap;
-        RTCPUID         idRealCpu = RTMpCpuId();
-
-        while (i-- > 0)
-        {
-            Assert(pSet->aEntries[i].cRefs > 0);
-            uint32_t iPage = pSet->aEntries[i].iPage;
-            Assert(iPage < pThis->cPages);
-            if (RTCpuSetIsMember(&pThis->paPages[iPage].PendingSet, idRealCpu))
-            {
-                RTCpuSetDel(&pThis->paPages[iPage].PendingSet, idRealCpu);
-                ASMInvalidatePage(pThis->paPages[iPage].pvPage);
-            }
-        }
+    uint32_t    i = pSet->cEntries;
+    if (i != PGMMAPSET_CLOSED)
+    {
+        AssertMsg(i <= RT_ELEMENTS(pSet->aEntries), ("%#x (%u)\n", i, i));
+        if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pSet->aEntries)))
+        {
+            PPGMR0DYNMAP    pThis = g_pPGMR0DynMap;
+            RTCPUID         idRealCpu = RTMpCpuId();
+
+            while (i-- > 0)
+            {
+                Assert(pSet->aEntries[i].cRefs > 0);
+                uint32_t iPage = pSet->aEntries[i].iPage;
+                Assert(iPage < pThis->cPages);
+                if (RTCpuSetIsMember(&pThis->paPages[iPage].PendingSet, idRealCpu))
+                {
+                    RTCpuSetDel(&pThis->paPages[iPage].PendingSet, idRealCpu);
+                    ASMInvalidatePage(pThis->paPages[iPage].pvPage);
+                }
+            }
+        }
+        Log6(("PGMDynMapMigrateAutoSet\n"));
     }
 }