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

Timestamp:

Dec 26, 2009 1:08:25 PM (15 years ago)

Author:

vboxsync

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

56271

Message:

PGMAllPhys.cpp: Fixed bug when entering MMIO2 pages into the physical TLB. Reenabled it for all rings.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (6 diffs)

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

@@ -41 +41 @@
 # include <iprt/thread.h>
 #endif
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** Enable the physical TLB. */
+#define PGM_WITH_PHYS_TLB
 
 
@@ -655 +662 @@
             PPGMRAMRANGE pRam = pgmPhysGetRange(&pVM->pgm.s, GCPhys);
             AssertMsgReturn(pRam || !pRam->pvR3, ("pRam=%p pPage=%R[pgmpage]\n", pRam, pPage), VERR_INTERNAL_ERROR_2);
-            *ppv = (void *)((uintptr_t)pRam->pvR3 + (GCPhys - pRam->GCPhys));
+            *ppv = (void *)((uintptr_t)pRam->pvR3 + (GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK) - pRam->GCPhys);
         }
         else if (PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2_ALIAS_MMIO)
@@ -863 +870 @@
         pTlbe->pMap = pMap;
         pTlbe->pv = pv;
+        Assert(!((uintptr_t)pTlbe->pv & PAGE_OFFSET_MASK));
     }
     else
@@ -870 +878 @@
         pTlbe->pv = pPGM->CTXALLSUFF(pvZeroPg);
     }
-#ifdef IN_RING0
-    pTlbe->GCPhys = (GCPhys & X86_PTE_PAE_PG_MASK);
+#ifdef PGM_WITH_PHYS_TLB
+    pTlbe->GCPhys = GCPhys & X86_PTE_PAE_PG_MASK;
 #else
-    /* REM already has a TLB of its own; no point in having two
-     * and keeping both in sync will eliminate any benefit there might be.
-     */
     pTlbe->GCPhys = NIL_RTGCPHYS;
 #endif
@@ -914 +919 @@
         pTlbe->pMap = pMap;
         pTlbe->pv = pv;
+        Assert(!((uintptr_t)pTlbe->pv & PAGE_OFFSET_MASK));
     }
     else
@@ -921 +927 @@
         pTlbe->pv = pPGM->CTXALLSUFF(pvZeroPg);
     }
-#ifdef IN_RING0
-    pTlbe->GCPhys = (GCPhys & X86_PTE_PAE_PG_MASK);
+#ifdef PGM_WITH_PHYS_TLB
+    pTlbe->GCPhys = GCPhys & X86_PTE_PAE_PG_MASK;
 #else
-    /* REM already has a TLB of its own; no point in having two
-     * and keeping both in sync will eliminate any benefit there might be.
-     */
     pTlbe->GCPhys = NIL_RTGCPHYS;
 #endif