Changeset 29217 in vbox

Timestamp:

May 7, 2010 2:38:51 PM (15 years ago)

Author:

vboxsync

Message:

Shared paging updates

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllBth.h (modified) (3 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (3 diffs)
• VMMR0/GMMR0.cpp (modified) (4 diffs)
• VMMR0/PGMR0.cpp (modified) (1 diff)

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

@@ -1438 +1438 @@
 # ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
                          && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
+# endif
+# ifdef VBOX_WITH_PAGE_SHARING
+                         && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_SHARED
 # endif
                         )
@@ -1834 +1837 @@
                                  && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
 #  endif
+#  ifdef VBOX_WITH_PAGE_SHARING
+                                 && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_SHARED
+#  endif
                                  )
                              )
@@ -2867 +2873 @@
 #  ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
                                      && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
+#  endif
+#  ifdef VBOX_WITH_PAGE_SHARING
+                                     && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_SHARED
 #  endif
                                      && !PGM_PAGE_IS_BALLOONED(pPage))

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

@@ -434 +434 @@
     pVM->pgm.s.aHandyPages[iHandyPage].HCPhysGCPhys = GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK;
 
+    const void *pvSharedPage = NULL;
+    
     if (PGM_PAGE_IS_SHARED(pPage))
     {
@@ -440 +442 @@
         VM_FF_SET(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
 
-        Log2(("PGM: Replaced shared page %#x at %RGp with %#x / %RHp\n", PGM_PAGE_GET_PAGEID(pPage),
-              GCPhys, pVM->pgm.s.aHandyPages[iHandyPage].idPage, HCPhys));
+        Log(("PGM: Replaced shared page %#x at %RGp with %#x / %RHp\n", PGM_PAGE_GET_PAGEID(pPage),
+             GCPhys, pVM->pgm.s.aHandyPages[iHandyPage].idPage, HCPhys));
         STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,PageReplaceShared));
         pVM->pgm.s.cSharedPages--;
-        AssertMsgFailed(("TODO: copy shared page content")); /** @todo err.. what about copying the page content? */
+    
+        /* Grab the address of the page so we can make a copy later on. */
+        rc = pgmPhysGCPhys2CCPtrInternalReadOnly(pVM, pPage, GCPhys, &pvSharedPage);
+        AssertRC(rc);
     }
     else
@@ -463 +468 @@
     PGM_PAGE_SET_PDE_TYPE(pPage, PGM_PAGE_PDE_TYPE_PT);
     PGMPhysInvalidatePageMapTLBEntry(pVM, GCPhys);
+
+    /* Copy the shared page contents to the replacement page. */
+    if (pvSharedPage)
+    {
+        void *pvNewPage;
+
+        /* Get the virtual address of the new page. */
+        rc = pgmPhysGCPhys2CCPtrInternal(pVM, pPage, GCPhys, &pvNewPage);
+        AssertRC(rc);
+        if (rc == VINF_SUCCESS)
+        {
+            /** todo write ASMMemCopy */
+            memcpy(pvNewPage, pvSharedPage, PAGE_SIZE);
+        }
+    }
 
     if (    fFlushTLBs

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

@@ -2620 +2620 @@
 }
 
+/**
+ * Converts a private page to a shared page, the page is known to exist and be valid and such.
+ *
+ * @param   pGMM        Pointer to the GMM instance.
+ * @param   pGVM        Pointer to the GVM instance.
+ * @param   idPage      The Page ID
+ * @param   pPage       The page structure.
+ */
+DECLINLINE(void) gmmR0ConvertToSharedPage(PGMM pGMM, PGVM pGVM, uint32_t idPage, PGMMPAGE pPage)
+{
+    PGMMCHUNK pChunk = gmmR0GetChunk(pGMM, idPage >> GMM_CHUNKID_SHIFT);
+    Assert(pChunk);
+    Assert(pChunk->cFree < GMM_CHUNK_NUM_PAGES);
+    Assert(GMM_PAGE_IS_PRIVATE(pPage));
+
+    pChunk->cPrivate--;
+    pChunk->cShared++;
+
+    pGMM->cSharedPages++;
+
+    pGVM->gmm.s.cSharedPages++;
+    pGVM->gmm.s.cPrivatePages--;
+
+    /* Modify the page structure. */
+    pPage->Shared.pfn     = pPage->Private.pfn;     /* same location */
+    pPage->Shared.cRefs   = 1;
+    pPage->Common.u2State = GMM_PAGE_STATE_SHARED;
+}
+
+/**
+ * Increase the use count of a shared page, the page is known to exist and be valid and such.
+ *
+ * @param   pGMM        Pointer to the GMM instance.
+ * @param   pGVM        Pointer to the GVM instance.
+ * @param   pPage       The page structure.
+ */
+DECLINLINE(void) gmmR0UseSharedPage(PGMM pGMM, PGVM pGVM, PGMMPAGE pPage)
+{
+    Assert(pGMM->cSharedPages > 0);
+    Assert(pGMM->cAllocatedPages > 0);
+
+    pPage->Shared.cRefs++;
+    pGVM->gmm.s.cSharedPages++;
+}
 
 /**
@@ -2640 +2684 @@
     gmmR0FreePageWorker(pGMM, pChunk, idPage, pPage);
 }
-
 
 /**
@@ -3739 +3782 @@
 
                     Assert(paPageDesc[i].HCPhys == (pPage->Private.pfn << 12));
-                    pPage->Shared.pfn     = pPage->Private.pfn;     /* same location */
-                    pPage->Shared.cRefs   = 1;
-                    pPage->Common.u2State = GMM_PAGE_STATE_SHARED;
+
+                    gmmR0ConvertToSharedPage(pGMM, pGVM, paPageDesc[i].uHCPhysPageId, pPage);
 
                     /* Keep track of these references. */
@@ -3815 +3857 @@
                     AssertRC(rc);
 
-                    /* Increase reference count. */
-                    pPage->Shared.cRefs++;
+                    gmmR0UseSharedPage(pGMM, pGVM, pPage);
 
                     /* Pass along the new physical address & page id. */

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

@@ -422 +422 @@
                         PGM_PAGE_SET_HCPHYS(pPage, paPageDesc[i].HCPhys);
                         PGM_PAGE_SET_PAGEID(pPage, paPageDesc[i].uHCPhysPageId);
+
+                        /* Invalidate page map TLB entry for this page too. */
+                        PGMPhysInvalidatePageMapTLBEntry(pVM, paPageDesc[i].GCPhys);
                     }
                     /* else nothing changed (== this page is now a shared page), so no need to flush anything. */