Changeset 88631 in vbox for trunk/src/VBox/Devices

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.

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (2 diffs)

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