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

Timestamp:

Aug 21, 2020 9:53:04 AM (5 years ago)

Author:

vboxsync

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

140030

Message:

AMD IOMMU: bugref:9654 Fix ring-0 IOMMU PDM callback registration.

File:

• trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (3 diffs)

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

@@ -1049 +1049 @@
     AssertLogRelMsgReturn(pIommuReg->u32Version == PDM_IOMMUREGCC_VERSION,
                           ("%#x vs %#x\n", pIommuReg->u32Version, PDM_IOMMUREGCC_VERSION), VERR_VERSION_MISMATCH);
+    AssertPtrReturn(pIommuReg->pfnMemRead, VERR_INVALID_POINTER);
+    AssertPtrReturn(pIommuReg->pfnMemWrite, VERR_INVALID_POINTER);
+    AssertPtrReturn(pIommuReg->pfnMsiRemap, VERR_INVALID_POINTER);
     AssertLogRelMsgReturn(pIommuReg->u32TheEnd == PDM_IOMMUREGCC_VERSION,
                           ("%#x vs %#x\n", pIommuReg->u32TheEnd, PDM_IOMMUREGCC_VERSION), VERR_VERSION_MISMATCH);
@@ -1079 +1082 @@
     pIommuR0->uPadding0   = 0xdeaddead;
     pIommuR0->pDevInsR0   = pDevIns;
+    pIommuR0->pfnMemRead  = pIommuReg->pfnMemRead;
+    pIommuR0->pfnMemWrite = pIommuReg->pfnMemWrite;
+    pIommuR0->pfnMsiRemap = pIommuReg->pfnMsiRemap;
 
     *ppIommuHlp = &g_pdmR0IommuHlp;
@@ -1560 +1566 @@
         && pDevInsIommu != pDevIns)
     {
+        AssertMsgReturn(VALID_PTR(pIommu->pfnMsiRemap),
+                        ("pdmR0IoApicHlp_IommuMsiRemap: pfnMsiRemap invalid!\n"), VERR_INVALID_POINTER);
         int rc = pIommu->pfnMsiRemap(pDevInsIommu, uDevId, pMsiIn, pMsiOut);
         if (RT_FAILURE(rc))