Changeset 86472 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 7, 2020 5:22:00 PM (5 years ago)

Author:

vboxsync

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

140781

Message:

VMM/PGMPool: Working on eliminating page table bitfield use. bugref:9841 bugref:9746

File:

• trunk/src/VBox/VMM/VMMR3/PGMPool.cpp (modified) (3 diffs)

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

@@ -97 +97 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_PGM_POOL
+#define VBOX_WITHOUT_PAGING_BIT_FIELDS /* 64-bit bitfields are just asking for trouble. See @bugref{9841} and others. */
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/mm.h>
@@ -563 +564 @@
                         {
                             Assert((pShwPD->a[i].u & UINT64_C(0xfff0000000000f80)) == 0);
-                            if (    pShwPD->a[i].n.u1Present
-                                &&  pShwPD->a[i].b.u1Size)
+                            if ((pShwPD->a[i].u & (EPT_E_READ | EPT_E_LEAF)) == (EPT_E_READ | EPT_E_LEAF))
                             {
 # ifndef PGM_WITHOUT_MAPPINGS
@@ -815 +815 @@
                     for (unsigned iShw = 0; iShw < RT_ELEMENTS(uShw.pPTEpt->a); iShw++)
                     {
-                        if (uShw.pPTEpt->a[iShw].n.u1Present)
-                            uShw.pPTEpt->a[iShw].n.u1Write = 0;
+                        if (uShw.pPTEpt->a[iShw].u & EPT_E_READ)
+                            uShw.pPTEpt->a[iShw].u &= ~(X86PGPAEUINT)EPT_E_WRITE;
                     }
                     break;