Changeset 90205 in vbox for trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

Timestamp:

Jul 15, 2021 5:06:04 AM (3 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Removed superfluous assertion, nits.

File:

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

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

@@ -2308 +2308 @@
     AssertPtr(pfnLookup);
 
-    RTGCPHYS       GCPhysAddr  = NIL_RTGCPHYS;
-    DMARMEMREQIN   MemReqIn    = pMemReqRemap->In;
-    uint64_t const uAddrIn     = MemReqIn.AddrRange.uAddr;
-    size_t const   cbAddrIn    = MemReqIn.AddrRange.cb;
-    uint64_t       uAddrInBase = MemReqIn.AddrRange.uAddr & X86_PAGE_4K_BASE_MASK;
-    uint64_t       offAddrIn   = MemReqIn.AddrRange.uAddr & X86_PAGE_4K_OFFSET_MASK;
-    size_t         cbRemaining = cbAddrIn;
-    size_t const   cbPage      = X86_PAGE_4K_SIZE;
+    RTGCPHYS       GCPhysAddrOut = NIL_RTGCPHYS;
+    DMARMEMREQIN   MemReqIn      = pMemReqRemap->In;
+    uint64_t const uAddrIn       = MemReqIn.AddrRange.uAddr;
+    size_t const   cbAddrIn      = MemReqIn.AddrRange.cb;
+    uint64_t       uAddrInBase   = MemReqIn.AddrRange.uAddr & X86_PAGE_4K_BASE_MASK;
+    uint64_t       offAddrIn     = MemReqIn.AddrRange.uAddr & X86_PAGE_4K_OFFSET_MASK;
+    size_t         cbRemaining   = cbAddrIn;
+    size_t const   cbPage        = X86_PAGE_4K_SIZE;
 
     int rc;
@@ -2326 +2326 @@
         MemReqIn.AddrRange.cb    = cbRemaining;  /* Not currently accessed by pfnLookup, but keep things consistent. */
 
-        /* Lookup the physical page corresponding to the I/O virtual address. */
+        /* Lookup the physical page corresponding to the DMA virtual address. */
         DMARIOPAGE IoPage;
         rc = pfnLookup(pDevIns, &MemReqIn, &pMemReqRemap->Aux, &IoPage);
@@ -2336 +2336 @@
             Assert((IoPage.fPerm & MemReqIn.AddrRange.fPerm) == MemReqIn.AddrRange.fPerm);
 
-            /* Store the translated address before continuing to access more pages. */
+            /* Store the translated address and permissions before continuing to access more pages. */
             if (cbRemaining == cbAddrIn)
             {
-                uint64_t const fOffMask   = X86_GET_PAGE_OFFSET_MASK(IoPage.cShift);
-                uint64_t const offAddrOut = uAddrIn & fOffMask;
-                Assert(!(IoPage.GCPhysBase & fOffMask));
-                GCPhysAddr = IoPage.GCPhysBase | offAddrOut;
+                uint64_t const offAddrOut = uAddrIn & X86_GET_PAGE_OFFSET_MASK(IoPage.cShift);
+                GCPhysAddrOut = IoPage.GCPhysBase | offAddrOut;
             }
             /* Check if addresses translated so far result in a physically contiguous region. */
@@ -2361 +2359 @@
             if (cbRemaining > cbPage - offAddrIn)
             {
-                cbRemaining -= (cbPage - offAddrIn); /* Calculate how much more we need to access. */
-                uAddrInBase += cbPage;               /* Update address of the next access. */
-                offAddrIn    = 0;                    /* After first page, all pages are accessed from offset 0. */
+                cbRemaining -= (cbPage - offAddrIn);  /* Calculate how much more we need to access. */
+                uAddrInBase += cbPage;                /* Update address of the next access. */
+                offAddrIn    = 0;                     /* After the first page, remaining pages are accessed from offset 0. */
             }
             else
@@ -2376 +2374 @@
     }
 
-    pMemReqRemap->Out.AddrRange.uAddr = GCPhysAddr;
+    pMemReqRemap->Out.AddrRange.uAddr = GCPhysAddrOut;
     pMemReqRemap->Out.AddrRange.cb    = cbAddrIn - cbRemaining;
     pMemReqRemap->Out.AddrRange.fPerm = IoPagePrev.fPerm;