Changeset 96900 in vbox for trunk

Timestamp:

Sep 27, 2022 1:30:45 PM (2 years ago)

Author:

vboxsync

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

153807

Message:

VMM/PGM: Drop the fIs64BitsPagingMode parameter to PGM_SHW_DECL(int, Enter), it was for 32-bit AMD-V hosts. bugref:10092

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMAll/PGMAllShw.h (modified) (5 diffs)
• include/PGMInternal.h (modified) (1 diff)

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

@@ -3449 +3449 @@
     {
         pVCpu->pgm.s.enmShadowMode = enmShadowMode;
-        int rc = g_aPgmShadowModeData[idxNewShw].pfnEnter(pVCpu, enmGuestMode >= PGMMODE_AMD64);
+        int rc = g_aPgmShadowModeData[idxNewShw].pfnEnter(pVCpu);
         AssertLogRelMsgRCReturnStmt(rc, ("Entering enmShadowMode=%s failed: %Rrc\n", PGMGetModeName(enmShadowMode), rc),
                                     pVCpu->pgm.s.enmShadowMode = PGMMODE_INVALID, rc);

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

@@ -215 +215 @@
 PGM_SHW_DECL(int, GetPage)(PVMCPUCC pVCpu, RTGCUINTPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys);
 PGM_SHW_DECL(int, ModifyPage)(PVMCPUCC pVCpu, RTGCUINTPTR GCPtr, size_t cbPages, uint64_t fFlags, uint64_t fMask, uint32_t fOpFlags);
-PGM_SHW_DECL(int, Enter)(PVMCPUCC pVCpu, bool fIs64BitsPagingMode);
 PGM_SHW_DECL(int, Exit)(PVMCPUCC pVCpu);
 #ifdef IN_RING3
@@ -228 +227 @@
  * @returns VBox status code.
  * @param   pVCpu                   The cross context virtual CPU structure.
- * @param   fIs64BitsPagingMode     New shadow paging mode is for 64 bits? (only relevant for 64 bits guests on a 32 bits AMD-V nested paging host)
  */
-PGM_SHW_DECL(int, Enter)(PVMCPUCC pVCpu, bool fIs64BitsPagingMode)
+PGM_SHW_DECL(int, Enter)(PVMCPUCC pVCpu)
 {
 #if PGM_TYPE_IS_NESTED_OR_EPT(PGM_SHW_TYPE)
 
-# if PGM_TYPE_IS_NESTED(PGM_SHW_TYPE) && HC_ARCH_BITS == 32
-    /* Must distinguish between 32 and 64 bits guest paging modes as we'll use
-       a different shadow paging root/mode in both cases. */
-    RTGCPHYS     GCPhysCR3 = (fIs64BitsPagingMode) ? RT_BIT_64(63) : RT_BIT_64(62);
-    PGMPOOLKIND  enmKind   = PGMPOOLKIND_ROOT_NESTED;
-# elif defined(VBOX_WITH_NESTED_HWVIRT_VMX_EPT)
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
     RTGCPHYS    GCPhysCR3;
     PGMPOOLKIND enmKind;
     if (pVCpu->pgm.s.enmGuestSlatMode != PGMSLAT_EPT)
     {
-        GCPhysCR3 = RT_BIT_64(63); NOREF(fIs64BitsPagingMode);
+        GCPhysCR3 = RT_BIT_64(63);
         enmKind   = PGMPOOLKIND_ROOT_NESTED;
     }
@@ -253 +246 @@
     }
 # else
-    RTGCPHYS     GCPhysCR3 = RT_BIT_64(63); NOREF(fIs64BitsPagingMode);
-    PGMPOOLKIND const enmKind = PGMPOOLKIND_ROOT_NESTED;
-# endif
-    PPGMPOOLPAGE pNewShwPageCR3;
-    PVMCC        pVM       = pVCpu->CTX_SUFF(pVM);
+    RTGCPHYS    const GCPhysCR3 = RT_BIT_64(63);
+    PGMPOOLKIND const enmKind   = PGMPOOLKIND_ROOT_NESTED;
+# endif
+    PVMCC       const pVM       = pVCpu->CTX_SUFF(pVM);
 
     Assert(HMIsNestedPagingActive(pVM));
@@ -265 +257 @@
     PGM_LOCK_VOID(pVM);
 
+    PPGMPOOLPAGE pNewShwPageCR3;
     int rc = pgmPoolAlloc(pVM, GCPhysCR3, enmKind, PGMPOOLACCESS_DONTCARE, PGM_A20_IS_ENABLED(pVCpu),
                           NIL_PGMPOOL_IDX, UINT32_MAX, true /*fLockPage*/,
@@ -277 +270 @@
     Log(("Enter nested shadow paging mode: root %RHv phys %RHp\n", pVCpu->pgm.s.pShwPageCR3R3, pVCpu->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key));
 #else
-    NOREF(pVCpu); NOREF(fIs64BitsPagingMode);
+    NOREF(pVCpu);
 #endif
     return VINF_SUCCESS;

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

@@ -2746 +2746 @@
     DECLCALLBACKMEMBER(int, pfnModifyPage,(PVMCPUCC pVCpu, RTGCPTR GCPtr, size_t cbPages, uint64_t fFlags,
                                                    uint64_t fMask, uint32_t fOpFlags));
-    DECLCALLBACKMEMBER(int, pfnEnter,(PVMCPUCC pVCpu, bool fIs64BitsPagingMode));
+    DECLCALLBACKMEMBER(int, pfnEnter,(PVMCPUCC pVCpu));
     DECLCALLBACKMEMBER(int, pfnExit,(PVMCPUCC pVCpu));
 #ifdef IN_RING3