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

Timestamp:

Jun 18, 2020 8:17:47 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 DevIoApic: Remap interrupts via the IOMMU.

File:

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

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

@@ -444 +444 @@
 }
 
-#if 0
+
 /**
  * Convert an APIC interrupt to an MSI message.
@@ -466 +466 @@
      *        possible in theory? Maybe document this more explicitly... */
 }
-#endif
+
 
 /**
@@ -488 +488 @@
 #endif
 
-    /* Ensure the RTE isn't masked. */
+    /*
+     * Ensure the interrupt isn't masked.
+     */
     uint64_t const u64Rte = pThis->au64RedirTable[idxRte];
     if (!IOAPIC_RTE_IS_MASKED(u64Rte))
@@ -504 +506 @@
         }
 
-        /** @todo IOMMU: Call into the IOMMU on how to remap this interrupt. uBusDevFn
-         *        will be needed then. */
+        XAPICINTR ApicIntr;
+        ApicIntr.u8Vector       = IOAPIC_RTE_GET_VECTOR(u64Rte);
+        ApicIntr.u8Dest         = IOAPIC_RTE_GET_DEST(u64Rte);
+        ApicIntr.u8DestMode     = IOAPIC_RTE_GET_DEST_MODE(u64Rte);
+        ApicIntr.u8DeliveryMode = IOAPIC_RTE_GET_DELIVERY_MODE(u64Rte);
+        ApicIntr.u8Polarity     = IOAPIC_RTE_GET_POLARITY(u64Rte);
+        ApicIntr.u8TriggerMode  = u8TriggerMode;
+        ApicIntr.u8RedirHint    = 0;
+
+#ifdef VBOX_WITH_IOMMU_AMD
+        /*
+         * The interrupt may need to be remapped (or discarded) if an IOMMU is present.
+         */
+        MSIMSG MsiOut;
+        MSIMSG MsiIn;
+        ioapicGetMsiFromApicIntr(&ApicIntr, &MsiIn);
+        Assert(PCIBDF_IS_VALID(uBusDevFn));
+        int rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, uBusDevFn, &MsiIn, &MsiOut);
+        if (RT_SUCCESS(rcRemap))
+            ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
+        else
+        {
+            if (rcRemap == VERR_IOMMU_INTR_REMAP_DENIED)
+                Log3(("IOAPIC: Interrupt (u8Vector=%#x) remapping denied. rc=%Rrc", ApicIntr.u8Vector, rcRemap));
+            else
+                Log(("IOAPIC: Interrupt (u8Vector=%#x) remapping failed. rc=%Rrc", ApicIntr.u8Vector, rcRemap));
+            return;
+        }
+#else
         NOREF(uBusDevFn);
-
-        uint8_t const  u8Vector       = IOAPIC_RTE_GET_VECTOR(u64Rte);
-        uint8_t const  u8DeliveryMode = IOAPIC_RTE_GET_DELIVERY_MODE(u64Rte);
-        uint8_t const  u8DestMode     = IOAPIC_RTE_GET_DEST_MODE(u64Rte);
-        uint8_t const  u8Polarity     = IOAPIC_RTE_GET_POLARITY(u64Rte);
-        uint8_t const  u8Dest         = IOAPIC_RTE_GET_DEST(u64Rte);
-        uint32_t const u32TagSrc      = pThis->au32TagSrc[idxRte];
-
+#endif
+
+        uint32_t const u32TagSrc = pThis->au32TagSrc[idxRte];
         Log2(("IOAPIC: Signaling %s-triggered interrupt. Dest=%#x DestMode=%s Vector=%#x (%u)\n",
-              u8TriggerMode == IOAPIC_RTE_TRIGGER_MODE_EDGE ? "edge" : "level", u8Dest,
-              u8DestMode == IOAPIC_RTE_DEST_MODE_PHYSICAL ? "physical" : "logical", u8Vector, u8Vector));
+              ApicIntr.u8TriggerMode == IOAPIC_RTE_TRIGGER_MODE_EDGE ? "edge" : "level", ApicIntr.u8Dest,
+              ApicIntr.u8DestMode == IOAPIC_RTE_DEST_MODE_PHYSICAL ? "physical" : "logical",
+              ApicIntr.u8Vector, ApicIntr.u8Vector));
 
         /*
@@ -523 +548 @@
          */
         int rc = pThisCC->pIoApicHlp->pfnApicBusDeliver(pDevIns,
-                                                        u8Dest,
-                                                        u8DestMode,
-                                                        u8DeliveryMode,
-                                                        u8Vector,
-                                                        u8Polarity,
-                                                        u8TriggerMode,
+                                                        ApicIntr.u8Dest,
+                                                        ApicIntr.u8DestMode,
+                                                        ApicIntr.u8DeliveryMode,
+                                                        ApicIntr.u8Vector,
+                                                        ApicIntr.u8Polarity,
+                                                        ApicIntr.u8TriggerMode,
                                                         u32TagSrc);
         /* Can't reschedule to R3. */