Changeset 39100 in vbox

Timestamp:

Oct 24, 2011 9:12:07 PM (14 years ago)

Author:

vboxsync

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

74532

Message:

DevATA: Implement proper command splitting if the command exceeds the I/O buffer

File:

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

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

@@ -1894 +1894 @@
     PSTAMPROFILEADV pProf = NULL;
 
-    cbTransfer = s->cbElementaryTransfer;
+    cbTransfer = RT_MIN(s->cbElementaryTransfer, s->cbIOBuffer);
 
     if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
@@ -1918 +1918 @@
 
     if (pProf) { STAM_PROFILE_ADV_START(pProf, b); }
-    if (cbTransfer > SCSI_MAX_BUFFER_SIZE)
+    if (   cbTransfer > SCSI_MAX_BUFFER_SIZE
+        || s->cbElementaryTransfer > s->cbIOBuffer)
     {
         /* Linux accepts commands with up to 100KB of data, but expects
@@ -1926 +1927 @@
         uint32_t iATAPILBA, cSectors, cReqSectors, cbCurrTX;
         uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
+        uint32_t cSectorsMax; /**< Maximum amount of sectors to read without exceeding the I/O buffer. */
+
+        Assert(s->cbATAPISector);
+        cSectorsMax = cbTransfer / s->cbATAPISector;
+        Assert(cSectorsMax * s->cbATAPISector <= s->cbIOBuffer);
 
         switch (s->aATAPICmd[0])
@@ -1960 +1966 @@
                 return false;
         }
+        cSectorsMax = RT_MIN(cSectorsMax, cSectors);
         memcpy(aATAPICmd, s->aATAPICmd, ATAPI_PACKET_SIZE);
         cReqSectors = 0;
-        for (uint32_t i = cSectors; i > 0; i -= cReqSectors)
+        for (uint32_t i = cSectorsMax; i > 0; i -= cReqSectors)
         {
             if (i * s->cbATAPISector > SCSI_MAX_BUFFER_SIZE)
@@ -1997 +2004 @@
             pbBuf += s->cbATAPISector * cReqSectors;
         }
+
+        if (RT_SUCCESS(rc))
+        {
+            /* Adjust ATAPI command for the next call. */
+            switch (s->aATAPICmd[0])
+            {
+                case SCSI_READ_10:
+                case SCSI_WRITE_10:
+                case SCSI_WRITE_AND_VERIFY_10:
+                    ataH2BE_U32(s->aATAPICmd + 2, iATAPILBA);
+                    ataH2BE_U16(s->aATAPICmd + 7, cSectors - cSectorsMax);
+                    break;
+                case SCSI_READ_12:
+                case SCSI_WRITE_12:
+                    ataH2BE_U32(s->aATAPICmd + 2, iATAPILBA);
+                    ataH2BE_U32(s->aATAPICmd + 6, cSectors - cSectorsMax);
+                    break;
+                case SCSI_READ_CD:
+                    ataH2BE_U32(s->aATAPICmd + 2, iATAPILBA);
+                    ataH2BE_U24(s->aATAPICmd + 6, cSectors - cSectorsMax);
+                    break;
+                case SCSI_READ_CD_MSF:
+                    ataLBA2MSF(s->aATAPICmd + 3, iATAPILBA);
+                    ataLBA2MSF(s->aATAPICmd + 6, iATAPILBA + cSectors - cSectorsMax);
+                    break;
+                default:
+                    AssertMsgFailed(("Don't know how to split command %#04x\n", s->aATAPICmd[0]));
+                    if (s->cErrors++ < MAX_LOG_REL_ERRORS)
+                        LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough split error\n", s->iLUN));
+                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
+                    return false;
+            }
+        }
     }
     else
@@ -2026 +2066 @@
         {
             Assert(cbTransfer <= s->cbTotalTransfer);
-            /* Reply with the same amount of data as the real drive. */
-            s->cbTotalTransfer = cbTransfer;
-            /* The initial buffer end value has been set up based on the total
-             * transfer size. But the I/O buffer size limits what can actually be
-             * done in one transfer, so set the actual value of the buffer end. */
-            s->cbElementaryTransfer = cbTransfer;
+            /*
+             * Reply with the same amount of data as the real drive
+             * but only if the command wasn't splitted.
+             */
+            if (s->cbElementaryTransfer < s->cbIOBuffer)
+                s->cbTotalTransfer = cbTransfer;
+
             if (s->aATAPICmd[0] == SCSI_INQUIRY)
             {
@@ -2074 +2115 @@
                 Log3(("ATAPI PT data read (%d): %.*Rhxs\n", cbTransfer, cbTransfer, s->CTX_SUFF(pbIOBuffer)));
         }
-        s->iSourceSink = ATAFN_SS_NULL;
-        atapiCmdOK(s);
+
+        /* The initial buffer end value has been set up based on the total
+         * transfer size. But the I/O buffer size limits what can actually be
+         * done in one transfer, so set the actual value of the buffer end. */
+        s->cbElementaryTransfer = cbTransfer;
+        if (cbTransfer >= s->cbTotalTransfer)
+        {
+            s->iSourceSink = ATAFN_SS_NULL;
+            atapiCmdOK(s);
+        }
     }
     else
@@ -3582 +3631 @@
             break;
         sendcmd:
-            /* Send a command to the drive, passing data in/out as required. */
+            /*
+             * Send a command to the drive, passing data in/out as required.
+             * Commands which exceed the I/O buffer size are splitted below
+             * or aborted if splitting is not implemented.
+             */
             Log2(("ATAPI PT: max size %d\n", cbTransfer));
-            if (cbTransfer > s->cbIOBuffer)
-            {
-                /* Rate limited logging, one log line every 5 seconds. */
-                static uint64_t uLastLogTS = 0;
-                if (RTTimeMilliTS() >= uLastLogTS + 5000)
-                {
-                    LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough command attempted to exceed buffer size, blocked\n", s->iLUN));
-                    uLastLogTS = RTTimeMilliTS();
-                }
-                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
-            }
-            else
-            {
-                if (cbTransfer == 0)
-                    uTxDir = PDMBLOCKTXDIR_NONE;
-                ataStartTransfer(s, cbTransfer, uTxDir, ATAFN_BT_ATAPI_PASSTHROUGH_CMD, ATAFN_SS_ATAPI_PASSTHROUGH, true);
-            }
+            if (cbTransfer == 0)
+                uTxDir = PDMBLOCKTXDIR_NONE;
+            ataStartTransfer(s, cbTransfer, uTxDir, ATAFN_BT_ATAPI_PASSTHROUGH_CMD, ATAFN_SS_ATAPI_PASSTHROUGH, true);
     }
 }