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

Timestamp:

Feb 9, 2017 4:04:03 PM (8 years ago)

Author:

vboxsync

Message:

DrvDiskIntegrity: Don't embed the tracking structure into the request as it gets too big otherwise making request cache creation fail

File:

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

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

@@ -29 +29 @@
 #include <iprt/avl.h>
 #include <iprt/mem.h>
+#include <iprt/memcache.h>
 #include <iprt/message.h>
 #include <iprt/sg.h>
@@ -189 +190 @@
     /** Next free slot in the array */
     volatile unsigned       iNextFreeSlot;
+    /** Request cache. */
+    RTMEMCACHE              hReqCache;
 
     /** Flag whether we check for requests completing twice. */
@@ -213 +216 @@
 } DRVDISKINTEGRITY, *PDRVDISKINTEGRITY;
 
+
+#define DISKINTEGRITY_IOREQ_HANDLE_2_DRVDISKAIOREQ(a_pThis, a_hIoReq) ((*(PDRVDISKAIOREQ *)((uintptr_t)(a_hIoReq) + (a_pThis)->cbIoReqOpaque)))
+#define DISKINTEGRITY_IOREQ_HANDLE_2_UPPER_OPAQUE(a_pThis, a_hIoReq) ((void *)((uintptr_t)(a_hIoReq) + (a_pThis)->cbIoReqOpaque + sizeof(PDRVDISKAIOREQ)))
+#define DISKINTEGRITY_IOREQ_ALLOC_2_DRVDISKAIOREQ(a_pvIoReqAlloc) (*(PDRVDISKAIOREQ *)(a_pvIoReqAlloc))
+#define DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(a_pvIoReqAlloc) ((void *)((uintptr_t)(a_pvIoReqAlloc) + sizeof(PDRVDISKAIOREQ)))
 
 static void drvdiskintIoReqCheckForDoubleCompletion(PDRVDISKINTEGRITY pThis, PDRVDISKAIOREQ pIoReq,
@@ -994 +1002 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaExPort);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)pvIoReqAlloc;
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_ALLOC_2_DRVDISKAIOREQ(pvIoReqAlloc);
     int rc = VINF_SUCCESS;
 
@@ -1033 +1041 @@
         RTSGBUF SgBufCmp;
         RTSgBufInit(&SgBufCmp, &SegCmp, 1);
-        rc = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1,
+        rc = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, hIoReq,
+                                                       DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(pvIoReqAlloc),
                                                        0, &SgBufCmp, pIoReq->cbTransfer);
         AssertRC(rc);
@@ -1087 +1096 @@
     else
     {
-        rc = pThis->pDrvMediaExPort->pfnIoReqCompleteNotify(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1, rcReq);
+        rc = pThis->pDrvMediaExPort->pfnIoReqCompleteNotify(pThis->pDrvMediaExPort, hIoReq,
+                                                            DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(pvIoReqAlloc),
+                                                            rcReq);
         /* Put on the watch list. */
         if (pThis->fCheckDoubleCompletion)
@@ -1104 +1115 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaExPort);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)pvIoReqAlloc;
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_ALLOC_2_DRVDISKAIOREQ(pvIoReqAlloc);
     RTSGBUF SgBuf;
 
     RTSgBufClone(&SgBuf, pSgBuf);
 
-    int rc = pThis->pDrvMediaExPort->pfnIoReqCopyFromBuf(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1, offDst,
-                                                         pSgBuf, cbCopy);
+    int rc = pThis->pDrvMediaExPort->pfnIoReqCopyFromBuf(pThis->pDrvMediaExPort, hIoReq,
+                                                         DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(pvIoReqAlloc),
+                                                         offDst, pSgBuf, cbCopy);
     if (   RT_SUCCESS(rc)
         && pIoReq->IoSeg.pvSeg)
@@ -1143 +1155 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaExPort);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)pvIoReqAlloc;
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_ALLOC_2_DRVDISKAIOREQ(pvIoReqAlloc);
     RTSGBUF SgBuf;
 
     RTSgBufClone(&SgBuf, pSgBuf);
 
-    int rc = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1, offSrc,
-                                                       pSgBuf, cbCopy);
+    int rc = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, hIoReq,
+                                                       DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(pvIoReqAlloc),
+                                                       offSrc, pSgBuf, cbCopy);
     if (   RT_SUCCESS(rc)
         && pIoReq->IoSeg.pvSeg)
@@ -1185 +1198 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaExPort);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)pvIoReqAlloc;
-
-    return pThis->pDrvMediaExPort->pfnIoReqQueryDiscardRanges(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1, idxRangeStart,
-                                                              cRanges, paRanges, pcRanges);
+    return pThis->pDrvMediaExPort->pfnIoReqQueryDiscardRanges(pThis->pDrvMediaExPort, hIoReq,
+                                                              DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(pvIoReqAlloc),
+                                                              idxRangeStart, cRanges, paRanges, pcRanges);
 }
 
@@ -1198 +1210 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaExPort);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)pvIoReqAlloc;
-
-    pThis->pDrvMediaExPort->pfnIoReqStateChanged(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1, enmState);
+    pThis->pDrvMediaExPort->pfnIoReqStateChanged(pThis->pDrvMediaExPort, hIoReq,
+                                                 DISKINTEGRITY_IOREQ_ALLOC_2_UPPER(pvIoReqAlloc),
+                                                 enmState);
 }
 
@@ -1221 +1233 @@
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaEx);
 
