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

Timestamp:

Feb 11, 2021 6:14:13 AM (4 years ago)

Author:

vboxsync

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

142756

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

@@ -902 +902 @@
 
 /**
- * Removes an IOTLB entry from the cache for the given key.
- *
- * @returns Pointer to the removed IOTLB entry, NULL if the entry wasn't found in
- *          the tree.
- * @param   pThis   The IOMMU device state.
- * @param   uKey    The key of the IOTLB entry to remove.
- */
-static PIOTLBE iommuAmdIotlbEntryRemove(PIOMMU pThis, AVLU64KEY uKey)
-{
-    PIOTLBE pIotlbe = (PIOTLBE)RTAvlU64Remove(&pThis->TreeIotlbe, uKey);
-    if (pIotlbe)
-    {
-        Assert(pThis->cCachedIotlbes > 0);
-        --pThis->cCachedIotlbes;
-        STAM_COUNTER_DEC(&pThis->StatIotlbeCached);
-    }
-    return pIotlbe;
-}
-
-
-/**
  * Destroys an IOTLB entry.
  *
@@ -939 +918 @@
 
 /**
+ * Removes an IOTLB entry from the cache for the given key.
+ *
+ * @returns Pointer to the removed IOTLB entry, NULL if the entry wasn't found in
+ *          the tree.
+ * @param   pThis   The IOMMU device state.
+ * @param   uKey    The key of the IOTLB entry to remove.
+ */
+static PIOTLBE iommuAmdIotlbEntryRemove(PIOMMU pThis, AVLU64KEY uKey)
+{
+    PIOTLBE pIotlbe = (PIOTLBE)RTAvlU64Remove(&pThis->TreeIotlbe, uKey);
+    if (pIotlbe)
+    {
+        if (pIotlbe->fEvictPending)
+            STAM_COUNTER_INC(&pThis->StatIotlbeLazyEvictReuse);
+        iommuAmdIotlbEntryDestroy(pIotlbe);
+        Assert(!pIotlbe->fEvictPending);
+        Assert(pThis->cCachedIotlbes > 0);
+        --pThis->cCachedIotlbes;
+        STAM_COUNTER_DEC(&pThis->StatIotlbeCached);
+    }
+    return pIotlbe;
+}
+
+
+/**
  * Looks up an IOTLB from the cache.
  *
@@ -950 +954 @@
     uint64_t const uKey = IOMMU_IOTLB_KEY_MAKE(uDomainId, uIova);
     PIOTLBE pIotlbe = (PIOTLBE)RTAvlU64Get(&pThis->TreeIotlbe, uKey);
-    if (   pIotlbe
-        && pIotlbe->fEvictPending)
-    {
-        /*
-         * Domain Id wildcard invalidations only marks entries for eviction later but doesn't remove
-         * them from the cache immediately. Here we found one such entry, so remove it and move it to
-         * the LRU list and return that the lookup failed as it should.
-         */
-        iommuAmdIotlbEntryRemove(pThis, pIotlbe->Core.Key);
-        iommuAmdIotlbEntryDestroy(pIotlbe);
-        Assert(!pIotlbe->fEvictPending);
-        STAM_COUNTER_INC(&pThis->StatIotlbeLazyEvictReuse);
-        iommuAmdIotlbEntryMoveToLru(pThis, pIotlbe);
-        return NULL;
-    }
-    return pIotlbe;
+    if (    pIotlbe
+        && !pIotlbe->fEvictPending)
+        return pIotlbe;
+
+    /*
+     * Domain Id wildcard invalidations only marks entries for eviction later but doesn't remove
+     * them from the cache immediately. We found an entry pending eviction, just return that
+     * nothing was found (rather than evicting now).
+     */
+    return NULL;
 }
 
@@ -996 +994 @@
         /* If the entry is in the cache, remove it. */
         if (pIotlbe->Core.Key != IOMMU_IOTLB_KEY_NIL)
-        {
-            if (pIotlbe->fEvictPending)
-                STAM_COUNTER_INC(&pThis->StatIotlbeLazyEvictReuse);
             iommuAmdIotlbEntryRemove(pThis, pIotlbe->Core.Key);
-            iommuAmdIotlbEntryDestroy(pIotlbe);
-        }
 
         /* Initialize and insert the IOTLB entry into the cache. */
@@ -1072 +1065 @@
         PIOTLBE pIotlbe = iommuAmdIotlbEntryRemove(pThis, uKey);
         if (pIotlbe)
-        {
-            iommuAmdIotlbEntryDestroy(pIotlbe);
             iommuAmdIotlbEntryMoveToLru(pThis, pIotlbe);
-        }
         uIova        += X86_PAGE_4K_SIZE;
         cbInvalidate -= X86_PAGE_4K_SIZE;