Changeset 83941 in vbox for trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -1787 +1787 @@
 #endif
 
+#ifdef VBOX_WITH_IOMMU_AMD
+    /** @todo IOMMU: Optimize/re-organize things here later. */
+    PVM        pVM          = pDevIns->Internal.s.pVMR3;
+    PPDMIOMMU  pIommu       = &pVM->pdm.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(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDeviceId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDeviceId,
+                 GCPhys, cbRead, rc));
+            return rc;
+        }
+    }
+#endif
+
     return pDevIns->pHlpR3->pfnPhysRead(pDevIns, GCPhys, pvBuf, cbRead);
 }
@@ -1812 +1832 @@
              pDevIns->pReg->szName, 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. */
+    PVM        pVM          = pDevIns->Internal.s.pVMR3;
+    PPDMIOMMU  pIommu       = &pVM->pdm.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(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDeviceId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDeviceId,
+                 GCPhys, cbWrite, rc));
+            return rc;
+        }
     }
 #endif
@@ -3315 +3355 @@
     /*
      * Find free IOMMU slot.
+     * The IOMMU at the root complex is the one at 0.
      */
     unsigned idxIommu = 0;
@@ -3328 +3369 @@
      * Init the R3 bits.
      */
-    pIommu->idxIommu = idxIommu;
-    pIommu->pDevInsR3 = pDevIns;
+    pIommu->idxIommu    = idxIommu;
+    pIommu->pDevInsR3   = pDevIns;
+    pIommu->pfnMemRead  = pIommuReg->pfnMemRead;
+    pIommu->pfnMemWrite = pIommuReg->pfnMemWrite;
     Log(("PDM: Registered IOMMU device '%s'/%d pDevIns=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns));