Changeset 50938 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Apr 1, 2014 9:36:18 AM (11 years ago)

Author:

vboxsync

Message:

AHCI: Fix race condition during port reset causing a release assertion when canceling outstanding requests

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (4 diffs)

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

@@ -1175 +1175 @@
     if ((u32Value & AHCI_PORT_SCTL_DET) == AHCI_PORT_SCTL_DET_INIT)
     {
-        bool fAllTasksCanceled;
-
-        /* Cancel all tasks first. */
-        fAllTasksCanceled = ahciCancelActiveTasks(pAhciPort);
-        Assert(fAllTasksCanceled);
-
         if (!ASMAtomicXchgBool(&pAhciPort->fPortReset, true))
             LogRel(("AHCI#%u: Port %d reset\n", ahci->CTX_SUFF(pDevIns)->iInstance,
                     pAhciPort->iLUN));
+
+        /* Make sure the async I/O thread is not working before we start to cancel active requests. */
+        while (   pAhciPort->u32TasksNew
+               && !pAhciPort->fWrkThreadSleeping)
+            RTThreadYield();
+
+        /* Cancel all tasks first. */
+        bool fAllTasksCanceled = ahciCancelActiveTasks(pAhciPort);
+        Assert(fAllTasksCanceled);
 
         pAhciPort->regSSTS = 0;
@@ -1190 +1193 @@
         pAhciPort->fFirstD2HFisSend = false;
     }
-    else if ((u32Value & AHCI_PORT_SCTL_DET) == AHCI_PORT_SCTL_DET_NINIT && pAhciPort->pDrvBase &&
-             (pAhciPort->regSCTL & AHCI_PORT_SCTL_DET) == AHCI_PORT_SCTL_DET_INIT)
+    else if (   (u32Value & AHCI_PORT_SCTL_DET) == AHCI_PORT_SCTL_DET_NINIT
+             && (pAhciPort->regSCTL & AHCI_PORT_SCTL_DET) == AHCI_PORT_SCTL_DET_INIT
+             && pAhciPort->pDrvBase)
     {
         if (pAhciPort->pDrvBase)
@@ -1238 +1242 @@
                 }
             }
-       }
+        }
     }
 
@@ -6538 +6542 @@
 
         idx = ASMBitFirstSetU32(u32Tasks);
-        while (idx)
+        while (   idx
+               && !pAhciPort->fPortReset)
         {
             bool fReqCanceled = false;