Changeset 93596 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 3, 2022 9:43:35 PM (3 years ago)

Author:

vboxsync

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

149733

Message:

VMM/PGM: Init HCPhysZeroPg and HCPhysMmioPg in ring-0 and forget MMR3HyperHCVirt2HCPhys. bugref:10093

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GVMMR0.cpp (modified) (1 diff)
• PGMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -905 +905 @@
                         pGVM->gvmm.s.VMMemObj  = hVMMemObj;
                         rc = GMMR0InitPerVMData(pGVM);
-                        int rc2 = PGMR0InitPerVMData(pGVM);
+                        int rc2 = PGMR0InitPerVMData(pGVM, hVMMemObj);
                         int rc3 = VMMR0InitPerVMData(pGVM);
                         DBGFR0InitPerVMData(pGVM);

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -68 +68 @@
  * @returns VBox status code.
  * @param   pGVM    Pointer to the global VM structure.
- */
-VMMR0_INT_DECL(int) PGMR0InitPerVMData(PGVM pGVM)
+ * @param   hMemObj Handle to the memory object backing pGVM.
+ */
+VMMR0_INT_DECL(int) PGMR0InitPerVMData(PGVM pGVM, RTR0MEMOBJ hMemObj)
 {
     AssertCompile(sizeof(pGVM->pgm.s) <= sizeof(pGVM->pgm.padding));
@@ -80 +81 @@
         pGVM->pgmr0.s.ahPoolMapObjs[i] = NIL_RTR0MEMOBJ;
     }
+
+    /*
+     * Get the physical address of the ZERO and MMIO-dummy pages.
+     */
+    AssertReturn(((uintptr_t)&pGVM->pgm.s.abZeroPg[0] & HOST_PAGE_OFFSET_MASK) == 0, VERR_INTERNAL_ERROR_2);
+    pGVM->pgm.s.HCPhysZeroPg    = RTR0MemObjGetPagePhysAddr(hMemObj, RT_UOFFSETOF(GVM, pgm.s.abZeroPg) >> HOST_PAGE_SHIFT);
+    AssertReturn(pGVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS, VERR_INTERNAL_ERROR_3);
+
+    AssertReturn(((uintptr_t)&pGVM->pgm.s.abMmioPg[0] & HOST_PAGE_OFFSET_MASK) == 0, VERR_INTERNAL_ERROR_2);
+    pGVM->pgm.s.HCPhysMmioPg    = RTR0MemObjGetPagePhysAddr(hMemObj, RT_UOFFSETOF(GVM, pgm.s.abMmioPg) >> HOST_PAGE_SHIFT);
+    AssertReturn(pGVM->pgm.s.HCPhysMmioPg != NIL_RTHCPHYS, VERR_INTERNAL_ERROR_3);
+
+    pGVM->pgm.s.HCPhysInvMmioPg = pGVM->pgm.s.HCPhysMmioPg;
+
     return RTCritSectInit(&pGVM->pgmr0.s.PoolGrowCritSect);
 }