Changeset 108466 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 6, 2025 9:46:36 AM (2 months ago)

Author:

vboxsync

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

167840

Message:

VMM/GIC: bugref:10404 Fixed issues that popped up after exposing the full range of extended SPIs and PPIs to the guest.
Fixed an issue with ignoring the priority mask.

File:

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

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

@@ -1166 +1166 @@
     Assert(pGicDev->fAffRoutingEnabled); RT_NOREF(pGicDev);
     uint16_t const idxPriority = idxReg * sizeof(uint32_t);
-    AssertReturn(idxPriority < RT_ELEMENTS(pGicCpu->abIntrPriority) - sizeof(uint32_t), VERR_BUFFER_OVERFLOW);
+    AssertReturn(idxPriority <= RT_ELEMENTS(pGicCpu->abIntrPriority) - sizeof(uint32_t), VERR_BUFFER_OVERFLOW);
     AssertCompile(sizeof(*puValue) == sizeof(uint32_t));
     *puValue = *(uint32_t *)&pGicCpu->abIntrPriority[idxPriority];
@@ -1189 +1189 @@
     PGICCPU pGicCpu = VMCPU_TO_GICCPU(pVCpu);
     uint16_t const idxPriority = idxReg * sizeof(uint32_t);
-    AssertReturn(idxPriority < RT_ELEMENTS(pGicCpu->abIntrPriority) - sizeof(uint32_t), VERR_BUFFER_OVERFLOW);
+    AssertReturn(idxPriority <= RT_ELEMENTS(pGicCpu->abIntrPriority) - sizeof(uint32_t), VERR_BUFFER_OVERFLOW);
     AssertCompile(sizeof(uValue) == sizeof(uint32_t));
     *(uint32_t *)&pGicCpu->abIntrPriority[idxPriority] = uValue;
@@ -1990 +1990 @@
     PGICCPU   pGicCpu = VMCPU_TO_GICCPU(pVCpu);
     uint16_t const uIntId = gicGetHighestPrioPendingIntrEx(pGicDev, pGicCpu, fGroup0, fGroup1, &idxIntr, &bPriority);
+
+    /* If the priority must be higher than the priority mask for the interrupt to be signalled/acknowledged. */
+    if (pGicCpu->bIntrPriorityMask <= bPriority)
+        return GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT;
 
     /* Acknowledge the interrupt. */
@@ -3053 +3057 @@
     }
 
-    AssertReleaseFailed();
+    AssertReleaseMsgFailed(("offReg=%#RX16\n", offReg));
     return VERR_INTERNAL_ERROR_2;
 #else