Changeset 99812 in vbox

Timestamp:

May 16, 2023 9:32:15 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157436

Message:

VMM/PGM: Nested VMX: bugref:10318 Fixes to flushing of large page page in the nested-guest case. Assertions.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (4 diffs)

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

@@ -634 +634 @@
                 if (uPde & EPT_PRESENT_MASK)
                 {
+                    Assert(!(uPde & EPT_E_LEAF));
                     Log7Func(("EPT PD iShw=%#x: %RX64 (%RGp) -> freeing it!\n", iShw, uPde, pPage->GCPhys));
                     pgmPoolFree(pVM, uPde & EPT_PDE_PG_MASK, pPage->idx, iShw);
@@ -648 +649 @@
                     if (uPde2 & EPT_PRESENT_MASK)
                     {
+                        Assert(!(uPde2 & EPT_E_LEAF));
                         Log7Func(("EPT PD (2): iShw2=%#x: %RX64 (%RGp) -> freeing it!\n", iShw2, uPde2, pPage->GCPhys));
                         pgmPoolFree(pVM, uPde2 & EPT_PDE_PG_MASK, pPage->idx, iShw2);
@@ -3515 +3517 @@
         /* Large page case only. */
         case PGMPOOLKIND_EPT_PD_FOR_PHYS:
+        case PGMPOOLKIND_EPT_PD_FOR_EPT_PD:
         {
             Assert(pVM->pgm.s.fNestedPaging);
@@ -3520 +3523 @@
             const uint64_t  u64 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PDE4M_P | X86_PDE4M_PS;
             PEPTPD          pPD = (PEPTPD)PGMPOOL_PAGE_2_PTR(pVM, pPage);
+
+            Assert(   pPage->enmKind != PGMPOOLKIND_EPT_PD_FOR_EPT_PD
+                   || (pPD->a[iPte].u & EPT_E_LEAF));
 
             if ((pPD->a[iPte].u & (EPT_PDE2M_PG_MASK | X86_PDE4M_P | X86_PDE4M_PS)) == u64)