Changeset 89200 in vbox

Timestamp:

May 20, 2021 2:05:10 PM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Add ring-3 MSI queuing for the IOMMU send MSI interface as well. Added a todo for later.

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (6 diffs)
• src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -1525 +1525 @@
      * @param   uTagSrc         The IRQ tag and source (for tracing).
      */
-    DECLR0CALLBACKMEMBER(int,   pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
+    DECLR0CALLBACKMEMBER(void,  pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
 
     /** Just a safety precaution. */
@@ -1536 +1536 @@
 
 /** Current PDMIOMMUHLPR0 version number. */
-#define PDM_IOMMUHLPR0_VERSION                      PDM_VERSION_MAKE(0xff13, 4, 0)
+#define PDM_IOMMUHLPR0_VERSION                      PDM_VERSION_MAKE(0xff13, 5, 0)
 
 
@@ -1579 +1579 @@
      * @param   uTagSrc         The IRQ tag and source (for tracing).
      */
-    DECLRCCALLBACKMEMBER(int,   pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
+    DECLRCCALLBACKMEMBER(void,  pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
 
     /** Just a safety precaution. */
@@ -1590 +1590 @@
 
 /** Current PDMIOMMUHLPRC version number. */
-#define PDM_IOMMUHLPRC_VERSION                      PDM_VERSION_MAKE(0xff14, 4, 0)
+#define PDM_IOMMUHLPRC_VERSION                      PDM_VERSION_MAKE(0xff14, 5, 0)
 
 
@@ -1633 +1633 @@
      * @param   uTagSrc         The IRQ tag and source (for tracing).
      */
-    DECLR3CALLBACKMEMBER(int,   pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
+    DECLR3CALLBACKMEMBER(void,  pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
 
     /** Just a safety precaution. */
@@ -1644 +1644 @@
 
 /** Current PDMIOMMUHLPR3 version number. */
-#define PDM_IOMMUHLPR3_VERSION                      PDM_VERSION_MAKE(0xff15, 4, 0)
+#define PDM_IOMMUHLPR3_VERSION                      PDM_VERSION_MAKE(0xff15, 5, 0)
 
 

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

@@ -224 +224 @@
  * @param   pMsi        The MSI to send.
  * @param   uTagSrc     The IRQ tag and source tracer ID.
+ *
+ * @remarks Atm, don't call this from ring-0. Use the respective R0 device helpers
+ *          instead.
  */
 VMM_INT_DECL(int) PDMIoApicSendMsi(PVM pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
 {
+    /** @todo We should somehow move/make this to ring-3 only, as in ring-0, the helper
+     *        code handles queuing the MSI to be sent from ring-3 when I/O APIC isn't
+     *        available in R0. When this TODO is done, remove the remark in the doxygen
+     *        above. */
     Assert(PCIBDF_IS_VALID(uBusDevFn));
     if (pVM->pdm.s.IoApic.CTX_SUFF(pDevIns))

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

@@ -1626 +1626 @@
 
 
-/** @interface_method_impl{PDMPCIHLPR0,pfnIoApicSendMsi} */
-static DECLCALLBACK(void) pdmR0PciHlp_IoApicSendMsi(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    Assert(PCIBDF_IS_VALID(uBusDevFn));
-    Log4(("pdmR0PciHlp_IoApicSendMsi: uBusDevFn=%#x Msi=(Addr:%#RX64 Data:%#RX32) uTagSrc=%#x\n", uBusDevFn, pMsi->Addr.u64,
-          pMsi->Data.u32, uTagSrc));
+/**
+ * Helper for sending an MSI via the I/O APIC.
+ *
+ * @param   pDevIns     PCI device instance.
+ * @param   uBusDevFn   The bus:device:function of the device initiating the MSI.
+ * @param   pMsi        The MSI to send.
+ * @param   uTagSrc     The IRQ tag and source (for tracing).
+ */
+static void pdmR0IoApicSendMsi(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
     PGVM pGVM = pDevIns->Internal.s.pGVM;
     if (pGVM->pdm.s.IoApic.pDevInsR0)
@@ -1656 +1659 @@
 
 
+/** @interface_method_impl{PDMPCIHLPR0,pfnIoApicSendMsi} */
+static DECLCALLBACK(void) pdmR0PciHlp_IoApicSendMsi(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    Assert(PCIBDF_IS_VALID(uBusDevFn));
+    Log4(("pdmR0PciHlp_IoApicSendMsi: uBusDevFn=%#x Msi=(Addr:%#RX64 Data:%#RX32) uTagSrc=%#x\n", uBusDevFn, pMsi->Addr.u64,
+          pMsi->Data.u32, uTagSrc));
+    pdmR0IoApicSendMsi(pDevIns, uBusDevFn, pMsi, uTagSrc);
+}
+
+
 /** @interface_method_impl{PDMPCIHLPR0,pfnLock} */
 static DECLCALLBACK(int) pdmR0PciHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -1731 +1745 @@
 
 /** @interface_method_impl{PDMIOMMUHLPR0,pfnSendMsi} */
-static DECLCALLBACK(int) pdmR0IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    PGVM pGVM = pDevIns->Internal.s.pGVM;
-    if (pGVM->pdm.s.IoApic.pDevInsR0)
-    {
-        Assert(pGVM->pdm.s.IoApic.pfnSendMsiR0);
-        pGVM->pdm.s.IoApic.pfnSendMsiR0(pGVM->pdm.s.IoApic.pDevInsR0, NIL_PCIBDF, pMsi, uTagSrc);
-        return VINF_SUCCESS;
-    }
-
-    /** @todo Implement this. */
-    AssertMsgFailedReturn(("Queue PDM task for sending the MSI in ring-3"), VERR_IOMMU_IPE_5);
+static DECLCALLBACK(void) pdmR0IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    pdmR0IoApicSendMsi(pDevIns, NIL_PCIBDF, pMsi, uTagSrc);
 }
 

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

@@ -299 +299 @@
 
 /** @interface_method_impl{PDMIOMMUHLPR3,pfnSendMsi} */
-static DECLCALLBACK(int) pdmR3IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
+static DECLCALLBACK(void) pdmR3IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
     LogFlowFunc(("caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
-    return PDMIoApicSendMsi(pDevIns->Internal.s.pVMR3, NIL_PCIBDF, pMsi, uTagSrc);
+    PDMIoApicSendMsi(pDevIns->Internal.s.pVMR3, NIL_PCIBDF, pMsi, uTagSrc);
 }