Changeset 29620 in vbox for trunk/src/VBox/VMM

Timestamp:

May 18, 2010 12:15:55 PM (15 years ago)

Author:

vboxsync

Message:

Statistics for shared pages

Location:

trunk/src/VBox/VMM

Files:

• GMM.cpp (modified) (3 diffs)
• PGMPhys.cpp (modified) (2 diffs)
• VMMR0/GMMR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/GMM.cpp

@@ -290 +290 @@
  * @see GMMR0QueryVMMMemoryStatsReq
  */
-GMMR3DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages, uint64_t *pcTotalBalloonPages)
+GMMR3DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages, uint64_t *pcTotalBalloonPages, uint64_t *puTotalBalloonSize)
 {
     GMMMEMSTATSREQ Req;
@@ -298 +298 @@
     Req.cFreePages       = 0;
     Req.cBalloonedPages  = 0;
+    Req.cSharedPages     = 0;
 
     *pcTotalAllocPages   = 0;
     *pcTotalFreePages    = 0;
     *pcTotalBalloonPages = 0;
+    *puTotalBalloonSize  = 0;
 
     /* Must be callable from any thread, so can't use VMMR3CallR0. */
@@ -310 +312 @@
         *pcTotalFreePages    = Req.cFreePages;
         *pcTotalBalloonPages = Req.cBalloonedPages;
+        *puTotalBalloonSize  = Req.cSharedPages;
     }
     return rc;

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -967 +967 @@
  * @param   puTotalFreeSize     Pointer to total free (allocated but not used yet) memory inside VMMR0 (in bytes)
  * @param   puTotalBalloonSize  Pointer to total ballooned memory inside VMMR0 (in bytes)
- */
-VMMR3DECL(int) PGMR3QueryVMMMemoryStats(PVM pVM, uint64_t *puTotalAllocSize, uint64_t *puTotalFreeSize, uint64_t *puTotalBalloonSize)
+ * @param   puTotalSharedSize   Pointer to total shared memory inside VMMR0 (in bytes)
+ */
+VMMR3DECL(int) PGMR3QueryVMMMemoryStats(PVM pVM, uint64_t *puTotalAllocSize, uint64_t *puTotalFreeSize, uint64_t *puTotalBalloonSize, uint64_t *puTotalSharedSize)
 {
     int rc;
 
-    uint64_t cAllocPages = 0, cFreePages = 0, cBalloonPages = 0;
-    rc = GMMR3QueryHypervisorMemoryStats(pVM, &cAllocPages, &cFreePages, &cBalloonPages);
+    uint64_t cAllocPages = 0, cFreePages = 0, cBalloonPages = 0, cSharedPages = 0;
+    rc = GMMR3QueryHypervisorMemoryStats(pVM, &cAllocPages, &cFreePages, &cBalloonPages, &cSharedPages);
     AssertRCReturn(rc, rc);
 
@@ -984 +985 @@
     if (puTotalBalloonSize)
         *puTotalBalloonSize = cBalloonPages * _4K;
+
+    if (puTotalSharedSize)
+        *puTotalSharedSize = cSharedPages * _4K;
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Query memory stats for the VM
+ *
+ * @returns VBox status code.
+ * @param   pVM                 The VM handle.
+ * @param   puTotalAllocSize    Pointer to total allocated  memory inside the VM (in bytes)
+ * @param   puTotalFreeSize     Pointer to total free (allocated but not used yet) memory inside the VM (in bytes)
+ * @param   puTotalBalloonSize  Pointer to total ballooned memory inside the VM (in bytes)
+ * @param   puTotalSharedSize   Pointer to total shared memory inside the VM (in bytes)
+ */
+VMMR3DECL(int) PGMR3QueryMemoryStats(PVM pVM, uint64_t *pulTotalMem, uint64_t *pulPrivateMem, uint64_t *puTotalSharedMem, uint64_t *puTotalZeroMem)
+{
+    if (pulTotalMem)
+        *pulTotalMem = pVM->pgm.s.cAllPages * _4K;
+
+    if (pulPrivateMem)
+        *pulPrivateMem = pVM->pgm.s.cPrivatePages * _4K;
+
+    if (puTotalSharedMem)
+        *puTotalSharedMem = pVM->pgm.s.cReusedSharedPages * _4K;
+
+    if (puTotalZeroMem)
+        *puTotalZeroMem = pVM->pgm.s.cZeroPages * _4K;
 
     return VINF_SUCCESS;

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

@@ -505 +505 @@
     /** The number of pages that are shared. A subset of cAllocatedPages. */
     uint64_t            cSharedPages;
+    /** The number of pages that are actually shared between VMs. */
+    uint64_t            cDuplicatePages;
     /** The number of pages that are shared that has been left behind by
      * VMs not doing proper cleanups. */
@@ -852 +854 @@
             pGMM->cAllocatedPages = 0;
             pGMM->cSharedPages = 0;
+            pGMM->cDuplicatePages = 0;
             pGMM->cLeftBehindSharedPages = 0;
             pGMM->cChunks = 0;
@@ -2127 +2130 @@
                             pGVM->gmm.s.Allocated.cBasePages--;
                             if (!--pPage->Shared.cRefs)
+                            {
                                 gmmR0FreeSharedPage(pGMM, paPages[iPage].idSharedPage, pPage);
+                            }
+                            else
+                            {
+                                Assert(pGMM->cDuplicatePages);
+                                pGMM->cDuplicatePages--;
+                            }
 
                             paPages[iPage].idSharedPage = NIL_GMM_PAGEID;
@@ -2667 +2677 @@
     Assert(pGMM->cSharedPages > 0);
     Assert(pGMM->cAllocatedPages > 0);
+
+    pGMM->cDuplicatePages++;
 
     pPage->Shared.cRefs++;
@@ -3078 +3090 @@
     pReq->cBalloonedPages = pGMM->cBalloonedPages;
     pReq->cMaxPages       = pGMM->cMaxPages;
+    pReq->cSharedPages    = pGMM->cDuplicatePages;
     GMM_CHECK_SANITY_UPON_LEAVING(pGMM);