Changeset 43399 in vbox

Timestamp:

Sep 21, 2012 2:05:51 PM (13 years ago)

Author:

vboxsync

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

80882

Message:

AHCI: Fix release assertion when cancelling requests and disabled async I/O

File:

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

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

@@ -5606 +5606 @@
  * and notifying the guest.
  *
- * @returns VBox status code
+ * @returns Flag whether the given request was canceled inbetween;
  *
  * @param pAhciPort    Pointer to the port where to request completed.
@@ -5613 +5613 @@
  * @param fFreeReq     Flag whether to free the request if it was canceled.
  */
-static int ahciTransferComplete(PAHCIPort pAhciPort, PAHCIREQ pAhciReq, int rcReq, bool fFreeReq)
+static bool ahciTransferComplete(PAHCIPort pAhciPort, PAHCIREQ pAhciReq, int rcReq, bool fFreeReq)
 {
     bool fXchg = false;
     bool fRedo = false;
+    bool fCanceled = false;
     uint64_t tsNow = RTTimeMilliTS();
 
@@ -5770 +5771 @@
                   ("Task is not active but wasn't canceled!\n"));
 
+        fCanceled = true;
+        ASMAtomicXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_FREE);
+
         if (pAhciReq->enmTxDir == AHCITXDIR_TRIM)
             ahciTrimRangesDestroy(pAhciReq);
@@ -5780 +5784 @@
             if (pAhciReq->enmTxDir == AHCITXDIR_FLUSH)
                 LogRel(("AHCI#%u: Canceled flush returned rc=%Rrc\n",
+                        pAhciPort->iLUN, rcReq));
+            else if (pAhciReq->enmTxDir == AHCITXDIR_TRIM)
+                LogRel(("AHCI#%u: Canceled trim returned rc=%Rrc\n",
                         pAhciPort->iLUN, rcReq));
             else
@@ -5796 +5803 @@
     }
 
-    return VINF_SUCCESS;
+    return fCanceled;
 }
 
@@ -6432 +6439 @@
                && RT_LIKELY(!pAhciPort->fPortReset))
         {
+            bool fReqCanceled = false;
             AHCITXDIR enmTxDir;
 
@@ -6450 +6458 @@
             /* Set current command slot */
             ASMAtomicWriteU32(&pAhciPort->u32CurrentCommandSlot, pAhciReq->uTag);
+            pAhciPort->aCachedTasks[0] = pAhciReq; /* Make cancelling the request possible. */
 
             /* Mark the task as processed by the HBA if this is a queued task so that it doesn't occur in the CI register anymore. */
@@ -6547 +6556 @@
                 }
 
-                ahciTransferComplete(pAhciPort, pAhciReq, rc, false /* fFreeReq */);
+                fReqCanceled = ahciTransferComplete(pAhciPort, pAhciReq, rc, false /* fFreeReq */);
                 uIORequestsProcessed++;
                 STAM_PROFILE_STOP(&pAhciPort->StatProfileProcessTime, a);
@@ -6563 +6572 @@
 #endif
             }
+
+            /*
+             * Don't process other requests if the last one was canceled,
+             * the others are not valid anymore.
+             */
+            if (fReqCanceled)
+                break;
             fTasksToProcess &= ~(1 << idx);
             idx = ASMBitFirstSetU32(fTasksToProcess);