Changeset 64407 in vbox for trunk/src/VBox

Timestamp:

Oct 25, 2016 11:53:00 AM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage: Add callback to query the actual transfer size of an I/O request if PDMIMEDIAEX is used, useful to calculate the amount of data transferred for requests where the transfer size can be different from the guest buffer size (e.g. SCSI)

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase.cpp (modified) (7 diffs)
• DrvHostBase.h (modified) (1 diff)
• DrvHostDVD.cpp (modified) (3 diffs)
• DrvSCSI.cpp (modified) (2 diffs)
• DrvVD.cpp (modified) (2 diffs)

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

@@ -394 +394 @@
     if (RT_LIKELY(pReq))
     {
+        pReq->cbReq      = 0;
+        pReq->cbResidual = 0;
         *phIoReq = (PDMMEDIAEXIOREQ)pReq;
         *ppvIoReqAlloc = &pReq->abAlloc[0];
@@ -416 +418 @@
 static DECLCALLBACK(int) drvHostBaseIoReqQueryResidual(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, size_t *pcbResidual)
 {
-    RT_NOREF2(pInterface, hIoReq);
-
-    *pcbResidual = 0; /** @todo: Implement. */
+    RT_NOREF1(pInterface);
+    PDRVHOSTBASEREQ pReq = (PDRVHOSTBASEREQ)hIoReq;
+
+    *pcbResidual = pReq->cbResidual;
+    return VINF_SUCCESS;
+}
+
+/** @interface_method_impl{PDMIMEDIAEX,pfnIoReqQueryXferSize} */
+static DECLCALLBACK(int) drvHostBaseIoReqQueryXferSize(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, size_t *pcbXfer)
+{
+    RT_NOREF1(pInterface);
+    PDRVHOSTBASEREQ pReq = (PDRVHOSTBASEREQ)hIoReq;
+
+    *pcbXfer = pReq->cbReq;
     return VINF_SUCCESS;
 }
@@ -444 +457 @@
              pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, pThis->pszDevice));
     RTCritSectEnter(&pThis->CritSect);
+
+    pReq->cbReq = cbRead;
+    pReq->cbResidual = cbRead;
 
     /*
@@ -464 +480 @@
                       "%16.*Rhxd\n",
                       pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
+
+                pReq->cbResidual = 0;
             }
             else
@@ -493 +511 @@
              pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbWrite, pThis->pszDevice));
     RTCritSectEnter(&pThis->CritSect);
+
+    pReq->cbReq = cbWrite;
+    pReq->cbResidual = cbWrite;
 
     /*
@@ -517 +538 @@
                          pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance,
                          off, pvBuf, cbWrite, rc, pThis->pszDevice));
+                else
+                    pReq->cbResidual = 0;
 
                 rc = drvHostBaseBufferRelease(pThis, pReq, cbWrite, true, pvBuf);
@@ -1052 +1075 @@
     pThis->IMediaEx.pfnIoReqFree                = drvHostBaseIoReqFree;
     pThis->IMediaEx.pfnIoReqQueryResidual       = drvHostBaseIoReqQueryResidual;
+    pThis->IMediaEx.pfnIoReqQueryXferSize       = drvHostBaseIoReqQueryXferSize;
     pThis->IMediaEx.pfnIoReqCancelAll           = drvHostBaseIoReqCancelAll;
     pThis->IMediaEx.pfnIoReqCancel              = drvHostBaseIoReqCancel;

trunk/src/VBox/Devices/Storage/DrvHostBase.h

@@ -133 +133 @@
 typedef struct DRVHOSTBASEREQ
 {
+    /** Transfer size. */
+    size_t                   cbReq;
+    /** Amount of residual data. */
+    size_t                   cbResidual;
     /** Start of the request data for the device above us. */
     uint8_t                  abAlloc[1];

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

@@ -565 +565 @@
         void *pvBuf = NULL;
         size_t cbXferCur = cbXfer;
+
+        pReq->cbReq = cbXfer;
+        pReq->cbResidual = cbXfer;
 
         if (cbXfer)
