Changeset 64832 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2016 11:53:14 AM (8 years ago)

Author:

vboxsync

Message:

Storage/QED: Apply the fix as done to QCOW as they share the same issue (see r112215)

File:

• trunk/src/VBox/Storage/QED.cpp (modified) (6 diffs)

trunk/src/VBox/Storage/QED.cpp

@@ -207 +207 @@
     uint32_t            cL2Shift;
 
+    /** Pointer to the L2 table we are currently allocating
+     * (can be only one at a time). */
+    PQEDL2CACHEENTRY    pL2TblAlloc;
+
     /** Memory occupied by the L2 table cache. */
     size_t              cbL2Cache;
@@ -418 +422 @@
 static PQEDL2CACHEENTRY qedL2TblCacheRetain(PQEDIMAGE pImage, uint64_t offL2Tbl)
 {
+    if (   pImage->pL2TblAlloc
+        && pImage->pL2TblAlloc->offL2Tbl == offL2Tbl)
+    {
+        pImage->pL2TblAlloc->cRefs++;
+        return pImage->pL2TblAlloc;
+    }
+
     PQEDL2CACHEENTRY pL2Entry;
     RTListForEach(&pImage->ListSearch, pL2Entry, QEDL2CACHEENTRY, NodeSearch)
@@ -1328 +1339 @@
             /* Revert the L1 table entry */
             pImage->paL1Table[pClusterAlloc->idxL1] = 0;
+            pImage->pL2TblAlloc = NULL;
 
             /* Assumption right now is that the L1 table is not modified on storage if the link fails. */
             rc = vdIfIoIntFileSetSize(pImage->pIfIo, pImage->pStorage, pClusterAlloc->cbImageOld);
             qedL2TblCacheEntryRelease(pClusterAlloc->pL2Entry); /* Release L2 cache entry. */
+            Assert(!pClusterAlloc->pL2Entry->cRefs);
             qedL2TblCacheEntryFree(pImage, pClusterAlloc->pL2Entry); /* Free it, it is not in the cache yet. */
             break;
@@ -1399 +1412 @@
             uint64_t offData = qedClusterAllocate(pImage, 1);
 
+            pImage->pL2TblAlloc = NULL;
             qedL2TblCacheEntryInsert(pImage, pClusterAlloc->pL2Entry);
 
@@ -1769 +1783 @@
                         pL2ClusterAlloc->cbToWrite     = cbToWrite;
                         pL2ClusterAlloc->pL2Entry      = pL2Entry;
+
+                        pImage->pL2TblAlloc = pL2Entry;
+
+                        LogFlowFunc(("Allocating new L2 table at cluster offset %llu\n", offL2Tbl));
 
                         /*
@@ -1791 +1809 @@
                     else
                     {
+                        LogFlowFunc(("Fetching L2 table at cluster offset %llu\n", pImage->paL1Table[idxL1]));
+
                         rc = qedL2TblCacheFetchAsync(pImage, pIoCtx, pImage->paL1Table[idxL1],
                                                      &pL2Entry);