Changeset 31807 in vbox for trunk

Timestamp:

Aug 20, 2010 9:15:56 AM (15 years ago)

Author:

vboxsync

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

65001

Message:

FT: disable large page usage
Removed debug code

Location:

trunk/src/VBox/VMM

Files:

• FTM.cpp (modified) (3 diffs)
• PGM.cpp (modified) (5 diffs)
• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (2 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -28 +28 @@
 #include <VBox/ssm.h>
 #include <VBox/log.h>
+#include <VBox/pgm.h>
 
 #include <iprt/assert.h>
@@ -295 +296 @@
         if (!pVM->ftm.s.fCheckpointingActive)
         {
-            int rc2 = PDMCritSectEnter(&pVM->ftm.s.CritSect, VERR_SEM_BUSY);
-            AssertMsg(rc2 == VINF_SUCCESS, ("%Rrc\n", rc));
+            rc = PDMCritSectEnter(&pVM->ftm.s.CritSect, VERR_SEM_BUSY);
+            AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));
 
             /* sync the changed memory with the standby node. */
 
             PDMCritSectLeave(&pVM->ftm.s.CritSect);
-
         }
         rc = RTSemEventWait(pVM->ftm.s.master.hShutdownEvent, pVM->ftm.s.uInterval);
@@ -448 +448 @@
 
         pVM->fFaultTolerantMaster = true;
+        if (PGMIsUsingLargePages(pVM))
+        {
+            /* Must disable large page usage as 2 MB pages are too big to write monitor. */
+            LogRel(("FTSync: disabling large page usage.\n"));
+            PGMSetLargePageUsage(pVM, false);
+        }
+        /** @todo might need to disable page fusion as well */
+
         return VMR3PowerOn(pVM);
     }

trunk/src/VBox/VMM/PGM.cpp

