Changeset 88631 in vbox

Timestamp:

Apr 21, 2021 11:54:19 AM (4 years ago)

Author:

vboxsync

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

143934

Message:

AMD IOMMU: bugref:9654 Slightly more efficient when a VM does not have an IOMMU configured.

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (1 diff)
• src/VBox/Devices/PC/DevIoApic.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PDMAllIommu.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (1 diff)
• src/VBox/VMM/include/PDMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -1941 +1941 @@
      * @param   idDevice    The device identifier (bus, device, function).
      * @param   pMsiIn      The source MSI.
-     * @param   pMsiOut     Where to store the remapped MSI.
+     * @param   pMsiOut     Where to store the remapped MSI (only updated when
+     *                      VINF_SUCCESS is returned).
      */
     DECLCALLBACKMEMBER(int, pfnIommuMsiRemap,(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -536 +536 @@
         RT_ZERO(MsiIn);
         ioapicGetMsiFromApicIntr(&ApicIntr, &MsiIn);
-        int rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, VBOX_PCI_BDF_SB_IOAPIC, &MsiIn, &MsiOut);
+        int const rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, VBOX_PCI_BDF_SB_IOAPIC, &MsiIn, &MsiOut);
+        if (RT_SUCCESS(rcRemap))
+            STAM_COUNTER_INC(&pThis->StatIommuRemappedIntr);
+        else if (rcRemap == VERR_IOMMU_NOT_PRESENT)
+            MsiOut = MsiIn;
+        else
+        {
+            STAM_COUNTER_INC(&pThis->StatIommuDiscardedIntr);
+            return;
+        }
+
+        ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
+
+# ifdef RT_STRICT
         if (RT_SUCCESS(rcRemap))
         {
-            STAM_COUNTER_INC(&pThis->StatIommuRemappedIntr);
-            LogFlow(("IOAPIC: IOMMU remapped interrupt %#x to %#x\n", MsiIn.Data.n.u8Vector, MsiOut.Data.n.u8Vector));
-            ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
             Assert(ApicIntr.u8Polarity == IOAPIC_RTE_GET_POLARITY(u64Rte)); /* Ensure polarity hasn't changed. */
             Assert(ApicIntr.u8TriggerMode == u8TriggerMode);                /* Ensure trigger mode hasn't changed. */
         }
-        else
-        {
-            STAM_COUNTER_INC(&pThis->StatIommuDiscardedIntr);
-            Log(("IOAPIC: IOMMU discarded interrupt %#x. rc=%Rrc\n", ApicIntr.u8Vector, rcRemap));
-            return;
-        }
+# endif
 #endif
 
@@ -925 +930 @@
         MSIMSG MsiOut;
         RT_ZERO(MsiOut);
-        int rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, uBusDevFn, pMsi, &MsiOut);
+        int const rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, uBusDevFn, pMsi, &MsiOut);
         if (RT_SUCCESS(rcRemap))
-        {
             STAM_COUNTER_INC(&pThis->StatIommuRemappedMsi);
-            ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
-        }
+        else if (rcRemap == VERR_IOMMU_NOT_PRESENT)
+            MsiOut = *pMsi;
         else
         {
             STAM_COUNTER_INC(&pThis->StatIommuDiscardedMsi);
-            Log(("IOAPIC: MSI (Addr=%#RX64 Data=%#RX32) remapping failed. rc=%Rrc", pMsi->Addr.u64, pMsi->Data.u32, rcRemap));
             return;
         }
+        ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
     }
     else

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

@@ -64 +64 @@
 #endif
     return PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
+}
+
+
+/**
+ * Returns whether an IOMMU instance is present.
+ *
+ * @returns @c true if an IOMMU is present, @c false otherwise.
+ * @param   pDevIns     The device instance.
+ */
+bool pdmIommuIsPresent(PPDMDEVINS pDevIns)
+{
+    PPDMIOMMU pIommu = PDMDEVINS_TO_IOMMU(pDevIns);
+    return pIommu != 0;
 }
 

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

@@ -1531 +1531 @@
 
 #ifdef VBOX_WITH_IOMMU_AMD
-    int rc = pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
-    if (RT_SUCCESS(rc) || rc != VERR_IOMMU_NOT_PRESENT)
-        return rc;
+    if (pdmIommuIsPresent(pDevIns))
+        return pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
 #else
     RT_NOREF(pDevIns, idDevice);
 #endif
-
-    *pMsiOut = *pMsiIn;
-    return VINF_SUCCESS;
+    return VERR_IOMMU_NOT_PRESENT;
 }
 

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

@@ -149 +149 @@
 
 #ifdef VBOX_WITH_IOMMU_AMD
-    int rc = pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
-    if (RT_SUCCESS(rc) || rc != VERR_IOMMU_NOT_PRESENT)
-        return rc;
+    if (pdmIommuIsPresent(pDevIns))
+        return pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
 #else
     RT_NOREF(pDevIns, idDevice);
 #endif
-
-    *pMsiOut = *pMsiIn;
-    return VINF_SUCCESS;
+    return VERR_IOMMU_NOT_PRESENT;
 }
 

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

@@ -1673 +1673 @@
 
 #if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL)
+bool        pdmIommuIsPresent(PPDMDEVINS pDevIns);
 int         pdmIommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut);
 int         pdmIommuMemAccessRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead, uint32_t fFlags);