Changeset 31938 in vbox for trunk/src

Timestamp:

Aug 24, 2010 5:17:48 PM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk/src/VBox/VMM

Files:

• FTM.cpp (modified) (5 diffs)
• PGMInternal.h (modified) (2 diffs)
• PGMPhys.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -546 +546 @@
 
     case FTMSYNCSTATE_DELTA_MEMORY:
+        /* Nothing to do as we sync the memory in an async thread; no need to block EMT. */
         break;
     }
@@ -557 +558 @@
         AssertRC(rc);
     }
+}
+
+/**
+ * PGMR3PhysEnumDirtyFTPages callback for syncing dirty physical pages
+ *
+ * @param   pVM             VM Handle.
+ * @param   GCPhys          GC physical address
+ * @param   pRange          HC virtual address of the page(s)
+ * @param   cbRange         Size of the dirty range in bytes.
+ * @param   pvUser          User argument
+ */
+static DECLCALLBACK(int) ftmR3SyncDirtyPage(PVM pVM, RTGCPHYS GCPhys, uint8_t *pRange, unsigned cbRange, void *pvUser)
+{
+    return VINF_SUCCESS;
 }
 
@@ -626 +641 @@
     for (;;)
     {
+        rc = RTSemEventWait(pVM->ftm.s.master.hShutdownEvent, pVM->ftm.s.uInterval);
+        if (rc != VERR_TIMEOUT)
+            break;    /* told to quit */
+
         if (!pVM->ftm.s.fCheckpointingActive)
         {
@@ -632 +651 @@
 
             /* sync the changed memory with the standby node. */
+            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)ftmR3PerformSync, 2, pVM, FTMSYNCSTATE_DELTA_MEMORY);
+            AssertRC(rc);
+
+            rc = PGMR3PhysEnumDirtyFTPages(pVM, ftmR3SyncDirtyPage, NULL /* pvUser */);
+            AssertRC(rc);
 
             PDMCritSectLeave(&pVM->ftm.s.CritSect);
         }
-        rc = RTSemEventWait(pVM->ftm.s.master.hShutdownEvent, pVM->ftm.s.uInterval);
-        if (rc != VERR_TIMEOUT)
-            break;    /* told to quit */            
     }
     return rc;
@@ -846 +867 @@
     pVM->ftm.s.syncstate.fEndOfStream = false;
 
-    /** @todo sync state + changed memory. */
+    /* Sync state + changed memory. */
+    rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)ftmR3PerformSync, 2, pVM, FTMSYNCSTATE_DELTA_VM);
+    AssertRC(rc);
 
     PDMCritSectLeave(&pVM->ftm.s.CritSect);

trunk/src/VBox/VMM/PGMInternal.h

@@ -724 +724 @@
      *  - [8-9]: u2HandlerVirtStateY - the virtual handler state
      *    (PGM_PAGE_HNDL_VIRT_STATE_*).
+     *  - [10]:  u1FTDirty - indicator of dirty page for fault tolerance tracking
      *  - [13-14]: u2PDEType  - paging structure needed to map the page (PGM_PAGE_PDE_TYPE_*)
      *  - [15]:  fWrittenToY - flag indicating that a write monitored page was
      *    written to when set.
-     *  - [10-13]: 4 unused bits.
+     *  - [11-13]: 3 unused bits.
      * @remarks Warning! All accesses to the bits are hardcoded.
      *
@@ -969 +970 @@
  */
 #define PGM_PAGE_IS_WRITTEN_TO(pPage)       ( !!((pPage)->u16MiscY.au8[1] & UINT8_C(0x80)) )
+
+/**
+ * Marks the page as dirty for FTM
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_SET_FT_DIRTY(pPage)        do { (pPage)->u16MiscY.au8[1] |= UINT8_C(0x04); } while (0)
+
+/**
+ * Clears the FTM dirty indicator
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_CLEAR_FT_DIRTY(pPage)      do { (pPage)->u16MiscY.au8[1] &= UINT8_C(0xfb); } while (0)
+
+/**
+ * Checks if the page was marked as dirty for FTM
+ * @returns true/false.
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_IS_FT_DIRTY(pPage)         ( !!((pPage)->u16MiscY.au8[1] & UINT8_C(0x04)) )
+
 
 /** @name PT usage values (PGMPAGE::u2PDEType).

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -980 +980 @@
     /** @todo pointless to write protect the physical page pointed to by RSP. */
 
-    /*
-     * Clear all the GCPhys links and rebuild the phys ext free list.
-     */
     for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
@@ -1004 +1001 @@
                             * monitoring if the page is known to be very busy. */
                         if (PGM_PAGE_IS_WRITTEN_TO(pPage))
+                        {
                             PGM_PAGE_CLEAR_WRITTEN_TO(pPage);
+                            /* Remember this dirty page for the next (memory) sync. */
+                            PGM_PAGE_SET_FT_DIRTY(pPage);
+                        }
 
                         PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_WRITE_MONITORED);
@@ -1042 +1043 @@
     int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmR3PhysWriteProtectRAMRendezvous, NULL);
     AssertRC(rc);
+    return rc;
+}
+
+/**
+ * Enumerate all dirty FT pages
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
+ * @param   pfnEnum     Enumerate callback handler
+ * @param   pvUser      Enumerate callback handler parameter
+ */
+VMMR3DECL(int) PGMR3PhysEnumDirtyFTPages(PVM pVM, PFNPGMENUMDIRTYFTPAGES pfnEnum, void *pvUser)
+{
+    int rc = VINF_SUCCESS;
+
+    pgmLock(pVM);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
+         pRam;
+         pRam = pRam->CTX_SUFF(pNext))
+    {
+        if (!PGM_RAM_RANGE_IS_AD_HOC(pRam))
+        {
+            unsigned iPage = pRam->cb >> PAGE_SHIFT;
+            while (iPage-- > 0)
+            {
+                PPGMPAGE pPage = &pRam->aPages[iPage];
+                if (RT_LIKELY(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM))
+                {
+                    /*
+                     * A RAM page.
+                     */
+                    switch (PGM_PAGE_GET_STATE(pPage))
+                    {
+                    case PGM_PAGE_STATE_ALLOCATED:
+                        if (    !PGM_PAGE_IS_WRITTEN_TO(pPage)
+                            &&  PGM_PAGE_IS_FT_DIRTY(pPage))
+                        {
+                            /** @todo this is risky; the range might be changed, but little choice as the sync costs a lot of time */
+                            pgmUnlock(pVM);
+                            pfnEnum(pVM, pRam->GCPhys + iPage * PAGE_SIZE, 0, 0, pvUser);
+                            pgmLock(pVM);
+                            PGM_PAGE_CLEAR_FT_DIRTY(pPage);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    pgmUnlock(pVM);
     return rc;
 }