@@ -631 +631 @@
 static DECLCALLBACK(int)  pgmR3CmdAssertCR3(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
 # endif
-# ifdef DEBUG_sandervl
-static DECLCALLBACK(int)  pgmR3CmdCountPhysWrites(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
-static DECLCALLBACK(void) pgmR3PhysWriteCountTMCallback(PVM pVM, PTMTIMER pTimer, void *pvUser);
-# endif
 static DECLCALLBACK(int)  pgmR3CmdPhysToFile(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
 #endif
@@ -680 +676 @@
     { "pgmsharedmodules", 0, 0,     NULL,                     0,            NULL,               0,          pgmR3CmdShowSharedModules,  "",             "Print shared modules info." },
 #  endif
-# endif
-# ifdef DEBUG_sandervl
-    { "pgmcountphyswrites", 2, 2,   &g_aPgmCountPhysWritesArgs[0], 2,       NULL,               0,          pgmR3CmdCountPhysWrites, "",                "Count physical page writes."},
 # endif
     { "pgmsyncalways", 0, 0,        NULL,                     0,            NULL,               0,          pgmR3CmdSyncAlways, "",                     "Toggle permanent CR3 syncing." },
@@ -1672 +1665 @@
         rc = STAMR3RegisterF(pVM, a, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, c, b); \
         AssertRC(rc);
-
-# ifdef DEBUG_sandervl
-    PGM_REG_COUNTER(&pPGM->StatRZFTPhysPageWrite,             "/PGM/FT/RZ/PageWrite",               "The number of times a physical page was written to (FT stats).");
-    PGM_REG_COUNTER(&pPGM->StatR3FTPhysPageWrite,             "/PGM/FT/R3/PageWrite",               "The number of times a physical page was written to (FT stats).");
-# endif
 
     PGMSTATS *pStats = pVM->pgm.s.pStatsR3;
@@ -2143 +2131 @@
     if (pVM->pgm.s.fRamPreAlloc)
         rc = pgmR3PhysRamPreAllocate(pVM);
-
-#ifdef DEBUG_sandervl
-    rc = TMR3TimerCreateInternal(pVM, TMCLOCK_REAL, pgmR3PhysWriteCountTMCallback, NULL, "Physical page write counting timer", &pVM->pgm.s.pPhysWritesCountTimer);
-    AssertRC(rc);
-#endif
 
     LogRel(("PGMR3InitFinalize: 4 MB PSE mask %RGp\n", pVM->pgm.s.GCPhys4MBPSEMask));
@@ -4313 +4296 @@
     return VINF_SUCCESS;
 }
-
-# ifdef DEBUG_sandervl
-/**
- * Internal timer callback function.
- *
- * @param   pVM             The VM.
- * @param   pTimer          The timer handle.
- * @param   pvUser          User argument specified upon timer creation.
- */
-static DECLCALLBACK(void) pgmR3PhysWriteCountTMCallback(PVM pVM, PTMTIMER pTimer, void *pvUser)
-{
-    if (pVM->pgm.s.fCountingPhysWrites)
-    {
-        pgmR3PoolClearAll(pVM, true/* fFlushRemTlb */);
-
-        /* Program next invocation. */
-        int rc = TMTimerSetMillies(pVM->pgm.s.pPhysWritesCountTimer, pVM->pgm.s.u32PhysWriteCountTimerInterval);
-        AssertRC(rc);
-    }
-}
-
-/**
- * The '.pgmcountphyswrites' command.
- *
- * @returns VBox status.
- * @param   pCmd        Pointer to the command descriptor (as registered).
- * @param   pCmdHlp     Pointer to command helper functions.
- * @param   pVM         Pointer to the current VM (if any).
- * @param   paArgs      Pointer to (readonly) array of arguments.
- * @param   cArgs       Number of arguments in the array.
- */
-static DECLCALLBACK(int) pgmR3CmdCountPhysWrites(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
-{
-    /*
-     * Validate input.
-     */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires a VM to be selected.\n");
-    if (    cArgs != 2
-        ||  paArgs[0].enmType != DBGCVAR_TYPE_STRING
-        ||  paArgs[1].enmType != DBGCVAR_TYPE_NUMBER)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: parser error, invalid arguments.\n");
-
-    if (!strcmp(paArgs[0].u.pszString, "off"))
-    {
-        if (!pVM->pgm.s.fCountingPhysWrites)
-            return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: not enabled!\n");
-
-        TMTimerStop(pVM->pgm.s.pPhysWritesCountTimer);
-        pVM->pgm.s.fCountingPhysWrites = false;
-        return VINF_SUCCESS;
-    }
-    else
-    if (strcmp(paArgs[0].u.pszString, "on"))
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid 1st argument '%s', must be 'on' or 'off'.\n", paArgs[0].u.pszString);
-
-    if (    paArgs[1].u.u64Number < 10
-        ||  paArgs[1].u.u64Number > 1000)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid 2nd argument '%d', must be between 10 and 1000 ms.\n", paArgs[1].u.u64Number);
-
-    pVM->pgm.s.u32PhysWriteCountTimerInterval = paArgs[1].u.u64Number;
-    pVM->pgm.s.fCountingPhysWrites = true;
-    int rc = TMTimerSetMillies(pVM->pgm.s.pPhysWritesCountTimer, paArgs[1].u.u64Number);
-    AssertRC(rc);
-    return VINF_SUCCESS;
-}
-# endif /* DEBUG_sandervl */
-
 #endif /* VBOX_STRICT */
 

trunk/src/VBox/VMM/PGMInternal.h

@@ -3224 +3224 @@
     /** @} */
 
-#ifdef DEBUG_sandervl
-    PTMTIMERR3                      pPhysWritesCountTimer;
-    uint32_t                        u32PhysWriteCountTimerInterval;
-    bool                            fCountingPhysWrites;
-    uint8_t                         u8Alignment[3];
-
-    STAMCOUNTER                     StatR3FTPhysPageWrite;              /**< R3: The number of times a physical page was written to (FT stats) */
-    STAMCOUNTER                     StatRZFTPhysPageWrite;              /**< RC/R0: The number of times a physical page was written to (FT stats) */
-#endif
-
 #ifdef VBOX_WITH_STATISTICS
     /** @name Statistics on the heap.

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -2177 +2177 @@
 
                 PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, PteSrc, pShwPage, iPTDst);
-#ifdef DEBUG_sandervl
-                if (pVM->pgm.s.fCountingPhysWrites)
-                    pPTDst->a[iPTDst].n.u1Write = 0;
-#endif
-
                 Log2(("SyncPage: 4K+ %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx} PteDst=%08llx%s\n",
                       GCPtrCurPage, PteSrc.n.u1Present,
@@ -2203 +2198 @@
         RTGCPTR         GCPtrCurPage = (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT)) | (iPTDst << PAGE_SHIFT);
         GSTPTE          PteSrc;
-
-#ifdef DEBUG_sandervl
-        if (    pVM->pgm.s.fCountingPhysWrites
-            &&  ((uErr & (X86_TRAP_PF_RW|X86_TRAP_PF_P)) == (X86_TRAP_PF_RW|X86_TRAP_PF_P)))
-        {
-            STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat, FTPhysPageWrite));
-        }
-#endif
 
         /* Fake the page table entry */