Changeset 74838 in vbox

Timestamp:

Oct 15, 2018 9:25:50 AM (6 years ago)

Author:

vboxsync

Message:

DrvVD: Fixed failing suspend/resume cycle if an recoverable error occurs a second time, need to clear the redo flag on resume. Fixed active I/O request accounting

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -2915 +2915 @@
     bool fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pIoReq->enmState, VDIOREQSTATE_COMPLETING, VDIOREQSTATE_ACTIVE);
     if (fXchg)
-        ASMAtomicDecU32(&pThis->cIoReqsActive);
+    {
+        uint32_t cNew = ASMAtomicDecU32(&pThis->cIoReqsActive);
+        AssertMsg(cNew != UINT32_MAX, ("Number of active requests underflowed!\n"));
+    }
     else
     {
@@ -3062 +3065 @@
             RTListAppend(&pThis->LstIoReqRedo, &pIoReq->NdLstWait);
             RTCritSectLeave(&pThis->CritSectIoReqRedo);
-            ASMAtomicDecU32(&pThis->cIoReqsActive);
+            uint32_t cNew = ASMAtomicDecU32(&pThis->cIoReqsActive);
+            AssertMsg(cNew != UINT32_MAX, ("Number of active requests underflowed!\n"));
             pThis->pDrvMediaExPort->pfnIoReqStateChanged(pThis->pDrvMediaExPort, pIoReq, &pIoReq->abAlloc[0],
                                                          PDMMEDIAEXIOREQSTATE_SUSPENDED);
+            LogFlowFunc(("Suspended I/O request %#p\n", pIoReq));
             rcReq = VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS;
         }
@@ -3157 +3162 @@
                 pThis->pDrvMediaExPort->pfnIoReqStateChanged(pThis->pDrvMediaExPort, pIoReq, &pIoReq->abAlloc[0],
                                                              PDMMEDIAEXIOREQSTATE_SUSPENDED);
+            LogFlowFunc(("Suspended I/O request %#p\n", pIoReq));
             RTCritSectLeave(&pThis->CritSectIoReqsIoBufWait);
             rc = VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS;
@@ -3703 +3709 @@
     }
 
-    if (fXchg)
-        ASMAtomicDecU32(&pThis->cIoReqsActive);
+    if (fXchg && enmStateOld == VDIOREQSTATE_ACTIVE)
+    {
+        uint32_t cNew = ASMAtomicDecU32(&pThis->cIoReqsActive);
+        AssertMsg(cNew != UINT32_MAX, ("Number of active requests underflowed!\n"));
+    }
 
     return fXchg;
@@ -3746 +3755 @@
         pThis->pDrvMediaExPort->pfnIoReqStateChanged(pThis->pDrvMediaExPort, pIoReqCur, &pIoReqCur->abAlloc[0],
                                                      PDMMEDIAEXIOREQSTATE_SUSPENDED);
+        LogFlowFunc(("Suspended I/O request %#p\n", pIoReqCur));
     }
     RTCritSectLeave(&pThis->CritSectIoReqsIoBufWait);
@@ -4753 +4763 @@
     drvvdSetWritable(pThis);
     pThis->fSuspending      = false;
+    pThis->fRedo            = false;
 
     if (pThis->pBlkCache)
@@ -4770 +4781 @@
                                                          PDMMEDIAEXIOREQSTATE_ACTIVE);
             ASMAtomicIncU32(&pThis->cIoReqsActive);
+            LogFlowFunc(("Resumed I/O request %#p\n", pIoReq));
         }
         RTCritSectLeave(&pThis->CritSectIoReqsIoBufWait);
@@ -4783 +4795 @@
             ASMAtomicIncU32(&pThis->cIoReqsActive);
 
+            LogFlowFunc(("Resuming I/O request %#p fXchg=%RTbool\n", pIoReq, fXchg));
             if (fXchg)
             {
                 pThis->pDrvMediaExPort->pfnIoReqStateChanged(pThis->pDrvMediaExPort, pIoReq, &pIoReq->abAlloc[0],
                                                              PDMMEDIAEXIOREQSTATE_ACTIVE);
+                LogFlowFunc(("Resumed I/O request %#p\n", pIoReq));
                 if (   pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ
                     || pIoReq->enmType == PDMMEDIAEXIOREQTYPE_WRITE)
@@ -4987 +5001 @@
     pThis->pRegionList                  = NULL;
     pThis->fSuspending                  = false;
+    pThis->fRedo                        = false;
 
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aIoReqAllocBins); i++)