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

Timestamp:

Aug 30, 2010 12:46:17 PM (14 years ago)

Author:

vboxsync

Message:

pgmPoolTrackPhysExtInsert: Fixed missing loop advancing, caused chains to be very short. Added missing rollout.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (3 diffs)

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

@@ -3775 +3775 @@
     PPGMPOOLPHYSEXT paPhysExts = pPool->CTX_SUFF(paPhysExts);
 
-    /* special common case. */
+    /*
+     * Special common cases.
+     */
+    if (paPhysExts[iPhysExt].aidx[1] == NIL_PGMPOOL_IDX)
+    {
+        paPhysExts[iPhysExt].aidx[1] = iShwPT;
+        paPhysExts[iPhysExt].apte[1] = iPte;
+        STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->StatTrackAliasedMany);
+        LogFlow(("pgmPoolTrackPhysExtInsert: %d:{,%d pte %d,}\n", iPhysExt, iShwPT, iPte));
+        return PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, iPhysExt);
+    }
     if (paPhysExts[iPhysExt].aidx[2] == NIL_PGMPOOL_IDX)
     {
@@ -3784 +3794 @@
         return PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, iPhysExt);
     }
-
-    /* general treatment. */
+    AssertCompile(RT_ELEMENTS(paPhysExts[iPhysExt].aidx) == 3);
+
+    /*
+     * General treatment.
+     */
     const uint16_t iPhysExtStart = iPhysExt;
     unsigned cMax = 15;
@@ -3807 +3820 @@
             return PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, PGMPOOL_TD_IDX_OVERFLOWED);
         }
-    }
-
-    /* add another extent to the list. */
+
+        /* advance */
+        iPhysExt = paPhysExts[iPhysExt].iNext;
+        if (iPhysExt == NIL_PGMPOOL_IDX)
+            break;
+    }
+
+    /*
+     * Add another extent to the list.
+     */
     PPGMPOOLPHYSEXT pNew = pgmPoolTrackPhysExtAlloc(pVM, &iPhysExt);
     if (!pNew)