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

Timestamp:

Jul 27, 2010 12:06:18 PM (15 years ago)

Author:

vboxsync

Message:

PGM: cache the last physical handler lookup result in each ring.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (3 diffs)
• PGMAllHandler.cpp (modified) (6 diffs)
• PGMAllPhys.cpp (modified) (7 diffs)

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

@@ -162 +162 @@
         const RTGCPHYS  GCPhysFault = (RTGCPHYS)pvFault;
 # endif
-        PPGMPHYSHANDLER pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhysFault);
+        PPGMPHYSHANDLER pCur = pgmHandlerPhysicalLookup(pVM, GCPhysFault);
         if (pCur)
         {
@@ -212 +212 @@
                 STAM_PROFILE_START(&pCur->Stat, h);
                 if (fLeaveLock)
-                    pgmUnlock(pVM); /* @todo: Not entirely safe. */
+                    pgmUnlock(pVM); /** @todo: Not entirely safe. */
 
                 rc = pfnHandler(pVM, uErr, pRegFrame, pvFault, GCPhysFault, pvUser);
@@ -218 +218 @@
                     pgmLock(pVM);
 #  ifdef VBOX_WITH_STATISTICS
-                pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhysFault);
+                pCur = pgmHandlerPhysicalLookup(pVM, GCPhysFault);
                 if (pCur)
                     STAM_PROFILE_STOP(&pCur->Stat, h);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -262 +262 @@
 
         /*
-         * Clear the page bits and notify the REM about this change.
+         * Clear the page bits, notify the REM about this change and clear
+         * the cache.
          */
         pgmHandlerPhysicalResetRamFlags(pVM, pCur);
         pgmHandlerPhysicalDeregisterNotifyREM(pVM, pCur);
+        pVM->pgm.s.pLastPhysHandlerR0 = 0;
+        pVM->pgm.s.pLastPhysHandlerR3 = 0;
+        pVM->pgm.s.pLastPhysHandlerRC = 0;
         MMHyperFree(pVM, pCur);
         pgmUnlock(pVM);
@@ -575 +579 @@
 
         /*
-         * Invalid new location, free it.
+         * Invalid new location, flush the cache and free it.
          * We've only gotta notify REM and free the memory.
          */
         pgmHandlerPhysicalDeregisterNotifyREM(pVM, pCur);
+        pVM->pgm.s.pLastPhysHandlerR0 = 0;
+        pVM->pgm.s.pLastPhysHandlerR3 = 0;
+        pVM->pgm.s.pLastPhysHandlerRC = 0;
         MMHyperFree(pVM, pCur);
     }
@@ -746 +753 @@
                         LogFlow(("PGMHandlerPhysicalJoin: %RGp-%RGp %RGp-%RGp\n",
                                  pCur1->Core.Key, pCur1->Core.KeyLast, pCur2->Core.Key, pCur2->Core.KeyLast));
+                        pVM->pgm.s.pLastPhysHandlerR0 = 0;
+                        pVM->pgm.s.pLastPhysHandlerR3 = 0;
+                        pVM->pgm.s.pLastPhysHandlerRC = 0;
                         MMHyperFree(pVM, pCur2);
                         pgmUnlock(pVM);
@@ -1175 +1185 @@
      */
     pgmLock(pVM);
-    PPGMPHYSHANDLER pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+    PPGMPHYSHANDLER pCur = pgmHandlerPhysicalLookup(pVM, GCPhys);
     if (pCur)
     {
@@ -1204 +1214 @@
 {
     pgmLock(pVM);
-    PPGMPHYSHANDLER pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+    PPGMPHYSHANDLER pCur = pgmHandlerPhysicalLookup(pVM, GCPhys);
     if (!pCur)
     {

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

@@ -1758 +1758 @@
     {
 #ifdef IN_RING3
-        pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+        pPhys = pgmHandlerPhysicalLookup(pVM, GCPhys);
         AssertReleaseMsg(pPhys, ("GCPhys=%RGp cb=%#x\n", GCPhys, cb));
         Assert(GCPhys >= pPhys->Core.Key && GCPhys <= pPhys->Core.KeyLast);
@@ -1776 +1776 @@
         pgmLock(pVM);
 # ifdef VBOX_WITH_STATISTICS
-        pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+        pPhys = pgmHandlerPhysicalLookup(pVM, GCPhys);
         if (pPhys)
             STAM_PROFILE_STOP(&pPhys->Stat, h);
@@ -1987 +1987 @@
         ||  PGM_PAGE_IS_MMIO(pPage) /* screw virtual handlers on MMIO pages */)
     {
-        PPGMPHYSHANDLER pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+        PPGMPHYSHANDLER pCur = pgmHandlerPhysicalLookup(pVM, GCPhys);
         if (pCur)
         {
@@ -2021 +2021 @@
                 pgmLock(pVM);
 # ifdef VBOX_WITH_STATISTICS
-                pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+                pCur = pgmHandlerPhysicalLookup(pVM, GCPhys);
                 if (pCur)
                     STAM_PROFILE_STOP(&pCur->Stat, h);
@@ -2174 +2174 @@
         if (fMorePhys && !pPhys)
         {
-            pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+            pPhys = pgmHandlerPhysicalLookup(pVM, GCPhys);
             if (pPhys)
             {
@@ -2233 +2233 @@
             pgmLock(pVM);
 # ifdef VBOX_WITH_STATISTICS
-            pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+            pPhys = pgmHandlerPhysicalLookup(pVM, GCPhys);
             if (pPhys)
                 STAM_PROFILE_STOP(&pPhys->Stat, h);
@@ -2302 +2302 @@
             pgmLock(pVM);
 # ifdef VBOX_WITH_STATISTICS
-            pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+            pPhys = pgmHandlerPhysicalLookup(pVM, GCPhys);
             if (pPhys)
                 STAM_PROFILE_STOP(&pPhys->Stat, h);