Changeset 18617 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 1, 2009 10:11:29 PM (16 years ago)

Author:

vboxsync

Message:

PGM,EM: Handle out of memory situations more gracefully - part 1. New debugger commands: .pgmerror and .pgmerroroff.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (7 diffs)
• PGMAllPhys.cpp (modified) (2 diffs)

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

@@ -75 +75 @@
  *
  * @returns VBox status code (appropriate for trap handling and GC return).
+ *
  * @param   pVM         VM Handle.
  * @param   uErr        The trap error code.
@@ -764 +765 @@
                             return rc;
                         }
+                        if (RT_UNLIKELY(VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)))
+                            return VINF_EM_NO_MEMORY;
                     }
                     /// @todo count the above case; else
@@ -1715 +1718 @@
 # ifdef PGM_SYNC_N_PAGES
                     Assert(cPages == 1 || !(uErr & X86_TRAP_PF_P));
-                    if (cPages > 1 && !(uErr & X86_TRAP_PF_P))
+                    if (    cPages > 1
+                        &&  !(uErr & X86_TRAP_PF_P)
+                        &&  !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
                     {
                         /*
@@ -1953 +1958 @@
 
     Assert(cPages == 1 || !(uErr & X86_TRAP_PF_P));
-    if (cPages > 1 && !(uErr & X86_TRAP_PF_P))
+    if (    cPages > 1
+        &&  !(uErr & X86_TRAP_PF_P)
+        &&  !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
     {
         /*
@@ -1993 +2000 @@
                       (uint64_t)pPTDst->a[iPTDst].u,
                       pPTDst->a[iPTDst].u & PGM_PTFLAGS_TRACK_DIRTY ? " Track-Dirty" : ""));
+
+                if (RT_UNLIKELY(VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)))
+                    break;
             }
             else
@@ -2677 +2687 @@
             PPGMRAMRANGE    pRam   = pVM->pgm.s.CTX_SUFF(pRamRanges);
             unsigned        iPTDst = 0;
-            while (iPTDst < RT_ELEMENTS(pPTDst->a))
+            while (     iPTDst < RT_ELEMENTS(pPTDst->a)
+                   &&   !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
             {
                 /* Advance ram range list. */
@@ -2700 +2711 @@
                             rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
                             AssertRCReturn(rc, rc);
+                            if (VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
+                                break;
                         }
 #  endif

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

@@ -262 +262 @@
  * This will also take the appropriate actions when reaching water-marks.
  *
- * @returns The following VBox status codes.
+ * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
  * @retval  VERR_EM_NO_MEMORY if we're really out of memory.
@@ -273 +273 @@
 static int pgmPhysEnsureHandyPage(PVM pVM)
 {
-    /** @remarks
-     * low-water mark logic for R0 & GC:
-     *      - 75%: Set FF.
-     *      - 50%: Force return to ring-3 ASAP.
-     *
-     * For ring-3 there is a little problem wrt to the recompiler, so:
-     *      - 75%: Set FF.
-     *      - 50%: Try allocate pages; on failure we'll force REM to quite ASAP.
-     *
-     * The basic idea is that we should be able to get out of any situation with
-     * only 50% of handy pages remaining.
-     *
-     * At the moment we'll not adjust the number of handy pages relative to the
-     * actual VM RAM committment, that's too much work for now.
-     */
-    Assert(PDMCritSectIsOwner(&pVM->pgm.s.CritSect));
     AssertMsg(pVM->pgm.s.cHandyPages <= RT_ELEMENTS(pVM->pgm.s.aHandyPages), ("%d\n", pVM->pgm.s.cHandyPages));
-    if (    !pVM->pgm.s.cHandyPages
+
+    /*
+     * Do we need to do anything special?
+     */
 #ifdef IN_RING3
-        ||   pVM->pgm.s.cHandyPages - 1 <= RT_ELEMENTS(pVM->pgm.s.aHandyPages) / 2 /* 50% */
-#endif
-       )
-    {
-        Log(("PGM: cHandyPages=%u out of %u -> allocate more\n", pVM->pgm.s.cHandyPages, RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
+    if (pVM->pgm.s.cHandyPages <= RT_MAX(PGM_HANDY_PAGES_SET_FF, PGM_HANDY_PAGES_R3_ALLOC))
+#else
+    if (pVM->pgm.s.cHandyPages <= RT_MAX(PGM_HANDY_PAGES_SET_FF, PGM_HANDY_PAGES_RZ_TO_R3))
+#endif
+    {
+        /*
+         * Allocate pages only if we're out of them, or in ring-3, almost out.
+         */
 #ifdef IN_RING3
-        int rc = PGMR3PhysAllocateHandyPages(pVM);
+        if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_R3_ALLOC)
+#else
+        if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_RZ_ALLOC)
+#endif
+        {
+            Log(("PGM: cHandyPages=%u out of %u -> allocate more; VM_FF_PGM_NO_MEMORY=%RTbool\n",
+                 pVM->pgm.s.cHandyPages, RT_ELEMENTS(pVM->pgm.s.aHandyPages), VM_FF_ISSET(pVM, VM_FF_PGM_NO_MEMORY) ));
+#ifdef IN_RING3
+            int rc = PGMR3PhysAllocateHandyPages(pVM);
 #elif defined(IN_RING0)
-        int rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
+            int rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
 #else
-        int rc = VMMGCCallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
-#endif
-        if (RT_UNLIKELY(rc != VINF_SUCCESS))
-        {
-            AssertMsg(rc == VINF_EM_NO_MEMORY || rc == VERR_EM_NO_MEMORY, ("%Rrc\n", rc));
-            if (!pVM->pgm.s.cHandyPages)
+            int rc = VMMGCCallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
+#endif
+            if (RT_UNLIKELY(rc != VINF_SUCCESS))
             {
-                LogRel(("PGM: no more handy pages!\n"));
-                return VERR_EM_NO_MEMORY;
+                if (RT_FAILURE(rc))
+                    return rc;
+                AssertMsgReturn(rc == VINF_EM_NO_MEMORY, ("%Rrc\n", rc), VERR_IPE_UNEXPECTED_INFO_STATUS);
+                if (!pVM->pgm.s.cHandyPages)
+                {
+                    LogRel(("PGM: no more handy pages!\n"));
+                    return VERR_EM_NO_MEMORY;
+                }
+                Assert(VM_FF_ISSET(pVM, VM_FF_PGM_NEED_HANDY_PAGES));
+                Assert(VM_FF_ISSET(pVM, VM_FF_PGM_NO_MEMORY));
+#ifdef IN_RING3
+                REMR3NotifyFF(pVM);
+#else
+                VM_FF_SET(pVM, VM_FF_TO_R3); /* paranoia */
+#endif
             }
-            Assert(VM_FF_ISSET(pVM, VM_FF_PGM_NEED_HANDY_PAGES));
-#ifdef IN_RING3
-            REMR3NotifyFF(pVM);
-#else
-            VM_FF_SET(pVM, VM_FF_TO_R3);
-#endif
-        }
-        AssertMsgReturn(    pVM->pgm.s.cHandyPages > 0
-                        &&  pVM->pgm.s.cHandyPages <= RT_ELEMENTS(pVM->pgm.s.aHandyPages),
-                        ("%u\n", pVM->pgm.s.cHandyPages),
-                        VERR_INTERNAL_ERROR);
-    }
-    else if (pVM->pgm.s.cHandyPages - 1 <= (RT_ELEMENTS(pVM->pgm.s.aHandyPages) / 4) * 3) /* 75% */
-    {
-        VM_FF_SET(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
+            AssertMsgReturn(    pVM->pgm.s.cHandyPages > 0
+                            &&  pVM->pgm.s.cHandyPages <= RT_ELEMENTS(pVM->pgm.s.aHandyPages),
+                            ("%u\n", pVM->pgm.s.cHandyPages),
+                            VERR_INTERNAL_ERROR);
+        }
+        else
+        {
+            if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_SET_FF)
+                VM_FF_SET(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
 #ifndef IN_RING3
-        if (pVM->pgm.s.cHandyPages - 1 <= RT_ELEMENTS(pVM->pgm.s.aHandyPages) / 2)
-        {
-            Log(("PGM: VM_FF_TO_R3 - cHandyPages=%u out of %u\n", pVM->pgm.s.cHandyPages - 1, RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
-            VM_FF_SET(pVM, VM_FF_TO_R3);
-        }
-#endif
+            if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_RZ_TO_R3)
+            {
+                Log(("PGM: VM_FF_TO_R3 - cHandyPages=%u out of %u\n", pVM->pgm.s.cHandyPages, RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
+                VM_FF_SET(pVM, VM_FF_TO_R3);
+            }
+#endif
+        }
     }