Changeset 17503 in vbox

Timestamp:

Mar 6, 2009 9:13:13 PM (16 years ago)

Author:

vboxsync

Message:

PGM: PGMR3PhysAllocateHandyPages fix and error handling.

File:

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

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -2472 +2472 @@
     pgmLock(pVM);
 
-
     /*
      * Allocate more pages, noting down the index of the first new page.
@@ -2478 +2477 @@
     uint32_t iClear = pVM->pgm.s.cHandyPages;
     AssertMsgReturn(iClear <= RT_ELEMENTS(pVM->pgm.s.aHandyPages), ("%d", iClear), VERR_INTERNAL_ERROR);
+    Log(("PGMR3PhysAllocateHandyPages: %d -> %d\n", iClear, RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
     int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, 0, NULL);
     if (rc == VERR_GMM_SEED_ME)
@@ -2485 +2485 @@
         if (RT_SUCCESS(rc))
             rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvChunk, NULL);
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("PGM: GMM Seeding failed, rc=%Rrc\n", rc));
-            rc = VINF_EM_NO_MEMORY;
-        }
+        if (RT_SUCCESS(rc))
+            rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, 0, NULL);
     }
 
@@ -2506 +2503 @@
             iClear++;
         }
+
+        VM_FF_CLEAR(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
+    }
+    else
+    {
+        LogRel(("PGM: Failed to procure handy pages, rc=%Rrc cHandyPages=%u\n",
+                rc, pVM->pgm.s.cHandyPages));
+        rc = VERR_EM_NO_MEMORY;
+        //rc = VINF_EM_NO_MEMORY;
+        //VM_FF_SET(pVM, VM_FF_PGM_WE_ARE_SCREWED?);
     }
 
 /** @todo Do proper VERR_EM_NO_MEMORY reporting. */
+    AssertMsg(   pVM->pgm.s.cHandyPages == RT_ELEMENTS(pVM->pgm.s.aHandyPages)
+              || rc != VINF_SUCCESS, ("%d rc=%Rrc\n", pVM->pgm.s.cHandyPages, rc));
     pgmUnlock(pVM);
-    Assert(rc == VINF_SUCCESS || rc == VINF_EM_NO_MEMORY);
+    Assert(rc == VINF_SUCCESS || rc == VINF_EM_NO_MEMORY || rc == VERR_EM_NO_MEMORY);
     return rc;
 }
@@ -2636 +2645 @@
             if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
                 rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
-            else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
-                rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+            else if (PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+            {
+                /** @todo Handle TLB loads of virtual handlers so ./test.sh can be made to work
+                 *        in -norawr0 mode. */
+                if (fWritable)
+                    rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+            }
             else
             {