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

Timestamp:

Mar 11, 2009 9:35:22 AM (16 years ago)

Author:

vboxsync

Message:

pgmPoolAlloc no longer fails with non-fatal errors.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (5 diffs)
• PGMAllBth.h (modified) (1 diff)
• PGMAllMap.cpp (modified) (1 diff)
• PGMAllPool.cpp (modified) (16 diffs)

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

@@ -940 +940 @@
         /* Create a reference back to the PDPT by using the index in its shadow page. */
         rc = pgmPoolAlloc(pVM, GCPdPt, enmKind, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPdPt, &pShwPage);
-        if (rc == VERR_PGM_POOL_FLUSHED)
-        {
-            Log(("pgmShwSyncPaePDPtr: PGM pool flushed -> signal sync cr3\n"));
-            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-# if defined(IN_RC)
-            PGMDynUnlockHCPage(pVM, (uint8_t *)pPdpe);
-# endif
-            return VINF_PGM_SYNC_CR3;
-        }
         AssertRCReturn(rc, rc);
 
@@ -1057 +1047 @@
         /* Create a reference back to the PDPT by using the index in its shadow page. */
         rc = pgmPoolAlloc(pVM, GCPml4, enmKind, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPml4, &pShwPage);
-        if (rc == VERR_PGM_POOL_FLUSHED)
-        {
-            Log(("PGMShwSyncLongModePDPtr: PGM pool flushed (1) -> signal sync cr3\n"));
-            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-            return VINF_PGM_SYNC_CR3;
-        }
         AssertRCReturn(rc, rc);
     }
@@ -1102 +1085 @@
         /* Create a reference back to the PDPT by using the index in its shadow page. */
         rc = pgmPoolAlloc(pVM, GCPdPt, enmKind, pShwPage->idx, iPdPt, &pShwPage);
-        if (rc == VERR_PGM_POOL_FLUSHED)
-        {
-            Log(("PGMShwSyncLongModePDPtr: PGM pool flushed (2) -> signal sync cr3\n"));
-            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-            return VINF_PGM_SYNC_CR3;
-        }
         AssertRCReturn(rc, rc);
     }
@@ -1196 +1172 @@
 
         rc = pgmPoolAlloc(pVM, GCPml4, PGMPOOLKIND_EPT_PDPT_FOR_PHYS, PGMPOOL_IDX_NESTED_ROOT, iPml4, &pShwPage);
-        if (rc == VERR_PGM_POOL_FLUSHED)
-        {
-            Log(("PGMShwSyncEPTPDPtr: PGM pool flushed (1) -> signal sync cr3\n"));
-            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-            return VINF_PGM_SYNC_CR3;
-        }
         AssertRCReturn(rc, rc);
     }
@@ -1230 +1199 @@
 
         rc = pgmPoolAlloc(pVM, GCPdPt, PGMPOOLKIND_64BIT_PD_FOR_PHYS, pShwPage->idx, iPdPt, &pShwPage);
-        if (rc == VERR_PGM_POOL_FLUSHED)
-        {
-            Log(("PGMShwSyncEPTPDPtr: PGM pool flushed (2) -> signal sync cr3\n"));
-            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-            return VINF_PGM_SYNC_CR3;
-        }
         AssertRCReturn(rc, rc);
     }

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

@@ -4273 +4273 @@
     Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
     rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pNewShwPageCR3);
-    if (rc == VERR_PGM_POOL_FLUSHED)
-    {
-        Log(("MapCR3: PGM pool flushed -> signal sync cr3\n"));
-        Assert(VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));
-        return VINF_PGM_SYNC_CR3;
-    }
-    AssertRCReturn(rc, rc);
+    AssertFatalRC(rc);
     rc = VINF_SUCCESS;
 

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

@@ -299 +299 @@
                     int rc = pgmShwSyncPaePDPtr(pVM, (iPdPt << X86_PDPT_SHIFT), &GstPdpe, &pShwPaePd);
                     AssertFatal(RT_SUCCESS(rc));
-                    if (rc != VINF_SUCCESS)
-                    {
-                        rc = pgmShwSyncPaePDPtr(pVM, (iPdPt << X86_PDPT_SHIFT), &GstPdpe, &pShwPaePd);
-                        AssertFatalMsg(rc == VINF_SUCCESS, ("rc = %Rrc\n", rc));
-                    }
                 }
                 Assert(pShwPaePd);

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

@@ -191 +191 @@
         {
             int rc2 = pgmPoolFlushPage(pPool, pPage);
-            if (rc2 == VERR_PGM_POOL_CLEARED && rc == VINF_SUCCESS)
-                rc = VINF_PGM_SYNC_CR3;
+            AssertRC(rc2);
         }
         /* next */
@@ -1233 +1232 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
- * @retval  VERR_PGM_POOL_CLEARED if the deregistration of a physical handler will cause a light weight pool flush.
  * @param   pPool       The pool.
  * @param   iUser       The user index.
@@ -1451 +1449 @@
                 {
                     STAM_COUNTER_INC(&pPool->StatCacheKindMismatches);
-                    pgmPoolFlushPage(pPool, pPage); /* ASSUMES that VERR_PGM_POOL_CLEARED will be returned by pgmPoolTracInsert. */
+                    pgmPoolFlushPage(pPool, pPage);
                     PGM_INVL_GUEST_TLBS(); /* see PT handler. */
                     break;
@@ -1632 +1630 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
- * @retval  VERR_PGM_POOL_CLEARED if the registration of the physical handler will cause a light weight pool flush.
  * @param   pPool       The pool.
  * @param   pPage       The cached page.
@@ -1719 +1716 @@
          * the heap size should suffice. */
         AssertFatalRC(rc);
-        if (pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)
-            rc = VERR_PGM_POOL_CLEARED;
+        Assert(!(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL) || VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));   
     }
     pPage->fMonitored = true;
