Changeset 29551 in vbox

Timestamp:

May 17, 2010 2:15:41 PM (15 years ago)

Author:

vboxsync

Message:

Rewrote previous accounting fix

File:

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

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

@@ -1823 +1823 @@
     {
         case GMMACCOUNT_BASE:
-            if (RT_UNLIKELY(pGVM->gmm.s.Allocated.cBasePages + pGVM->gmm.s.cBalloonedPages + pGVM->gmm.s.cSharedPages + cPages > pGVM->gmm.s.Reserved.cBasePages))
+            if (RT_UNLIKELY(pGVM->gmm.s.Allocated.cBasePages + pGVM->gmm.s.cBalloonedPages + cPages > pGVM->gmm.s.Reserved.cBasePages))
             {
                 Log(("gmmR0AllocatePages:Base: Reserved=%#llx Allocated+Ballooned+Requested=%#llx+%#llx+%#x!\n",
@@ -2668 +2668 @@
     pPage->Shared.cRefs++;
     pGVM->gmm.s.cSharedPages++;
+    pGVM->gmm.s.Allocated.cBasePages++;
 }
 #endif
@@ -2711 +2712 @@
     {
         case GMMACCOUNT_BASE:
-            if (RT_UNLIKELY(pGVM->gmm.s.Allocated.cBasePages + pGVM->gmm.s.cSharedPages < cPages))
+            if (RT_UNLIKELY(pGVM->gmm.s.Allocated.cBasePages < cPages))
             {
                 Log(("gmmR0FreePages: allocated=%#llx cPages=%#x!\n", pGVM->gmm.s.Allocated.cBasePages, cPages));
@@ -2743 +2744 @@
     int rc = VINF_SUCCESS;
     uint32_t iPage;
-    uint32_t cSharedPages = 0;
     for (iPage = 0; iPage < cPages; iPage++)
     {
@@ -2770 +2770 @@
                 Assert(pGVM->gmm.s.cSharedPages);
                 pGVM->gmm.s.cSharedPages--;
-                cSharedPages++;
                 Assert(pPage->Shared.cRefs);
                 if (!--pPage->Shared.cRefs)
@@ -2791 +2790 @@
     }
 
-    Assert(iPage > cSharedPages);
-
     /*
      * Update the account.
@@ -2798 +2795 @@
     switch (enmAccount)
     {
-        case GMMACCOUNT_BASE:   pGVM->gmm.s.Allocated.cBasePages   -= (iPage - cSharedPages); break;
+        case GMMACCOUNT_BASE:   pGVM->gmm.s.Allocated.cBasePages   -= iPage; break;
         case GMMACCOUNT_SHADOW: pGVM->gmm.s.Allocated.cShadowPages -= iPage; break;
         case GMMACCOUNT_FIXED:  pGVM->gmm.s.Allocated.cFixedPages  -= iPage; break;