Changeset 100267 in vbox for trunk

Timestamp:

Jun 23, 2023 2:57:53 PM (18 months ago)

Author:

vboxsync

Message:

Additions: Make the R0 physical heap configurable to allow for allocations >= 4GiB if supported by the VBox device (the MMIO request path is available), add support for the MMIO request path required for ARM, bugref:10457

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (5 diffs)
• include/VBox/VBoxGuestLib.h (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (6 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (15 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp (modified) (4 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInternal.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp (modified) (10 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -266 +266 @@
             /** The MMIO mapping.  NULL if no MMIO region. */
             struct VMMDevMemory volatile RT_FAR *pvVmmDevMapping;
+            /** The MMIO region for the request port, NULL if not available. */
+            uintptr_t volatile RT_FAR           *pMmioReq;
             /** The I/O port address. */
             RTIOPORT                        IoPort;
@@ -273 +275 @@
     } u;
 } VBGLIOCGETVMMDEVIOINFO, RT_FAR *PVBGLIOCGETVMMDEVIOINFO;
-AssertCompileSize(VBGLIOCGETVMMDEVIOINFO, 24 + (HC_ARCH_BITS == 64 ? 16 : 8));
+AssertCompileSize(VBGLIOCGETVMMDEVIOINFO, 24 + (HC_ARCH_BITS == 64 ? 24 : 12));
 /** @} */
 
@@ -388 +390 @@
     VBGLREQHDR      Hdr;
     /** The physical address of the following VMMDevHGCMCall structure. */
-    RTGCPHYS32      GCPhysReq;
+    RTGCPHYS64      GCPhysReq;
+    uint64_t        uTimestamp[2]; /** @todo Looks completely unused. */
     /** Set if interruptible. */
     bool            fInterruptible;
     /** Reserved. */
     uint8_t         abReserved0[3];
-    uint64_t        uTimestamp[2];
-    uint8_t         abReserved1[4];
     /* After this structure follows a VMMDevHGCMCall strcuture (44 bytes), then
        zero or more HGCMFunctionParameter structures (12 or 16 bytes), and finally
@@ -400 +401 @@
 } VBGLIOCIDCHGCMFASTCALL, RT_FAR *PVBGLIOCIDCHGCMFASTCALL;
 #pragma pack()
-AssertCompileSize(VBGLIOCIDCHGCMFASTCALL, /* 24 + 4 + 1 + 3 + 2*8 + 4 = 0x34 (52) = */ 0x34);
+AssertCompileSize(VBGLIOCIDCHGCMFASTCALL, /* 24 + 8 + 2*8 + 1 + 3 = 0x34 (52) = */ 0x34);
 
 /**
@@ -407 +408 @@
  *
  * @param   a_pHdr      The request header to initialize.
- * @param   a_HdrPhys   The 32-bit physical address corresponding to @a a_pHdr.
+ * @param   a_HdrPhys   The physical address corresponding to @a a_pHdr.
  * @param   a_pCall     Pointer to the VMMDevHGCMCall structure.
  * @param   a_idClient  The HGCM client ID.

trunk/include/VBox/VBoxGuestLib.h

@@ -121 +121 @@
  * @return VBox status code.
  */
-DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures);
+DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, uintptr_t volatile *pMmioReq, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures);
 
 /**
@@ -484 +484 @@
  *
  * @returns VBox status code.
- */
-DECLR0VBGL(int)     VbglR0PhysHeapInit(void);
+ * @param   fAlloc32BitAddr     Flag whether all allocations should be below 4GiB,
+ *                              so they fit into a 32-bit address.
+ */
+DECLR0VBGL(int)     VbglR0PhysHeapInit(bool fAlloc32BitAddr);
 
 /**
@@ -513 +515 @@
  *          isn't valid.
  */
-DECLR0VBGL(uint32_t) VbglR0PhysHeapGetPhysAddr(void *pv);
+DECLR0VBGL(RTCCPHYS) VbglR0PhysHeapGetPhysAddr(void *pv);
 
 # ifdef IN_TESTCASE

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp

@@ -922 +922 @@
                              * Initialize the device extension.
                              */
