Changeset 37803 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 6, 2011 2:45:27 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72682

Message:

GMM: Don't ignore the status code of the update loop. PGM: Initialize the handy pages correctly and retry the handy page allocation a little differently.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (2 diffs)
• PGMR0.cpp (modified) (2 diffs)

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

@@ -2657 +2657 @@
                                 /* else: NIL_RTHCPHYS nothing */
 
-                                paPages[iPage].idPage = NIL_GMM_PAGEID;
+                                paPages[iPage].idPage       = NIL_GMM_PAGEID;
                                 paPages[iPage].HCPhysGCPhys = NIL_RTHCPHYS;
                             }
@@ -2722 +2722 @@
                     }
                 }
+            } /* for each page to update */
+
+            if (RT_SUCCESS(rc))
+            {
+#if 0  /* This appears to spell trouble... weird. */
+                for (iPage = 0; iPage < cPagesToAlloc; iPage++)
+                {
+                    Assert(paPages[iPage].HCPhysGCPhys  == NIL_RTHCPHYS);
+                    Assert(paPages[iPage].idPage        == NIL_GMM_PAGEID);
+                    Assert(paPages[iPage].idSharedPage  == NIL_GMM_PAGEID);
+                }
+#endif
+
+                /*
+                 * Join paths with GMMR0AllocatePages for the allocation.
+                 * Note! gmmR0AllocateMoreChunks may leave the protection of the mutex!
+                 */
+#if 0  /* Trying to reproduce out of memory issue... */
+                if (!cPagesToUpdate)
+#endif
+                    rc = gmmR0AllocatePagesNew(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE);
+#if 0  /* Trying to reproduce out of memory issue... */
+                else
+                {
+                    for (iPage = 0; iPage < cPagesToAlloc; iPage++)
+                    {
+                        paPages[iPage].HCPhysGCPhys  = NIL_RTHCPHYS;
+                        paPages[iPage].idPage        = NIL_GMM_PAGEID;
+                        paPages[iPage].idSharedPage  = NIL_GMM_PAGEID;
+                    }
+
+                    rc = VERR_GMM_HIT_VM_ACCOUNT_LIMIT;
+                }
+#endif
             }
-
-            /*
-             * Join paths with GMMR0AllocatePages for the allocation.
-             * Note! gmmR0AllocateMoreChunks may leave the protection of the mutex!
-             */
-            rc = gmmR0AllocatePagesNew(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE);
         }
         else

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -121 +121 @@
             do
             {
-                cPages >>= 2;
+                cPages >>= 1;
                 if (cPages + iFirst < PGM_HANDY_PAGES_MIN)
                     cPages = PGM_HANDY_PAGES_MIN - iFirst;
-                rc = GMMR0AllocateHandyPages(pVM, pVCpu->idCpu, cPages, cPages, &pVM->pgm.s.aHandyPages[iFirst]);
+                rc = GMMR0AllocateHandyPages(pVM, pVCpu->idCpu, 0, cPages, &pVM->pgm.s.aHandyPages[iFirst]);
             } while (   (   rc == VERR_GMM_HIT_GLOBAL_LIMIT
                          || rc == VERR_GMM_HIT_VM_ACCOUNT_LIMIT)