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

Timestamp:

Feb 1, 2012 3:54:44 PM (13 years ago)

Author:

vboxsync

Message:

AHCI: Temporary release assertions which hopefully catch inconsistent controller states causing hangs during VM poweroff

File:

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

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

@@ -5383 +5383 @@
             {
                 /* Task is active and was canceled. */
-                AssertMsg(pAhciPort->cTasksActive > 0, ("Task was canceled but none is active\n"));
+                AssertReleaseMsg(ASMAtomicReadU32(&pAhciPort->cTasksActive) > 0,
+                                 ("Task was canceled but none is active\n"));
                 ASMAtomicDecU32(&pAhciPort->cTasksActive);
 
@@ -5400 +5401 @@
     }
 
+    AssertRelease(!ASMAtomicReadU32(&pAhciPort->cTasksActive));
     return true; /* always true for now because tasks don't use guest memory as the buffer which makes canceling a task impossible. */
 }
@@ -5696 +5698 @@
         /* Add the task to the cache. */
         ASMAtomicWritePtr(&pAhciPort->aCachedTasks[pAhciReq->uTag], pAhciReq);
+        AssertReleaseMsg(ASMAtomicReadU32(&pAhciPort->cTasksActive) > 0 ,
+                         ("Inconsistent request counter\n"));
         ASMAtomicDecU32(&pAhciPort->cTasksActive);
 
@@ -6249 +6253 @@
             else
             {
+                AssertReleaseMsg(ASMAtomicReadU32(&pAhciPort->cTasksActive) < AHCI_NR_COMMAND_SLOTS,
+                                 ("There are more than 32 requests active"));
                 ASMAtomicIncU32(&pAhciPort->cTasksActive);
 
@@ -6433 +6439 @@
             else
             {
+                AssertReleaseMsg(ASMAtomicReadU32(&pAhciPort->cTasksActive) < AHCI_NR_COMMAND_SLOTS,
+                                 ("There are more than 32 requests active"));
                 ASMAtomicIncU32(&pAhciPort->cTasksActive);
                 enmTxDir = ahciProcessCmd(pAhciPort, pAhciReq, &pAhciReq->cmdFis[0]);
@@ -6445 +6453 @@
                     {
                         pAhciPort->Led.Asserted.s.fWriting = pAhciPort->Led.Actual.s.fWriting = 1;
-                        rc = pAhciPort->pDrvBlock->pfnDiscard(pAhciPort->pDrvBlock, 
+                        rc = pAhciPort->pDrvBlock->pfnDiscard(pAhciPort->pDrvBlock,
                                                               pAhciReq->u.Trim.paRanges,
                                                               pAhciReq->u.Trim.cRanges);