Changeset 87499 in vbox

Timestamp:

Feb 1, 2021 1:55:23 PM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 IOTLB cache bits.

File:

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

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

@@ -371 +371 @@
     STAMCOUNTER                 StatCmdInvIommuAll;         /**< Number of Invalidate IOMMU All commands processed. */
 
+    STAMCOUNTER                 StatDteLookupNonContig;     /**< Number of non-contiguous address region translations. */
     STAMPROFILEADV              StatDteLookup;              /**< Profiling of device table entry lookup (uncached). */
     /** @} */
@@ -2964 +2965 @@
                         uint64_t offIova     = uIova & X86_PAGE_4K_OFFSET_MASK;
                         uint64_t cbPages     = 0;
+#ifdef IOMMU_WITH_IOTLBE_CACHE
+                        IOWALKRESULT WalkResultPrev;
+                        RT_ZERO(WalkResultPrev);
+#endif
                         for (;;)
                         {
@@ -2976 +2981 @@
                                     uint64_t const offSpa  = uIova & offMask;
                                     GCPhysSpa = WalkResult.GCPhysSpa | offSpa;
+#ifdef IOMMU_WITH_IOTLBE_CACHE
+                                    /* Store the walk result from the first page. */
+                                    WalkResultPrev = WalkResult;
+#endif
                                 }
+#ifdef IOMMU_WITH_IOTLBE_CACHE
+                                /* Check if addresses translated so far result in a physically contiguous region
+                                   and that permissions and page sizes are identical for all pages in the access. */
+                                else if (   (GCPhysSpa & X86_PAGE_4K_BASE_MASK) + cbPages == WalkResult.GCPhysSpa
+                                         && WalkResultPrev.cShift  == WalkResult.cShift
+                                         && WalkResultPrev.fIoPerm == WalkResult.fIoPerm)
+                                {
+                                    /* Paranoia. */
+                                    Assert((WalkResultPrev.GCPhysSpa & X86_PAGE_4K_BASE_MASK)
+                                           + RT_BIT_64(WalkResultPrev.cShift) == WalkResult.GCPhysSpa);
+                                    /* Store the walk result before moving on to the next page. */
+                                    WalkResultPrev = WalkResult;
+                                }
+#else
                                 /* Check if addresses translated so far result in a physically contiguous region. */
-                                else if ((GCPhysSpa & X86_PAGE_4K_BASE_MASK) + cbPages == WalkResult.GCPhysSpa)
+                                else if (   (GCPhysSpa & X86_PAGE_4K_BASE_MASK) + cbPages == WalkResult.GCPhysSpa)
                                 { /* likely */ }
+#endif
                                 else
+                                {
+                                    STAM_COUNTER_INC(&pThis->StatDteLookupNonContig);
                                     break;
+                                }
 
                                 /* Check if we need to access more pages. */
-                                uint64_t const cbPage = UINT64_C(1) << WalkResult.cShift;
+                                uint64_t const cbPage = RT_BIT_64(WalkResult.cShift);
                                 if (cbRemaining > cbPage - offIova)
                                 {
@@ -3018 +3045 @@
 
                         /* Paranoia. */
-                        Assert(WalkResult.cShift   == 0);
+                        Assert(WalkResult.cShift    == 0);
                         Assert(WalkResult.GCPhysSpa == uIova);
                         Assert((WalkResult.fIoPerm & fAccess) == fAccess);
@@ -5131 +5158 @@
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCmdCompletePprReq, STAMTYPE_COUNTER, "R3/Commands/CompletePprReq", STAMUNIT_OCCURENCES, "Number of Complete PPR Requests commands processed.");
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCmdInvIommuAll, STAMTYPE_COUNTER, "R3/Commands/InvIommuAll", STAMUNIT_OCCURENCES, "Number of Invalidate IOMMU All commands processed.");
+
+    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatDteLookupNonContig, STAMTYPE_COUNTER, "DteLookupNonContig", STAMUNIT_OCCURENCES, "Number of non-contiguous translated regions.");
 
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatDteLookup, STAMTYPE_PROFILE, "DteLookup", STAMUNIT_TICKS_PER_CALL, "Profiling device table entry lookup (uncached).");