Changeset 94983 in vbox

Timestamp:

May 11, 2022 9:17:50 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Assertion to ensure we don't need to mask twice.

File:

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

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

@@ -134 +134 @@
                                   | PGM_PTATTRS_EPT_W_MASK
                                   | PGM_PTATTRS_EPT_X_SUPER_MASK;
+    Assert(!(fCumulativeEpt & ~PGM_PTATTRS_EPT_MASK));
 
     /*
@@ -176 +177 @@
         uint8_t const fExecute       = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_EXECUTE);
         uint8_t const fAccessed      = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_ACCESSED);
-        uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & PGM_PTATTRS_EPT_MASK;
+        uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fCumulativeEpt;
         fEffective = RT_BF_MAKE(PGM_PTATTRS_R,   fRead)
                    | RT_BF_MAKE(PGM_PTATTRS_W,   fWrite)
@@ -209 +210 @@
             uint8_t const fExecute       = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_EXECUTE);
             uint8_t const fAccessed      = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_ACCESSED);
-            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & PGM_PTATTRS_EPT_MASK;
+            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fCumulativeEpt;
             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)
-                        | (fEffectiveEpt & fCumulativeEpt);
+                        | fEffectiveEpt;
             pWalk->fEffective = fEffective;
         }
@@ -228 +229 @@
             uint8_t const fDirty         = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_DIRTY);
             uint8_t const fMemType       = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_MEMTYPE);
-            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & PGM_PTATTRS_EPT_MASK;
+            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fCumulativeEpt;
             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)
-                        | (fEffectiveEpt & fCumulativeEpt);
+                        | fEffectiveEpt;
             fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,           fDirty)
                         | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE, fMemType);
@@ -272 +273 @@
             uint8_t const fExecute       = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_EXECUTE);
             uint8_t const fAccessed      = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_ACCESSED);
-            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & PGM_PTATTRS_EPT_MASK;
+            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fCumulativeEpt;
             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)
-                        | (fEffectiveEpt & fCumulativeEpt);
+                        | fEffectiveEpt;
             pWalk->fEffective = fEffective;
         }
@@ -291 +292 @@
             uint8_t const fDirty         = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_DIRTY);
             uint8_t const fMemType       = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_MEMTYPE);
-            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & PGM_PTATTRS_EPT_MASK;
+            uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fCumulativeEpt;
             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)
-                        | (fEffectiveEpt & fCumulativeEpt);
+                        | fEffectiveEpt;
             fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,           fDirty)
                         | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE, fMemType);
@@ -340 +341 @@
         uint8_t const fDirty         = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_DIRTY);
         uint8_t const fMemType       = RT_BF_GET(fEptAttrs, VMX_BF_EPT_PT_MEMTYPE);
-        uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & PGM_PTATTRS_EPT_MASK;
+        uint64_t const fEffectiveEpt = (fEptAttrs << PGM_PTATTRS_EPT_SHIFT) & fCumulativeEpt;
         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)
-                    | (fEffectiveEpt & fCumulativeEpt);
+                    | fEffectiveEpt;
         fEffective |= RT_BF_MAKE(PGM_PTATTRS_D,           fDirty)
                     | RT_BF_MAKE(PGM_PTATTRS_EPT_MEMTYPE, fMemType);