Changeset 87371 in vbox for trunk/src/VBox/VMM/VMMR3/PDMDevHlpTracing.cpp

Timestamp:

Jan 22, 2021 2:42:17 PM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Handle the case where an access might result in non-contiguous physical addresses after address translation via the IOMMU.

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevHlpTracing.cpp (modified) (2 diffs)

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

@@ -429 +429 @@
         Assert(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses));
         PPDMPCIBUS pBus = &pVM->pdm.s.aPciBuses[idxBus];
-
-        RTGCPHYS GCPhysOut;
         uint16_t const uDevId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
-        int rc = pIommu->pfnMemAccess(pDevInsIommu, uDevId, GCPhys, cbRead, PDMIOMMU_MEM_F_READ, &GCPhysOut);
-        if (RT_SUCCESS(rc))
-            GCPhys = GCPhysOut;
-        else
+        int rc = VINF_SUCCESS;
+        while (cbRead > 0)
         {
-            Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
-                 cbRead, rc));
-            return rc;
+            RTGCPHYS GCPhysOut;
+            size_t   cbContig;
+            rc = pIommu->pfnMemAccess(pDevInsIommu, uDevId, GCPhys, cbRead, PDMIOMMU_MEM_F_READ, &GCPhysOut, &cbContig);
+            if (RT_SUCCESS(rc))
+            {
+                /** @todo Handle strict return codes from PGMPhysRead. */
+                rc = pDevIns->pHlpR3->pfnPhysRead(pDevIns, GCPhysOut, pvBuf, cbRead, fFlags);
+                if (RT_SUCCESS(rc))
+                {
+                    cbRead -= cbContig;
+                    pvBuf   = (void *)((uintptr_t)pvBuf + cbContig);
+                    GCPhys += cbContig;
+                }
+                else
+                    break;
+            }
+            else
+            {
+                Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
+                     cbRead, rc));
+                break;
+            }
         }
-
-        GCPhys = GCPhysOut;
+        return rc;
     }
 #endif
@@ -485 +499 @@
         Assert(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses));
         PPDMPCIBUS pBus = &pVM->pdm.s.aPciBuses[idxBus];
-
-        RTGCPHYS GCPhysOut;
         uint16_t const uDevId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
-        int rc = pIommu->pfnMemAccess(pDevInsIommu, uDevId, GCPhys, cbWrite, PDMIOMMU_MEM_F_WRITE, & GCPhysOut);
-        if (RT_SUCCESS(rc))
-            GCPhys = GCPhysOut;
-        else
+        int rc = VINF_SUCCESS;
+        while (cbWrite > 0)
         {
-            Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
-                 cbWrite, rc));
-            return rc;
+            RTGCPHYS GCPhysOut;
+            size_t   cbContig;
+            rc = pIommu->pfnMemAccess(pDevInsIommu, uDevId, GCPhys, cbWrite, PDMIOMMU_MEM_F_WRITE, &GCPhysOut, &cbContig);
+            if (RT_SUCCESS(rc))
+            {
+                /** @todo Handle strict return codes from PGMPhysWrite. */
+                rc = pDevIns->pHlpR3->pfnPhysWrite(pDevIns, GCPhysOut, pvBuf, cbContig, fFlags);
+                if (RT_SUCCESS(rc))
+                {
+                    cbWrite -= cbContig;
+                    pvBuf    = (const void *)((uintptr_t)pvBuf + cbContig);
+                    GCPhys  += cbContig;
+                }
+                else
+                    break;
+            }
+            else
+            {
+                Log(("pdmR3DevHlp_PCIPhysWrite: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
+                     cbWrite, rc));
+                break;
+            }
         }
-
-        GCPhys = GCPhysOut;
+        return rc;
     }
 #endif