@@ -1732 +1728 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
- * @retval  VERR_PGM_POOL_CLEARED if the deregistration of the physical handler will cause a light weight pool flush.
  * @param   pPool       The pool.
  * @param   pPage       The cached page.
@@ -1818 +1813 @@
         rc = PGMHandlerPhysicalDeregister(pVM, pPage->GCPhys & ~(RTGCPHYS)(PAGE_SIZE - 1));
         AssertFatalRC(rc);
-        if (pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)
-            rc = VERR_PGM_POOL_CLEARED;
+        Assert(!(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL) || VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));   
     }
     pPage->fMonitored = false;
@@ -2117 +2111 @@
      * Lazy approach.
      */
-    /* @todo incompatible with long mode paging (cr3 root will be flushed) */
+    /* @todo This path no longer works (CR3 root pages will be flushed)!! */
+    AssertCompileFailed();
     Assert(!CPUMIsGuestInLongMode(pVM));
     pgmPoolFlushAllInt(pPool);
@@ -2134 +2129 @@
  * @retval  VINF_SUCCESS if successfully added.
  * @retval  VERR_PGM_POOL_FLUSHED if the pool was flushed.
- * @retval  VERR_PGM_POOL_CLEARED if the deregistration of the physical handler will cause a light weight pool flush.
  * @param   pPool       The pool.
  * @param   pPage       The cached page.
@@ -2213 +2207 @@
 # ifdef PGMPOOL_WITH_MONITORING
         rc = pgmPoolMonitorInsert(pPool, pPage);
-        if (rc == VERR_PGM_POOL_CLEARED)
-        {
-            /* 'Failed' - free the usage, and keep it in the cache (if enabled). */
-#  ifndef PGMPOOL_WITH_CACHE
-            pgmPoolMonitorFlush(pPool, pPage);
-            rc = VERR_PGM_POOL_FLUSHED;
-#  endif
-            pPage->iUserHead = NIL_PGMPOOL_USER_INDEX;
-            paUsers[i].iNext = pPool->iUserFreeHead;
-            paUsers[i].iUser = NIL_PGMPOOL_IDX;
-            pPool->iUserFreeHead = i;
-        }
+        AssertRC(rc);
     }
 # endif
@@ -3995 +3978 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
- * @retval  VERR_PGM_POOL_CLEARED if the deregistration of the physical handler will cause a light weight pool flush.
  * @param   pPool       The pool.
  * @param   HCPhys      The HC physical address of the shadow page.
@@ -4011 +3993 @@
     if (pPage->idx < PGMPOOL_IDX_FIRST)
     {
+        AssertFailed(); /* can no longer happen */
         Log(("pgmPoolFlushPage: special root page, rejected. enmKind=%s idx=%d\n", pgmPoolPoolKindToStr(pPage->enmKind), pPage->idx));
         return VINF_SUCCESS;
@@ -4114 +4097 @@
     if (!pPage->fCached)
 #endif
-        pgmPoolFlushPage(pPool, pPage);  /* ASSUMES that VERR_PGM_POOL_CLEARED can be ignored here. */
+        pgmPoolFlushPage(pPool, pPage);
     STAM_PROFILE_STOP(&pPool->StatFree, a);
 }
@@ -4170 +4153 @@
      * a cheap replacement strategy...
      */
-    /* @todo incompatible with long mode paging (cr3 root will be flushed) */
+    /* @todo This path no longer works (CR3 root pages will be flushed)!! */
+    AssertCompileFailed();
     Assert(!CPUMIsGuestInLongMode(pVM));
     pgmPoolFlushAllInt(pPool);
@@ -4230 +4214 @@
         if (RT_FAILURE(rc))
         {
-            if (rc != VERR_PGM_POOL_CLEARED)
-            {
-                Log(("pgmPoolAlloc: returns %Rrc (Free)\n", rc));
-                STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
-                return rc;
-            }
-            Log(("pgmPoolMakeMoreFreePages failed with %Rrc -> return VERR_PGM_POOL_FLUSHED\n", rc));
-            rc = VERR_PGM_POOL_FLUSHED;
+            Log(("pgmPoolAlloc: returns %Rrc (Free)\n", rc));
+            STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
+            return rc;
         }
         iNew = pPool->iFreeHead;
@@ -4275 +4254 @@
     if (RT_FAILURE(rc3))
     {
-        if (rc3 != VERR_PGM_POOL_CLEARED)
-        {
-            pPool->cUsedPages--;
-            pPage->enmKind = PGMPOOLKIND_FREE;
-            pPage->GCPhys = NIL_RTGCPHYS;
-            pPage->iNext = pPool->iFreeHead;
-            pPool->iFreeHead = pPage->idx;
-            STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
-            Log(("pgmPoolAlloc: returns %Rrc (Insert)\n", rc3));
-            return rc3;
-        }
-        Log(("pgmPoolTrackInsert failed with %Rrc -> return VERR_PGM_POOL_FLUSHED\n", rc3));
-        rc = VERR_PGM_POOL_FLUSHED;
+        pPool->cUsedPages--;
+        pPage->enmKind = PGMPOOLKIND_FREE;
+        pPage->GCPhys = NIL_RTGCPHYS;
+        pPage->iNext = pPool->iFreeHead;
+        pPool->iFreeHead = pPage->idx;
+        STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
+        Log(("pgmPoolAlloc: returns %Rrc (Insert)\n", rc3));
+        return rc3;
     }
 #endif /* PGMPOOL_WITH_USER_TRACKING */