Changeset 97145 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 14, 2022 6:05:15 AM (2 years ago)

Author:

vboxsync

Message:

VMM/PGM: Nested VMX: bugref:10092 Implemented large (2M) page support for EPT PDEs.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGM.cpp (modified) (1 diff)
• PGMPool.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -1726 +1726 @@
                && !(fEptVpidCap & MSR_IA32_VMX_EPT_VPID_CAP_ACCESS_DIRTY));
         /* We need to shadow reserved bits as guest EPT tables can set them to trigger EPT misconfigs.  */
-        pVCpu->pgm.s.fGstEptShadowedPteMask   = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT;
-        pVCpu->pgm.s.fGstEptShadowedPdeMask   = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT | EPT_E_LEAF;
-        pVCpu->pgm.s.fGstEptShadowedPdpteMask = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT | EPT_E_LEAF;
-        pVCpu->pgm.s.fGstEptShadowedPml4eMask = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_PML4E_MBZ_MASK;
+        pVCpu->pgm.s.fGstEptShadowedPteMask    = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT;
+        pVCpu->pgm.s.fGstEptShadowedPdeMask    = GCPhysRsvdAddrMask | EPT_PRESENT_MASK;
+        pVCpu->pgm.s.fGstEptShadowedBigPdeMask = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT | EPT_E_LEAF;
+        pVCpu->pgm.s.fGstEptShadowedPdpteMask  = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT | EPT_E_LEAF;
+        pVCpu->pgm.s.fGstEptShadowedPml4eMask  = GCPhysRsvdAddrMask | EPT_PRESENT_MASK | EPT_PML4E_MBZ_MASK;
         /* If mode-based execute control for EPT is enabled, we would need to include bit 10 in the present mask. */
         pVCpu->pgm.s.fGstEptPresentMask       = EPT_PRESENT_MASK;

trunk/src/VBox/VMM/VMMR3/PGMPool.cpp

@@ -600 +600 @@
                     }
                     goto default_case;
+
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+                case PGMPOOLKIND_EPT_PD_FOR_EPT_PD: /* Large pages reference 2 MB of physical memory, so we must clear them. */
+                    if (pPage->cPresent)
+                    {
+                        PEPTPD pShwPD = (PEPTPD)PGMPOOL_PAGE_2_PTR_V2(pPool->CTX_SUFF(pVM), pVCpu, pPage);
+                        for (unsigned i = 0; i < RT_ELEMENTS(pShwPD->a); i++)
+                        {
+                            if (   (pShwPD->a[i].u & EPT_PRESENT_MASK)
+                                && (pShwPD->a[i].u & EPT_E_LEAF))
+                            {
+                                pShwPD->a[i].u = 0;
+                                Assert(pPage->cPresent);
+                                pPage->cPresent--;
+                            }
+                        }
+                        if (pPage->cPresent == 0)
+                            pPage->iFirstPresent = NIL_PGMPOOL_PRESENT_INDEX;
+                    }
+                    goto default_case;
+# endif /* VBOX_WITH_NESTED_HWVIRT_VMX_EPT */
 #endif /* PGM_WITH_LARGE_PAGES */
 
@@ -613 +634 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
                 case PGMPOOLKIND_EPT_PT_FOR_EPT_PT:
-                case PGMPOOLKIND_EPT_PD_FOR_EPT_PD:
+                case PGMPOOLKIND_EPT_PT_FOR_EPT_2MB:
                 case PGMPOOLKIND_EPT_PDPT_FOR_EPT_PDPT:
                 case PGMPOOLKIND_EPT_PML4_FOR_EPT_PML4:
@@ -622 +643 @@
                         void *pvShw = PGMPOOL_PAGE_2_PTR_V2(pPool->CTX_SUFF(pVM), pVCpu, pPage);
                         STAM_PROFILE_START(&pPool->StatZeroPage, z);
-#ifdef VBOX_STRICT
-                        if (PGMPOOL_PAGE_IS_NESTED(pPage))
-                        {
-                            PEPTPT pPT = (PEPTPT)pvShw;
-                            for (unsigned idxPt = 0; idxPt < RT_ELEMENTS(pPT->a); idxPt++)
-                                if (pPT->a[idxPt].u & EPT_PRESENT_MASK)
-                                    Assert(!(pPT->a[idxPt].u & EPT_E_LEAF));  /* We don't support large pages as of yet. */
-                        }
-#endif
 #if 0
                         /* Useful check for leaking references; *very* expensive though. */
@@ -792 +804 @@
     AssertRC(rc);
 }
