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

Timestamp:

Aug 19, 2014 10:04:54 AM (10 years ago)

Author:

vboxsync

Message:

Storage/AHCI: Free cached tasks on detach and before ahciR3Destruct is called because drivers are not available at that point anymore

File:

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

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

@@ -5660 +5660 @@
 
 /**
+ * Free all cached tasks on the given port.
+ *
+ * @returns nothing.
+ * @param   pAhciPort    The AHCI port.
+ */
+static void ahciR3PortCachedReqsFree(PAHCIPort pAhciPort)
+{
+    for (uint32_t i = 0; i < AHCI_NR_COMMAND_SLOTS; i++)
+    {
+        if (pAhciPort->aCachedTasks[i])
+        {
+            ahciReqMemFree(pAhciPort, pAhciPort->aCachedTasks[i], true /* fForceFree */);
+            RTMemFree(pAhciPort->aCachedTasks[i]);
+            pAhciPort->aCachedTasks[i] = NULL;
+        }
+    }
+}
+
+/**
  * Cancels all active tasks on the port.
  *
@@ -7588 +7607 @@
     PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
     ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+    /*
+     * Free all cached tasks here, not possible on destruct because the driver
+     * is destroyed before us.
+     */
+    for (unsigned iPort = 0; iPort < pThis->cPortsImpl; iPort++)
+        ahciR3PortCachedReqsFree(&pThis->ahciPort[iPort]);
     return true;
 }
@@ -7602 +7627 @@
         PDMDevHlpSetAsyncNotification(pDevIns, ahciR3IsAsyncSuspendOrPowerOffDone);
     else
+    {
+        /*
+         * Free all cached tasks here, not possible on destruct because the driver
+         * is destroyed before us.
+         */
+        for (unsigned iPort = 0; iPort < pThis->cPortsImpl; iPort++)
+            ahciR3PortCachedReqsFree(&pThis->ahciPort[iPort]);
+
         ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+    }
 }
 
@@ -7810 +7844 @@
     if (pAhciPort->fATAPI)
         ahciMediumRemoved(pAhciPort);
+
+    /* Free all cached I/O tasks. */
+    ahciR3PortCachedReqsFree(pAhciPort);
 
     if (!(fFlags & PDM_TACH_FLAGS_NOT_HOT_PLUG))
@@ -8017 +8054 @@
 static DECLCALLBACK(void) ahciR3PowerOff(PPDMDEVINS pDevIns)
 {
+    PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+
     Log(("achiR3PowerOff\n"));
     ahciR3SuspendOrPowerOff(pDevIns);
@@ -8056 +8095 @@
             }
 
-            /* Free all cached tasks. */
-            for (uint32_t i = 0; i < AHCI_NR_COMMAND_SLOTS; i++)
-                if (pAhciPort->aCachedTasks[i])
-                {
-                    ahciReqMemFree(pAhciPort, pAhciPort->aCachedTasks[i], true /* fForceFree */);
-                    RTMemFree(pAhciPort->aCachedTasks[i]);
-                    pAhciPort->aCachedTasks[i] = NULL;
-                }
+#ifdef VBOX_STRICT
+            /* Check that all cached tasks were freed at this point. */
+            for (unsigned iPort = 0; iPort < pThis->cPortsImpl; iPort++)
+            {
+                PAHCIPort pAhciPort = &pThis->ahciPort[iPort];
+
+                for (uint32_t i = 0; i < AHCI_NR_COMMAND_SLOTS; i++)
+                    Assert(!pAhciPort->aCachedTasks[i]);
+            }
+#endif
         }