Changeset 82896 in vbox

Timestamp:

Jan 28, 2020 9:43:45 PM (5 years ago)

Author:

vboxsync

Message:

PGMPool: PGMR0PoolGrow should return failure when allocating the first batch of pages fails. It and the caller PGMR3PoolGrow should report the incident to the release log. bugref:9627

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMMR0/PGMR0Pool.cpp (modified) (2 diffs)
• VMMR3/PGMPool.cpp (modified) (1 diff)

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

@@ -4995 +4995 @@
         int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_POOL_GROW, 0);
 #endif
-        if (RT_FAILURE(rc))
-            return rc;
+        if (rc == VINF_SUCCESS)
+        { /* likely */ }
+        else
+        {
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+
         STAM_PROFILE_ADV_RESUME(&pPool->StatAlloc, a);
         if (pPool->iFreeHead != NIL_PGMPOOL_IDX)

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

@@ -46 +46 @@
     PPGMPOOL pPool = pGVM->pgm.s.pPoolR0;
     AssertReturn(pPool->cCurPages < pPool->cMaxPages, VERR_PGM_POOL_MAXED_OUT_ALREADY);
+    AssertReturn(pPool->pVMR3 == pGVM->pVMR3, VERR_PGM_POOL_IPE);
+    AssertReturn(pPool->pVMR0 == pGVM, VERR_PGM_POOL_IPE);
 
     /* With 32-bit guests and no EPT, the CR3 limits the root pages to low
@@ -139 +141 @@
             RTR0MemObjFree(hMemObj, true /*fFreeMappings*/);
         }
+        if (cCurPages > 0)
+            rc = -rc;
+        else
+            LogRel(("PGMR0PoolGrow: rc=%Rrc cNewPages=%#x cCurPages=%#x cMaxPages=%#x fCanUseHighMemory=%d\n",
+                    rc, cNewPages, cCurPages, cMaxPages, fCanUseHighMemory));
     }
     RTCritSectLeave(&pGVM->pgmr0.s.PoolGrowCritSect);
-    return VINF_SUCCESS;
+    return rc;
 }
 

trunk/src/VBox/VMM/VMMR3/PGMPool.cpp

@@ -485 +485 @@
     /* This used to do a lot of stuff, but it has moved to ring-0 (PGMR0PoolGrow). */
     AssertReturn(pVM->pgm.s.pPoolR3->cCurPages < pVM->pgm.s.pPoolR3->cMaxPages, VERR_PGM_POOL_MAXED_OUT_ALREADY);
-    return VMMR3CallR0Emt(pVM, pVCpu, VMMR0_DO_PGM_POOL_GROW, 0, NULL);
+    int rc = VMMR3CallR0Emt(pVM, pVCpu, VMMR0_DO_PGM_POOL_GROW, 0, NULL);
+    if (rc == VINF_SUCCESS)
+        return rc;
+    LogRel(("PGMR3PoolGrow: rc=%Rrc cCurPages=%#x cMaxPages=%#x\n",
+            rc, pVM->pgm.s.pPoolR3->cCurPages, pVM->pgm.s.pPoolR3->cMaxPages));
+    return rc;
 }