-                            int rc = VGDrvCommonInitDevExt(&g_DevExt, IOPortBase, pvMMIOBase, cbMMIO,
+                            int rc = VGDrvCommonInitDevExt(&g_DevExt, IOPortBase, NULL /*pvMmioReq*/, pvMMIOBase, cbMMIO,
                                                            ARCH_BITS == 64 ? VBOXOSTYPE_MacOS_x64 : VBOXOSTYPE_MacOS, 0);
                             if (RT_SUCCESS(rc))

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c

@@ -717 +717 @@
              */
             rc = VGDrvCommonInitDevExt(&g_DevExt, pState->uIOPortBase,
+                                       NULL /*pvMmioReq*/,
                                        pState->pMMIOBase, pState->VMMDevMemSize,
 #if ARCH_BITS == 64

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c

@@ -476 +476 @@
              * Call the common device extension initializer.
              */
-            rc = VGDrvCommonInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase, pState->VMMDevMemSize,
+            rc = VGDrvCommonInitDevExt(&g_DevExt, pState->uIOPortBase, NULL /*pvMmioReq*/,
+                                       pState->pMMIOBase, pState->VMMDevMemSize,
 #if ARCH_BITS == 64
                                        VBOXOSTYPE_Haiku_x64,

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -148 +148 @@
 /** The pointer to the mapping of the MMIO range. */
 static void                    *g_pvMMIOBase;
+
+static RTHCPHYS                 g_MmioReqPhysAddr = NIL_RTHCPHYS;
+static uint32_t                 g_cbMmioReq;
+static void                    *g_pvMmioReq = NULL;
+
 /** Wait queue used by polling. */
 static wait_queue_head_t        g_PollEventQueue;
@@ -288 +293 @@
 
 
+#if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+static int vgdrvLinuxMapMmio(struct pci_dev *pPciDev)
+{
+    g_MmioReqPhysAddr = pci_resource_start(pPciDev, 3);
+    g_cbMmioReq       = pci_resource_len(pPciDev, 3);
+    if (request_mem_region(g_MmioReqPhysAddr, g_cbMmioReq, DEVICE_NAME) != NULL)
+    {
+        g_pvMmioReq = ioremap(g_MmioReqPhysAddr, g_cbMmioReq);
+        if (g_pvMmioReq)
+            return 0;
+
+        /* failure cleanup path */
+        LogRel((DEVICE_NAME ": ioremap failed; MMIO Addr=%RHp cb=%#x\n", g_MmioReqPhysAddr, g_cbMmioReq));
+        release_mem_region(g_MmioReqPhysAddr, g_cbMmioReq);
+        return -ENOMEM;
+    }
+    else
+        LogRel((DEVICE_NAME ": failed to obtain adapter memory\n"));
+
+    return -EBUSY;
+}
+#endif
+
+
 /**
  * Does the PCI detection and init of the device.
@@ -302 +331 @@
     if (rc >= 0)
     {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
         /* I/O Ports are mandatory, the MMIO bit is not. */
         g_IOPortBase = pci_resource_start(pPciDev, 0);
         if (g_IOPortBase != 0)
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+        rc = vgdrvLinuxMapMmio(pPciDev);
+        if (!rc)
+#else
+# error "I have no memory of this arechitecture"
+#endif
         {
             /*
@@ -356 +392 @@
     if (pPciDev)
     {
+        if (g_pvMmioReq)
+        {
+            iounmap(g_pvMmioReq);
+            g_pvMmioReq = NULL;
+
+            release_mem_region(g_MmioReqPhysAddr, g_cbMmioReq);
+            g_MmioReqPhysAddr = NIL_RTHCPHYS;
+            g_cbMmioReq = 0;
+        }
+
         iounmap(g_pvMMIOBase);
         g_pvMMIOBase = NULL;
@@ -703 +749 @@
          * Call the common device extension initializer.
          */
-#if RTLNX_VER_MIN(2,6,0) && defined(RT_ARCH_X86)
+#if RTLNX_VER_MIN(2,6,0) && defined(RT_ARCH_X86) || defined(RT_ARCH_ARM32)
         VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
-#elif RTLNX_VER_MIN(2,6,0) && defined(RT_ARCH_AMD64)
+#elif RTLNX_VER_MIN(2,6,0) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_ARM64))
         VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
 #elif RTLNX_VER_MIN(2,4,0) && defined(RT_ARCH_X86)
@@ -717 +763 @@
         rc = VGDrvCommonInitDevExt(&g_DevExt,
                                    g_IOPortBase,
+                                   g_pvMmioReq,
                                    g_pvMMIOBase,
                                    g_cbMMIO,

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -334 +334 @@
              */
             rc = VGDrvCommonInitDevExt(&g_DevExt, sc->sc_iobase,
+                                       NULL /*pvMmioReq*/,
                                        bus_space_vaddr(sc->sc_memt, sc->sc_memh),
                                        sc->sc_memsize,

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

@@ -187 +187 @@
             if (g_MemMapMMIO != NIL_RTR0MEMOBJ)
                 rc = VGDrvCommonInitDevExt(&g_DevExt, g_IOPortBase,
+                                           NULL /*pvMmioReq*/,
                                            RTR0MemObjAddress(g_MemMapMMIO),
                                            RTR0MemObjSize(g_MemMapMMIO),

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -335 +335 @@
                              * Call the common device extension initializer.
                              */
-                            rc = VGDrvCommonInitDevExt(&g_DevExt, g_uIOPortBase, g_pMMIOBase, g_cbMMIO,
+                            rc = VGDrvCommonInitDevExt(&g_DevExt, g_uIOPortBase,
+                                                       NULL /*pvMmioReq*/,
+                                                       g_pMMIOBase, g_cbMMIO,
 #if ARCH_BITS == 64
                                                        VBOXOSTYPE_Solaris_x64,

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -1072 +1072 @@
             int vrc = VGDrvCommonInitDevExtResources(&pDevExt->Core,
                                                      pDevExt->Core.IOPortBase,
+                                                     NULL /*pvMmioReq*/,
                                                      pvMMIOBase, cbMMIO,
                                                      vgdrvNtVersionToOSType(g_enmVGDrvNtVer),

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -72 +72 @@
 #include <iprt/memobj.h>
 #include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/string.h>
 #include <iprt/process.h>
@@ -994 +996 @@
      */
     pDevExt->IOPortBase = UINT16_MAX;
+    pDevExt->pMmioReq      = NULL;
+    pDevExt->pMmioReqFast  = NULL;
     pDevExt->pVMMDevMemory = NULL;
     pDevExt->hGuestMappings = NIL_RTR0MEMOBJ;
@@ -1098 +1102 @@
  * @param   pDevExt         The device extension. Allocated by the native code.
  * @param   IOPortBase      The base of the I/O port range.
+ * @param   pvMmioReq       The base of the MMIO request region.
  * @param   pvMMIOBase      The base of the MMIO memory mapping.
  *                          This is optional, pass NULL if not present.
@@ -1107 +1112 @@
  */
 int VGDrvCommonInitDevExtResources(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase,
-                                   void *pvMMIOBase, uint32_t cbMMIO, VBOXOSTYPE enmOSType, uint32_t fFixedEvents)
+                                   void *pvMmioReq, void *pvMMIOBase, uint32_t cbMMIO,
+                                   VBOXOSTYPE enmOSType, uint32_t fFixedEvents)
 {
     int rc;
@@ -1138 +1144 @@
      * made by the VMM.
      */
-    pDevExt->IOPortBase = IOPortBase;
-    rc = VbglR0InitPrimary(pDevExt->IOPortBase, (VMMDevMemory *)pDevExt->pVMMDevMemory, &pDevExt->fHostFeatures);
+    pDevExt->IOPortBase   = IOPortBase;
+    pDevExt->pMmioReq     = (uintptr_t volatile *)pvMmioReq;
+    pDevExt->pMmioReqFast = (uint32_t volatile *)((uintptr_t)pvMmioReq + VMMDEV_MMIO_OFF_REQUEST_FAST);
+    rc = VbglR0InitPrimary(pDevExt->IOPortBase, pDevExt->pMmioReq, (VMMDevMemory *)pDevExt->pVMMDevMemory, &pDevExt->fHostFeatures);
     if (RT_SUCCESS(rc))
     {
@@ -1147 +1155 @@
         {
             pDevExt->PhysIrqAckEvents = VbglR0PhysHeapGetPhysAddr(pAckReq);
-            Assert(pDevExt->PhysIrqAckEvents != 0);
+            Assert(   pDevExt->PhysIrqAckEvents != 0
+                   && pDevExt->PhysIrqAckEvents == (uintptr_t)pDevExt->PhysIrqAckEvents);
             ASMCompilerBarrier(); /* linux + solaris already have IRQs hooked up at this point, so take care. */
             pDevExt->pIrqAckEvents = (VMMDevEvents *)pAckReq;
@@ -1321 +1330 @@
  * @param   pDevExt         The device extension. Allocated by the native code.
  * @param   IOPortBase      The base of the I/O port range.
+ * @param   pvMmioReq       The base of the MMIO request region.
  * @param   pvMMIOBase      The base of the MMIO memory mapping.
  *                          This is optional, pass NULL if not present.
@@ -1330 +1340 @@
  */
 int VGDrvCommonInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase,
-                          void *pvMMIOBase, uint32_t cbMMIO, VBOXOSTYPE enmOSType, uint32_t fFixedEvents)
+                          void *pvMmioReq, void *pvMMIOBase, uint32_t cbMMIO,
+                          VBOXOSTYPE enmOSType, uint32_t fFixedEvents)
 {
     int rc;
@@ -1338 +1349 @@
     if (RT_SUCCESS(rc))
     {
-        rc = VGDrvCommonInitDevExtResources(pDevExt, IOPortBase, pvMMIOBase, cbMMIO, enmOSType, fFixedEvents);
+        rc = VGDrvCommonInitDevExtResources(pDevExt, IOPortBase, pvMmioReq, pvMMIOBase, cbMMIO,
+                                            enmOSType, fFixedEvents);
         if (RT_SUCCESS(rc))
             return rc;
@@ -2076 +2088 @@
     pInfo->u.Out.IoPort          = pDevExt->IOPortBase;
     pInfo->u.Out.pvVmmDevMapping = pDevExt->pVMMDevMemory;
+    pInfo->u.Out.pMmioReq        = pDevExt->pMmioReq;
     pInfo->u.Out.auPadding[0]    = 0;
 #if HC_ARCH_BITS != 32
@@ -2799 +2812 @@
     fFlags = !fUserData && pSession->R0Process == NIL_RTR0PROCESS ? VBGLR0_HGCMCALL_F_KERNEL : VBGLR0_HGCMCALL_F_USER;
     uint32_t cbInfo = (uint32_t)(cbData - cbExtra);
-#ifdef RT_ARCH_AMD64
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_ARM64)
     if (f32bit)
     {
@@ -2864 +2877 @@
      */
     Assert((pCallReq->GCPhysReq & PAGE_OFFSET_MASK) == ((uintptr_t)pHgcmCall & PAGE_OFFSET_MASK));
+    AssertReturn(pCallReq->GCPhysReq == (uintptr_t)pCallReq->GCPhysReq, VERR_VBGL_INVALID_ADDR);
 
     AssertReturn(!pCallReq->fInterruptible, VERR_NOT_IMPLEMENTED);
@@ -2871 +2885 @@
      */
     Log(("vgdrvIoCtl_HGCMFastCall -> host\n"));
-    ASMOutU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST, (uint32_t)pCallReq->GCPhysReq);
+    if (pDevExt->pMmioReq)
+        *pDevExt->pMmioReq = (uintptr_t)pCallReq->GCPhysReq;
+    else
+    {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+        ASMOutU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST, (uint32_t)pCallReq->GCPhysReq);
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+        AssertReleaseFailed(); /* Not possible on ARM. */
+        return VERR_INVALID_STATE;
+#else
+# error "I have no memory of this architecture"
+#endif
+    }
 
     /* Make the compiler aware that the host has changed memory. */
@@ -4413 +4439 @@
         if (!pReq)
         {
-            fEvents = ASMInU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST_FAST);
+            if (pDevExt->pMmioReqFast)
+                fEvents = *pDevExt->pMmioReqFast;
+            else
+            {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+                fEvents = ASMInU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST_FAST);
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+                AssertReleaseFailed(); /* No port I/O on ARM. */
+#else
+# error "I have no memory of this architecture"
+#endif
+            }
             ASMCompilerBarrier();   /* paranoia */
             rc = fEvents != UINT32_MAX ? VINF_SUCCESS : VERR_INTERNAL_ERROR;
@@ -4422 +4459 @@
             pReq->events    = 0;
             ASMCompilerBarrier();
-            ASMOutU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST, (uint32_t)pDevExt->PhysIrqAckEvents);
+            if (pDevExt->pMmioReq)
+                *pDevExt->pMmioReq = pDevExt->PhysIrqAckEvents;
+            else
+            {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+                ASMOutU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST, (uint32_t)pDevExt->PhysIrqAckEvents);
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+                AssertReleaseFailed();
+#else
+# error "I have no memory of this architecture"
+#endif
+            }
+
             ASMCompilerBarrier();   /* paranoia */
             fEvents = pReq->events;

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -157 +157 @@
     /** The base of the adapter I/O ports. */
     RTIOPORT                    IOPortBase;
+    /** Pointer to the mapping of the MMIO request region if available. */
+    uintptr_t volatile         *pMmioReq;
+    /** Pointer to the fast request register in the MMIO region if available. */
+    uint32_t volatile          *pMmioReqFast;
     /** Pointer to the mapping of the VMMDev adapter memory. */
     VMMDevMemory volatile      *pVMMDevMemory;
@@ -350 +354 @@
 RT_C_DECLS_BEGIN
 
-int  VGDrvCommonInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, void *pvMMIOBase, uint32_t cbMMIO,
+int  VGDrvCommonInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, void *pvMmioReq,
+                           void *pvMMIOBase, uint32_t cbMMIO,
                            VBOXOSTYPE enmOSType, uint32_t fEvents);
 void VGDrvCommonDeleteDevExt(PVBOXGUESTDEVEXT pDevExt);
@@ -359 +364 @@
 void VGDrvCommonDeleteDevExtFundament(PVBOXGUESTDEVEXT pDevExt);
 int  VGDrvCommonInitDevExtResources(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase,
-                                    void *pvMMIOBase, uint32_t cbMMIO, VBOXOSTYPE enmOSType, uint32_t fFixedEvents);
+                                    void *pvMmioReq, void *pvMMIOBase, uint32_t cbMMIO,
+                                    VBOXOSTYPE enmOSType, uint32_t fFixedEvents);
 void VGDrvCommonDeleteDevExtResources(PVBOXGUESTDEVEXT pDevExt);
 int  VGDrvCommonReinitDevExtAfterHibernation(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType);

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp

@@ -35 +35 @@
 #include "VBoxGuestR0LibInternal.h"
 #include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/string.h>
@@ -159 +161 @@
         {
             RTCCPHYS PhysAddr = VbglR0PhysHeapGetPhysAddr(pReq);
-            if (   PhysAddr != 0
-                && PhysAddr < _4G) /* Port IO is 32 bit. */
+            if (PhysAddr != 0)
             {
-                ASMOutU32(g_vbgldata.portVMMDev + VMMDEV_PORT_OFF_REQUEST, (uint32_t)PhysAddr);
+                if (g_vbgldata.pMmioReq)
+                {
+                    Assert((uintptr_t)PhysAddr == PhysAddr);
+                    *g_vbgldata.pMmioReq = (uintptr_t)PhysAddr;
+                }
+                else if (PhysAddr < _4G) /* Port IO is 32 bit. */
+                {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+                    ASMOutU32(g_vbgldata.portVMMDev + VMMDEV_PORT_OFF_REQUEST, (uint32_t)PhysAddr);
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+                    rc = VERR_INVALID_STATE;
+#else
+# error "I have no memory of this architecture"
+#endif
+                }
+                else
+                    rc = VERR_VBGL_INVALID_ADDR;
+
                 /* Make the compiler aware that the host has changed memory. */
-                ASMCompilerBarrier();
-                rc = pReq->rc;
+                if (RT_SUCCESS(rc))
+                {
+                    ASMCompilerBarrier();
+                    rc = pReq->rc;
+                }
             }
             else

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp

@@ -115 +115 @@
                     g_vbgldata.portVMMDev    = PortInfo.u.Out.IoPort;
                     g_vbgldata.pVMMDevMemory = (VMMDevMemory *)PortInfo.u.Out.pvVmmDevMapping;
-                    g_vbgldata.status        = VbglStatusReady;
-
-                    vbglR0QueryHostVersion();
+                    g_vbgldata.pMmioReq      = PortInfo.u.Out.pMmioReq;
+
+                    rc = VbglR0PhysHeapInit(g_vbgldata.pMmioReq == NULL /*fAlloc32BitAddr*/);
+                    if (RT_SUCCESS(rc))
+                    {
+                        g_vbgldata.status = VbglStatusReady;
+                        vbglR0QueryHostVersion();
+                    }
+                    else
+                    {
+                        LogRel(("vbglR0QueryDriverInfo: VbglR0PhysHeapInit() -> %Rrc\n", rc));
+                        g_vbgldata.status = VbglStatusNotInitialized;
+                    }
                 }
             }
@@ -160 +170 @@
 static int vbglR0InitCommon(void)
 {
-    int rc;
-
     RT_ZERO(g_vbgldata);
     g_vbgldata.status = VbglStatusInitializing;
-
-    rc = VbglR0PhysHeapInit();
-    if (RT_SUCCESS(rc))
-    {
-        dprintf(("vbglR0InitCommon: returns rc = %d\n", rc));
-        return rc;
-    }
-
-    LogRel(("vbglR0InitCommon: VbglR0PhysHeapInit failed: rc=%Rrc\n", rc));
-    g_vbgldata.status = VbglStatusNotInitialized;
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -186 +184 @@
 #ifdef VBGL_VBOXGUEST
 
-DECLR0VBGL(int) VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures)
+DECLR0VBGL(int) VbglR0InitPrimary(RTIOPORT portVMMDev, uintptr_t volatile *pMmioReq, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures)
 {
     int rc;
@@ -208 +206 @@
         g_vbgldata.portVMMDev    = portVMMDev;
         g_vbgldata.pVMMDevMemory = pVMMDevMemory;
-        g_vbgldata.status        = VbglStatusReady;
-
-        vbglR0QueryHostVersion();
-        *pfFeatures = g_vbgldata.hostVersion.features;
-        return VINF_SUCCESS;
+        g_vbgldata.pMmioReq      = pMmioReq;
+
+        rc = VbglR0PhysHeapInit(pMmioReq == NULL /*fAlloc32BitAddr*/);
+        if (RT_SUCCESS(rc))
+        {
+            g_vbgldata.status = VbglStatusReady;
+
+            vbglR0QueryHostVersion();
+            *pfFeatures = g_vbgldata.hostVersion.features;
+            return VINF_SUCCESS;
+        }
+        else
+        {
+            LogRel(("VbglR0InitPrimary: VbglR0PhysHeapInit() -> %Rrc\n", rc));
+            g_vbgldata.status = VbglStatusNotInitialized;
+        }
     }
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInternal.h

@@ -125 +125 @@
 typedef struct VBGLDATA
 {
-    enum VbglLibStatus status;
-
-    RTIOPORT portVMMDev;
-
-    VMMDevMemory *pVMMDevMemory;
+    /** Init status of the library. */
+    enum VbglLibStatus      status;
+    /** I/O port to issue requests to. */
+    RTIOPORT                portVMMDev;
+    /** MMIO request region if available. */
+    volatile uintptr_t      *pMmioReq;
+    /** VMMDev adapter memory region if available. */
+    VMMDevMemory            *pVMMDevMemory;
 
     /** Physical memory heap data.
@@ -149 +152 @@
     /** Head of the chunk list. */
     VBGLPHYSHEAPCHUNK      *pChunkHead;
+    /** Flag whether all allocations should be below 4GiB to fit into
+     * a 32-bit address. */
+    bool                   fAlloc32BitAddr;
     /** @} */
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp

@@ -215 +215 @@
     /** Magic value (VBGL_PH_CHUNKSIGNATURE). */
     uint32_t u32Signature;
-
     /** Size of the chunk. Includes the chunk header. */
     uint32_t cbChunk;
-
-    /** Physical address of the chunk (contiguous). */
-    uint32_t physAddr;
-
-#if !defined(VBGL_PH_USE_MEMOBJ) || ARCH_BITS != 32
-    uint32_t uPadding1;
-#endif
-
     /** Number of block of any kind. */
     int32_t  cBlocks;
@@ -231 +222 @@
     int32_t  cFreeBlocks;
 
+    /** Physical address of the chunk (contiguous). */
+    RTCCPHYS physAddr;
+
     /** Pointer to the next chunk. */
     VBGLPHYSHEAPCHUNK  *pNext;
@@ -239 +233 @@
     /** The allocation handle. */
     RTR0MEMOBJ          hMemObj;
-#endif
-
-#if ARCH_BITS == 64
+#elif ARCH_BITS == 64
     /** Pad the size up to 64 bytes. */
 # ifdef VBGL_PH_USE_MEMOBJ
@@ -252 +244 @@
 #if ARCH_BITS == 64
 AssertCompileSize(VBGLPHYSHEAPCHUNK, 64);
+#elif ARCH_BITS == 32
+AssertCompileSize(VBGLPHYSHEAPCHUNK, 32);
+#else
+# error "Unknown architecture!"
 #endif
 
@@ -536 +532 @@
     cbChunk = RT_ALIGN_32(cbChunk, VBGL_PH_CHUNKSIZE);
 
-    /*
-     * This function allocates physical contiguous memory below 4 GB.  This 4GB
-     * limitation stems from using a 32-bit OUT instruction to pass a block
-     * physical address to the host.
-     */
+    if (g_vbgldata.fAlloc32BitAddr)
+    {
+        /*
+         * This function allocates physical contiguous memory below 4 GB.  This 4GB
+         * limitation stems from using a 32-bit OUT instruction to pass a block
+         * physical address to the host.
+         */
 #ifdef VBGL_PH_USE_MEMOBJ
-    rc = RTR0MemObjAllocCont(&hMemObj, cbChunk, false /*fExecutable*/);
-    pChunk = (VBGLPHYSHEAPCHUNK *)(RT_SUCCESS(rc) ? RTR0MemObjAddress(hMemObj) : NULL);
+        rc = RTR0MemObjAllocCont(&hMemObj, cbChunk, false /*fExecutable*/);
+        pChunk = (VBGLPHYSHEAPCHUNK *)(RT_SUCCESS(rc) ? RTR0MemObjAddress(hMemObj) : NULL);
 #else
-    pChunk = (VBGLPHYSHEAPCHUNK *)RTMemContAlloc(&PhysAddr, cbChunk);
-#endif
+        pChunk = (VBGLPHYSHEAPCHUNK *)RTMemContAlloc(&PhysAddr, cbChunk);
+#endif
+    }
+    else
+    {
+        /** @todo Provide appropriate memory API. */
+#ifdef VBGL_PH_USE_MEMOBJ
+        rc = RTR0MemObjAllocCont(&hMemObj, cbChunk, false /*fExecutable*/);
+        pChunk = (VBGLPHYSHEAPCHUNK *)(RT_SUCCESS(rc) ? RTR0MemObjAddress(hMemObj) : NULL);
+#else
+        pChunk = (VBGLPHYSHEAPCHUNK *)RTMemContAlloc(&PhysAddr, cbChunk);
+#endif
+    }
     if (!pChunk)
     {
@@ -569 +578 @@
         VBGLPHYSHEAPCHUNK     *pOldHeadChunk;
         VBGLPHYSHEAPFREEBLOCK *pBlock;
-        AssertRelease(PhysAddr < _4G && PhysAddr + cbChunk <= _4G);
+        AssertRelease(   !g_vbgldata.fAlloc32BitAddr
+                      || (PhysAddr < _4G && PhysAddr + cbChunk <= _4G));
 
         /*
@@ -576 +586 @@
         pChunk->u32Signature     = VBGL_PH_CHUNKSIGNATURE;
         pChunk->cbChunk          = cbChunk;
-        pChunk->physAddr         = (uint32_t)PhysAddr;
+        pChunk->physAddr         = PhysAddr;
         pChunk->cBlocks          = 0;
         pChunk->cFreeBlocks      = 0;
@@ -586 +596 @@
 
         /* Initialize the padding too: */
-#if !defined(VBGL_PH_USE_MEMOBJ) || ARCH_BITS != 32
-        pChunk->uPadding1        = UINT32_C(0xADDCAAA1);
-#endif
 #if ARCH_BITS == 64
         pChunk->auPadding2[0]    = UINT64_C(0xADDCAAA3ADDCAAA2);
@@ -865 +872 @@
 
 
-DECLR0VBGL(uint32_t) VbglR0PhysHeapGetPhysAddr(void *pv)
+DECLR0VBGL(RTCCPHYS) VbglR0PhysHeapGetPhysAddr(void *pv)
 {
     /*
@@ -1176 +1183 @@
 #endif /* IN_TESTCASE */
 
-DECLR0VBGL(int) VbglR0PhysHeapInit(void)
-{
-    g_vbgldata.hMtxHeap = NIL_RTSEMFASTMUTEX;
+DECLR0VBGL(int) VbglR0PhysHeapInit(bool fAlloc32BitAddr)
+{
+    g_vbgldata.fAlloc32BitAddr = fAlloc32BitAddr;
+    g_vbgldata.hMtxHeap        = NIL_RTSEMFASTMUTEX;
 
     /* Allocate the first chunk of the heap. */