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

Timestamp:

Jun 29, 2015 4:59:20 PM (10 years ago)

Author:

vboxsync

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

101318

Message:

Storage/AHCI: Fix assertion which can trigger erroneously after r100611 in rare circumstances. Also make it only log the assertion in release builds but don't abort the VM

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (1 diff)

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

@@ -6762 +6762 @@
         if (pAhciReq->cmdFis[AHCI_CMDFIS_BITS] & AHCI_CMDFIS_C)
         {
-            AssertReleaseMsg(ASMAtomicReadU32(&pAhciPort->cTasksActive) < AHCI_NR_COMMAND_SLOTS,
-                             ("There are more than 32 requests active"));
+            /*
+             * It is possible that the request counter can get one higher than the maximum because
+             * the request counter is decremented after the guest was notified about the completed
+             * request (see @bugref{7859}). If the completing thread is preempted in between the
+             * guest might already issue another request before the request counter is decremented
+             * which would trigger the following assertion incorrectly in the past.
+             */
+            AssertLogRelMsg(ASMAtomicReadU32(&pAhciPort->cTasksActive) <= AHCI_NR_COMMAND_SLOTS,
+                            ("AHCI#%uP%u: There are more than %u (+1) requests active",
+                             pAhciPort->CTX_SUFF(pDevIns)->iInstance, pAhciPort->iLUN,
+                             AHCI_NR_COMMAND_SLOTS));
             ASMAtomicIncU32(&pAhciPort->cTasksActive);
         }