Changeset 83941 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Apr 23, 2020 10:22:56 AM (5 years ago)

Author:

vboxsync

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

137493

Message:

AMD IOMMU: bugref:9654 Hook into PCIPhys[Read|Write] for intercepting and translating device accesses through the IOMMU.

File:

• trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (2 diffs)

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

@@ -274 +274 @@
 #endif
 
+#ifdef VBOX_WITH_IOMMU_AMD
+    /** @todo IOMMU: Optimize/re-organize things here later. */
+    PGVM        pGVM         = pDevIns->Internal.s.pGVM;
+    PPDMIOMMUR0 pIommu       = &pGVM->pdmr0.s.aIommus[0];
+    PPDMDEVINS  pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
+    if (   pDevInsIommu
+        && pDevInsIommu != pDevIns)
+    {
+        RTGCPHYS GCPhysOut;
+        uint16_t const uDeviceId = VBOX_PCI_BUSDEVFN_MAKE(pPciDev->Int.s.idxPdmBus, pPciDev->uDevFn);
+        int rc = pIommu->pfnMemRead(pDevInsIommu, uDeviceId, GCPhys, cbRead, &GCPhysOut);
+        if (RT_FAILURE(rc))
+        {
+            Log(("pdmR0DevHlp_PCIPhysRead: IOMMU translation failed. uDeviceId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDeviceId,
+                 GCPhys, cbRead, rc));
+            return rc;
+        }
+    }
+#endif
+
     return pDevIns->pHlpR0->pfnPhysRead(pDevIns, GCPhys, pvBuf, cbRead);
 }
@@ -299 +319 @@
              pDevIns, pDevIns->iInstance, VERR_PDM_NOT_PCI_BUS_MASTER, GCPhys, cbWrite));
         return VERR_PDM_NOT_PCI_BUS_MASTER;
+    }
+#endif
+
+#ifdef VBOX_WITH_IOMMU_AMD
+    /** @todo IOMMU: Optimize/re-organize things here later. */
+    PGVM        pGVM          = pDevIns->Internal.s.pGVM;
+    PPDMIOMMUR0 pIommu        = &pGVM->pdmr0.s.aIommus[0];
+    PPDMDEVINS   pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
+    if (   pDevInsIommu
+        && pDevInsIommu != pDevIns)
+    {
+        RTGCPHYS GCPhysOut;
+        uint16_t const uDeviceId = VBOX_PCI_BUSDEVFN_MAKE(pPciDev->Int.s.idxPdmBus, pPciDev->uDevFn);
+        int rc = pIommu->pfnMemWrite(pDevInsIommu, uDeviceId, GCPhys, cbWrite, &GCPhysOut);
+        if (RT_FAILURE(rc))
+        {
+            Log(("pdmR0DevHlp_PCIPhysWrite: IOMMU translation failed. uDeviceId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDeviceId,
+                 GCPhys, cbWrite, rc));
+            return rc;
+        }
     }
 #endif