儲存庫 vbox 的更動 16465

時間撮記:

2009-2-2 下午03:25:18 (16 年 以前)

作者:

vboxsync

訊息:

Got rid of the aliased hack that directly manipulates shadow page table entries; use the right way by going through the PGM pool.

位置:

trunk/src/VBox/VMM/VMMAll

檔案:

• IOMAllMMIO.cpp (修改) (3 筆差異)
• PGMAllHandler.cpp (修改) (2 筆差異)
• PGMAllShw.h (修改) (1 筆差異)

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

@@ -1785 +1785 @@
 #endif
 
-#if 0
+    /* @note this is a NOP in the EPT case; we'll just let it fault again to resync the page. */
     rc = PGMPrefetchPage(pVM, (RTGCPTR)GCPhys);
-#else
-    /* Mark it as writable and present so reads and writes no longer fault. */
-    rc = PGMShwModifyPage(pVM, (RTGCPTR)GCPhys, 1, fPageFlags, ~fPageFlags);
-#endif
     Assert(rc == VINF_SUCCESS || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT);
-
     return VINF_SUCCESS;
 }
@@ -1807 +1802 @@
 VMMDECL(int)  IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys)
 {
-    uint32_t cb;
-
     Log(("IOMMMIOResetRegion %RGp\n", GCPhys));
 
@@ -1825 +1818 @@
 
 
-    cb     = pRange->cb;
+    /* Reset the entire range by clearing all shadow page table entries. */
+    int rc = PGMHandlerPhysicalReset(pVM, pRange->GCPhys);
+    AssertRC(rc);
+
+#ifdef VBOX_STRICT
+    uint32_t cb = pRange->cb;
+
     GCPhys = pRange->GCPhys;
 
     while (cb)
     {
-        int rc = PGMHandlerPhysicalPageReset(pVM, pRange->GCPhys, GCPhys);
-        AssertRC(rc);
-
-        /* Mark it as not present again to intercept all read and write access. */
-#if 0
-        rc = PGMPrefetchPage(pVM, (RTGCPTR)GCPhys);
-#else
-        rc = PGMShwModifyPage(pVM, (RTGCPTR)GCPhys, 1, 0, ~(uint64_t)(X86_PTE_RW|X86_PTE_P));
-        Assert(rc == VINF_SUCCESS || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT);
-#endif
-
-#ifdef VBOX_STRICT
+
         uint64_t fFlags;
         RTHCPHYS HCPhys;
         rc = PGMShwGetPage(pVM, (RTGCPTR)GCPhys, &fFlags, &HCPhys);
         Assert(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT);
-#endif
         cb     -= PAGE_SIZE;
         GCPhys += PAGE_SIZE;
     }
+#endif
     return VINF_SUCCESS;
 }

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

@@ -819 +819 @@
             case PGMPHYSHANDLERTYPE_PHYSICAL_WRITE:
             case PGMPHYSHANDLERTYPE_PHYSICAL_ALL:
+            case PGMPHYSHANDLERTYPE_MMIO: /* @note Only use when clearing aliased mmio ranges! */
             {
                 /*
@@ -842 +843 @@
              * Invalid.
              */
-            case PGMPHYSHANDLERTYPE_MMIO:
-                AssertMsgFailed(("Can't reset type %d!\n",  pCur->enmType));
-                rc = VERR_INTERNAL_ERROR;
-                break;
-
             default:
                 AssertMsgFailed(("Invalid type %d! Corruption!\n",  pCur->enmType));

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

@@ -358 +358 @@
             {
                 pPT->a[iPTE].u = (pPT->a[iPTE].u & (fMask | SHW_PTE_PG_MASK)) | (fFlags & ~SHW_PTE_PG_MASK);
-/** @todo r=bird: I think this may break assumptions in page pool GCPhys
- * tracking, and I seems to recall putting it here to prevent API users from
- * making anything !P. The assertion is kind of useless now, as it
- * won't hit anything any longer... */
-                Assert(pPT->a[iPTE].n.u1Present || !(fMask & X86_PTE_P));
+                Assert(pPT->a[iPTE].n.u1Present);
 # if PGM_SHW_TYPE == PGM_TYPE_EPT
                 HWACCMInvalidatePhysPage(pVM, (RTGCPHYS)GCPtr);