Changeset 88640 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2021 6:15:35 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Implement PDM R3-task queueing for sending MSIs via the IOAPIC in ring-0.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PDMR0DevHlp.cpp (modified) (1 diff)
• VMMR3/PDMDevHlp.cpp (modified) (1 diff)
• include/PDMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

@@ -1627 +1627 @@
     if (pGVM->pdm.s.IoApic.pDevInsR0)
         pGVM->pdm.s.IoApic.pfnSendMsiR0(pGVM->pdm.s.IoApic.pDevInsR0, uBusDevFn, pMsi, uTagSrc);
-    else
-        AssertFatalMsgFailed(("Lazy bastards!"));
+    else if (pGVM->pdm.s.IoApic.pDevInsR3)
+    {
+        /* queue for ring-3 execution. */
+        PPDMDEVHLPTASK pTask = (PPDMDEVHLPTASK)PDMQueueAlloc(pGVM->pdm.s.pDevHlpQueueR0);
+        if (pTask)
+        {
+            pTask->enmOp = PDMDEVHLPTASKOP_IOAPIC_SEND_MSI;
+            pTask->pDevInsR3 = NIL_RTR3PTR; /* not required */
+            pTask->u.IoApicSendMsi.uBusDevFn = uBusDevFn;
+            pTask->u.IoApicSendMsi.Msi       = *pMsi;
+            pTask->u.IoApicSendMsi.uTagSrc   = uTagSrc;
+
+            PDMQueueInsertEx(pGVM->pdm.s.pDevHlpQueueR0, &pTask->Core, 0);
+        }
+        else
+            AssertMsgFailed(("We're out of devhlp queue items!!!\n"));
+    }
 }
 

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

@@ -5392 +5392 @@
         }
 
+        case PDMDEVHLPTASKOP_IOAPIC_SEND_MSI:
+        {
+            PDMIoApicSendMsi(pVM, pTask->u.IoApicSendMsi.uBusDevFn, &pTask->u.IoApicSendMsi.Msi, pTask->u.IoApicSendMsi.uTagSrc);
+            break;
+        }
+
         default:
             AssertReleaseMsgFailed(("Invalid operation %d\n", pTask->enmOp));

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

@@ -1209 +1209 @@
     /** PCISetIrq */
     PDMDEVHLPTASKOP_IOAPIC_SET_IRQ,
+    /** IoApicSendMsi */
+    PDMDEVHLPTASKOP_IOAPIC_SEND_MSI,
     /** The usual 32-bit hack. */
     PDMDEVHLPTASKOP_32BIT_HACK = 0x7fffffff
@@ -1259 +1261 @@
             uint32_t                uTagSrc;
         } PciSetIRQ;
+
+        /**
+         * PDMDEVHLPTASKOP_IOAPIC_SEND_MSI
+         */
+        struct PDMDEVHLPTASKIOAPICSENDMSI
+        {
+            /** The bus:device:function of the device sending the MSI. */
+            PCIBDF                  uBusDevFn;
+            /** The MSI. */
+            MSIMSG                  Msi;
+            /** The IRQ tag and source. */
+            uint32_t                uTagSrc;
+        } IoApicSendMsi;
 
         /** Expanding the structure. */