Changeset 11141 in vbox for trunk/src/VBox

Timestamp:

Aug 5, 2008 5:16:08 PM (17 years ago)

Author:

vboxsync

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

34117

Message:

VMM: Try harder allocating the core code page(s). Solaris frequently throws up series of bad pages here, very little we can do about it when there is lots of memory on the system (without having to relocate during init).

File:

• trunk/src/VBox/VMM/VMM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -248 +248 @@
         if (rc == VERR_PGM_INTERMEDIATE_PAGING_CONFLICT)
         {
-            /* try more allocations. */
-            struct
+            /* try more allocations - Solaris  */
+            const unsigned cTries = 4112;
+            struct VMMInitBadTry
             {
                 RTR0PTR  pvR0;
@@ -255 +256 @@
                 RTHCPHYS HCPhys;
                 RTUINT   cb;
-            } aBadTries[128];
+            } *paBadTries = (struct VMMInitBadTry *)RTMemTmpAlloc(sizeof(*paBadTries) * cTries);
+            AssertReturn(paBadTries, VERR_NO_TMP_MEMORY);
             unsigned i = 0;
             do
             {
-                aBadTries[i].pvR3 = pVM->vmm.s.pvHCCoreCodeR3;
-                aBadTries[i].pvR0 = pVM->vmm.s.pvHCCoreCodeR0;
-                aBadTries[i].HCPhys = pVM->vmm.s.HCPhysCoreCode;
+                paBadTries[i].pvR3 = pVM->vmm.s.pvHCCoreCodeR3;
+                paBadTries[i].pvR0 = pVM->vmm.s.pvHCCoreCodeR0;
+                paBadTries[i].HCPhys = pVM->vmm.s.HCPhysCoreCode;
                 i++;
                 pVM->vmm.s.pvHCCoreCodeR0 = NIL_RTR0PTR;
@@ -270 +272 @@
                 rc = PGMR3MapIntermediate(pVM, pVM->vmm.s.pvHCCoreCodeR0, pVM->vmm.s.HCPhysCoreCode, cbCoreCode);
             } while (   rc == VERR_PGM_INTERMEDIATE_PAGING_CONFLICT
-                     && i < RT_ELEMENTS(aBadTries) - 1);
+                     && i < cTries - 1);
 
             /* cleanup */
             if (VBOX_FAILURE(rc))
             {
-                aBadTries[i].pvR3   = pVM->vmm.s.pvHCCoreCodeR3;
-                aBadTries[i].pvR0   = pVM->vmm.s.pvHCCoreCodeR0;
-                aBadTries[i].HCPhys = pVM->vmm.s.HCPhysCoreCode;
-                aBadTries[i].cb     = pVM->vmm.s.cbCoreCode;
+                paBadTries[i].pvR3   = pVM->vmm.s.pvHCCoreCodeR3;
+                paBadTries[i].pvR0   = pVM->vmm.s.pvHCCoreCodeR0;
+                paBadTries[i].HCPhys = pVM->vmm.s.HCPhysCoreCode;
+                paBadTries[i].cb     = pVM->vmm.s.cbCoreCode;
                 i++;
                 LogRel(("Failed to allocated and map core code: rc=%Vrc\n", rc));
@@ -285 +287 @@
             {
                 LogRel(("Core code alloc attempt #%d: pvR3=%p pvR0=%p HCPhys=%VHp\n",
-                        i, aBadTries[i].pvR3, aBadTries[i].pvR0, aBadTries[i].HCPhys));
-                SUPContFree(aBadTries[i].pvR3, aBadTries[i].cb >> PAGE_SHIFT);
-            }
+                        i, paBadTries[i].pvR3, paBadTries[i].pvR0, paBadTries[i].HCPhys));
+                SUPContFree(paBadTries[i].pvR3, paBadTries[i].cb >> PAGE_SHIFT);
+            }
+            RTMemTmpFree(paBadTries);
         }
     }