Changeset 100267 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib

Timestamp:

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

Author:

vboxsync

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

157982

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/src/VBox/Additions/common/VBoxGuest/lib

Files:

• VBoxGuestR0LibGenericRequest.cpp (modified) (2 diffs)
• VBoxGuestR0LibInit.cpp (modified) (4 diffs)
• VBoxGuestR0LibInternal.h (modified) (2 diffs)
• VBoxGuestR0LibPhysHeap.cpp (modified) (10 diffs)

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. */