Changeset 89032 in vbox for trunk

Timestamp:

May 13, 2021 11:37:48 AM (4 years ago)

Author:

vboxsync

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

144371

Message:

Intel IOMMU: bugref:9967 Trigger mode can actually be changed by remapping and level is always set to 1.

File:

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

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

@@ -486 +486 @@
 {
     /*
-     * Parse the message from the physical address and data
+     * Parse the message from the physical address and data.
+     * Do -not- zero out other fields in the APIC interrupt.
+     *
      * See Intel spec. 10.11.1 "Message Address Register Format".
      * See Intel spec. 10.11.2 "Message Data Register Format".
@@ -589 +591 @@
     }
 
+    XAPICINTR ApicIntr;
+    RT_ZERO(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;
+
     /** @todo We might be able to release the IOAPIC(PDM) lock here and re-acquire it
      *        before setting the remote IRR bit below. The APIC and IOMMU should not
      *        require the caller to hold the PDM lock. */
-
-    XAPICINTR ApicIntr;
-    RT_ZERO(ApicIntr);
 
 #if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL)
@@ -619 +628 @@
     }
 
+    /* Update the APIC interrupt with the remapped data. */
     ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
-# ifdef RT_STRICT
-    if (RT_SUCCESS(rcRemap))
-    {
-        Assert(ApicIntr.u8Polarity == IOAPIC_RTE_GET_POLARITY(u64Rte)); /* Ensure polarity hasn't changed. */
-        Assert(ApicIntr.u8TriggerMode == u8TriggerMode);                /* Ensure trigger mode hasn't changed. */
-    }
-# endif
-#else
-    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;
+
+    /* Ensure polarity hasn't changed (trigger mode might change with Intel IOMMUs). */
+    Assert(ApicIntr.u8Polarity == IOAPIC_RTE_GET_POLARITY(u64Rte));
 #endif