Changeset 109206 in vbox for trunk/src/VBox/VMM/VMMAll/GITSAll.cpp

Timestamp:

May 8, 2025 12:02:48 PM (11 days ago)

Author:

vboxsync

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

168783

Message:

VMM/GIC: bugref:10877 GITS command-queue, work-in-progress.

File:

• trunk/src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (4 diffs)

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

@@ -37 +37 @@
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/dbgf.h>
+#include <VBox/vmm/vm.h>        /* pVM->cCpus */
 #include <iprt/errcore.h>       /* VINF_SUCCESS */
 #include <iprt/string.h>        /* RT_ZERO */
@@ -68 +69 @@
 
     /* Command queue: INVALL. */
+    GITSDIAG_DESC(CmdQueue_Cmd_Invall_Cte_Unmapped),
     GITSDIAG_DESC(CmdQueue_Cmd_Invall_Icid_Invalid),
 
@@ -940 +942 @@
                         case GITS_CMD_ID_INV:
                         {
-                            uint64_t const uReg = pGitsDev->aItsTableRegs[0].u;
-                            AssertMsgFailed(("aItsTableRegs[0].u=%#RX64 (%#RGp %#RGp) Valid=%RTbool\n", uReg,
-                                             uReg & GITS_BF_CTRL_REG_BASER_PHYS_ADDR_MASK, gitsGetBaseRegPhysAddr(uReg),
-                                             RT_BOOL(RT_BF_GET(uReg, GITS_BF_CTRL_REG_BASER_VALID))));
-                            NOREF(uReg);
+                            /* Reading the table is likely to take the same time as reading just one entry. */
+                            gicDistReadLpiConfigTableFromMem(pDevIns);
                             break;
                         }
@@ -958 +957 @@
                             uint64_t const uDw2  = pCmd->au64[2].u;
                             uint16_t const uIcId = RT_BF_GET(uDw2, GITS_BF_CMD_INVALL_DW2_IC_ID);
-                            if (RT_LIKELY(uIcId < RT_ELEMENTS(pGitsDev->aCtes)))
-                                gicDistReadLpiConfigTableFromMem(pDevIns);
+                            PCVMCC         pVM   = PDMDevHlpGetVM(pDevIns);
+                            if (uIcId < RT_ELEMENTS(pGitsDev->aCtes))
+                            {
+                                if (pGitsDev->aCtes[uIcId].idTargetCpu < pVM->cCpus)
+                                    gicDistReadLpiConfigTableFromMem(pDevIns);
+                                else
+                                    gitsCmdQueueSetError(pDevIns, pGitsDev, kGitsDiag_CmdQueue_Cmd_Invall_Cte_Unmapped,
+                                                         false /* fStall */);
+                            }
                             else
                                 gitsCmdQueueSetError(pDevIns, pGitsDev, kGitsDiag_CmdQueue_Cmd_Invall_Icid_Invalid,