Changeset 25192 in vbox

Timestamp:

Dec 4, 2009 1:56:27 PM (15 years ago)

Author:

vboxsync

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

55665

Message:

Storage/DevATA: fix device reset if a transfer redo is pending. Triggered release assertions (which was good, because if that check was missing the guest would have been with a totally unresponsive hard disk) with message "I/O state inconsistent: state=0 request=1". Reproducing is pretty much impossible unless using an iSCSI target which becomes unresponsive at just the right time, i.e. when doing big transfers.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (5 diffs)

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

@@ -776 +776 @@
                 break;
             case ATA_AIO_DMA:
-                LogRel(("dma transfer finished\n"));
+                LogRel(("dma transfer continuation\n"));
                 break;
             case ATA_AIO_PIO:
-                LogRel(("pio transfer finished\n"));
+                LogRel(("pio transfer continuation\n"));
                 break;
             case ATA_AIO_RESET_ASSERTED:
@@ -4648 +4648 @@
                         fRedo = g_apfnSourceSinkFuncs[s->iSourceSink](s);
                         pCtl->fRedo = fRedo;
-                        if (RT_UNLIKELY(fRedo))
+                        if (RT_UNLIKELY(fRedo && !pCtl->fReset))
                         {
                             /* Operation failed at the initial transfer, restart
@@ -4755 +4755 @@
                 ataDMATransfer(pCtl);
 
-                if (RT_UNLIKELY(pCtl->fRedo))
+                if (RT_UNLIKELY(pCtl->fRedo && !pCtl->fReset))
                 {
                     LogRel(("PIIX3 ATA: Ctl#%d: redo DMA operation\n", ATACONTROLLER_IDX(pCtl)));
@@ -4800 +4800 @@
                     fRedo = g_apfnSourceSinkFuncs[s->iSourceSink](s);
                     pCtl->fRedo = fRedo;
-                    if (RT_UNLIKELY(fRedo))
+                    if (RT_UNLIKELY(fRedo && !pCtl->fReset))
                     {
                         LogRel(("PIIX3 ATA: Ctl#%d: redo PIO operation\n", ATACONTROLLER_IDX(pCtl)));
@@ -4875 +4875 @@
                 pCtl->uAsyncIOState = ATA_AIO_NEW;
                 pCtl->fReset = false;
+                /* Ensure that half-completed transfers are not redone. A reset
+                 * cancels the entire transfer, so continuing is wrong. */
+                pCtl->fRedo = false;
+                pCtl->fRedoDMALastDesc = false;
                 LogRel(("PIIX3 ATA: Ctl#%d: finished processing RESET\n",
                         ATACONTROLLER_IDX(pCtl)));