Changeset 86070 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Sep 9, 2020 9:50:01 AM (5 years ago)

Author:

vboxsync

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

140287

Message:

AMD IOMMU: bugref:9654 Fix accidentally not copying/initialize MSIMSG values. Fix using the translated memory address on
successful translations from the IOMMU. Fix not remapping any interrupt when IOMMU code is compiled but an IOMMU is not present.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PDMDevHlp.cpp (modified) (2 diffs)
• PDMDevHlpTracing.cpp (modified) (4 diffs)
• PDMDevMiscHlp.cpp (modified) (1 diff)

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

@@ -1834 +1834 @@
         uint16_t const uDevId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemRead(pDevInsIommu, uDevId, GCPhys, cbRead, &GCPhysOut);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            GCPhys = GCPhysOut;
+        else
         {
             Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
@@ -1886 +1888 @@
         uint16_t const uDevId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemWrite(pDevInsIommu, uDevId, GCPhys, cbWrite, &GCPhysOut);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            GCPhys = GCPhysOut;
+        else
         {
             Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,

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

@@ -433 +433 @@
         uint16_t const uDevId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemRead(pDevInsIommu, uDevId, GCPhys, cbRead, &GCPhysOut);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            GCPhys = GCPhysOut;
+        else
         {
             Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
@@ -439 +441 @@
             return rc;
         }
+
+        GCPhys = GCPhysOut;
     }
 #endif
@@ -485 +489 @@
         uint16_t const uDevId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemWrite(pDevInsIommu, uDevId, GCPhys, cbWrite, &GCPhysOut);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            GCPhys = GCPhysOut;
+        else
         {
             Log(("pdmR3DevHlp_PCIPhysRead: IOMMU translation failed. uDevId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDevId, GCPhys,
@@ -491 +497 @@
             return rc;
         }
+
+        GCPhys = GCPhysOut;
     }
 #endif

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

@@ -157 +157 @@
     {
         int rc = pIommu->pfnMsiRemap(pDevInsIommu, uDevId, pMsiIn, pMsiOut);
-        if (RT_FAILURE(rc))
-        {
-            Log(("pdmR3IoApicHlp_IommuRemapMsi: IOMMU MSI remap failed. uDevId=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n",
-                 uDevId, pMsiIn->Addr.u64, pMsiIn->Data.u32, rc));
+        if (RT_SUCCESS(rc))
             return rc;
-        }
+
+        Log(("pdmR3IoApicHlp_IommuRemapMsi: IOMMU MSI remap failed. uDevId=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n",
+             uDevId, pMsiIn->Addr.u64, pMsiIn->Data.u32, rc));
+        return rc;
     }
 #else
     RT_NOREF(pDevIns, uDevId);
+#endif
     *pMsiOut = *pMsiIn;
-#endif
     return VINF_SUCCESS;
 }