Changeset 89477 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 3, 2021 9:17:34 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Address translation, WIP.

File:

• trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -2242 +2242 @@
 
 /**
- * Checks whether two consecutive I/O page results of a DMA memory request form a
- * physically contiguous region.
+ * Checks whether two consecutive I/O page results of a DMA memory request
+ * translates to a physically contiguous region.
  *
  * @returns @c true if the I/O pages are contiguous, @c false otherwise.
@@ -2257 +2257 @@
     RTGCPHYS const GCPhysPrev  = pIoPagePrev->GCPhysBase;
     RTGCPHYS const GCPhys      = pIoPage->GCPhysBase;
-    uint64_t const offMaskPrev = X86_GET_PAGE_OFFSET_MASK(pIoPagePrev->cShift);
-    uint64_t const offMask     = X86_GET_PAGE_OFFSET_MASK(pIoPage->cShift);
-
+#ifdef RT_STRICT
     /* Paranoia: Ensure offset bits are 0. */
-    Assert(!(GCPhysPrev & offMaskPrev));
-    Assert(!(GCPhys     & offMask));
-
-    if ((GCPhysPrev & ~offMaskPrev) + cbPrev == (GCPhys & ~offMask))
-        return true;
-    return false;
+    {
+        uint64_t const fOffMaskPrev = X86_GET_PAGE_OFFSET_MASK(pIoPagePrev->cShift);
+        uint64_t const fOffMask     = X86_GET_PAGE_OFFSET_MASK(pIoPage->cShift);
+        Assert(!(GCPhysPrev & fOffMaskPrev));
+        Assert(!(GCPhys     & fOffMask));
+    }
+#endif
+    return GCPhysPrev + cbPrev == GCPhys;
 }