Changeset 92334 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 10, 2021 5:19:29 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Eliminate fEffectiveRW, use the W bit from the PGMPTATTRS instead.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (5 diffs)
• PGMAllGst.h (modified) (2 diffs)
• PGMAllGstSlatEpt.cpp.h (modified) (3 diffs)

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

@@ -277 +277 @@
                 && pCurType->enmKind != PGMPHYSHANDLERKIND_WRITE
 #   if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
-                && pGstWalk->Core.fEffectiveRW
+                && (pGstWalk->Core.fEffective & PGM_PTATTRS_W_MASK)
                 && !pGstWalk->Core.fEffectiveUS /** @todo Remove pGstWalk->Core.fEffectiveUS and X86_PTE_US further down in the sync code. */
 #   endif
@@ -437 +437 @@
     {
         if (    (   (uErr & X86_TRAP_PF_RW)
-                 && !GstWalk.Core.fEffectiveRW
+                 && !(GstWalk.Core.fEffective & PGM_PTATTRS_W_MASK)
                  && (   (uErr & X86_TRAP_PF_US)
                      || CPUMIsGuestR0WriteProtEnabled(pVCpu)) )
@@ -778 +778 @@
              * Check to see if we need to emulate the instruction if CR0.WP=0.
              */
-            if (    !GstWalk.Core.fEffectiveRW
+            if (    !(GstWalk.Core.fEffective & PGM_PTATTRS_W_MASK)
                 &&  (CPUMGetGuestCR0(pVCpu) & (X86_CR0_WP | X86_CR0_PG)) == X86_CR0_PG
                 &&  CPUMGetGuestCPL(pVCpu) < 3)
@@ -798 +798 @@
 #    if (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE) && 1
                 if (   GstWalk.Core.fEffectiveUS
-                    && !GstWalk.Core.fEffectiveRW
+                    && !(GstWalk.Core.fEffective & PGM_PTATTRS_W_MASK)
                     && (GstWalk.Core.fBigPage || (GstWalk.Pde.u & X86_PDE_RW))
                     && pVM->cCpus == 1 /* Sorry, no go on SMP. Add CFGM option? */)
@@ -881 +881 @@
          */
         else if (    GstWalk.Core.fEffectiveUS
-                 && !GstWalk.Core.fEffectiveRW
+                 && !(GstWalk.Core.fEffective & PGM_PTATTRS_W_MASK)
                  && (GstWalk.Core.fBigPage || (GstWalk.Pde.u & X86_PDE_RW))
                  &&  pVCpu->pgm.s.cNetwareWp0Hacks > 0

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

@@ -257 +257 @@
             Assert(fEffective & PGM_PTATTRS_R_MASK);
 
-            pWalk->Core.fEffectiveRW = !!(fEffective & X86_PTE_RW);
             pWalk->Core.fEffectiveUS = !!(fEffective & X86_PTE_US);
             pWalk->Core.fBigPage     = true;
@@ -320 +319 @@
         Assert(fEffective & PGM_PTATTRS_R_MASK);
 
-        pWalk->Core.fEffectiveRW = !!(fEffective & X86_PTE_RW);
         pWalk->Core.fEffectiveUS = !!(fEffective & X86_PTE_US);
         pWalk->Core.fSucceeded   = true;

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

@@ -153 +153 @@
             pWalk->Core.fEffective = fEffective;
 
-            pWalk->Core.fEffectiveRW = !!fWrite;
             pWalk->Core.fEffectiveUS = true;
             pWalk->Core.fGigantPage  = true;
@@ -191 +190 @@
             pWalk->Core.fEffective = fEffective;
 
-            pWalk->Core.fEffectiveRW = !!fWrite;
             pWalk->Core.fEffectiveUS = true;
             pWalk->Core.fBigPage     = true;
@@ -246 +244 @@
         pWalk->Core.fEffective = fEffective;
 
-        pWalk->Core.fEffectiveRW = !!fWrite;
         pWalk->Core.fEffectiveUS = true;
         pWalk->Core.fSucceeded   = true;