Changeset 81528 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Oct 25, 2019 10:00:16 AM (6 years ago)

Author:

vboxsync

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

134261

Message:

DevOHCI: Don't allocate the page two page caches, just put them directly into the ring-3 state structure. (It is no longer on the hyper heap, so we've got plenty space.) bugref:9218

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -248 +248 @@
     RTGCPHYS            GCPhysReadCacheAddr;
     /** Copy of last read physical page. */
-    uint8_t             au8PhysReadCache[PAGE_SIZE];
-} OHCIPAGECACHE, *POHCIPAGECACHE;
+    uint8_t             abPhysReadCache[PAGE_SIZE];
+} OHCIPAGECACHE;
+typedef OHCIPAGECACHE *POHCIPAGECACHE;
 #endif
 
@@ -408 +409 @@
 #ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     /** Last read physical page for caching ED reads in the framer thread. */
-    R3PTRTYPE(POHCIPAGECACHE)  pCacheED;
+    OHCIPAGECACHE               CacheED;
     /** Last read physical page for caching TD reads in the framer thread. */
-    R3PTRTYPE(POHCIPAGECACHE)  pCacheTD;
+    OHCIPAGECACHE               CacheTD;
 #endif
 } OHCIR3;
@@ -889 +890 @@
 static void                 ohciR3BusStop(POHCI pThis);
 #ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
-static void                 ohciR3PhysReadCacheClear(POHCIPAGECACHE pPageCache);
+static void                 ohciR3PhysReadCacheInvalidate(POHCIPAGECACHE pPageCache);
 #endif
 
@@ -1282 +1283 @@
 
 #ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
-    ohciR3PhysReadCacheClear(pThisCC->pCacheED);
-    ohciR3PhysReadCacheClear(pThisCC->pCacheTD);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheED);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheTD);
 #endif
 
@@ -1428 +1429 @@
 # ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
 
-static POHCIPAGECACHE ohciR3PhysReadCacheAlloc(void)
-{
-    return (POHCIPAGECACHE)RTMemAlloc(sizeof(OHCIPAGECACHE));
-}
-
-static void ohciR3PhysReadCacheFree(POHCIPAGECACHE pPageCache)
-{
-    RTMemFree(pPageCache);
-}
-
-static void ohciR3PhysReadCacheClear(POHCIPAGECACHE pPageCache)
+static void ohciR3PhysReadCacheInvalidate(POHCIPAGECACHE pPageCache)
 {
     pPageCache->GCPhysReadCacheAddr = NIL_RTGCPHYS;
@@ -1451 +1442 @@
         if (PageAddr != pPageCache->GCPhysReadCacheAddr)
         {
-            PDMDevHlpPhysRead(pDevIns, PageAddr, pPageCache->au8PhysReadCache, sizeof(pPageCache->au8PhysReadCache));
+            PDMDevHlpPhysRead(pDevIns, PageAddr, pPageCache->abPhysReadCache, sizeof(pPageCache->abPhysReadCache));
             pPageCache->GCPhysReadCacheAddr = PageAddr;
 #  ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
@@ -1458 +1449 @@
         }
 
-        memcpy(pvBuf, &pPageCache->au8PhysReadCache[GCPhys & PAGE_OFFSET_MASK], cbBuf);
+        memcpy(pvBuf, &pPageCache->abPhysReadCache[GCPhys & PAGE_OFFSET_MASK], cbBuf);
 #  ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
         ++g_PhysReadState.cCacheReads;
@@ -1490 +1481 @@
     {
         uint32_t offPage = GCPhys & PAGE_OFFSET_MASK;
-        memcpy(&pPageCache->au8PhysReadCache[offPage], pvBuf, RT_MIN(PAGE_SIZE - offPage, cbBuf));
+        memcpy(&pPageCache->abPhysReadCache[offPage], pvBuf, RT_MIN(PAGE_SIZE - offPage, cbBuf));
     }
 }
@@ -1504 +1495 @@
 DECLINLINE(void) ohciR3CacheEdUpdate(POHCICC pThisCC, RTGCPHYS32 EdAddr, PCOHCIED pEd)
 {
-    ohciR3PhysCacheUpdate(pThisCC->pCacheED, EdAddr + RT_OFFSETOF(OHCIED, HeadP), &pEd->HeadP, sizeof(uint32_t));
+    ohciR3PhysCacheUpdate(&pThisCC->CacheED, EdAddr + RT_OFFSETOF(OHCIED, HeadP), &pEd->HeadP, sizeof(uint32_t));
 }
 
