Changeset 64727 in vbox

Timestamp:

Nov 21, 2016 11:43:03 AM (8 years ago)

Author:

vboxsync

Message:

Storage/DrvVD: Don't process I/O requests under a lock but postpone it until it was released

File:

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

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

@@ -3233 +3233 @@
         if (cIoReqsWaiting > 0)
         {
+            RTLISTANCHOR LstIoReqProcess;
+            RTListInit(&LstIoReqProcess);
+
             /* Try to process as many requests as possible. */
             RTCritSectEnter(&pThis->CritSectIoReqsIoBufWait);
@@ -3255 +3258 @@
                     pIoReqCur->ReadWrite.pSgBuf     = &pIoReqCur->ReadWrite.IoBuf.SgBuf;
 
-                    bool fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pIoReqCur->enmState, VDIOREQSTATE_ACTIVE, VDIOREQSTATE_ALLOCATED);
-                    if (RT_UNLIKELY(!fXchg))
-                    {
-                        /* Must have been canceled inbetween. */
-                        Assert(pIoReqCur->enmState == VDIOREQSTATE_CANCELED);
-                        drvvdMediaExIoReqCompleteWorker(pThis, pIoReqCur, VERR_PDM_MEDIAEX_IOREQ_CANCELED, true /* fUpNotify */);
-                    }
-                    ASMAtomicIncU32(&pThis->cIoReqsActive);
-                    rc = drvvdMediaExIoReqReadWriteProcess(pThis, pIoReqCur, true /* fUpNotify */);
+                    RTListAppend(&LstIoReqProcess, &pIoReqCur->NdLstWait);
                 }
                 else
@@ -3274 +3269 @@
 
             ASMAtomicAddU32(&pThis->cIoReqsWaiting, cIoReqsWaiting);
+
+            /* Process the requests we could allocate memory for outside the lock now. */
+            RTListForEachSafe(&LstIoReqProcess, pIoReqCur, pIoReqNext, PDMMEDIAEXIOREQINT, NdLstWait)
+            {
+                RTListNodeRemove(&pIoReqCur->NdLstWait);
+
+                bool fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pIoReqCur->enmState, VDIOREQSTATE_ACTIVE, VDIOREQSTATE_ALLOCATED);
+                if (RT_UNLIKELY(!fXchg))
+                {
+                    /* Must have been canceled inbetween. */
+                    Assert(pIoReqCur->enmState == VDIOREQSTATE_CANCELED);
+                    drvvdMediaExIoReqCompleteWorker(pThis, pIoReqCur, VERR_PDM_MEDIAEX_IOREQ_CANCELED, true /* fUpNotify */);
+                }
+                ASMAtomicIncU32(&pThis->cIoReqsActive);
+                drvvdMediaExIoReqReadWriteProcess(pThis, pIoReqCur, true /* fUpNotify */);
+            }
         }
     }