Changeset 101001 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 1, 2023 1:57:59 PM (17 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 Fix performance issue with Hyper-V enabled Windows Server 2012 R2 guests.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllBth.h (modified) (3 diffs)
• VMMR3/PGM.cpp (modified) (1 diff)

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

@@ -2634 +2634 @@
      */
     SHWPTE Pte;
-    uint64_t const fGstShwPteFlags = pGstWalkAll->u.Ept.Pte.u & pVCpu->pgm.s.fGstEptShadowedPteMask;
+    uint64_t const fGstShwPteFlags = (pGstWalkAll->u.Ept.Pte.u & pVCpu->pgm.s.fGstEptShadowedPteMask)
+                                   | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
     if (!PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage) || PGM_PAGE_IS_HNDL_PHYS_NOT_IN_HM(pPage))
     {
@@ -2796 +2797 @@
         Assert(pShwPage->enmKind == PGMPOOLKIND_EPT_PT_FOR_EPT_2MB);
 #endif
-        uint64_t const fGstPteFlags = pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask & ~EPT_E_LEAF;
+        uint64_t const fGstPteFlags = (pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask & ~EPT_E_LEAF)
+                                    | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
         pGstWalkAll->u.Ept.Pte.u = GCPhysPage | fGstPteFlags;
 
@@ -2988 +2990 @@
          * If we have a 2M backing page, we can map the guest's 2M page right away.
          */
-        uint64_t const fShwBigPdeFlags = pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask;
+        uint64_t const fShwBigPdeFlags = (pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask)
+                                       | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
         if (HCPhys != NIL_RTHCPHYS)
         {

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

@@ -1729 +1729 @@
         /* We currently do -not- shadow reserved bits in guest page tables but instead trap them using non-present permissions,
            see todo in (NestedSyncPT). */
-        pVCpu->pgm.s.fGstEptShadowedPteMask    = EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT;
+        pVCpu->pgm.s.fGstEptShadowedPteMask    = EPT_PRESENT_MASK;
         pVCpu->pgm.s.fGstEptShadowedPdeMask    = EPT_PRESENT_MASK;
-        pVCpu->pgm.s.fGstEptShadowedBigPdeMask = EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT | EPT_E_LEAF;
-        pVCpu->pgm.s.fGstEptShadowedPdpteMask  = EPT_PRESENT_MASK | EPT_E_MEMTYPE_MASK | EPT_E_IGNORE_PAT | EPT_E_LEAF;
+        pVCpu->pgm.s.fGstEptShadowedBigPdeMask = EPT_PRESENT_MASK | EPT_E_LEAF;
+        pVCpu->pgm.s.fGstEptShadowedPdpteMask  = EPT_PRESENT_MASK;
         pVCpu->pgm.s.fGstEptShadowedPml4eMask  = 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. */