Changeset 10021

Timestamp:

06/30/08 17:13:44 (6 months ago)

Author:

vboxsync

Message:

Updates for amd64 nested paging.

Files:

• trunk/src/VBox/VMM/PGM.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/PGMGst.h (modified) (2 diffs)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMShw.h (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (4 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1264 +1264 @@
-    AssertRelease((uintptr_t)pVM->pgm.s.apHCPaePDs[2] + PAGE_SIZE == (uintptr_t)pVM->pgm.s.apHCPaePDs[3]);
-    pVM->pgm.s.pHCPaePDPT    = (PX86PDPT)MMR3PageAllocLow(pVM);
+    pVM->pgm.s.pHCNestedRoot = MMR3PageAllocLow(pVM);
+
-    if (    !pVM->pgm.s.pHC32BitPD
-        ||  !pVM->pgm.s.apHCPaePDs[0]
@@ -1269 +1271 @@
-        ||  !pVM->pgm.s.apHCPaePDs[2]
-        ||  !pVM->pgm.s.apHCPaePDs[3]
-
+
+
-    {
-        AssertMsgFailed(("Failed to allocate pages for the intermediate context!\n"));
@@ -1283 +1286 @@
-    pVM->pgm.s.aHCPhysPaePDs[3] = MMPage2Phys(pVM, pVM->pgm.s.apHCPaePDs[3]);
-    pVM->pgm.s.HCPhysPaePDPT    = MMPage2Phys(pVM, pVM->pgm.s.pHCPaePDPT);
+    pVM->pgm.s.HCPhysNestedRoot = MMPage2Phys(pVM, pVM->pgm.s.pHCNestedRoot);
-
-    /*
@@ -1288 +1292 @@
-     */
-    ASMMemZero32(pVM->pgm.s.pHC32BitPD, PAGE_SIZE);
-
-    ASMMemZero32(pVM->pgm.s.pHCPaePDPT, PAGE_SIZE);
+    ASMMemZero32(pVM->pgm.s.pHCNestedRoot, PAGE_SIZE);
-    for (unsigned i = 0; i < ELEMENTS(pVM->pgm.s.apHCPaePDs); i++)
-    {

trunk/src/VBox/VMM/PGMGst.h

@@ -223 +223 @@
-PGM_GST_DECL(int, Enter)(PVM pVM, RTGCPHYS GCPhysCR3)
-{
+    Assert(!HWACCMIsNestedPagingActive(pVM));
-    /*
-     * Map and monitor CR3
@@ -255 +256 @@
-PGM_GST_DECL(int, Exit)(PVM pVM)
-{
+    Assert(!HWACCMIsNestedPagingActive(pVM));
-    int rc = PGM_GST_NAME(UnmonitorCR3)(pVM);
-    if (VBOX_SUCCESS(rc))

trunk/src/VBox/VMM/PGMInternal.h

@@ -2006 +2006 @@
-    /** @}*/
-
+    /** @name Nested Shadow Paging
+     * @{ */
+    /** Root table; format depends on the host paging mode (AMD-V) or EPT */
+    R3R0PTRTYPE(void *)         pHCNestedRoot;
+    /** The Physical Address (HC) of the nested paging root. */
+    RTHCPHYS                    HCPhysNestedRoot;
+
-    /** @name Function pointers for Shadow paging.
-     * @{

trunk/src/VBox/VMM/PGMShw.h

@@ -138 +138 @@
-PGM_SHW_DECL(int, Enter)(PVM pVM)
-{
-
-
-
-
+
+
+
+
+
-#endif
-    return VINF_SUCCESS;
@@ -169 +170 @@
-PGM_SHW_DECL(int, Exit)(PVM pVM)
-{
-
-
-
-
+
+
+
-#endif
-

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

@@ -824 +824 @@
-    int            rc;
-
-    Assert(!HWACCMIsNestedPagingActive(pVM));
-    AssertReturn(pVM->pgm.s.pHCPaePML4, VERR_INTERNAL_ERROR);
-
@@ -902 +901 @@
-    PPGMPOOLPAGE   pShwPage;
-
-    Assert(!HWACCMIsNestedPagingActive(pVM));
-    AssertReturn(pVM->pgm.s.pHCPaePML4, VERR_INTERNAL_ERROR);
-

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

@@ -408 +408 @@
-PGM_GST_DECL(int, MapCR3)(PVM pVM, RTGCPHYS GCPhysCR3)
-{
+    Assert(!HWACCMIsNestedPagingActive(pVM));
-#if PGM_GST_TYPE == PGM_TYPE_32BIT \
- || PGM_GST_TYPE == PGM_TYPE_PAE \
@@ -511 +512 @@
-{
-    LogFlow(("UnmapCR3\n"));
+    Assert(!HWACCMIsNestedPagingActive(pVM));
-
-    int rc = VINF_SUCCESS;
@@ -561 +563 @@
-{
-    Assert(!pVM->pgm.s.fMappingsFixed);
+    Assert(!HWACCMIsNestedPagingActive(pVM));
-    int rc = VINF_SUCCESS;
-
@@ -663 +666 @@
-{
-    int rc = VINF_SUCCESS;
+
+    Assert(!HWACCMIsNestedPagingActive(pVM));
-
-    /*