Changeset 88638 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 22, 2021 5:40:05 AM (4 years ago)

Author:

vboxsync

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

143951

Message:

Intel IOMMU: bugref:9967 Refactor some PDM-IOMMU interfaces to differentiate between device present vs. device instance available in current context (ring-0/ring-3).
This should help us to support IOMMU as ring-3-only device in the future.
Still more work to do in that regard (PDM task queue), but one step at a time.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllIommu.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/PDMAllIommu.cpp

@@ -89 +89 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
-        int rc = pIommu->pfnMsiRemap(pDevInsIommu, idDevice, pMsiIn, pMsiOut);
-        if (RT_FAILURE(rc))
-        {
-            LogFunc(("MSI remap failed. idDevice=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n", idDevice, pMsiIn->Addr.u64,
-                     pMsiIn->Data.u32, rc));
-        }
-        return rc;
-    }
-    /** @todo Should we return an rc such that we can reschedule to R3 if R0 isn't
-     *        enabled?  Is that even viable with the state the I/O APIC would be in? */
-    return VERR_IOMMU_NOT_PRESENT;
+    Assert(pDevInsIommu);
+    if (pDevInsIommu != pDevIns)
+        return pIommu->pfnMsiRemap(pDevInsIommu, idDevice, pMsiIn, pMsiOut);
+    return VERR_IOMMU_CANNOT_CALL_SELF;
 }
 
@@ -126 +116 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
+    if (pDevInsIommu)
+    {
+        if (pDevInsIommu != pDevIns)
+        { /* likely */ }
+        else
+            return VERR_IOMMU_CANNOT_CALL_SELF;
+
         uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         int rc = VINF_SUCCESS;
@@ -190 +184 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
+    if (pDevInsIommu)
+    {
+        if (pDevInsIommu != pDevIns)
+        { /* likely */ }
+        else
+            return VERR_IOMMU_CANNOT_CALL_SELF;
+
         uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         int rc = VINF_SUCCESS;
@@ -251 +249 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
+    if (pDevInsIommu)
+    {
+        if (pDevInsIommu != pDevIns)
+        { /* likely */ }
+        else
+            return VERR_IOMMU_CANNOT_CALL_SELF;
+
         uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         size_t   cbContig  = 0;
@@ -296 +298 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
+    if (pDevInsIommu)
+    {
+        if (pDevInsIommu != pDevIns)
+        { /* likely */ }
+        else
+            return VERR_IOMMU_CANNOT_CALL_SELF;
+
         uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         size_t   cbContig  = 0;
@@ -344 +350 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
+    if (pDevInsIommu)
+    {
+        if (pDevInsIommu != pDevIns)
+        { /* likely */ }
+        else
+            return VERR_IOMMU_CANNOT_CALL_SELF;
+
         /* Allocate space for translated addresses. */
         size_t const cbIovas  = cPages * sizeof(uint64_t);
@@ -407 +417 @@
     PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
     PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
+    if (pDevInsIommu)
+    {
+        if (pDevInsIommu != pDevIns)
+        { /* likely */ }
+        else
+            return VERR_IOMMU_CANNOT_CALL_SELF;
+
         /* Allocate space for translated addresses. */
         size_t const cbIovas  = cPages * sizeof(uint64_t);