Changeset 38541 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Aug 25, 2011 10:11:02 PM (14 years ago)

Author:

vboxsync

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

73689

Message:

DrvDiskIntegrity: Add support for the I/O logger from the storage debug library

File:

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

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

@@ -22 +22 @@
 #define LOG_GROUP LOG_GROUP_DRV_DISK_INTEGRITY
 #include <VBox/vmm/pdmdrv.h>
+#include <VBox/vddbg.h>
 #include <iprt/assert.h>
 #include <iprt/string.h>
@@ -76 +77 @@
     /** Completion timestamp. */
     uint64_t        tsComplete;
+    /** I/O log entry if configured. */
+    VDIOLOGENT      hIoLogEntry;
 } DRVDISKAIOREQ, *PDRVDISKAIOREQ;
 
@@ -180 +183 @@
     /** Current entry in the array. */
     unsigned                iEntry;
+
+    /** I/O logger to use if enabled. */
+    VDIOLOGGER              hIoLogger;
 } DRVDISKINTEGRITY, *PDRVDISKINTEGRITY;
 
@@ -201 +207 @@
     if (RT_LIKELY(pIoReq))
     {
-        pIoReq->enmTxDir   = enmTxDir;
-        pIoReq->off        = off;
-        pIoReq->cbTransfer = cbTransfer;
-        pIoReq->paSeg      = paSeg;
-        pIoReq->cSeg       = cSeg;
-        pIoReq->pvUser     = pvUser;
-        pIoReq->iSlot      = 0;
-        pIoReq->tsStart    = RTTimeSystemMilliTS();
-        pIoReq->tsComplete = 0;
+        pIoReq->enmTxDir    = enmTxDir;
+        pIoReq->off         = off;
+        pIoReq->cbTransfer  = cbTransfer;
+        pIoReq->paSeg       = paSeg;
+        pIoReq->cSeg        = cSeg;
+        pIoReq->pvUser      = pvUser;
+        pIoReq->iSlot       = 0;
+        pIoReq->tsStart     = RTTimeSystemMilliTS();
+        pIoReq->tsComplete  = 0;
+        pIoReq->hIoLogEntry = NULL;
     }
 
@@ -556 +563 @@
                                         uint64_t off, void *pvBuf, size_t cbRead)
 {
+    int rc = VINF_SUCCESS;
+    VDIOLOGENT hIoLogEntry;
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
-    int rc = pThis->pDrvMedia->pfnRead(pThis->pDrvMedia, off, pvBuf, cbRead);
+
+    if (pThis->hIoLogger)
+    {
+        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGTXDIR_READ, off,
+                             cbRead, NULL, &hIoLogEntry);
+        AssertRC(rc);
+    }
+
+    rc = pThis->pDrvMedia->pfnRead(pThis->pDrvMedia, off, pvBuf, cbRead);
+
+    if (pThis->hIoLogger)
+    {
+        RTSGSEG Seg;
+        RTSGBUF SgBuf;
+
+        Seg.pvSeg = pvBuf;
+        Seg.cbSeg = cbRead;
+        RTSgBufInit(&SgBuf, &Seg, 1);
+
+        int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, hIoLogEntry, rc, &SgBuf);
+        AssertRC(rc2);
+    }
+
     if (RT_FAILURE(rc))
         return rc;
@@ -578 +609 @@
                                          size_t cbWrite)
 {
+    int rc = VINF_SUCCESS;
+    VDIOLOGENT hIoLogEntry;
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
-    int rc = pThis->pDrvMedia->pfnWrite(pThis->pDrvMedia, off, pvBuf, cbWrite);
+
+    if (pThis->hIoLogger)
+    {
+        RTSGSEG Seg;
+        RTSGBUF SgBuf;
+
+        Seg.pvSeg = (void *)pvBuf;
+        Seg.cbSeg = cbWrite;
+        RTSgBufInit(&SgBuf, &Seg, 1);
+
+        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGTXDIR_WRITE, off,
+                             cbWrite, &SgBuf, &hIoLogEntry);
+        AssertRC(rc);
+    }
+
+    rc = pThis->pDrvMedia->pfnWrite(pThis->pDrvMedia, off, pvBuf, cbWrite);
+
+    if (pThis->hIoLogger)
+    {
+        int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, hIoLogEntry, rc, NULL);
+        AssertRC(rc2);
+    }
+
     if (RT_FAILURE(rc))
         return rc;
@@ -608 +663 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
+    if (pThis->hIoLogger)
+    {
+        int rc2 = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGTXDIR_READ, uOffset,
+                                  cbRead, NULL, &pIoReq->hIoLogEntry);
+        AssertRC(rc2);
+    }
+
     int rc = pThis->pDrvMediaAsync->pfnStartRead(pThis->pDrvMediaAsync, uOffset, paSeg, cSeg,
                                                  cbRead, pIoReq);
@@ -616 +678 @@
         {
             int rc2 = drvdiskintReadVerify(pThis, paSeg, cSeg, uOffset, cbRead);
+            AssertRC(rc2);
+        }
+
+        if (pThis->hIoLogger)
+        {
+            RTSGBUF SgBuf;
+
+            RTSgBufInit(&SgBuf, paSeg, cSeg);
+
+            int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, pIoReq->hIoLogEntry, VINF_SUCCESS, &SgBuf);
             AssertRC(rc2);
         }
