儲存庫 vbox 的更動 16408

時間撮記:

2009-1-30 下午12:14:26 (16 年 以前)

作者:

vboxsync

訊息:

Fixed disabling of hypervisor mappings in VT-x/AMD-V mode.

位置:

trunk

檔案:

• include/VBox/pgm.h (修改) (2 筆差異)
• src/VBox/VMM/HWACCM.cpp (修改) (1 筆差異)
• src/VBox/VMM/PGM.cpp (修改) (1 筆差異)
• src/VBox/VMM/PGMMap.cpp (修改) (4 筆差異)
• src/VBox/VMM/VMMAll/PGMAllMap.cpp (修改) (2 筆差異)
• src/VBox/VMM/VMMTests.cpp (修改) (1 筆差異)

trunk/include/VBox/pgm.h

@@ -503 +503 @@
 VMMR3DECL(int)      PGMR3TermCPU(PVM pVM);
 VMMR3DECL(int)      PGMR3LockCall(PVM pVM);
-VMMR3DECL(int)      PGMR3ChangeShwPDMappings(PVM pVM, bool fEnable);
 VMMR3DECL(int)      PGMR3ChangeMode(PVM pVM, PGMMODE enmGuestMode);
 
@@ -548 +547 @@
 VMMR3DECL(int)      PGMR3MappingsFix(PVM pVM, RTGCPTR GCPtrBase, uint32_t cb);
 VMMR3DECL(int)      PGMR3MappingsUnfix(PVM pVM);
+VMMR3DECL(int)      PGMR3MappingsDisable(PVM pVM);
 VMMR3DECL(int)      PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages);
 VMMR3DECL(bool)     PGMR3MapHasConflicts(PVM pVM, uint64_t cr3, bool fRawR0);

trunk/src/VBox/VMM/HWACCM.cpp

@@ -416 +416 @@
 
     /* Disable mapping of the hypervisor into the shadow page table. */
-    PGMR3ChangeShwPDMappings(pVM, false);
+    PGMR3MappingsDisable(pVM);
 
     /* Disable the switcher */

trunk/src/VBox/VMM/PGM.cpp

@@ -4580 +4580 @@
 
 
-/**
- * Inform PGM if we want all mappings to be put into the shadow page table. (necessary for e.g. VMX)
- *
- * @returns VBox status code.
- * @param   pVM         VM handle.
- * @param   fEnable     Enable or disable shadow mappings
- */
-VMMR3DECL(int) PGMR3ChangeShwPDMappings(PVM pVM, bool fEnable)
-{
-    pVM->pgm.s.fDisableMappings = !fEnable;
-
-    uint32_t cb;
-    int rc = PGMR3MappingsSize(pVM, &cb);
-    AssertRCReturn(rc, rc);
-
-    /* Pretend the mappings are now fixed; to force a refresh of the reserved PDEs. */
-    rc = PGMR3MappingsFix(pVM, MM_HYPER_AREA_ADDRESS, cb);
-    AssertRCReturn(rc, rc);
-
-    return VINF_SUCCESS;
-}
-

trunk/src/VBox/VMM/PGMMap.cpp

@@ -640 +640 @@
 }
 
+/**
+ * Disable the hypervisor mappings in the shadow page tables (doesn't touch the intermediate table!)
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM.
+ */
+VMMR3DECL(int) PGMR3MappingsDisable(PVM pVM)
+{
+    uint32_t cb;
+    int rc = PGMR3MappingsSize(pVM, &cb);
+    AssertRCReturn(rc, rc);
+
+    rc = PGMMapDeactivateAll(pVM);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Mark the mappings as fixed (using fake values) and disabled. 
+     */
+    pVM->pgm.s.fDisableMappings  = true;
+    pVM->pgm.s.fMappingsFixed    = true;
+    pVM->pgm.s.GCPtrMappingFixed = MM_HYPER_AREA_ADDRESS;
+    pVM->pgm.s.cbMappingFixed    = cb;
+    pVM->pgm.s.fSyncFlags       &= ~PGM_SYNC_MONITOR_CR3;
+    VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+    return VINF_SUCCESS;
+}
+
 
 /**
@@ -968 +995 @@
          */
 #ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        Assert(!pPGM->pShw32BitPdR3->a[iNewPDE].n.u1Present || pgmMapAreMappingsEnabled(&pVM->pgm.s));
         if (    pgmMapAreMappingsEnabled(&pVM->pgm.s)
             &&  pPGM->pShw32BitPdR3->a[iNewPDE].n.u1Present)
@@ -989 +1017 @@
         unsigned iPDE = iNewPDE * 2 % 512;
 #ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        Assert(!pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present || pgmMapAreMappingsEnabled(&pVM->pgm.s));
         if (   pgmMapAreMappingsEnabled(&pVM->pgm.s)
             && pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present)
@@ -1006 +1035 @@
         AssertFatal(iPDE < 512);
 #ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        Assert(!pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present || pgmMapAreMappingsEnabled(&pVM->pgm.s));
         if (   pgmMapAreMappingsEnabled(&pVM->pgm.s)
             && pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present)

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

@@ -209 +209 @@
 
 
-
-#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-
 /**
  * Sets all PDEs involved with the mapping in the shadow page table.
@@ -416 +413 @@
     return VINF_SUCCESS;
 }
-#endif /* VBOX_WITH_PGMPOOL_PAGING_ONLY */

trunk/src/VBox/VMM/VMMTests.cpp

@@ -478 +478 @@
 
     /* Enable mapping of the hypervisor into the shadow page table. */
-    PGMR3ChangeShwPDMappings(pVM, true);
+    uint32_t cb;
+    rc = PGMR3MappingsSize(pVM, &cb);
+    AssertRCReturn(rc, rc);
+
+    /* Pretend the mappings are now fixed; to force a refresh of the reserved PDEs. */
+    rc = PGMR3MappingsFix(pVM, MM_HYPER_AREA_ADDRESS, cb);
+    AssertRCReturn(rc, rc);
 
     CPUMQueryHyperCtxPtr(pVM, &pHyperCtx);