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

Timestamp:

Apr 22, 2021 5:40:05 AM (4 years ago)

Author:

vboxsync

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

143951

Message:

Intel IOMMU: bugref:9967 Refactor some PDM-IOMMU interfaces to differentiate between device present vs. device instance available in current context (ring-0/ring-3).
This should help us to support IOMMU as ring-3-only device in the future.
Still more work to do in that regard (PDM task queue), but one step at a time.

File:

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

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

@@ -537 +537 @@
         ioapicGetMsiFromApicIntr(&ApicIntr, &MsiIn);
         int const rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, VBOX_PCI_BDF_SB_IOAPIC, &MsiIn, &MsiOut);
-        if (RT_SUCCESS(rcRemap))
+        if (   rcRemap == VERR_IOMMU_NOT_PRESENT
+            || rcRemap == VERR_IOMMU_CANNOT_CALL_SELF)
+            MsiOut = MsiIn;
+        else if (RT_SUCCESS(rcRemap))
             STAM_COUNTER_INC(&pThis->StatIommuRemappedIntr);
-        else if (rcRemap == VERR_IOMMU_NOT_PRESENT)
-            MsiOut = MsiIn;
         else
         {
@@ -924 +925 @@
      *
      * If the Bus:Dev:Fn isn't valid, it is ASSUMED the device generating the
-     * MSI is the IOMMU itself and hence is not subject to remapping.
+     * MSI may be the IOMMU itself and hence is not subject to remapping.
+     *
+     * For AMD IOMMUs, since it's a full fledged PCI device, the BDF will be
+     * valid but will be handled by VERR_IOMMU_CANNOT_CALL_SELF case.
      */
     if (PCIBDF_IS_VALID(uBusDevFn))
@@ -931 +935 @@
         RT_ZERO(MsiOut);
         int const rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, uBusDevFn, pMsi, &MsiOut);
-        if (RT_SUCCESS(rcRemap))
+        if (   rcRemap == VERR_IOMMU_NOT_PRESENT
+            || rcRemap == VERR_IOMMU_CANNOT_CALL_SELF)
+            MsiOut = *pMsi;
+        else if (RT_SUCCESS(rcRemap))
             STAM_COUNTER_INC(&pThis->StatIommuRemappedMsi);
-        else if (rcRemap == VERR_IOMMU_NOT_PRESENT)
-            MsiOut = *pMsi;
         else
         {