Changeset 100185 in vbox for trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

Timestamp:

Jun 16, 2023 6:54:50 AM (18 months ago)

Author:

vboxsync

Message:

Devices/VMMDev: Add an MMIO interface in addition to the existing PIO interface for guest additions running inside an ARM based guest. Also remove the dependency from the architecture page size and introduce a 4KiB VMM page size as ARM has different page sizes (4KiB, 16KiB, 64KiB) and it can differ between host and guest, bugref:10456

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -691 +691 @@
     if (pPtr->cPages == 1)
         return true;
-    RTGCPHYS64 Phys = pPtr->paPages[0] + GUEST_PAGE_SIZE;
+    RTGCPHYS64 Phys = pPtr->paPages[0] + VMMDEV_PAGE_SIZE;
     if (Phys != pPtr->paPages[1])
         return false;
@@ -699 +699 @@
         do
         {
-            Phys += GUEST_PAGE_SIZE;
+            Phys += VMMDEV_PAGE_SIZE;
             if (Phys != pPtr->paPages[iPage])
                 return false;
@@ -734 +734 @@
     for (uint32_t iPage = 0; iPage < pPtr->cPages && cbRemaining > 0; ++iPage)
     {
-        uint32_t cbToRead = GUEST_PAGE_SIZE - offPage;
+        uint32_t cbToRead = VMMDEV_PAGE_SIZE - offPage;
         if (cbToRead > cbRemaining)
             cbToRead = cbRemaining;
@@ -773 +773 @@
     for (iPage = 0; iPage < pPtr->cPages && cbRemaining > 0; ++iPage)
     {
-        uint32_t cbToWrite = GUEST_PAGE_SIZE - offPage;
+        uint32_t cbToWrite = VMMDEV_PAGE_SIZE - offPage;
         if (cbToWrite > cbRemaining)
             cbToWrite = cbRemaining;
@@ -1098 +1098 @@
                 ASSERT_GUEST_RETURN(cbData <= VMMDEV_MAX_HGCM_DATA_SIZE, VERR_INVALID_PARAMETER);
 
-                const uint32_t offFirstPage = cbData > 0 ? GCPtr & GUEST_PAGE_OFFSET_MASK : 0;
-                const uint32_t cPages       = cbData > 0 ? (offFirstPage + cbData + GUEST_PAGE_SIZE - 1) / GUEST_PAGE_SIZE : 0;
+                const uint32_t offFirstPage = cbData > 0 ? GCPtr & VMMDEV_PAGE_OFFSET_MASK : 0;
+                const uint32_t cPages       = cbData > 0 ? (offFirstPage + cbData + VMMDEV_PAGE_SIZE - 1) / VMMDEV_PAGE_SIZE : 0;
 
                 pGuestParm->u.ptr.cbData        = cbData;
@@ -1119 +1119 @@
 
                     /* Gonvert the guest linear pointers of pages to physical addresses. */
-                    GCPtr &= ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK;
+                    GCPtr &= ~(RTGCPTR)VMMDEV_PAGE_OFFSET_MASK;
                     for (uint32_t iPage = 0; iPage < cPages; ++iPage)
                     {
@@ -1134 +1134 @@
 
                         pGuestParm->u.ptr.paPages[iPage] = GCPhys;
-                        GCPtr += GUEST_PAGE_SIZE;
+                        GCPtr += VMMDEV_PAGE_SIZE;
                     }
                 }
@@ -1179 +1179 @@
                                         ("%#x\n", pPageListInfo->flags), VERR_INVALID_FLAGS);
                 /* First page offset. */
-                ASSERT_GUEST_MSG_RETURN(pPageListInfo->offFirstPage < GUEST_PAGE_SIZE,
+                ASSERT_GUEST_MSG_RETURN(pPageListInfo->offFirstPage < VMMDEV_PAGE_SIZE,
                                         ("%#x\n", pPageListInfo->offFirstPage), VERR_INVALID_PARAMETER);
 
@@ -1187 +1187 @@
                 ASSERT_GUEST_MSG_RETURN(      pPageListInfo->cPages
                                            == (pGuestParm->enmType == VMMDevHGCMParmType_ContiguousPageList ? 1
-                                               :    RT_ALIGN_32(pPageListInfo->offFirstPage + cbData, GUEST_PAGE_SIZE)
-                                                 >> GUEST_PAGE_SHIFT)
+                                               :    RT_ALIGN_32(pPageListInfo->offFirstPage + cbData, VMMDEV_PAGE_SIZE)
+                                                 >> VMMDEV_PAGE_SHIFT)
                                         || pGuestParm->enmType == VMMDevHGCMParmType_PageList,
                                         ("offFirstPage=%#x cbData=%#x cPages=%#x enmType=%d\n",
@@ -1203 +1203 @@
                 {
                     /* Validate page offsets */
-                    ASSERT_GUEST_MSG_RETURN(   !(pPageListInfo->aPages[0] & GUEST_PAGE_OFFSET_MASK)
-                                            || (pPageListInfo->aPages[0] & GUEST_PAGE_OFFSET_MASK) == pPageListInfo->offFirstPage,
+                    ASSERT_GUEST_MSG_RETURN(   !(pPageListInfo->aPages[0] & VMMDEV_PAGE_OFFSET_MASK)
+                                            || (pPageListInfo->aPages[0] & VMMDEV_PAGE_OFFSET_MASK) == pPageListInfo->offFirstPage,
                                             ("%#RX64 offFirstPage=%#x\n", pPageListInfo->aPages[0], pPageListInfo->offFirstPage),
                                             VERR_INVALID_POINTER);
                     uint32_t const cPages = pPageListInfo->cPages;
                     for (uint32_t iPage = 1; iPage < cPages; iPage++)
-                        ASSERT_GUEST_MSG_RETURN(!(pPageListInfo->aPages[iPage] & GUEST_PAGE_OFFSET_MASK),
+                        ASSERT_GUEST_MSG_RETURN(!(pPageListInfo->aPages[iPage] & VMMDEV_PAGE_OFFSET_MASK),
                                                 ("[%#zx]=%#RX64\n", iPage, pPageListInfo->aPages[iPage]), VERR_INVALID_POINTER);
                     RT_UNTRUSTED_VALIDATED_FENCE();