Changeset 108835 in vbox for trunk/src/VBox/VMM/VMMR3/GICR3.cpp

Timestamp:

Apr 3, 2025 10:40:08 AM (3 weeks ago)

Author:

vboxsync

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

168283

Message:

VMM/GIC: bugref:10877 GITS work-in-progress, remove unused R0/RC callbacks, fixed typo in debug info dumping ITS table base adderss registers and other nits.

File:

• trunk/src/VBox/VMM/VMMR3/GICR3.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/GICR3.cpp

@@ -42 +42 @@
 
 #include <iprt/armv8.h>
+#include <iprt/mem.h>
 
 
@@ -290 +291 @@
     PCGICDEV   pGicDev  = PDMDEVINS_2_DATA(pDevIns, PCGICDEV);
     if (pGicDev->hMmioGits != NIL_IOMMMIOHANDLE)
-    {
-        PCGITSDEV  pGitsDev = &pGicDev->Gits;
-        gitsR3DbgInfo(pGitsDev, pHlp, pszArgs);
-    }
+        gitsR3DbgInfo(&pGicDev->Gits, pHlp, pszArgs);
     else
         pHlp->pfnPrintf(pHlp, "GIC ITS is not mapped/configured for the VM\n");
@@ -314 +312 @@
     AssertPtrReturn(pGicDev, VERR_INVALID_PARAMETER);
     LogFlowFunc(("Command-queue thread spawned and initialized\n"));
+
+    /*
+     * Pre-allocate the maximum size of the command queue allowed by the spec.
+     * This prevents trashing the heap as well as deal with out-of-memory situations
+     * up-front while starting the VM. It also simplifies the code from having to
+     * dynamically grow/shrink the allocation based on how software sizes the queue.
+     * Guests normally don't alter the queue size all the time, but that's not an
+     * assumption we can make.
+     */
+    uint16_t const cMaxPages  = GITS_BF_CTRL_REG_CBASER_SIZE_MASK + 1;
+    size_t const   cbCmdQueue = cMaxPages << GUEST_PAGE_SHIFT;
+    void *pvCommands = RTMemAllocZ(cbCmdQueue);
+    AssertLogRelMsgReturn(pvCommands, ("Failed to alloc %.Rhcb (%zu bytes) for GITS command queue\n", cbCmdQueue, cbCmdQueue),
+                          VERR_NO_MEMORY);
 
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
@@ -322 +334 @@
         {
             int const rc = PDMDevHlpSUPSemEventWaitNoResume(pDevIns, pGicDev->hEvtCmdQueue, RT_INDEFINITE_WAIT);
-            AssertLogRelMsgReturn(RT_SUCCESS(rc) || rc == VERR_INTERRUPTED, ("%Rrc\n", rc), rc);
+            AssertLogRelMsgReturnStmt(RT_SUCCESS(rc) || rc == VERR_INTERRUPTED, ("%Rrc\n", rc), RTMemFree(pvCommands), rc);
             if (pThread->enmState != PDMTHREADSTATE_RUNNING)
                 break;
@@ -330 +342 @@
         PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
-        /** @todo Process commands.   */
+        /** @todo Process commands. */
 
         PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
     }
+
+    RTMemFree(pvCommands);
 
     LogFlowFunc(("Command-queue thread terminating\n"));
@@ -613 +627 @@
         gicResetCpu(pDevIns, pVCpuDest);
     }
-}
-
-
-/**
- * @interface_method_impl{PDMDEVREG,pfnRelocate}
- */
-DECLCALLBACK(void) gicR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
-{
-    RT_NOREF(pDevIns, offDelta);
 }