Changeset 64537 in vbox

Timestamp:

Nov 3, 2016 3:56:04 PM (8 years ago)

Author:

vboxsync

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

111718

Message:

BusLogic: Query the residual data length from the driver below when a request completes and don't guess it while copying between host and guest buffers

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (2 diffs)

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

@@ -1618 +1618 @@
             cbCopied += RT_MIN(cbDataCCB, cbCopy);
         }
-    }
-
-    /* Update residual data length. */
-    if (   (pReq->CCBGuest.c.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB_RESIDUAL_DATA_LENGTH)
-        || (pReq->CCBGuest.c.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB_RESIDUAL_SCATTER_GATHER))
-    {
-        uint32_t    cbResidual;
-
-        /** @todo we need to get the actual transfer length from the VSCSI layer?! */
-        cbResidual = 0; //LEN_TO_U32(pTaskState->CCBGuest.acbData) - ???;
-        if (pReq->fIs24Bit)
-            U32_TO_LEN(pReq->CCBGuest.o.acbData, cbResidual);
-        else
-            pReq->CCBGuest.n.cbData = cbResidual;
     }
 
@@ -2872 +2858 @@
             buslogicR3SenseBufferFree(pReq, (pReq->u8ScsiSts != SCSI_STATUS_OK));
 
+        /* Update residual data length. */
+        if (   (pReq->CCBGuest.c.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB_RESIDUAL_DATA_LENGTH)
+            || (pReq->CCBGuest.c.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB_RESIDUAL_SCATTER_GATHER))
+        {
+            size_t cbResidual = 0;
+            int rc = pTgtDev->pDrvMediaEx->pfnIoReqQueryResidual(pTgtDev->pDrvMediaEx, pReq->hIoReq, &cbResidual);
+            AssertRC(rc); Assert(cbResidual == (uint32_t)cbResidual);
+
+            if (pReq->fIs24Bit)
+                U32_TO_LEN(pReq->CCBGuest.o.acbData, (uint32_t)cbResidual);
+            else
+                pReq->CCBGuest.n.cbData = (uint32_t)cbResidual;
+        }
+
         /*
          * Save vital things from the request and free it before posting completion