@@ -643 +715 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
+    if (pThis->hIoLogger)
+    {
+        RTSGBUF SgBuf;
+
+        RTSgBufInit(&SgBuf, paSeg, cSeg);
+
+        int rc2 = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGTXDIR_WRITE, uOffset,
+                                  cbWrite, &SgBuf, &pIoReq->hIoLogEntry);
+        AssertRC(rc2);
+    }
+
     int rc = pThis->pDrvMediaAsync->pfnStartWrite(pThis->pDrvMediaAsync, uOffset, paSeg, cSeg,
                                                   cbWrite, pIoReq);
     if (rc == VINF_VD_ASYNC_IO_FINISHED)
     {
-        /* Verify the read now. */
+        /* Record the write. */
         if  (pThis->fCheckConsistency)
         {
@@ -654 +737 @@
         }
 
+        if (pThis->hIoLogger)
+        {
+            int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, pIoReq->hIoLogEntry, VINF_SUCCESS, NULL);
+            AssertRC(rc2);
+        }
+
         if (pThis->fTraceRequests)
             drvdiskintIoReqRemove(pThis, pIoReq);
@@ -669 +758 @@
 static DECLCALLBACK(int) drvdiskintStartFlush(PPDMIMEDIAASYNC pInterface, void *pvUser)
 {
+    int rc = VINF_SUCCESS;
     PDRVDISKINTEGRITY pThis = PDMIMEDIAASYNC_2_DRVDISKINTEGRITY(pInterface);
     PDRVDISKAIOREQ pIoReq = drvdiskintIoReqAlloc(DRVDISKAIOTXDIR_FLUSH, 0, NULL, 0, 0, pvUser);
@@ -676 +766 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    return pThis->pDrvMediaAsync->pfnStartFlush(pThis->pDrvMediaAsync, pIoReq);
+    if (pThis->hIoLogger)
+    {
+        rc = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGTXDIR_FLUSH, 0,
+                             0, NULL, &pIoReq->hIoLogEntry);
+        AssertRC(rc);
+    }
+
+    rc = pThis->pDrvMediaAsync->pfnStartFlush(pThis->pDrvMediaAsync, pIoReq);
+
+    if (rc == VINF_VD_ASYNC_IO_FINISHED)
+    {
+        if (pThis->hIoLogger)
+        {
+            int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, pIoReq->hIoLogEntry, VINF_SUCCESS, NULL);
+            AssertRC(rc2);
+        }
+
+        RTMemFree(pIoReq);
+    }
+    else if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
+        RTMemFree(pIoReq);
+
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
+    return rc;
 }
 
@@ -682 +795 @@
 static DECLCALLBACK(int) drvdiskintFlush(PPDMIMEDIA pInterface)
 {
+    int rc = VINF_SUCCESS;
+    VDIOLOGENT hIoLogEntry;
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
-    return pThis->pDrvMedia->pfnFlush(pThis->pDrvMedia);
+
+    if (pThis->hIoLogger)
+    {
+        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGTXDIR_FLUSH, 0,
+                             0, NULL, &hIoLogEntry);
+        AssertRC(rc);
+    }
+
+    rc = pThis->pDrvMedia->pfnFlush(pThis->pDrvMedia);
+
+    if (pThis->hIoLogger)
+    {
+        int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, hIoLogEntry, rc, NULL);
+        AssertRC(rc2);
+    }
+
+    return rc;
 }
 
@@ -768 +899 @@
     }
 
+    if (pThis->hIoLogger)
+    {
+        RTSGBUF SgBuf;
+
+        if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_READ)
+            RTSgBufInit(&SgBuf, pIoReq->paSeg, pIoReq->cSeg);
+
+        int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, pIoReq->hIoLogEntry, rc, &SgBuf);
+        AssertRC(rc2);
+    }
+
     void *pvUserComplete = pIoReq->pvUser;
 
@@ -854 +996 @@
         }
     }
+
+    if (pThis->hIoLogger)
+        VDDbgIoLogDestroy(pThis->hIoLogger);
 }
 
@@ -876 +1021 @@
                                     "ExpireIntervalMs\0"
                                     "CheckDoubleCompletions\0"
-                                    "HistorySize\0"))
+                                    "HistorySize\0"
+                                    "IoLog\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -892 +1038 @@
     AssertRC(rc);
 
+    char *pszIoLogFilename = NULL;
+    rc = CFGMR3QueryStringAlloc(pCfg, "IoLog", &pszIoLogFilename);
+    Assert(RT_SUCCESS(rc) || rc == VERR_CFGM_VALUE_NOT_FOUND);
+
     /*
      * Initialize most of the data members.
@@ -980 +1130 @@
         pThis->papIoReq = (PDRVDISKAIOREQ *)RTMemAllocZ(pThis->cEntries * sizeof(PDRVDISKAIOREQ));
         AssertPtr(pThis->papIoReq);
+    }
+
+    if (pszIoLogFilename)
+    {
+        rc = VDDbgIoLogCreate(&pThis->hIoLogger, pszIoLogFilename, VDDBG_IOLOG_LOG_DATA);
+        RTStrFree(pszIoLogFilename);
     }