Changeset 92062 in vbox for trunk/src

Timestamp:

Oct 26, 2021 7:34:48 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Macro for present paging entry check GST_IS_PGENTRY_PRESENT.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllGst.h (modified) (4 diffs)
• include/PGMGstDefs.h (modified) (4 diffs)

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

@@ -148 +148 @@
         pWalk->Pml4e.u = Pml4e.u = pPml4e->u;
 
-        if (Pml4e.u & X86_PML4E_P) { /* probable */ }
+        if (GST_IS_PGENTRY_PRESENT(pVCpu, Pml4e)) { /* probable */ }
         else return PGM_GST_NAME(WalkReturnNotPresent)(pVCpu, pWalk, 4);
 
@@ -210 +210 @@
         pWalk->Pdpe.u = Pdpe.u = pPdpe->u;
 
-        if (Pdpe.u & X86_PDPE_P) { /* probable */ }
+        if (GST_IS_PGENTRY_PRESENT(pVCpu, Pdpe)) { /* probable */ }
         else return PGM_GST_NAME(WalkReturnNotPresent)(pVCpu, pWalk, 3);
 
@@ -300 +300 @@
         GSTPDE  Pde;
         pWalk->Pde.u = Pde.u = pPde->u;
-        if (Pde.u & X86_PDE_P) { /* probable */ }
+        if (GST_IS_PGENTRY_PRESENT(pVCpu, Pde)) { /* probable */ }
         else return PGM_GST_NAME(WalkReturnNotPresent)(pVCpu, pWalk, 2);
         if ((Pde.u & X86_PDE_PS) && GST_IS_PSE_ACTIVE(pVCpu))
@@ -358 +358 @@
         pWalk->Pte.u = Pte.u = pPte->u;
 
-        if (Pte.u & X86_PTE_P) { /* probable */ }
+        if (GST_IS_PGENTRY_PRESENT(pVCpu, Pte)) { /* probable */ }
         else return PGM_GST_NAME(WalkReturnNotPresent)(pVCpu, pWalk, 1);
 

trunk/src/VBox/VMM/include/PGMGstDefs.h

@@ -132 +132 @@
 # define GST_IS_BIG_PDPE_VALID(pVCpu, Pdpe)     (true)
 # define GST_IS_PML4E_VALID(pVCpu, Pml4e)       (true)
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge.u) & X86_PTE_P)
 # define GST_IS_PSE_ACTIVE(pVCpu)               (false && This_should_not_be_used_in_this_context)
 
@@ -173 +174 @@
 //# define GST_IS_BIG_PDPE_VALID(pVCpu, Pdpe)     (false)
 //# define GST_IS_PML4E_VALID(pVCpu, Pml4e)       (false)
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge.u) & X86_PTE_P)
 # define GST_IS_PSE_ACTIVE(pVCpu)               pgmGst32BitIsPageSizeExtActive(pVCpu)
 # define GST_IS_NX_ACTIVE(pVCpu)                (false)
@@ -236 +238 @@
 #  define GST_IS_PML4E_VALID(pVCpu, Pml4e)      (!( (Pml4e).u & (pVCpu)->pgm.s.fGstAmd64MbzPml4eMask ))
 # endif
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge.u) & X86_PTE_P)
 # define GST_PT_SHIFT                           X86_PT_PAE_SHIFT
 # define GST_PT_MASK                            X86_PT_PAE_MASK
@@ -287 +290 @@
 # define GST_IS_BIG_PDPE_VALID(pVCpu, Pdpe)     (!( (Pdpe).u  & (pVCpu)->pgm.s.fGstEptMbzBigPdpteMask ))
 # define GST_IS_PML4E_VALID(pVCpu, Pml4e)       (!( (Pml4e).u & (pVCpu)->pgm.s.fGstEptMbzPml4eMask ))
-# define GST_IS_PGENTRY_PRESENT(pVCpu, Entry)   (!( (Entry).u & (pVCpu)->pgm.s.fGstEptPresentMask ))
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge).u & (pVCpu)->pgm.s.fGstEptPresentMask)
 # define GST_IS_PSE_ACTIVE(pVCpu)               (true)
 # define GST_IS_NX_ACTIVE(pVCpu)                (pgmGstIsNoExecuteActive(pVCpu))