Changeset 51619 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 16, 2014 9:10:42 AM (11 years ago)

Author:

vboxsync

Message:

Devices/Storage: Add new read after write verification mode and fix driver crash after the interface changed

File:

• trunk/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp (modified) (9 diffs)

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

@@ -53 +53 @@
     DRVDISKAIOTXDIR_FLUSH,
     /** Discard */
-    DRVDISKAIOTXDIR_DISCARD
+    DRVDISKAIOTXDIR_DISCARD,
+    /** Read after write for immediate verification. */
+    DRVDISKAIOTXDIR_READ_AFTER_WRITE
 } DRVDISKAIOTXDIR;
 
@@ -191 +193 @@
     /** Current entry in the array. */
     unsigned                iEntry;
+
+    /** Flag whether to do a immediate read after write for verification. */
+    bool                    fReadAfterWrite;
 
     /** I/O logger to use if enabled. */
@@ -716 +721 @@
 }
 
+/**
+ * Verify a completed read after write request.
+ *
+ * @returns VBox status code.
+ * @param   pThis    The driver instance data.
+ * @param   pIoReq   The request to be verified.
+ */
+static int drvdiskintReadAfterWriteVerify(PDRVDISKINTEGRITY pThis, PDRVDISKAIOREQ pIoReq)
+{
+    int rc = VINF_SUCCESS;
+
+    if (pThis->fCheckConsistency)
+        rc = drvdiskintReadVerify(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
+    else /** @todo: Implement read after write verification without a memory based image of the disk. */
+        AssertMsgFailed(("TODO\n"));
+
+    return rc;
+}
+
 /* -=-=-=-=- IMedia -=-=-=-=- */
 
@@ -1072 +1096 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
     return pThis->pDrvMedia->pfnGetUuid(pThis->pDrvMedia, pUuid);
+}
+
+/** @copydoc PDMIMEDIA::pfnGetSectorSize */
+static DECLCALLBACK(uint32_t) drvdiskintGetSectorSize(PPDMIMEDIA pInterface)
+{
+    PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
+    return pThis->pDrvMedia->pfnGetSectorSize(pThis->pDrvMedia);
 }
 
@@ -1126 +1157 @@
         else if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_DISCARD)
             rc = drvdiskintDiscardRecords(pThis, pIoReq->paRanges, pIoReq->cRanges);
+        else if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_READ_AFTER_WRITE)
+            rc = drvdiskintReadAfterWriteVerify(pThis, pIoReq);
         else
             AssertMsg(pIoReq->enmTxDir == DRVDISKAIOTXDIR_FLUSH, ("Huh?\n"));
@@ -1143 +1176 @@
     }
 
-    void *pvUserComplete = pIoReq->pvUser;
-
-    drvdiskintIoReqFree(pThis, pIoReq);
-
-    rc = pThis->pDrvMediaAsyncPort->pfnTransferCompleteNotify(pThis->pDrvMediaAsyncPort, pvUserComplete, rcReq);
+    if (   pThis->fReadAfterWrite
+        && pIoReq->enmTxDir == DRVDISKAIOTXDIR_WRITE)
+    {
+        pIoReq->enmTxDir = DRVDISKAIOTXDIR_READ_AFTER_WRITE;
+
+        /* Readd because it was rmeoved above. */
+        if (pThis->fTraceRequests)
+            drvdiskintIoReqAdd(pThis, pIoReq);
+
+        rc = pThis->pDrvMediaAsync->pfnStartRead(pThis->pDrvMediaAsync, pIoReq->off, pIoReq->paSeg, pIoReq->cSeg,
+                                                 pIoReq->cbTransfer, pIoReq);
+        if (rc == VINF_VD_ASYNC_IO_FINISHED)
+        {
+            rc = drvdiskintReadAfterWriteVerify(pThis, pIoReq);
+
+            if (pThis->fTraceRequests)
+                drvdiskintIoReqRemove(pThis, pIoReq);
+            RTMemFree(pIoReq);
+        }
+        else if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
+            rc = VINF_SUCCESS;
+        else if (RT_FAILURE(rc))
+            RTMemFree(pIoReq);
+    }
+    else
+    {
+        void *pvUserComplete = pIoReq->pvUser;
+        drvdiskintIoReqFree(pThis, pIoReq);
+
+        rc = pThis->pDrvMediaAsyncPort->pfnTransferCompleteNotify(pThis->pDrvMediaAsyncPort, pvUserComplete, rcReq);
+    }
 
     return rc;
@@ -1256 +1315 @@
                                     "HistorySize\0"
                                     "IoLog\0"
-                                    "PrepopulateRamDisk\0"))
+                                    "PrepopulateRamDisk\0"
+                                    "ReadAfterWrite\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -1273 +1333 @@
     rc = CFGMR3QueryBoolDef(pCfg, "PrepopulateRamDisk", &pThis->fPrepopulateRamDisk, false);
     AssertRC(rc);
+    rc = CFGMR3QueryBoolDef(pCfg, "ReadAfterWrite", &pThis->fReadAfterWrite, false);
+    AssertRC(rc);
 
     char *pszIoLogFilename = NULL;
@@ -1297 +1359 @@
     pThis->IMedia.pfnBiosSetLCHSGeometry = drvdiskintBiosSetLCHSGeometry;
     pThis->IMedia.pfnGetUuid             = drvdiskintGetUuid;
+    pThis->IMedia.pfnGetSectorSize       = drvdiskintGetSectorSize;
 
     /* IMediaAsync */