Changeset 87671 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Feb 10, 2021 5:34:28 AM (4 years ago)

Author:

vboxsync

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

142713

Message:

AMD IOMMU: bugref:9654 IOTLB cache bits, better stats, profile build fix.

File:

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

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

@@ -452 +452 @@
     STAMCOUNTER                 StatIotlbeCacheMiss;        /**< Number of IOTLB cache misses. */
     STAMCOUNTER                 StatIotlbeLazyEvictReuse;   /**< Number of IOTLB entries re-used after lazy eviction. */
+    STAMPROFILEADV              StatIotlbeLookup;           /**< Profiling of IOTLB entry lookup (cached). */
 
     STAMCOUNTER                 StatDteLookupNonContig;     /**< Number of DTE lookups that result in non-contiguous regions. */
-    STAMPROFILEADV              StatDteLookup;              /**< Profiling of device table entry lookup (uncached). */
+    STAMPROFILEADV              StatIoPageWalkLookup;       /**< Profiling of I/O page walk (uncached). */
     /** @} */
 #endif
@@ -3392 +3393 @@
     RTGCPHYS GCPhysSpa    = NIL_RTGCPHYS;
     size_t   cbContiguous = 0;
-
-    STAM_PROFILE_ADV_START(&pThis->StatDteLookup, a);
 
     /* Read the device table entry from memory. */
@@ -3425 +3424 @@
                         IOWALKRESULT WalkResult;
                         RT_ZERO(WalkResult);
+                        STAM_PROFILE_ADV_START(&pThis->StatIoPageWalkLookup, a);
                         rc = iommuAmdIoPageTableWalk(pDevIns, uDevId, uIovaPage, fPerm, &Dte, enmOp, &WalkResult);
+                        STAM_PROFILE_ADV_STOP(&pThis->StatIoPageWalkLookup, a);
                         if (RT_SUCCESS(rc))
                         {
@@ -3552 +3553 @@
     AssertMsg(rc != VINF_SUCCESS || cbContiguous > 0, ("cbContiguous=%zu\n", cbContiguous));
 
-    STAM_PROFILE_ADV_STOP(&pThis->StatDteLookup, a);
     return rc;
 }
@@ -3603 +3603 @@
         for (;;)
         {
+            STAM_PROFILE_ADV_START(&pThis->StatIotlbeLookup, b);
             PCIOTLBE pIotlbe = iommuAmdIotlbLookup(pThis, pDevice->uDomainId, uIovaPage);
+            STAM_PROFILE_ADV_STOP(&pThis->StatIotlbeLookup, b);
             if (pIotlbe)
             {
@@ -5458 +5460 @@
     PCPDMPCIDEV pPciDev = pDevIns->apPciDevs[0];
     PDMPCIDEV_ASSERT_VALID(pDevIns, pPciDev);
+    NOREF(pPciDev);
 
     uint8_t cSegments = 0;
@@ -5892 +5895 @@
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatIotlbeCacheMiss, STAMTYPE_COUNTER, "IOTLB/CacheMiss", STAMUNIT_OCCURENCES, "Number of IOTLB cache misses.");
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatIotlbeLazyEvictReuse, STAMTYPE_COUNTER, "IOTLB/LazyEvictReuse", STAMUNIT_OCCURENCES, "Number of IOTLB entries reused after lazy eviction.");
+    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatIotlbeLookup, STAMTYPE_PROFILE, "IOTLB/Lookup", STAMUNIT_TICKS_PER_CALL, "Profiling IOTLB entry lookup.");
 
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatDteLookupNonContig, STAMTYPE_COUNTER, "DTE/LookupNonContig", STAMUNIT_OCCURENCES, "DTE lookups that resulted in non-contiguous translated regions.");
-    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatDteLookup, STAMTYPE_PROFILE, "DTE/Lookup", STAMUNIT_TICKS_PER_CALL, "Profiling device table entry lookup (uncached).");
+    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatIoPageWalkLookup, STAMTYPE_PROFILE, "DTE/Lookup", STAMUNIT_TICKS_PER_CALL, "Profiling I/O page walk lookup.");
 # endif