Changeset 24751 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2009 1:13:11 AM (15 years ago)

Author:

vboxsync

Message:

DrvSCSI: Converted to async reset, suspend and power off notification handling.

File:

• trunk/src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (8 diffs)

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

@@ -91 +91 @@
     /** Request that we've left pending on wakeup or reset. */
     PRTREQ                  pPendingDummyReq;
+    /** Indicates whether PDMDrvHlpAsyncNotificationCompleted should be called by
+     * any of the dummy functions. */
+    bool volatile           fDummySignal;
     /** Release statistics: number of bytes written. */
     STAMCOUNTER             StatBytesWritten;
@@ -676 +679 @@
  * to complete prior to the device reset.
  *
+ * @param   pThis           Pointer to the instace data.
  * @returns VINF_SUCCESS.
  */
-static int drvscsiAsyncIOLoopSyncCallback(void)
-{
+static int drvscsiAsyncIOLoopSyncCallback(PDRVSCSI pThis)
+{
+    if (pThis->fDummySignal)
+        PDMDrvHlpAsyncNotificationCompleted(pThis->pDrvIns);
     return VINF_SUCCESS;
 }
@@ -686 +692 @@
  * Request function to wakeup the thread.
  *
+ * @param   pThis           Pointer to the instace data.
  * @returns VWRN_STATE_CHANGED.
  */
-static int drvscsiAsyncIOLoopWakeupFunc(void)
-{
+static int drvscsiAsyncIOLoopWakeupFunc(PDRVSCSI pThis)
+{
+    if (pThis->fDummySignal)
+        PDMDrvHlpAsyncNotificationCompleted(pThis->pDrvIns);
     return VWRN_STATE_CHANGED;
 }
@@ -697 +706 @@
  *
  * @returns VBox status code.
- * @param   pDrvIns    Pointer to the device instance data.
+ * @param   pDrvIns    Pointer to the driver instance data.
  * @param   pThread    Pointer to the thread instance data.
  */
@@ -753 +762 @@
     }
 
-    rc = RTReqCall(pThis->pQueueRequests, &pReq, 10000 /* 10 sec. */, (PFNRT)drvscsiAsyncIOLoopWakeupFunc, 0);
+    rc = RTReqCall(pThis->pQueueRequests, &pReq, 10000 /* 10 sec. */, (PFNRT)drvscsiAsyncIOLoopWakeupFunc, 1, pThis);
     if (RT_SUCCESS(rc))
         RTReqFree(pReq);
@@ -805 +814 @@
  * Worker for drvscsiReset, drvscsiSuspend and drvscsiPowerOff.
  *
- * @param   pThis               The instance data.
- * @param   pszEvent            The notification event (for logging).
- */
-static void drvscsiWaitForPendingRequests(PDRVSCSI pThis, const char *pszEvent)
-{
-    /*
-     * Try make sure any pending I/O has completed now.
-     */
-    if (pThis->pQueueRequests)
-    {
-        if (!drvscsiAsyncIOLoopNoPendingDummy(pThis, 20000 /*ms*/))
+ * @param   pDrvIns         The driver instance.
+ * @param   pfnAsyncNotify  The async callback.
+ */
+static void drvscsiR3ResetOrSuspendOrPowerOff(PPDMDRVINS pDrvIns, PFNPDMDRVASYNCNOTIFY pfnAsyncNotify)
+{
+    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
+
+    if (!pThis->pQueueRequests)
+        return;
+
+    ASMAtomicWriteBool(&pThis->fDummySignal, true);
+    if (drvscsiAsyncIOLoopNoPendingDummy(pThis, 0 /*ms*/))
+    {
+        if (!RTReqIsBusy(pThis->pQueueRequests))
         {
-            LogRel(("drvscsi%s#%u: previous dummy request is still pending\n", pszEvent, pThis->pDrvIns->iInstance));
+            ASMAtomicWriteBool(&pThis->fDummySignal, false);
             return;
         }
 
-        if (RTReqIsBusy(pThis->pQueueRequests))
+        PRTREQ pReq;
+        int rc = RTReqCall(pThis->pQueueRequests, &pReq, 0 /*ms*/, (PFNRT)drvscsiAsyncIOLoopSyncCallback, 1, pThis);
+        if (RT_SUCCESS(rc))
         {
-            PRTREQ pReq;
-            int rc = RTReqCall(pThis->pQueueRequests, &pReq, 20000 /*ms*/, (PFNRT)drvscsiAsyncIOLoopSyncCallback, 0);
-            if (RT_SUCCESS(rc))
-                RTReqFree(pReq);
-            else
-            {
-                pThis->pPendingDummyReq = pReq;
-                LogRel(("drvscsi%s#%u: %Rrc pReq=%p\n", pszEvent, pThis->pDrvIns->iInstance, rc, pReq));
-            }
+            ASMAtomicWriteBool(&pThis->fDummySignal, false);
+            RTReqFree(pReq);
+            return;
         }
-    }
-/** @todo r=bird: this is a deadlock trap. We're EMT(0), if there are
- *        outstanding requests they may require EMT interaction because of
- *        physical write backs around lsilogicDeviceSCSIRequestCompleted...
- *
- *        I have some more generic solution for delayed suspend, reset and
- *        poweroff handling that I'm considering.  The idea is that the
- *        notification callback returns a status indicating that it didn't
- *        complete and needs to be called again or something.  EMT continues on
- *        the next device and when it's done, it processes incoming requests and
- *        does another notification round... This way we could combine the waits
- *        in the I/O controllers and reduce the time it takes to suspend a VM a
- *        wee bit...
- */
+
+        pThis->pPendingDummyReq = pReq;
+    }
+    PDMDrvHlpSetAsyncNotification(pDrvIns, pfnAsyncNotify);
+}
+
+/**
+ * Callback employed by drvscsiSuspend and drvscsiPowerOff.
+ *
+ * @returns true if we've quiesced, false if we're still working.
+ * @param   pDrvIns     The driver instance.
+ */
+static DECLCALLBACK(bool) drvscsiIsAsyncSuspendOrPowerOffDone(PPDMDRVINS pDrvIns)
+{
+    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
+
+    if (!drvscsiAsyncIOLoopNoPendingDummy(pThis, 0 /*ms*/))
+        return false;
+    ASMAtomicWriteBool(&pThis->fDummySignal, false);
+    PDMR3ThreadSuspend(pThis->pAsyncIOThread);
+    return true;
 }
 
@@ -854 +869 @@
 static DECLCALLBACK(void) drvscsiPowerOff(PPDMDRVINS pDrvIns)
 {
+    drvscsiR3ResetOrSuspendOrPowerOff(pDrvIns, drvscsiIsAsyncSuspendOrPowerOffDone);
+}
+
+/**
+ * @copydoc FNPDMDRVSUSPEND
+ */
+static DECLCALLBACK(void) drvscsiSuspend(PPDMDRVINS pDrvIns)
+{
+    drvscsiR3ResetOrSuspendOrPowerOff(pDrvIns, drvscsiIsAsyncSuspendOrPowerOffDone);
+}
+
+/**
+ * Callback employed by drvscsiReset.
+ *
+ * @returns true if we've quiesced, false if we're still working.
+ * @param   pDrvIns     The driver instance.
+ */
+static DECLCALLBACK(bool) drvscsiIsAsyncResetDone(PPDMDRVINS pDrvIns)
+{
     PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
-    PDMR3ThreadSuspend(pThis->pAsyncIOThread);
-}
-
-/**
- * @copydoc FNPDMDRVSUSPEND
- */
-static DECLCALLBACK(void) drvscsiSuspend(PPDMDRVINS pDrvIns)
-{
-    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
-    PDMR3ThreadSuspend(pThis->pAsyncIOThread);
+
+    if (!drvscsiAsyncIOLoopNoPendingDummy(pThis, 0 /*ms*/))
+        return false;
+    ASMAtomicWriteBool(&pThis->fDummySignal, false);
+    return true;
 }
 
@@ -872 +901 @@
 static DECLCALLBACK(void) drvscsiReset(PPDMDRVINS pDrvIns)
 {
-    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
-    drvscsiWaitForPendingRequests(pThis, "Reset");
+    drvscsiR3ResetOrSuspendOrPowerOff(pDrvIns, drvscsiIsAsyncResetDone);
 }