+
+
+/**
+ * Stringifies a PGMPOOLACCESS value.
+ */
+static const char *pgmPoolPoolAccessToStr(uint8_t enmAccess)
+{
+    switch ((PGMPOOLACCESS)enmAccess)
+    {
+        case PGMPOOLACCESS_DONTCARE:         return "DONTCARE";
+        case PGMPOOLACCESS_USER_RW:          return "USER_RW";
+        case PGMPOOLACCESS_USER_R:           return "USER_R";
+        case PGMPOOLACCESS_USER_RW_NX:       return "USER_RW_NX";
+        case PGMPOOLACCESS_USER_R_NX:        return "USER_R_NX";
+        case PGMPOOLACCESS_SUPERVISOR_RW:    return "SUPERVISOR_RW";
+        case PGMPOOLACCESS_SUPERVISOR_R:     return "SUPERVISOR_R";
+        case PGMPOOLACCESS_SUPERVISOR_RW_NX: return "SUPERVISOR_RW_NX";
+        case PGMPOOLACCESS_SUPERVISOR_R_NX:  return "SUPERVISOR_R_NX";
+    }
+    return "Unknown Access";
+}
+
 
 /**
@@ -862 +896 @@
         case PGMPOOLKIND_EPT_PT_FOR_EPT_PT:
             return "EPT_PT_FOR_EPT_PT";
+        case PGMPOOLKIND_EPT_PT_FOR_EPT_2MB:
+            return "EPT_PT_FOR_EPT_2MB";
         case PGMPOOLKIND_EPT_PD_FOR_EPT_PD:
             return "EPT_PD_FOR_EPT_PD";
@@ -958 +994 @@
             && enmKind != PGMPOOLKIND_FREE)
         {
-            pHlp->pfnPrintf(pHlp, "#%04x: HCPhys=%RHp GCPhys=%RGp %s %s%s%s\n",
+            pHlp->pfnPrintf(pHlp, "#%04x: HCPhys=%RHp GCPhys=%RGp %s %s %s%s%s\n",
                             iPage, pPage->Core.Key, GCPhys, pPage->fA20Enabled ? "A20 " : "!A20",
                             pgmPoolPoolKindToStr(enmKind),
-                            pPage->fCached ? " cached" : "",
-                            pPage->fMonitored ? " monitored" : "");
+                            pPage->enmAccess == PGMPOOLACCESS_DONTCARE ? "" : pgmPoolPoolAccessToStr(pPage->enmAccess),
+                            pPage->fCached ? " cached" : "", pPage->fMonitored ? " monitored" : "");
             if (!--cLeft)
                 break;
@@ -1126 +1162 @@
                                 || ((uShw & EPT_E_EXECUTE) && !(uGst & EPT_E_EXECUTE)) ) )
                             pgmR3PoolCheckError(&State, "Mismatch r/w/x: idx=%#x guest %RX64 shw=%RX64\n", j, uGst, uShw);
+                    }
+                }
+                break;
+            }
+
+            case PGMPOOLKIND_EPT_PT_FOR_EPT_2MB:
+            {
+                PCEPTPT const pShwPT = (PCEPTPT)PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
+                for (unsigned j = 0; j < RT_ELEMENTS(pShwPT->a); j++)
+                {
+                    uint64_t const uShw = pShwPT->a[j].u;
+                    if (uShw & EPT_E_LEAF)
+                        pgmR3PoolCheckError(&State, "Leafness-error: idx=%#x shw=%RX64 (2MB)\n", j, uShw);
+                    else if (uShw & EPT_PRESENT_MASK)
+                    {
+                        RTGCPHYS const GCPhysSubPage = pPage->GCPhys | (j << PAGE_SHIFT);
+                        RTHCPHYS       HCPhys        = NIL_RTHCPHYS;
+                        int rc = PGMPhysGCPhys2HCPhys(pPool->CTX_SUFF(pVM), GCPhysSubPage, &HCPhys);
+                        if (   rc != VINF_SUCCESS
+                            || (uShw & EPT_E_PG_MASK) != HCPhys)
+                            pgmR3PoolCheckError(&State, "Mismatch HCPhys: rc=%Rrc idx=%#x guest %RX64 shw=%RX64 vs %RHp\n",
+                                                rc, j, GCPhysSubPage, uShw, HCPhys);
                     }
                 }
@@ -1160 +1218 @@
                             if (pSubPage)
                             {
-                                /** @todo adjust for 2M page to shadow PT mapping.   */
-                                if (pSubPage->enmKind != PGMPOOLKIND_EPT_PT_FOR_EPT_PT)
+                                if (   pSubPage->enmKind != PGMPOOLKIND_EPT_PT_FOR_EPT_PT
+                                    && pSubPage->enmKind != PGMPOOLKIND_EPT_PT_FOR_EPT_2MB)
                                     pgmR3PoolCheckError(&State, "Wrong sub-table type: idx=%#x guest %RX64 shw=%RX64: idxSub=%#x %s\n",
                                                         j, uGst, uShw, pSubPage->idx, pgmPoolPoolKindToStr(pSubPage->enmKind));
@@ -1173 +1231 @@
                             else
                                 pgmR3PoolCheckError(&State, "sub table not found: idx=%#x shw=%RX64\n", j, uShw);
-
                         }
                         if (      (uShw & (EPT_E_READ | EPT_E_WRITE | EPT_E_EXECUTE))