Changeset 92296 in vbox

Timestamp:

Nov 9, 2021 3:56:26 PM (3 years ago)

Author:

vboxsync

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

148143

Message:

VMM: Nested VMX: bugref:10092 Use the computed effective page attributes in the guest (GetPage) template function.

File:

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

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

@@ -384 +384 @@
         if (!Walk.Core.fBigPage)
             *pfFlags = (Walk.Pte.u & ~(GST_PTE_PG_MASK | X86_PTE_RW | X86_PTE_US))                      /* NX not needed */
-                     | (Walk.Core.fEffectiveRW ? X86_PTE_RW : 0)
-                     | (Walk.Core.fEffectiveUS ? X86_PTE_US : 0)
+                     | (Walk.Core.fEffective & (  PGM_PTATTRS_RW_MASK
+                                                | PGM_PTATTRS_US_MASK))
 # if PGM_WITH_NX(PGM_GST_TYPE, PGM_GST_TYPE)
-                     | (Walk.Core.fEffectiveNX ? X86_PTE_PAE_NX : 0)
+                     | (RT_BF_GET(Walk.Core.fEffective, PGM_PTATTRS_X) << X86_PTE_PAE_BIT_NX)
 # endif
                      ;
@@ -393 +393 @@
         {
             *pfFlags = (Walk.Pde.u & ~(GST_PTE_PG_MASK | X86_PDE4M_RW | X86_PDE4M_US | X86_PDE4M_PS))   /* NX not needed */
-                     | ((Walk.Pde.u & X86_PDE4M_PAT) >> X86_PDE4M_PAT_SHIFT)
-                     | (Walk.Core.fEffectiveRW ? X86_PTE_RW : 0)
-                     | (Walk.Core.fEffectiveUS ? X86_PTE_US : 0)
+                     | (Walk.Core.fEffective & (  PGM_PTATTRS_RW_MASK
+                                                | PGM_PTATTRS_US_MASK
+                                                | PGM_PTATTRS_PAT_MASK))
 # if PGM_WITH_NX(PGM_GST_TYPE, PGM_GST_TYPE)
-                     | (Walk.Core.fEffectiveNX ? X86_PTE_PAE_NX : 0)
+                     | (RT_BF_GET(Walk.Core.fEffective, PGM_PTATTRS_X) << X86_PTE_PAE_BIT_NX)
 # endif
                      ;