Changeset 108835 in vbox

Timestamp:

Apr 3, 2025 10:40:08 AM (6 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.

Location:

trunk

Files:

• include/VBox/gic-its.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/GICAll.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/GICR3.cpp (modified) (6 diffs)
• src/VBox/VMM/include/GICInternal.h (modified) (1 diff)

trunk/include/VBox/gic-its.h

@@ -264 +264 @@
 /** GITS_BASER: ITS Table Descriptors - RW. */
 #define GITS_CTRL_REG_BASER_OFF_FIRST                           0x0100
+#define GITS_CTRL_REG_BASER_OFF_LAST                            0x0138
+#define GITS_CTRL_REG_BASER_RANGE_SIZE                          (GITS_CTRL_REG_BASER_OFF_LAST + sizeof(uint64_t) - GITS_CTRL_REG_BASER_OFF_FIRST)
 /** GITS_BASER: Size - Number of pages allocated to the table minus one. */
 #define GITS_BF_CTRL_REG_BASER_SIZE_SHIFT                       0
@@ -299 +301 @@
                              VALID));
 
-#define GITS_CTRL_REG_BASER_OFF_LAST                            0x0138
-#define GITS_CTRL_REG_BASER_RANGE_SIZE                          (GITS_CTRL_REG_BASER_OFF_LAST + sizeof(uint64_t) - GITS_CTRL_REG_BASER_OFF_FIRST)
-
 /** GITS_PIDR2: ITS Peripheral ID2 register - RO. */
 #define GITS_CTRL_REG_PIDR2_OFF                                 0xffe8
@@ -331 +330 @@
 #define GITS_TRANSLATION_REG_TRANSLATER                         0x0040
 
+/** GITS Two-level (indirect) table entry. */
+#define GITS_BF_ITE_LVL2_RSVD_11_0_SHIFT                        0
+#define GITS_BF_ITE_LVL2_RSVD_11_0_MASK                         UINT64_C(0x0000000000000fff)
+#define GITS_BF_ITE_LVL2_PHYS_ADDR_SHIFT                        12
+#define GITS_BF_ITE_LVL2_PHYS_ADDR_MASK                         UINT64_C(0x000ffffffffff000)
+#define GITS_BF_ITE_LVL2_RSVD_62_52_SHIFT                       52
+#define GITS_BF_ITE_LVL2_RSVD_62_52_MASK                        UINT64_C(0x7ff0000000000000)
+#define GITS_BF_ITE_LVL2_VALID_SHIFT                            63
+#define GITS_BF_ITE_LVL2_VALID_MASK                             UINT64_C(0x8000000000000000)
+RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_ITE_LVL2_, UINT64_C(0), UINT64_MAX,
+                            (RSVD_11_0, PHYS_ADDR, RSVD_62_52, VALID));
+
 /**
  * Memory shareability attributes.

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -47 +47 @@
  * sources to specific PEs. The ITS is only accessible via its memory mapped I/O
  * region. When the MMIO handle for the its region is NIL_IOMMMIOHANDLE it's
- * considered to be disabled for the VM. The ITS code lives in GITSAll.cpp.
+ * considered to be disabled for the VM. Most of the ITS code lives in GITSAll.cpp.
  *
  * This implementation only targets GICv3. This implementation does not support
@@ -3371 +3371 @@
 
 
-
-#ifndef IN_RING3
-/**
- * @callback_method_impl{PDMDEVREGR0,pfnConstruct}
- */
-static DECLCALLBACK(int) gicRZConstruct(PPDMDEVINS pDevIns)
-{
-    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    AssertReleaseFailed();
-    return VINF_SUCCESS;
-}
-#endif /* !IN_RING3 */
-
-
 /**
  * GIC device registration structure.
@@ -3408 +3394 @@
     /* .pfnConstruct = */           gicR3Construct,
     /* .pfnDestruct = */            gicR3Destruct,
-    /* .pfnRelocate = */            gicR3Relocate,
+    /* .pfnRelocate = */            NULL,
     /* .pfnMemSetup = */            NULL,
     /* .pfnPowerOn = */             NULL,
@@ -3430 +3416 @@
 #elif defined(IN_RING0)
     /* .pfnEarlyConstruct = */      NULL,
-    /* .pfnConstruct = */           gicRZConstruct,
+    /* .pfnConstruct = */           NULL,
     /* .pfnDestruct = */            NULL,
     /* .pfnFinalDestruct = */       NULL,
@@ -3443 +3429 @@
     /* .pfnReserved7 = */           NULL,
 #elif defined(IN_RC)
-    /* .pfnConstruct = */           gicRZConstruct,
+    /* .pfnConstruct = */           NULL,
     /* .pfnReserved0 = */           NULL,
     /* .pfnReserved1 = */           NULL,

trunk/src/VBox/VMM/VMMAll/GITSAll.cpp

@@ -322 +322 @@
         static const char* const s_apszType[] = { "UnImpl", "Devices", "vPEs", "Intr Collections" };
 
-        uint64_t const uReg        = pGitsDev->aItsTableRegs[8].u;
+        uint64_t const uReg        = pGitsDev->aItsTableRegs[i].u;
         uint16_t const uSize       = RT_BF_GET(uReg, GITS_BF_CTRL_REG_BASER_SIZE);
         uint16_t const cPages      = uSize > 0 ? uSize + 1 : 0;

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);
 }
 

trunk/src/VBox/VMM/include/GICInternal.h

@@ -283 +283 @@
 DECLCALLBACK(int)                  gicR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg);
 DECLCALLBACK(int)                  gicR3Destruct(PPDMDEVINS pDevIns);
-DECLCALLBACK(void)                 gicR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta);
 DECLCALLBACK(void)                 gicR3Reset(PPDMDEVINS pDevIns);