Changeset 10032 in vbox

Timestamp:

Jun 30, 2008 5:03:54 PM (16 years ago)

Author:

vboxsync

Message:

Nested paging updates

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (2 diffs)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (2 diffs)
• VMMAll/PGMAllPool.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1291 +1291 @@
 /** AMD64 CR3 level index.*/
 #define PGMPOOL_IDX_AMD64_CR3   8
+/** Nested paging root.*/
+#define PGMPOOL_IDX_NESTED_ROOT 9
 /** The first normal index. */
-#define PGMPOOL_IDX_FIRST       9
+#define PGMPOOL_IDX_FIRST       10
 /** The last valid index. (inclusive, 14 bits) */
 #define PGMPOOL_IDX_LAST        0x3fff
@@ -1387 +1389 @@
     /** Shw: Root PAE page directory pointer table (legacy, 4 entries). */
     PGMPOOLKIND_ROOT_PDPT,
+    /** Shw: Root Nested paging table. */
+    PGMPOOLKIND_ROOT_NESTED,
 
     /** The last valid entry. */
-    PGMPOOLKIND_LAST = PGMPOOLKIND_ROOT_PDPT
+    PGMPOOLKIND_LAST = PGMPOOLKIND_ROOT_NESTED
 } PGMPOOLKIND;
 

trunk/src/VBox/VMM/PGMPool.cpp

@@ -273 +273 @@
     pPool->aPages[PGMPOOL_IDX_AMD64_CR3].enmKind   = PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4;
     pPool->aPages[PGMPOOL_IDX_AMD64_CR3].idx       = PGMPOOL_IDX_AMD64_CR3;
+
+    /* The Shadow AMD64 CR3. */
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].Core.Key  = NIL_RTHCPHYS;
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].GCPhys    = NIL_RTGCPHYS;
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].pvPageHC  = pVM->pgm.s.pHCNestedRoot;
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].enmKind   = PGMPOOLKIND_ROOT_NESTED;
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].idx       = PGMPOOL_IDX_NESTED_ROOT;
 
     /*

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

@@ -824 +824 @@
     int            rc;
     PGMPOOLKIND    enmPdpt, enmPd;
-
-    AssertReturn(pVM->pgm.s.pHCPaePML4 && pVM->pgm.s.pHCShwAmd64CR3, VERR_INTERNAL_ERROR);
-
+    unsigned       idxTopLevel;
+
+    AssertReturn(pVM->pgm.s.pHCPaePML4, VERR_INTERNAL_ERROR);
     if (HWACCMIsNestedPagingActive(pVM))
     {
-        enmPdpt = PGMPOOLKIND_64BIT_PDPT_FOR_PHYS;
-        enmPd   = PGMPOOLKIND_64BIT_PD_FOR_PHYS;
+        enmPdpt     = PGMPOOLKIND_64BIT_PDPT_FOR_PHYS;
+        enmPd       = PGMPOOLKIND_64BIT_PD_FOR_PHYS;
+        idxTopLevel = PGMPOOL_IDX_NESTED_ROOT;
     }
     else
     {
-        enmPdpt = PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT;
-        enmPd   = PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD;
+        AssertReturn(pVM->pgm.s.pHCShwAmd64CR3, VERR_INTERNAL_ERROR);
+
+        enmPdpt     = PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT;
+        enmPd       = PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD;
+        idxTopLevel = pVM->pgm.s.pHCShwAmd64CR3->idx;
     }
 
@@ -847 +851 @@
 
         Assert(!(pPml4e->u & X86_PML4E_PG_MASK));
-        rc = pgmPoolAlloc(pVM, pPml4eGst->u & X86_PML4E_PG_MASK, enmPdpt, pVM->pgm.s.pHCShwAmd64CR3->idx, iPml4e, &pShwPage);
+        rc = pgmPoolAlloc(pVM, pPml4eGst->u & X86_PML4E_PG_MASK, enmPdpt, idxTopLevel, iPml4e, &pShwPage);
         if (rc == VERR_PGM_POOL_FLUSHED)
             return VINF_PGM_SYNC_CR3;

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

@@ -1117 +1117 @@
         case PGMPOOLKIND_ROOT_PAE_PD:
         case PGMPOOLKIND_ROOT_PDPT:
+        case PGMPOOLKIND_ROOT_NESTED:
             return false;
 
@@ -1330 +1331 @@
                 case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
                 case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
+                case PGMPOOLKIND_ROOT_NESTED:
                     break;
                 default:
@@ -1379 +1381 @@
         case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
+        case PGMPOOLKIND_ROOT_NESTED:
             /* Nothing to monitor here. */
             return VINF_SUCCESS;
@@ -1464 +1467 @@
         case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
+        case PGMPOOLKIND_ROOT_NESTED:
             /* Nothing to monitor here. */
             return VINF_SUCCESS;
@@ -2152 +2156 @@
         case PGMPOOLKIND_ROOT_PAE_PD:
         case PGMPOOLKIND_ROOT_PDPT:
+        case PGMPOOLKIND_ROOT_NESTED:
         case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
@@ -2199 +2204 @@
         case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
+        case PGMPOOLKIND_ROOT_NESTED:
             /** @todo can we return 0? (nobody is calling this...) */
             AssertFailed();
@@ -2520 +2526 @@
             /* GCPhys >> PAGE_SHIFT is the index here */
             break;
+        case PGMPOOLKIND_ROOT_NESTED:
+            Assert(pUser->iUserTable < X86_PG_PAE_ENTRIES);
+            break;
+
         default:
             AssertMsgFailed(("enmKind=%d\n", pUserPage->enmKind));
@@ -2544 +2554 @@
         case PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT:
         case PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4:
+        case PGMPOOLKIND_ROOT_NESTED:
             u.pau64[pUser->iUserTable] = 0;
             break;
@@ -3260 +3271 @@
                 /* Not root of shadowed pages currently, ignore it. */
                 break;
+
+            case PGMPOOLKIND_ROOT_NESTED:
+                ASMMemZero32(u.pau64, PAGE_SIZE);
+                break;
         }
     }