Changeset 34386 in vbox

Timestamp:

Nov 25, 2010 5:10:52 PM (14 years ago)

Author:

vboxsync

Message:

PBMBlkCache: Bug fixes

File:

• trunk/src/VBox/VMM/PDMBlkCache.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/PDMBlkCache.cpp

@@ -1013 +1013 @@
                     {
                         /* Arm the timer if this is the first endpoint. */
-                        if (   pBlkCacheGlobal->cRefs == 1
+                        if (   !pBlkCacheGlobal->cRefs
                             && pBlkCacheGlobal->u32CommitTimeoutMs > 0)
                             rc = TMTimerSetMillies(pBlkCacheGlobal->pTimerCommit, pBlkCacheGlobal->u32CommitTimeoutMs);
@@ -1208 +1208 @@
     PPDMBLKCACHEGLOBAL pCache = pBlkCache->pCache;
 
+    /*
+     * Commit all dirty entries now (they are waited on for completion during the
+     * destruction of the AVL tree below).
+     * The exception is if the VM was paused because of an I/O error before.
+     */
+    if (!ASMAtomicReadBool(&pCache->fIoErrorVmSuspended))
+        pdmBlkCacheCommit(pBlkCache);
+
     /* Make sure nobody is accessing the cache while we delete the tree. */
     pdmBlkCacheLockEnter(pCache);
@@ -1351 +1359 @@
  * @param   pEntryAbove       Where to store the pointer to the best fit entry above the
  *                            the given offset. NULL if not required.
- * @param   pEntryBelow       Where to store the pointer to the best fit entry below the
- *                            the given offset. NULL if not required.
  */
 static void pdmBlkCacheGetCacheBestFitEntryByOffset(PPDMBLKCACHE pBlkCache, uint64_t off,
-                                                    PPDMBLKCACHEENTRY *ppEntryAbove,
-                                                    PPDMBLKCACHEENTRY *ppEntryBelow)
+                                                    PPDMBLKCACHEENTRY *ppEntryAbove)
 {
     PPDMBLKCACHEGLOBAL pCache = pBlkCache->pCache;
@@ -1370 +1375 @@
     }
 
-    if (ppEntryBelow)
-    {
-        *ppEntryBelow = (PPDMBLKCACHEENTRY)RTAvlrU64GetBestFit(pBlkCache->pTree, off, false /*fAbove*/);
-        if (*ppEntryBelow)
-            pdmBlkCacheEntryRef(*ppEntryBelow);
-    }
     RTSemRWReleaseRead(pBlkCache->SemRWEntries);
 
@@ -1517 +1516 @@
 static int pdmBlkCacheEntryWaitersAdd(PPDMBLKCACHEENTRY pEntry,
                                       PPDMBLKCACHEREQ pReq,
-                                      PCRTSGBUF pSgBuf, uint64_t offDiff,
+                                      PRTSGBUF pSgBuf, uint64_t offDiff,
                                       size_t cbData, bool fWrite)
 {
@@ -1530 +1529 @@
     pWaiter->fWrite        = fWrite;
     RTSgBufClone(&pWaiter->SgBuf, pSgBuf);
+    RTSgBufAdvance(pSgBuf, cbData);
 
     pdmBlkCacheEntryAddWaiter(pEntry, pWaiter);
@@ -1560 +1560 @@
     uint64_t offAligned;
     PPDMBLKCACHEENTRY pEntryAbove = NULL;
-    PPDMBLKCACHEENTRY pEntryBelow = NULL;
 
     /* Get the best fit entries around the offset */
-    pdmBlkCacheGetCacheBestFitEntryByOffset(pBlkCache, off, &pEntryAbove, &pEntryBelow);
+    pdmBlkCacheGetCacheBestFitEntryByOffset(pBlkCache, off, &pEntryAbove);
 
     /* Log the info */
-    LogFlow(("%sest fit entry below off=%llu (BestFit=%llu BestFitEnd=%llu BestFitSize=%u)\n",
-             pEntryBelow ? "B" : "No b",
-             off,
-             pEntryBelow ? pEntryBelow->Core.Key : 0,
-             pEntryBelow ? pEntryBelow->Core.KeyLast : 0,
-             pEntryBelow ? pEntryBelow->cbData : 0));
-
     LogFlow(("%sest fit entry above off=%llu (BestFit=%llu BestFitEnd=%llu BestFitSize=%u)\n",
              pEntryAbove ? "B" : "No b",
@@ -1580 +1572 @@
              pEntryAbove ? pEntryAbove->cbData : 0));
 
-    /* Align the offset first. */
-    offAligned = off & ~(uint64_t)(512-1);
-    if (   pEntryBelow
-        && offAligned <= pEntryBelow->Core.KeyLast)
-        offAligned = pEntryBelow->Core.KeyLast;
+    offAligned = off;
 
     if (    pEntryAbove
@@ -1599 +1587 @@
 
     /* A few sanity checks */
-    AssertMsg(!pEntryBelow || pEntryBelow->Core.KeyLast < offAligned,
-              ("Aligned start offset intersects with another cache entry\n"));
     AssertMsg(!pEntryAbove || (offAligned + cbAligned) <= pEntryAbove->Core.Key,
               ("Aligned size intersects with another cache entry\n"));
     Assert(cbInEntry <= cbAligned);
 
-    if (pEntryBelow)
-        pdmBlkCacheEntryRelease(pEntryBelow);
     if (pEntryAbove)
         pdmBlkCacheEntryRelease(pEntryAbove);
@@ -1933 +1917 @@
             /* Clip read size if necessary. */
             PPDMBLKCACHEENTRY pEntryAbove;
-            pdmBlkCacheGetCacheBestFitEntryByOffset(pBlkCache, off,
-                                                    &pEntryAbove, NULL);
+            pdmBlkCacheGetCacheBestFitEntryByOffset(pBlkCache, off, &pEntryAbove);
 
             if (pEntryAbove)
@@ -2019 +2002 @@
             {
                 /* Check if the entry is dirty. */
-                if(pdmBlkCacheEntryFlagIsSetClearAcquireLock(pBlkCache, pEntry,
-                                                             PDMBLKCACHE_ENTRY_IS_DIRTY,
-                                                             0))
+                if (pdmBlkCacheEntryFlagIsSetClearAcquireLock(pBlkCache, pEntry,
+                                                              PDMBLKCACHE_ENTRY_IS_DIRTY,
+                                                              0))
                 {
                     /* If it is already dirty but not in progress just update the data. */
@@ -2272 +2255 @@
          * the user fixed the problem and the next write succeeds.
          */
-        /** @todo r=aeichner: This solution doesn't work
-         * The user will get the message but the VM will hang afterwards
-         * VMR3Suspend() returns when the VM is suspended but suspending
-         * the VM will reopen the images readonly in DrvVD. They are closed first
-         * which will close the endpoints. This will block EMT while the
-         * I/O manager processes the close request but the IO manager is stuck
-         * in the VMR3Suspend call and can't process the request.
-         * Another problem is that closing the VM means flushing the cache
-         * but the entry failed and will probably fail again.
-         * No idea so far how to solve this problem... but the user gets informed
-         * at least.
-         */
         if (RT_FAILURE(rcIoXfer))
         {