Changeset 27734 in vbox

Timestamp:

Mar 26, 2010 12:20:00 PM (15 years ago)

Author:

vboxsync

Message:

AHCI: Report I/O errors to the guest

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevAHCI.cpp (modified) (8 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -490 +490 @@
     /** The revision string for SCSI INQUIRY commands. */
     char                            szInquiryRevision[AHCI_ATAPI_INQUIRY_REVISION_LENGTH+1];
-
-    uint32_t                        Alignment7;
+    /** Error counter */
+    uint32_t                        cErrors;
 
 } AHCIPort;
@@ -4159 +4159 @@
 
     /* Allocate new buffers and SG lists. */
-    pAhciPortTaskState->pvBufferUnaligned = RTMemAlloc(pAhciPortTaskState->cbSGBuffers);
+    pAhciPortTaskState->pvBufferUnaligned = RTMemPageAlloc(pAhciPortTaskState->cbSGBuffers);
     if (!pAhciPortTaskState->pvBufferUnaligned)
         return VERR_NO_MEMORY;
@@ -5097 +5097 @@
         case ATA_SMART:
         case ATA_NV_CACHE:
+        case ATA_READ_LOG_EXT:
             pAhciPortTaskState->uATARegError = ABRT_ERR;
             pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_ERR;
@@ -5524 +5525 @@
                             pAhciPort->Led.Actual.s.fReading = 0;
                             if (RT_FAILURE(rc))
-                                AssertMsgFailed(("%s: Failed to read data %Rrc\n", __FUNCTION__, rc));
+                                break;
 
                             STAM_REL_COUNTER_ADD(&pAhciPort->StatBytesRead, cbProcess);
@@ -5535 +5536 @@
                             pAhciPort->Led.Actual.s.fWriting = 0;
                             if (RT_FAILURE(rc))
-                                AssertMsgFailed(("%s: Failed to write data %Rrc\n", __FUNCTION__, rc));
+                                break;
 
                             STAM_REL_COUNTER_ADD(&pAhciPort->StatBytesWritten, cbProcess);
@@ -5549 +5550 @@
                     STAM_PROFILE_STOP(&pAhciPort->StatProfileReadWrite, b);
 
+                    /* Log the error. */
+                    if (   RT_FAILURE(rc)
+                        && pAhciPort->cErrors++ < MAX_LOG_REL_ERRORS)
+                    {
+                        LogRel(("AHCI#%u: %s at offset %llu (%u bytes left) returned rc=%Rrc\n",
+                                pAhciPort->iLUN,
+                                iTxDir == PDMBLOCKTXDIR_FROM_DEVICE
+                                ? "Read"
+                                : "Write",
+                                uOffset, cbTransfer, rc));
+                    }
+
                     /* Cleanup. */
-                    rc = ahciScatterGatherListDestroy(pAhciPort, pAhciPortTaskState);
-                    if (RT_FAILURE(rc))
+                    int rc2 = ahciScatterGatherListDestroy(pAhciPort, pAhciPortTaskState);
+                    if (RT_FAILURE(rc2))
                         AssertMsgFailed(("Destroying task list failed rc=%Rrc\n", rc));
 
                     if (RT_LIKELY(!pAhciPort->fPortReset))
                     {
-                        pAhciPortTaskState->cmdHdr.u32PRDBC = pAhciPortTaskState->cbTransfer;
-                        pAhciPortTaskState->uATARegError = 0;
-                        pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+                        pAhciPortTaskState->cmdHdr.u32PRDBC = pAhciPortTaskState->cbTransfer - cbTransfer;
+                        if (RT_FAILURE(rc))
+                        {
+                            pAhciPortTaskState->uATARegError = ID_ERR;
+                            pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_ERR;
+                        }
+                        else
+                        {
+                            pAhciPortTaskState->uATARegError = 0;
+                            pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+                        }
                         /* Write updated command header into memory of the guest. */
                         PDMDevHlpPhysWrite(pAhciPort->CTX_SUFF(pDevIns), pAhciPortTaskState->GCPhysCmdHdrAddr,
@@ -5598 +5619 @@
             ahciLog(("%s: After uActReadPos=%u\n", __FUNCTION__, pAhciPort->uActReadPos));
             cTasksToProcess--;
-            if (!cTasksToProcess)
+
+            /* If we encountered an error notify the guest and continue with the next task. */
+            if (RT_FAILURE(rc))
+            {
+                if (uQueuedTasksFinished && RT_LIKELY(!pAhciPort->fPortReset))
+                    ahciSendSDBFis(pAhciPort, uQueuedTasksFinished, pAhciPortTaskState, true);
+
+                uQueuedTasksFinished = 0;
+            }
+            else if (!cTasksToProcess)
                 cTasksToProcess = ASMAtomicXchgU32(&pAhciPort->uActTasksActive, 0);
         }
@@ -5619 +5649 @@
             pAhciPort->StatIORequestsPerSecond.c = uIOsPerSec;
         }
-    }
+    } /* While running */
 
     if (pAhci->fSignalIdle)

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1210 +1210 @@
     GEN_CHECK_OFF(AHCIPort, szInquiryRevision);
     GEN_CHECK_OFF(AHCIPort, szInquiryRevision[AHCI_ATAPI_INQUIRY_REVISION_LENGTH]);
+    GEN_CHECK_OFF(AHCIPort, cErrors);
 
     GEN_CHECK_SIZE(AHCI);