儲存庫 vbox 的更動 17134

時間撮記:

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

作者:

vboxsync

訊息:

VBOX_WITH_PGMPOOL_PAGING_ONLY: updates

位置:

trunk

檔案:

• include/VBox/pgm.h (修改) (1 筆差異)
• src/VBox/VMM/PGMBth.h (修改) (2 筆差異)
• src/VBox/VMM/PGMInternal.h (修改) (1 筆差異)
• src/VBox/VMM/PGMMap.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMAll/PGMAll.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMAll/PGMAllBth.h (修改) (4 筆差異)
• src/VBox/VMM/VMMAll/PGMAllMap.cpp (修改) (4 筆差異)

trunk/include/VBox/pgm.h

@@ -329 +329 @@
 VMMDECL(int)        PGMMapSetPage(PVM pVM, RTGCPTR GCPtr, uint64_t cb, uint64_t fFlags);
 VMMDECL(int)        PGMMapModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask);
-VMMDECL(int)        PGMMapActivateAll(PVM pVM);
-VMMDECL(int)        PGMMapDeactivateAll(PVM pVM);
 #ifndef IN_RING0
 VMMDECL(bool)       PGMMapHasConflicts(PVM pVM);

trunk/src/VBox/VMM/PGMBth.h

@@ -149 +149 @@
     {
         /* Remove the hypervisor mappings from the shadow page table. */
-        PGMMapDeactivateAll(pVM);
+        pgmMapDeactivateCR3(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 
         /* It might have been freed already by a pool flush (see e.g. PGMR3MappingsUnfix). */
@@ -192 +192 @@
 
     /* Apply all hypervisor mappings to the new CR3. */
-    return PGMMapActivateAll(pVM);
+    return pgmMapActivateCR3(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 # endif
 #else

trunk/src/VBox/VMM/PGMInternal.h

@@ -2986 +2986 @@
 void            pgmMapClearShadowPDEs(PVM pVM, PPGMPOOLPAGE pShwPageCR3, PPGMMAPPING pMap, unsigned iOldPDE);
 void            pgmMapSetShadowPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE);
+int             pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);
+#endif
 int             pgmMapDeactivateCR3(PVM pVM, PPGMPOOLPAGE pShwPageCR3);
-int             pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);
-#endif
+int             pgmMapActivateCR3(PVM pVM, PPGMPOOLPAGE pShwPageCR3);
+
 #ifndef IN_RC
 int             pgmShwSyncLongModePDPtr(PVM pVM, RTGCPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);

trunk/src/VBox/VMM/PGMMap.cpp

@@ -652 +652 @@
     AssertRCReturn(rc, rc);
 
-    rc = PGMMapDeactivateAll(pVM);
+    rc = pgmMapDeactivateCR3(pVM, pVM->pgm.s.pShwPageCR3R3);
     AssertRCReturn(rc, rc);
 

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

@@ -2193 +2193 @@
     register unsigned iPage = pVM->pgm.s.iDynPageMapLast;
 #  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    for (unsigned i=0;i<(MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT);i++)
+    unsigned i;
+    for (i=0;i<(MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT);i++)
     {
         pVM->pgm.s.iDynPageMapLast = iPage = (iPage + 1) & ((MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT) - 1);

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

@@ -4643 +4643 @@
     uint32_t     iOldShwUserTable  = pVM->pgm.s.iShwUserTable;
     uint32_t     iOldShwUser       = pVM->pgm.s.iShwUser;
+    PPGMPOOLPAGE pNewShwPageCR3;
 
     Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
-    rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pNewShwPageCR3);
     if (rc == VERR_PGM_POOL_FLUSHED)
     {
         Log(("MapCR3: PGM pool flushed -> signal sync cr3\n"));
-        pVM->pgm.s.CTX_SUFF(pShwPageCR3) = pOldShwPageCR3;
         Assert(VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));
         return VINF_PGM_SYNC_CR3;
@@ -4655 +4655 @@
     AssertRCReturn(rc, rc);
     rc = VINF_SUCCESS;
+
     pVM->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
     pVM->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
+    pVM->pgm.s.CTX_SUFF(pShwPageCR3) = pNewShwPageCR3;
 #  ifdef IN_RING0
     pVM->pgm.s.pShwPageCR3R3 = MMHyperCCToR3(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
@@ -4682 +4684 @@
     Assert(VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3_NON_GLOBAL));
 #   endif
-    rc = PGMMapActivateAll(pVM);
+    rc = pgmMapActivateCR3(pVM, pNewShwPageCR3);
     AssertRCReturn(rc, rc);
 #  endif
@@ -4783 +4785 @@
 # ifndef PGM_WITHOUT_MAPPINGS
     /* Remove the hypervisor mappings from the shadow page table. */
-    PGMMapDeactivateAll(pVM);
+    pgmMapDeactivateCR3(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 # endif
 

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

@@ -532 +532 @@
  * @returns VBox status.
  * @param   pVM         The virtual machine.
- */
-VMMDECL(int) PGMMapActivateAll(PVM pVM)
+ * @param   pShwPageCR3 CR3 root page
+ */
+int pgmMapActivateCR3(PVM pVM, PPGMPOOLPAGE pShwPageCR3)
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
@@ -552 +553 @@
 
 # ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    Assert(pShwPageCR3 && pShwPageCR3 == pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 # endif
 
@@ -563 +564 @@
 
         pgmMapSetShadowPDEs(pVM, pCur, iPDE);
-    }
-    return VINF_SUCCESS;
-}
-
-/**
- * Remove the hypervisor mappings from the active CR3
- *
- * @returns VBox status.
- * @param   pVM         The virtual machine.
- */
-VMMDECL(int) PGMMapDeactivateAll(PVM pVM)
-{
-#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    /*
-     * Can skip this if mappings are disabled.
-     */
-    if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
-#else
-    /*
-     * Can skip this if mappings are safely fixed.
-     */
-    if (pVM->pgm.s.fMappingsFixed)
-#endif
-        return VINF_SUCCESS;
-
-    Log(("PGMMapDeactivateAll fixed mappings=%d\n", pVM->pgm.s.fMappingsFixed));
-
-# ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
-# endif
-
-    /*
-     * Iterate mappings.
-     */
-    for (PPGMMAPPING pCur = pVM->pgm.s.CTX_SUFF(pMappings); pCur; pCur = pCur->CTX_SUFF(pNext))
-    {
-        unsigned iPDE = pCur->GCPtr >> X86_PD_SHIFT;
-
-        pgmMapClearShadowPDEs(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3), pCur, iPDE);
     }
     return VINF_SUCCESS;
@@ -630 +592 @@
 
 # ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    Assert(pShwPageCR3);
 # endif