@@ -1518 +1509 @@
 DECLINLINE(void) ohciR3CacheTdUpdate(POHCICC pThisCC, RTGCPHYS32 TdAddr, PCOHCITD pTd)
 {
-    ohciR3PhysCacheUpdate(pThisCC->pCacheTD, TdAddr, pTd, sizeof(*pTd));
+    ohciR3PhysCacheUpdate(&pThisCC->CacheTD, TdAddr, pTd, sizeof(*pTd));
 }
 
@@ -1534 +1525 @@
 #ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     POHCICC pThisCC = PDMINS_2_DATA_CC(pDevIns, POHCICC);
-    ohciR3PhysReadCacheRead(pDevIns, pThisCC->pCacheED, EdAddr, pEd, sizeof(*pEd));
+    ohciR3PhysReadCacheRead(pDevIns, &pThisCC->CacheED, EdAddr, pEd, sizeof(*pEd));
 #else
     ohciR3GetDWords(pDevIns, EdAddr, (uint32_t *)pEd, sizeof(*pEd) >> 2);
@@ -1551 +1542 @@
 #ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     POHCICC pThisCC = PDMINS_2_DATA_CC(pDevIns, POHCICC);
-    ohciR3PhysReadCacheRead(pDevIns, pThisCC->pCacheTD, TdAddr, pTd, sizeof(*pTd));
+    ohciR3PhysReadCacheRead(pDevIns, &pThisCC->CacheTD, TdAddr, pTd, sizeof(*pTd));
 #else
     ohciR3GetDWords(pDevIns, TdAddr, (uint32_t *)pTd, sizeof(*pTd) >> 2);
@@ -2529 +2520 @@
     /* Clear all caches here to avoid reading stale data from previous lock holders. */
     POHCICC pThisCC = pThis->pThisR3;
-    ohciR3PhysReadCacheClear(pThisCC->pCacheED);
-    ohciR3PhysReadCacheClear(pThisCC->pCacheTD);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheED);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheTD);
 # endif
 }
@@ -2549 +2540 @@
      */
     POHCICC pThisCC = pThis->pThisR3;
-    ohciR3PhysReadCacheClear(pThisCC->pCacheED);
-    ohciR3PhysReadCacheClear(pThisCC->pCacheTD);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheED);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheTD);
 # endif
 
@@ -3162 +3153 @@
 # ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     POHCICC pThisCC = PDMINS_2_DATA_CC(pDevIns, POHCICC);
-    ohciR3PhysReadCacheClear(pThisCC->pCacheTD);
+    ohciR3PhysReadCacheInvalidate(&pThisCC->CacheTD);
 # endif
 
@@ -4109 +4100 @@
             {
 # ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
-                ohciR3PhysReadCacheClear(pThisCC->pCacheTD);
+                ohciR3PhysReadCacheInvalidate(&pThisCC->CacheTD);
 # endif
                 do
@@ -5963 +5954 @@
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
     POHCI   pThis   = PDMINS_2_DATA(pDevIns, POHCI);
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
-    POHCIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, POHCIR3);
-
-    ohciR3PhysReadCacheFree(pThisCC->pCacheED);
-    pThisCC->pCacheED = NULL;
-    ohciR3PhysReadCacheFree(pThisCC->pCacheTD);
-    pThisCC->pCacheTD = NULL;
-#endif
 
     if (RTCritSectIsInitialized(&pThis->CritSect))
@@ -6145 +6128 @@
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                    N_("OHCI: Failed to create critical section"));
-
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
-    pThisCC->pCacheED = ohciR3PhysReadCacheAlloc();
-    pThisCC->pCacheTD = ohciR3PhysReadCacheAlloc();
-    if (pThisCC->pCacheED == NULL || pThisCC->pCacheTD == NULL)
-        return PDMDevHlpVMSetError(pDevIns, VERR_NO_MEMORY, RT_SRC_POS, N_("OHCI: Failed to allocate PhysRead cache"));
-#endif
 
     /*