Changeset 100198 in vbox for trunk

Timestamp:

Jun 16, 2023 12:04:51 PM (18 months ago)

Author:

vboxsync

Message:

VMM/PGM: Nested VMX: bugref:10318 Fixed hang when starting inner VMs sometimes due to repeated faults on unallocated/zero page.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)

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

@@ -2586 +2586 @@
     {
 # ifndef VBOX_WITH_NEW_LAZY_PAGE_ALLOC
-        /* Page wasn't allocated, write protect it. */
+        /* If it's the zero page or write to an unallocated page, allocate it to make it writable. */
         if (    PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM
             &&  (   PGM_PAGE_IS_ZERO(pPage)
@@ -2602 +2602 @@
            )
         {
-            Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | (fGstShwPteFlags & ~EPT_E_WRITE);
-            Log7Func(("zero page (%R[pgmpage]) at %RGp -> %RX64\n", pPage, GCPhysPage, Pte.u));
-        }
-        else
+            rc = pgmPhysPageMakeWritable(pVCpu->CTX_SUFF(pVM), pPage, GCPhysPage);
+            AssertRC(rc);
+            Log7Func(("made writable (%R[pgmpage]) at %RGp\n", pPage, GCPhysPage));
+        }
 # endif
-        {
-            /** @todo access bit. */
-            Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | fGstShwPteFlags;
-            Log7Func(("regular page (%R[pgmpage]) at %RGp -> %RX64\n", pPage, GCPhysPage, Pte.u));
-        }
+        /** @todo access bit. */
+        Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | fGstShwPteFlags;
+        Log7Func(("regular page (%R[pgmpage]) at %RGp -> %RX64\n", pPage, GCPhysPage, Pte.u));
     }
     else if (!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))