Changeset 104933 in vbox

Timestamp:

Jun 15, 2024 12:44:02 AM (3 months ago)

Author:

vboxsync

Message:

VMM/PGM,IEM: Refactored+copied PGMGstGetPage into PGMGstQueryPage that takes care of table walking, setting A & D bits and validating the access. Use new function in IEM. [fixes] bugref:10687

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (4 diffs)

trunk/include/VBox/vmm/pgm.h

@@ -348 +348 @@
  * level 8.  This is 0 on success. */
 #define PGM_WALKFAIL_LEVEL_MASK                     UINT32_C(0x0000f100)
-/** Level shift (see PGM_WALKINFO_LEVEL_MASK).   */
+/** Level shift (see PGM_WALKFAIL_LEVEL_MASK).   */
 #define PGM_WALKFAIL_LEVEL_SHIFT                    11
 

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -554 +554 @@
     }
 #else
-    Assert((WalkFast.fEffective & X86_PTE_US) || IEM_GET_CPL(pVCpu) != 3));
+    Assert((WalkFast.fEffective & X86_PTE_US) || IEM_GET_CPL(pVCpu) != 3);
     Assert(!(WalkFast.fEffective & X86_PTE_PAE_NX) || !(pVCpu->cpum.GstCtx.msrEFER & MSR_K6_EFER_NXE));
 #endif
-    RTGCPHYS const GCPhys = Walk.GCPhys;
-    /** @todo Check reserved bits and such stuff. PGM is better at doing
-     *        that, so do it when implementing the guest virtual address
-     *        TLB... */
+    RTGCPHYS const GCPhys = WalkFast.GCPhys;
 
     /*
@@ -1250 +1247 @@
     }
 
-    PGMPTWALK Walk;
-    int rc = PGMGstGetPage(pVCpu, GCPtrNext, &Walk);
-    if (RT_FAILURE(rc))
+    PGMPTWALKFAST WalkFast;
+    int rc = PGMGstQueryPageFast(pVCpu, GCPtrNext,
+                                 IEM_GET_CPL(pVCpu) == 3 ? PGMQPAGE_F_EXECUTE | PGMQPAGE_F_USER_MODE : PGMQPAGE_F_EXECUTE,
+                                 &WalkFast);
+    if (RT_SUCCESS(rc))
+        Assert((WalkFast.fInfo & PGM_WALKINFO_SUCCEEDED) && WalkFast.fFailed == PGM_WALKFAIL_SUCCESS);
+    else
     {
         Log(("iemOpcodeFetchMoreBytes: %RGv - rc=%Rrc\n", GCPtrNext, rc));
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
-        if (Walk.fFailed & PGM_WALKFAIL_EPT)
-            IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PHYS_ADDR, 0 /* cbInstr */);
+        if (WalkFast.fFailed & PGM_WALKFAIL_EPT)
+            IEM_VMX_VMEXIT_EPT_RET(pVCpu, &WalkFast, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PHYS_ADDR, 0 /* cbInstr */);
 #endif
         return iemRaisePageFault(pVCpu, GCPtrNext, 1, IEM_ACCESS_INSTRUCTION, rc);
     }
