Changeset 100232 in vbox for trunk

Timestamp:

Jun 21, 2023 9:50:56 AM (18 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 Fixed incorrect accumulation of execute permissions in the NX attribute bit while walking EPT.
This addresses the log flooding in bugref:10474 as a consequence.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGstSlatEpt.cpp.h (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllGstSlatEpt.cpp.h

@@ -263 +263 @@
             fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,   fRead)
                         | RT_BF_MAKE(PGM_PTATTRS_W,   fWrite)
-                        | RT_BF_MAKE(PGM_PTATTRS_NX, !fExecute)
                         | RT_BF_MAKE(PGM_PTATTRS_A,   fAccessed)
                         | fEptAndBits;
+            fEffective |= RT_BF_MAKE(PGM_PTATTRS_NX, !fExecute);
             pWalk->fEffective = fEffective;
         }
@@ -280 +280 @@
             uint8_t const  fMemType    = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_MEMTYPE);
             uint64_t const fEptAndBits = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fEptAndMask;
-            fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,           fRead)
-                        | RT_BF_MAKE(PGM_PTATTRS_W,           fWrite)
-                        | RT_BF_MAKE(PGM_PTATTRS_NX,         !fExecute)
-                        | RT_BF_MAKE(PGM_PTATTRS_A,           fAccessed)
+            fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,            fRead)
+                        | RT_BF_MAKE(PGM_PTATTRS_W,            fWrite)
+                        | RT_BF_MAKE(PGM_PTATTRS_A,            fAccessed)
                         | fEptAndBits;
-            fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,           fDirty)
-                        | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE, fMemType);
+            fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,            fDirty)
+                        | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE,  fMemType)
+                        | RT_BF_MAKE(PGM_PTATTRS_NX,          !fExecute);
             pWalk->fEffective = fEffective;
 
@@ -326 +326 @@
             fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,   fRead)
                         | RT_BF_MAKE(PGM_PTATTRS_W,   fWrite)
-                        | RT_BF_MAKE(PGM_PTATTRS_NX, !fExecute)
                         | RT_BF_MAKE(PGM_PTATTRS_A,   fAccessed)
                         | fEptAndBits;
+            fEffective |= RT_BF_MAKE(PGM_PTATTRS_NX, !fExecute);
             pWalk->fEffective = fEffective;
         }
@@ -343 +343 @@
             uint8_t const  fMemType    = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_MEMTYPE);
             uint64_t const fEptAndBits = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fEptAndMask;
-            fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,           fRead)
-                        | RT_BF_MAKE(PGM_PTATTRS_W,           fWrite)
-                        | RT_BF_MAKE(PGM_PTATTRS_NX,         !fExecute)
-                        | RT_BF_MAKE(PGM_PTATTRS_A,           fAccessed)
+            fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,            fRead)
+                        | RT_BF_MAKE(PGM_PTATTRS_W,            fWrite)
+                        | RT_BF_MAKE(PGM_PTATTRS_A,            fAccessed)
                         | fEptAndBits;
-            fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,           fDirty)
-                        | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE, fMemType);
+            fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,            fDirty)
+                        | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE,  fMemType)
+                        | RT_BF_MAKE(PGM_PTATTRS_NX,          !fExecute);
             pWalk->fEffective = fEffective;
 
@@ -392 +392 @@
         uint8_t const  fMemType    = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_MEMTYPE);
         uint64_t const fEptAndBits = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fEptAndMask;
-        fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,           fRead)
-                    | RT_BF_MAKE(PGM_PTATTRS_W,           fWrite)
-                    | RT_BF_MAKE(PGM_PTATTRS_NX,         !fExecute)
-                    | RT_BF_MAKE(PGM_PTATTRS_A,           fAccessed)
+        fEffective &= RT_BF_MAKE(PGM_PTATTRS_R,            fRead)
+                    | RT_BF_MAKE(PGM_PTATTRS_W,            fWrite)
+                    | RT_BF_MAKE(PGM_PTATTRS_A,            fAccessed)
                     | fEptAndBits;
-        fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,           fDirty)
-                    | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE, fMemType);
+        fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,            fDirty)
+                    | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE,  fMemType)
+                    | RT_BF_MAKE(PGM_PTATTRS_NX,          !fExecute);
         pWalk->fEffective = fEffective;