-    /* Increase the amount by our private tracking structure. */
-    cbIoReqAlloc += sizeof(DRVDISKAIOREQ);
+    /* Increase the amount by the size of a pointer to our private tracking structure. */
+    cbIoReqAlloc += sizeof(PDRVDISKAIOREQ);
 
     pThis->fCheckDoubleCompletion = false;
@@ -1236 +1248 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaEx);
-    PDRVDISKAIOREQ pIoReq = NULL;
-
-    int rc = pThis->pDrvMediaEx->pfnIoReqAlloc(pThis->pDrvMediaEx, phIoReq, (void **)&pIoReq, uIoReqId, fFlags);
-    if RT_SUCCESS(rc)
+    int rc = VINF_SUCCESS;
+    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)RTMemCacheAlloc(pThis->hReqCache);
+    if (RT_LIKELY(pIoReq))
     {
         pIoReq->enmTxDir    = DRVDISKAIOTXDIR_INVALID;
@@ -1254 +1265 @@
         pIoReq->IoSeg.cbSeg = 0;
 
-        /*
-         * Store the size off the start of our tracking structure because it is
-         * required to access it for the read/write callbacks.
-         *
-         * ASSUMPTION that the offset is constant.
-         */
-        if (!pThis->cbIoReqOpaque)
-            pThis->cbIoReqOpaque = (uintptr_t)pIoReq - (uintptr_t)*phIoReq;
+        PDRVDISKAIOREQ *ppIoReq = NULL;
+        rc = pThis->pDrvMediaEx->pfnIoReqAlloc(pThis->pDrvMediaEx, phIoReq, (void **)&ppIoReq, uIoReqId, fFlags);
+        if RT_SUCCESS(rc)
+        {
+            /*
+             * Store the size off the start of our tracking structure because it is
+             * required to access it for the read/write callbacks.
+             *
+             * ASSUMPTION that the offset is constant.
+             */
+            if (!pThis->cbIoReqOpaque)
+                pThis->cbIoReqOpaque = (uintptr_t)ppIoReq - (uintptr_t)*phIoReq;
+            else
+                Assert(pThis->cbIoReqOpaque == (uintptr_t)ppIoReq - (uintptr_t)*phIoReq);
+
+            *ppIoReq = pIoReq;
+            *ppvIoReqAlloc = ((uint8_t *)ppIoReq) + sizeof(PDRVDISKAIOREQ);
+        }
         else
-            Assert(pThis->cbIoReqOpaque == (uintptr_t)pIoReq - (uintptr_t)*phIoReq);
-
-        *ppvIoReqAlloc = pIoReq + 1;
-    }
+            RTMemCacheFree(pThis->hReqCache, pIoReq);
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     return rc;
@@ -1277 +1298 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaEx);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)((uintptr_t)hIoReq + pThis->cbIoReqOpaque);
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_HANDLE_2_DRVDISKAIOREQ(pThis, hIoReq);
 
     if (pIoReq->IoSeg.pvSeg)
@@ -1327 +1348 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaEx);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)((uintptr_t)hIoReq + pThis->cbIoReqOpaque);
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_HANDLE_2_DRVDISKAIOREQ(pThis, hIoReq);
 
     pIoReq->enmTxDir    = DRVDISKAIOTXDIR_READ;
@@ -1384 +1405 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaEx);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)((uintptr_t)hIoReq + pThis->cbIoReqOpaque);
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_HANDLE_2_DRVDISKAIOREQ(pThis, hIoReq);
 
     pIoReq->enmTxDir    = DRVDISKAIOTXDIR_WRITE;
@@ -1407 +1428 @@
 
             RTSgBufInit(&SgBuf, &pIoReq->IoSeg, 1);
-            int rc2 = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, hIoReq, pIoReq + 1, 0,
-                                                               &SgBuf, cbWrite);
+            int rc2 = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, hIoReq,
+                                                                DISKINTEGRITY_IOREQ_HANDLE_2_UPPER_OPAQUE(pThis, hIoReq),
+                                                                0, &SgBuf, cbWrite);
             AssertRC(rc2);
         }
@@ -1464 +1486 @@
 {
     PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMediaEx);
-    PDRVDISKAIOREQ pIoReq = (PDRVDISKAIOREQ)((uintptr_t)hIoReq + pThis->cbIoReqOpaque);
+    PDRVDISKAIOREQ pIoReq = DISKINTEGRITY_IOREQ_HANDLE_2_DRVDISKAIOREQ(pThis, hIoReq);
 
     pIoReq->enmTxDir    = DRVDISKAIOTXDIR_FLUSH;
@@ -1623 +1645 @@
     if (pThis->hIoLogger)
         VDDbgIoLogDestroy(pThis->hIoLogger);
+
+    if (pThis->hReqCache != NIL_RTMEMCACHE)
+    {
+        RTMemCacheDestroy(pThis->hReqCache);
+        pThis->hReqCache = NIL_RTMEMCACHE;
+    }
 }
 
@@ -1686 +1714 @@
      */
     pThis->pDrvIns                       = pDrvIns;
+    pThis->hReqCache                     = NIL_RTMEMCACHE;
 
     /* IBase. */
@@ -1745 +1774 @@
     /* Try to attach extended media port interface above.*/
     pThis->pDrvMediaExPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIMEDIAEXPORT);
+
+    rc = RTMemCacheCreate(&pThis->hReqCache, sizeof(DRVDISKAIOREQ), 0, UINT32_MAX,
+                          NULL, NULL, NULL, 0);
+    if (RT_FAILURE(rc))
+        return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                N_("Failed to create request tracking structure cache"));
 
     /*