@@ -645 +648 @@
                 if (rc != VINF_SUCCESS)
                     break;
+
+                pReq->cbResidual -= cbCurrTX;
                 iATAPILBA += cReqSectors;
                 pbBuf += cbSector * cReqSectors;
@@ -654 +659 @@
             rc = drvHostBaseScsiCmdOs(&pThis->Core, pbCdb, cbCdb, enmXferDir, pvBuf, &cbXferTmp,
                                       &pThis->abATAPISense[0], sizeof(pThis->abATAPISense), cTimeoutMillies);
+            if (RT_SUCCESS(rc))
+                pReq->cbResidual -= cbXferTmp;
         }
 

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

@@ -789 +789 @@
 }
 
+/** @interface_method_impl{PDMIMEDIAEX,pfnIoReqQueryXferSize} */
+static DECLCALLBACK(int) drvscsiIoReqQueryXferSize(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, size_t *pcbXfer)
+{
+    RT_NOREF1(pInterface);
+    PDRVSCSIREQ pReq = (PDRVSCSIREQ)hIoReq;
+
+    *pcbXfer = pReq->cbBuf; /** @todo: Implement properly. */
+    return VINF_SUCCESS;
+}
+
 /** @interface_method_impl{PDMIMEDIAEX,pfnIoReqCancelAll} */
 static DECLCALLBACK(int) drvscsiIoReqCancelAll(PPDMIMEDIAEX pInterface)
@@ -1288 +1298 @@
     pThis->IMediaEx.pfnIoReqFree                = drvscsiIoReqFree;
     pThis->IMediaEx.pfnIoReqQueryResidual       = drvscsiIoReqQueryResidual;
+    pThis->IMediaEx.pfnIoReqQueryXferSize       = drvscsiIoReqQueryXferSize;
     pThis->IMediaEx.pfnIoReqCancelAll           = drvscsiIoReqCancelAll;
     pThis->IMediaEx.pfnIoReqCancel              = drvscsiIoReqCancel;

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

@@ -3402 +3402 @@
 
     if (   pIoReq->enmType != PDMMEDIAEXIOREQTYPE_READ
-        && pIoReq->enmType != PDMMEDIAEXIOREQTYPE_WRITE)
+        && pIoReq->enmType != PDMMEDIAEXIOREQTYPE_WRITE
+        && pIoReq->enmType != PDMMEDIAEXIOREQTYPE_FLUSH)
         return VERR_PDM_MEDIAEX_IOREQ_INVALID_STATE;
 
     *pcbResidual = 0; /* No data left to transfer always. */
     return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQueryXferSize}
+ */
+static DECLCALLBACK(int) drvvdIoReqQueryXferSize(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, size_t *pcbXfer)
+{
+    int rc = VINF_SUCCESS;
+    RT_NOREF1(pInterface);
+
+    PPDMMEDIAEXIOREQINT pIoReq = hIoReq;
+
+    if (pIoReq->enmState != VDIOREQSTATE_COMPLETED)
+        return VERR_PDM_MEDIAEX_IOREQ_INVALID_STATE;
+
+    if (   pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ
+        || pIoReq->enmType == PDMMEDIAEXIOREQTYPE_WRITE)
+        *pcbXfer = pIoReq->ReadWrite.cbReq;
+    else if (pIoReq->enmType == PDMMEDIAEXIOREQTYPE_FLUSH)
+        *pcbXfer = 0;
+    else
+        rc = VERR_PDM_MEDIAEX_IOREQ_INVALID_STATE;
+
+    return rc;
 }
 
@@ -4389 +4414 @@
     pThis->IMediaEx.pfnIoReqFree                = drvvdIoReqFree;
     pThis->IMediaEx.pfnIoReqQueryResidual       = drvvdIoReqQueryResidual;
+    pThis->IMediaEx.pfnIoReqQueryXferSize       = drvvdIoReqQueryXferSize;
     pThis->IMediaEx.pfnIoReqCancelAll           = drvvdIoReqCancelAll;
     pThis->IMediaEx.pfnIoReqCancel              = drvvdIoReqCancel;