-    if (!(Walk.fEffective & X86_PTE_US) && IEM_GET_CPL(pVCpu) == 3)
-    {
-        Log(("iemOpcodeFetchMoreBytes: %RGv - supervisor page\n", GCPtrNext));
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
-        if (Walk.fFailed & PGM_WALKFAIL_EPT)
-            IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PAGE_TABLE, 0 /* cbInstr */);
-#endif
-        return iemRaisePageFault(pVCpu, GCPtrNext, 1, IEM_ACCESS_INSTRUCTION, VERR_ACCESS_DENIED);
-    }
-    if ((Walk.fEffective & X86_PTE_PAE_NX) && (pVCpu->cpum.GstCtx.msrEFER & MSR_K6_EFER_NXE))
-    {
-        Log(("iemOpcodeFetchMoreBytes: %RGv - NX\n", GCPtrNext));
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
-        if (Walk.fFailed & PGM_WALKFAIL_EPT)
-            IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PAGE_TABLE, 0 /* cbInstr */);
-#endif
-        return iemRaisePageFault(pVCpu, GCPtrNext, 1, IEM_ACCESS_INSTRUCTION, VERR_ACCESS_DENIED);
-    }
-    RTGCPHYS const GCPhys = Walk.GCPhys | (GCPtrNext & GUEST_PAGE_OFFSET_MASK);
-    Log5(("GCPtrNext=%RGv GCPhys=%RGp cbOpcodes=%#x\n",  GCPtrNext,  GCPhys,  cbOpcode));
-    /** @todo Check reserved bits and such stuff. PGM is better at doing
-     *        that, so do it when implementing the guest virtual address
-     *        TLB... */
+    Assert((WalkFast.fEffective & X86_PTE_US) || IEM_GET_CPL(pVCpu) != 3);
+    Assert(!(WalkFast.fEffective & X86_PTE_PAE_NX) || !(pVCpu->cpum.GstCtx.msrEFER & MSR_K6_EFER_NXE));
+
+    RTGCPHYS const GCPhys = WalkFast.GCPhys;
+    Log5(("GCPtrNext=%RGv GCPhys=%RGp cbOpcodes=%#x\n",  GCPtrNext,  GCPhys, cbOpcode));
 
     /*
@@ -5710 +5693 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
     if (WalkFast.fFailed & PGM_WALKFAIL_EPT)
-        IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, fAccess, IEM_SLAT_FAIL_LINEAR_TO_PHYS_ADDR, 0 /* cbInstr */);
+        IEM_VMX_VMEXIT_EPT_RET(pVCpu, &WalkFast, fAccess, IEM_SLAT_FAIL_LINEAR_TO_PHYS_ADDR, 0 /* cbInstr */);
 #endif
     *pGCPhysMem = NIL_RTGCPHYS;

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

@@ -455 +455 @@
 #if defined(VBOX_WITH_NESTED_HWVIRT_VMX_EPT) || defined(VBOX_WITH_NESTED_HWVIRT_SVM_XXX) || defined(DOXYGEN_RUNNING)
 /** Converts regular style walk info to fast style. */
-DECL_FORCE_INLINE(void) PGM_GST_NAME(ConvertPtWalkToFast)(PGMPTWALK const *pSrc, PPGMPTWALKFAST *pDst)
+DECL_FORCE_INLINE(void) PGM_GST_NAME(ConvertPtWalkToFast)(PGMPTWALK const *pSrc, PPGMPTWALKFAST pDst)
 {
     pDst->GCPtr              = pSrc->GCPtr;
@@ -462 +462 @@
     pDst->fInfo              = (pSrc->fSucceeded         ? PGM_WALKINFO_SUCCEEDED            : 0)
                              | (pSrc->fIsSlat            ? PGM_WALKINFO_IS_SLAT              : 0)
-                             | (pSrc->fIsLinearAddrValid ? PGM_WALKINFO_IS_LINEAR_ADDR_VALID : 0)
-                             | ((uint32_t)pSrc->uLevel << PGM_WALKINFO_LEVEL_SHIFT);
-    pDst->fFailed            = pSrc->fFailed;
+                             | (pSrc->fIsLinearAddrValid ? PGM_WALKINFO_IS_LINEAR_ADDR_VALID : 0);
+    pDst->fFailed            = pSrc->fFailed | ((uint32_t)pSrc->uLevel << PGM_WALKFAIL_LEVEL_SHIFT);
     pDst->fEffective         = pSrc->fEffective;
 }
@@ -553 +552 @@
             else \
             { \
-                PGM_NAME(ConvertPtWalkToFast)(&WalkSlat, pWalk); \
+                PGM_GST_NAME(ConvertPtWalkToFast)(&WalkSlat, pWalk); \
                 return rcX; \
             } \
@@ -907 +906 @@
             pWalk->GCPhys       = WalkSlat.GCPhys;
             pWalk->GCPhysNested = 0;
-            pWalk->u64Union     = 0;
-            pWalk->fSucceeded   = true;
+            pWalk->fInfo        = PGM_WALKINFO_SUCCEEDED;
+            pWalk->fFailed      = PGM_WALKFAIL_SUCCESS;
             pWalk->fEffective   = X86_PTE_P | X86_PTE_RW | X86_PTE_US | X86_PTE_A | X86_PTE_D;
         }
         else
-            PGM_NAME(ConvertPtWalkToFast)(&WalkSlat, pWalk);
+            PGM_GST_NAME(ConvertPtWalkToFast)(&WalkSlat, pWalk);
         return rc;
     }