Changeset 10026 in vbox for trunk/src/VBox

Timestamp:

Jun 30, 2008 4:37:01 PM (17 years ago)

Author:

vboxsync

Message:

Nested paging updates.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMAll/PGMAllPool.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1369 +1369 @@
     /** Shw: 64-bit page directory pointer table;   Gst: 64-bit page directory pointer table. */
     PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT,
+    /** Shw: 64-bit page directory pointer table; Gst: no paging  */
+    PGMPOOLKIND_64BIT_PDPT_FOR_PHYS,
     /** Shw: 64-bit page directory table;   Gst: 64-bit page directory table. */
     PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD,
+    /** Shw: 64-bit page directory table; Gst: no paging  */
+    PGMPOOLKIND_64BIT_PD_FOR_PHYS,
 
     /** Shw: 64-bit PML4;   Gst: 64-bit PML4. */
     PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4,
+    /** Shw: 64-bit PML4; Gst: no paging  */
+    PGMPOOLKIND_64BIT_PML4_FOR_PHYS,
 
     /** Shw: Root 32-bit page directory. */

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

@@ -823 +823 @@
     PPGMPOOLPAGE   pShwPage;
     int            rc;
-
-    AssertReturn(pVM->pgm.s.pHCPaePML4, VERR_INTERNAL_ERROR);
+    PGMPOOLKIND    enmPdpt, enmPd;
+
+    AssertReturn(pVM->pgm.s.pHCPaePML4 && pVM->pgm.s.pHCShwAmd64CR3, VERR_INTERNAL_ERROR);
+
+    if (HWACCMIsNestedPagingActive(pVM))
+    {
+        enmPdpt = PGMPOOLKIND_64BIT_PDPT_FOR_PHYS;
+        enmPd   = PGMPOOLKIND_64BIT_PD_FOR_PHYS;
+    }
+    else
+    {
+        enmPdpt = PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT;
+        enmPd   = PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD;
+    }
 
     Assert(pVM->pgm.s.pHCPaePML4);
@@ -835 +847 @@
 
         Assert(!(pPml4e->u & X86_PML4E_PG_MASK));
-        rc = pgmPoolAlloc(pVM, pPml4eGst->u & X86_PML4E_PG_MASK, PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT, pVM->pgm.s.pHCShwAmd64CR3->idx, iPml4e, &pShwPage);
+        rc = pgmPoolAlloc(pVM, pPml4eGst->u & X86_PML4E_PG_MASK, enmPdpt, pVM->pgm.s.pHCShwAmd64CR3->idx, iPml4e, &pShwPage);
         if (rc == VERR_PGM_POOL_FLUSHED)
             return VINF_PGM_SYNC_CR3;
@@ -865 +877 @@
         Assert(!(pPdpe->u & X86_PDPE_PG_MASK));
         /* Create a reference back to the PDPT by using the index in its shadow page. */
-        rc = pgmPoolAlloc(pVM, pPdptGst->a[iPdPt].u & X86_PDPE_PG_MASK, PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD, pShwPage->idx, iPdPt, &pShwPage);
+        rc = pgmPoolAlloc(pVM, pPdptGst->a[iPdPt].u & X86_PDPE_PG_MASK, enmPd, pShwPage->idx, iPdPt, &pShwPage);
         if (rc == VERR_PGM_POOL_FLUSHED)
             return VINF_PGM_SYNC_CR3;

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

@@ -1054 +1054 @@
         case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
             return true;
 
@@ -1074 +1077 @@
                 case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
                 case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
                     return true;
                 default:
@@ -1097 +1103 @@
                 case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
                 case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
                     return true;
                 default:
@@ -1318 +1327 @@
                 case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
                 case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+                case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
                     break;
                 default:
@@ -1364 +1376 @@
         case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
             /* Nothing to monitor here. */
             return VINF_SUCCESS;
@@ -1446 +1461 @@
         case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
             /* Nothing to monitor here. */
             return VINF_SUCCESS;
@@ -2134 +2152 @@
         case PGMPOOLKIND_ROOT_PAE_PD:
         case PGMPOOLKIND_ROOT_PDPT:
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
             return 8;
 
@@ -2175 +2196 @@
         case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+        case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
             /** @todo can we return 0? (nobody is calling this...) */
+            AssertFailed();
             return 0;
 
@@ -3164 +3189 @@
         case PGMPOOLKIND_PAE_PD_FOR_PAE_PD:
         case PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
             pgmPoolTrackDerefPDPae(pPool, pPage, (PX86PDPAE)pvShw);
             break;
 
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT:
             pgmPoolTrackDerefPDPT64Bit(pPool, pPage, (PX86PDPT)pvShw);
@@ -3172 +3199 @@
 
         case PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4:
+        case PGMPOOLKIND_64BIT_PML4_FOR_PHYS:
             pgmPoolTrackDerefPML464Bit(pPool, pPage, (PX86PML4)pvShw);
             break;