Changeset 13393 in vbox for trunk/src

Timestamp:

Oct 20, 2008 1:26:44 PM (16 years ago)

Author:

vboxsync

Message:

Updates for physical page aliases

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IOMAllMMIO.cpp (modified) (2 diffs)
• PGMAllHandler.cpp (modified) (1 diff)
• PGMAllShw.h (modified) (1 diff)

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

@@ -1762 +1762 @@
     AssertRCReturn(rc, rc);
 
+    /* Prefetch it as it's now marked as not present and our trap handler will
+     * still call the access handler.
+     */
+    rc = PGMPrefetchPage(pVM, (RTGCPTR)GCPhys);
+    AssertRC(rc);
+
     /* Mark it as writable and present so reads and writes no longer fault. */
-    rc = PGMShwSetPage(pVM, (RTGCPTR)GCPhys, PAGE_SIZE, fPageFlags);
+    rc = PGMShwModifyPage(pVM, (RTGCPTR)GCPhys, 1, fPageFlags, ~fPageFlags);
     AssertRC(rc);
 
@@ -1806 +1812 @@
 
         /* Mark it as not present again to intercept all read and write access. */
-        rc = PGMShwSetPage(pVM, (RTGCPTR)GCPhys, PAGE_SIZE, 0);
+        rc = PGMShwModifyPage(pVM, (RTGCPTR)GCPhys, 1, 0, ~(uint64_t)(X86_PTE_RW|X86_PTE_P));
         AssertRC(rc);
 

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

@@ -947 +947 @@
             pPage->HCPhys = pPageRemap->HCPhys;
 
+            LogFlow(("PGMHandlerPhysicalPageAlias %VGp -> %VGp - %VHp\n", GCPhysPage, GCPhysPageRemap, pPageRemap->HCPhys));
             PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_DISABLED);
 #ifndef IN_GC

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

@@ -359 +359 @@
             {
                 pPT->a[iPTE].u = (pPT->a[iPTE].u & (fMask | SHW_PTE_PG_MASK)) | (fFlags & ~SHW_PTE_PG_MASK);
-                Assert(pPT->a[iPTE].n.u1Present);
+                Assert(pPT->a[iPTE].n.u1Present || !(fMask & X86_PTE_P));
 # if PGM_SHW_TYPE == PGM_TYPE_EPT
                 HWACCMInvalidatePhysPage(pVM, (RTGCPHYS)GCPtr);