Changeset 8543 in vbox

Timestamp:

May 2, 2008 5:48:42 PM (17 years ago)

Author:

vboxsync

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

30448

Message:

Corrected the error code for that core code 'allocation' failure.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/PGMMap.cpp (modified) (5 diffs)
• src/VBox/VMM/VMM.cpp (modified) (2 diffs)

trunk/include/VBox/err.h

@@ -396 +396 @@
 /** Physical range crosses dynamic ram chunk boundary; translation to HC ptr not safe. */
 #define VERR_PGM_GCPHYS_RANGE_CROSSES_BOUNDARY  (-1626)
+/** Conflict between the core memory and the intermediate paging context, try again.
+ * There are some very special conditions applying to the intermediate paging context
+ * (used during the world switches), and some times we continuously run into these
+ * when asking the host kernel for memory during VM init. Let us know if you run into
+ * this and we'll adjust the code so it tries harder to avoid it.
+ */
+#define VERR_PGM_INTERMEDIATE_PAGING_CONFLICT   (-1627)
+
 /** @} */
 

trunk/src/VBox/VMM/PGMMap.cpp

@@ -501 +501 @@
             )
        )
-    {
-        AssertMsgFailed(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
-        LogRel(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
-        return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */
-    }
+        AssertLogRelMsgFailedReturn(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages),
+                                    VERR_PGM_INTERMEDIATE_PAGING_CONFLICT);
 
     /* The intermediate mapping must not conflict with our default hypervisor address. */
@@ -514 +511 @@
         : pvHyperGC + cbHyper > uAddress
        )
-    {
-        AssertMsgFailed(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages));
-        LogRel(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages));
-        return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */
-    }
+        AssertLogRelMsgFailedReturn(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages),
+                                    VERR_PGM_INTERMEDIATE_PAGING_CONFLICT);
 
     const unsigned cPages = cbPages >> PAGE_SHIFT;
@@ -575 +569 @@
                 /** @todo this must be handled with a relocation of the conflicting mapping!
                  * Which of course cannot be done because we're in the middle of the initialization. bad design! */
-                AssertMsgFailed(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress));
-                LogRel(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress));
-                return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */
+                AssertLogRelMsgFailedReturn(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress),
+                                            VERR_PGM_INTERMEDIATE_PAGING_CONFLICT);
             }
         }
         if (pPT->a[iPTE].u)
-        {
-            AssertMsgFailed(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", iPTE, iPDE, uAddress, pPT->a[iPTE].u));
-            LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n",
-                    iPTE, iPDE, uAddress, pPT->a[iPTE].u));
-            return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */
-        }
+            AssertLogRelMsgFailedReturn(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", iPTE, iPDE, uAddress, pPT->a[iPTE].u),
+                                        VERR_PGM_INTERMEDIATE_PAGING_CONFLICT);
 
         /*
@@ -608 +597 @@
                 /** @todo this must be handled with a relocation of the conflicting mapping!
                  * Which of course cannot be done because we're in the middle of the initialization. bad design! */
-                AssertMsgFailed(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress));
-                LogRel(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress));
-                return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */
+                AssertLogRelMsgFailedReturn(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress),
+                                            VERR_PGM_INTERMEDIATE_PAGING_CONFLICT);
             }
         }
         if (pPTPae->a[iPTE].u)
-        {
-            AssertMsgFailed(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", iPTE, iPDE, uAddress, pPTPae->a[iPTE].u));
-            LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n",
-                    iPTE, iPDE, uAddress, pPTPae->a[iPTE].u));
-            return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */
-        }
+            AssertLogRelMsgFailedReturn(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", iPTE, iPDE, uAddress, pPTPae->a[iPTE].u),
+                                        VERR_PGM_INTERMEDIATE_PAGING_CONFLICT);
 
         /* next */
@@ -1201 +1185 @@
 DECLCALLBACK(void) pgmR3MapInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
-    pHlp->pfnPrintf(pHlp, pVM->pgm.s.fMappingsFixed 
-                    ? "\nThe mappings are FIXED.\n" 
+    pHlp->pfnPrintf(pHlp, pVM->pgm.s.fMappingsFixed
+                    ? "\nThe mappings are FIXED.\n"
                     : "\nThe mappings are FLOATING.\n");
     PPGMMAPPING pCur;

trunk/src/VBox/VMM/VMM.cpp

@@ -246 +246 @@
     {
         rc = PGMR3MapIntermediate(pVM, pVM->vmm.s.pvHCCoreCodeR0, pVM->vmm.s.HCPhysCoreCode, cbCoreCode);
-        if (rc == VERR_PGM_MAPPINGS_FIX_CONFLICT)
+        if (rc == VERR_PGM_INTERMEDIATE_PAGING_CONFLICT)
         {
             /* try more allocations. */
@@ -269 +269 @@
                     break;
                 rc = PGMR3MapIntermediate(pVM, pVM->vmm.s.pvHCCoreCodeR0, pVM->vmm.s.HCPhysCoreCode, cbCoreCode);
-            } while (   rc == VERR_PGM_MAPPINGS_FIX_CONFLICT
-                     && i < ELEMENTS(aBadTries) - 1);
+            } while (   rc == VERR_PGM_INTERMEDIATE_PAGING_CONFLICT
+                     && i < RT_ELEMENTS(aBadTries) - 1);
 
             /* cleanup */