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

Timestamp:

Jan 8, 2014 12:06:11 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91489

Message:

AHCI: Fix race which can cause a hang during suspend

File:

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

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

@@ -446 +446 @@
     /** Flag whether this port is hot plug capable. */
     bool                            fHotpluggable;
-    /** Flag whether the I/O thread idles. */
-    volatile bool                   fAsyncIOThreadIdle;
     /** Flag whether the port is in redo task mode. */
     volatile bool                   fRedo;
@@ -6547 +6545 @@
                  * Couldn't find anything in either the AHCI or SATA spec which
                  * indicates what should be done if the FIS is not read successfully.
-                 * The closes thing is in the state machine, stating that the device
+                 * The closest thing is in the state machine, stating that the device
                  * should go into idle state again (SATA spec 1.0 chapter 8.7.1).
                  * Do the same here and ignore any corrupt FIS types, after all
@@ -6788 +6786 @@
         pHlp->pfnPrintf(pHlp, "PortTasksFinished=%#x\n", pThisPort->u32TasksFinished);
         pHlp->pfnPrintf(pHlp, "PortQueuedTasksFinished=%#x\n", pThisPort->u32QueuedTasksFinished);
-        pHlp->pfnPrintf(pHlp, "PortAsyncIoThreadIdle=%RTbool\n", pThisPort->fAsyncIOThreadIdle);
         pHlp->pfnPrintf(pHlp, "\n");
     }
@@ -6808 +6805 @@
     PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
 
+    if (pThis->cThreadsActive)
+        return false;
+
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->ahciPort); i++)
     {
@@ -6813 +6813 @@
         if (pThisPort->pDrvBase)
         {
-            bool fFinished;
-            if (pThisPort->fAsyncInterface)
-                fFinished = (pThisPort->cTasksActive == 0);
-            else
-                fFinished = ((pThisPort->cTasksActive == 0) && (pThisPort->fAsyncIOThreadIdle));
-            if (!fFinished)
+            if (   (pThisPort->cTasksActive != 0)
+                || (pThisPort->u32TasksNew != 0))
                return false;
         }
@@ -8222 +8218 @@
         pAhciPort->IMountNotify.pfnMountNotify          = ahciR3MountNotify;
         pAhciPort->IMountNotify.pfnUnmountNotify        = ahciR3UnmountNotify;
-        pAhciPort->fAsyncIOThreadIdle                   = true;
 
         /* Query per port configuration options if available. */