Changeset 93554 in vbox for trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

Timestamp:

Feb 2, 2022 10:57:02 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Changed PAGE_SIZE -> GUEST_PAGE_SIZE / HOST_PAGE_SIZE, PAGE_SHIFT -> GUEST_PAGE_SHIFT / HOST_PAGE_SHIFT, and PAGE_OFFSET_MASK -> GUEST_PAGE_OFFSET_MASK / HOST_PAGE_OFFSET_MASK. Also removed most usage of ASMMemIsZeroPage and ASMMemZeroPage since the host and guest page size doesn't need to be the same any more. Some work left to do in the page pool code. bugref:9898

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (8 diffs)

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

@@ -890 +890 @@
                      */
                     const uint32_t  cbVM      = RT_UOFFSETOF_DYN(GVM, aCpus[cCpus]);
-                    const uint32_t  cPages    = RT_ALIGN_32(cbVM, PAGE_SIZE) >> PAGE_SHIFT;
+                    const uint32_t  cPages    = RT_ALIGN_32(cbVM, HOST_PAGE_SIZE) >> HOST_PAGE_SHIFT;
                     RTR0MEMOBJ      hVMMemObj = NIL_RTR0MEMOBJ;
-                    rc = RTR0MemObjAllocPage(&hVMMemObj, cPages << PAGE_SHIFT, false /* fExecutable */);
+                    rc = RTR0MemObjAllocPage(&hVMMemObj, cPages << HOST_PAGE_SHIFT, false /* fExecutable */);
                     if (RT_SUCCESS(rc))
                     {
@@ -901 +901 @@
                          * Initialise the structure.
                          */
-                        RT_BZERO(pGVM, cPages << PAGE_SHIFT);
+                        RT_BZERO(pGVM, cPages << HOST_PAGE_SHIFT);
                         gvmmR0InitPerVMData(pGVM, iHandle, cCpus, pSession);
                         pGVM->gvmm.s.VMMemObj  = hVMMemObj;
@@ -931 +931 @@
                                  * Map the page array, VM and VMCPU structures into ring-3.
                                  */
-                                AssertCompileSizeAlignment(VM, PAGE_SIZE);
+                                AssertCompileSizeAlignment(VM, HOST_PAGE_SIZE);
                                 rc = RTR0MemObjMapUserEx(&pGVM->gvmm.s.VMMapObj, pGVM->gvmm.s.VMMemObj, (RTR3PTR)-1, 0,
                                                          RTMEM_PROT_READ | RTMEM_PROT_WRITE, NIL_RTR0PROCESS,
@@ -937 +937 @@
                                 for (VMCPUID i = 0; i < cCpus && RT_SUCCESS(rc); i++)
                                 {
-                                    AssertCompileSizeAlignment(VMCPU, PAGE_SIZE);
+                                    AssertCompileSizeAlignment(VMCPU, HOST_PAGE_SIZE);
                                     rc = RTR0MemObjMapUserEx(&pGVM->aCpus[i].gvmm.s.VMCpuMapObj, pGVM->gvmm.s.VMMemObj,
                                                              (RTR3PTR)-1, 0, RTMEM_PROT_READ | RTMEM_PROT_WRITE, NIL_RTR0PROCESS,
@@ -1254 +1254 @@
      */
     AssertPtrReturn(pGVM, VERR_INVALID_POINTER);
-    AssertReturn(!((uintptr_t)pGVM & PAGE_OFFSET_MASK), VERR_INVALID_POINTER);
+    AssertReturn(!((uintptr_t)pGVM & HOST_PAGE_OFFSET_MASK), VERR_INVALID_POINTER);
     AssertMsgReturn(pGVM->enmVMState >= VMSTATE_CREATING && pGVM->enmVMState <= VMSTATE_TERMINATED, ("%d\n", pGVM->enmVMState),
                     VERR_WRONG_ORDER);
@@ -1861 +1861 @@
     int rc;
     if (RT_LIKELY(   RT_VALID_PTR(pGVM)
-                  && ((uintptr_t)pGVM & PAGE_OFFSET_MASK) == 0 ))
+                  && ((uintptr_t)pGVM & HOST_PAGE_OFFSET_MASK) == 0 ))
     {
         /*
@@ -1951 +1951 @@
      */
     AssertPtrReturn(pGVM, VERR_INVALID_POINTER);
-    AssertReturn(((uintptr_t)pGVM & PAGE_OFFSET_MASK) == 0, VERR_INVALID_POINTER);
+    AssertReturn(((uintptr_t)pGVM & HOST_PAGE_OFFSET_MASK) == 0, VERR_INVALID_POINTER);
 
     /*
@@ -2269 +2269 @@
     uintptr_t const off = (uintptr_t)pv - (uintptr_t)pGVM;
     Assert(off < RT_UOFFSETOF_DYN(GVM, aCpus[pGVM->cCpus]));
-    return RTR0MemObjGetPagePhysAddr(pGVM->gvmm.s.VMMemObj, off >> PAGE_SHIFT) | ((uintptr_t)pv & PAGE_OFFSET_MASK);
+    return RTR0MemObjGetPagePhysAddr(pGVM->gvmm.s.VMMemObj, off >> HOST_PAGE_SHIFT) | ((uintptr_t)pv & HOST_PAGE_OFFSET_MASK);
 }