Changeset 52023 in vbox

Timestamp:

Jul 14, 2014 9:00:18 PM (11 years ago)

Author:

vboxsync

Message:

pdmifs.h,DrvBlock,DrvVD: Add methods to allocate and free I/O buffer memory to PDMIBLOCK and PDMIMEDIA. DrvVD decides how to allocate the memory based on the setup

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvBlock.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -1136 +1136 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnDiscard,(PPDMIBLOCK pInterface, PCRTRANGE paRanges, unsigned cRanges));
+
+    /**
+     * Allocate buffer memory which is suitable for I/O and might have special proerties for secure
+     * environments (non-pageable memory for sensitive data which should not end up on the disk).
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   cb              Amount of memory to allocate.
+     * @param   ppvNew          Where to store the pointer to the buffer on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIoBufAlloc, (PPDMIBLOCK pInterface, size_t cb, void **ppvNew));
+
+    /**
+     * Free memory allocated with PDMIBLOCK::pfnIoBufAlloc().
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   pv              Pointer to the memory to free.
+     * @param   cb              Amount of bytes given in PDMIBLOCK::pfnIoBufAlloc().
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIoBufFree, (PPDMIBLOCK pInterface, void *pv, size_t cb));
+
 } PDMIBLOCK;
 /** PDMIBLOCK interface ID. */
-#define PDMIBLOCK_IID                           "5e7123dd-8cdf-4a6e-97a5-ab0c68d7e850"
+#define PDMIBLOCK_IID                           "4e804e8e-3c01-4f20-98d9-a30ece8ec9f5"
 
 
@@ -1494 +1516 @@
     DECLR3CALLBACKMEMBER(int, pfnDiscard,(PPDMIMEDIA pInterface, PCRTRANGE paRanges, unsigned cRanges));
 
+    /**
+     * Allocate buffer memory which is suitable for I/O and might have special proerties for secure
+     * environments (non-pageable memory for sensitive data which should not end up on the disk).
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   cb              Amount of memory to allocate.
+     * @param   ppvNew          Where to store the pointer to the buffer on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIoBufAlloc, (PPDMIMEDIA pInterface, size_t cb, void **ppvNew));
+
+    /**
+     * Free memory allocated with PDMIMEDIA::pfnIoBufAlloc().
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   pv              Pointer to the memory to free.
+     * @param   cb              Amount of bytes given in PDMIMEDIA::pfnIoBufAlloc().
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIoBufFree, (PPDMIMEDIA pInterface, void *pv, size_t cb));
+
 } PDMIMEDIA;
 /** PDMIMEDIA interface ID. */
-#define PDMIMEDIA_IID                           "ec385d21-7aa9-42ca-8cfb-e1388297fa52"
+#define PDMIMEDIA_IID                           "b4acf420-c9e3-4333-9ed5-e86f6b2d5f1a"
 
 

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

@@ -310 +310 @@
 }
 
+/** @copydoc PDMIBLOCK::pfnIoBufAlloc */
+static DECLCALLBACK(int) drvblockIoBufAlloc(PPDMIBLOCK pInterface, size_t cb, void **ppvNew)
+{
+    PDRVBLOCK pThis = PDMIBLOCK_2_DRVBLOCK(pInterface);
+
+    return pThis->pDrvMedia->pfnIoBufAlloc(pThis->pDrvMedia, cb, ppvNew);
+}
+
+/** @copydoc PDMIBLOCK::pfnIoBufFree */
+static DECLCALLBACK(int) drvblockIoBufFree(PPDMIBLOCK pInterface, void *pv, size_t cb)
+{
+    PDRVBLOCK pThis = PDMIBLOCK_2_DRVBLOCK(pInterface);
+
+    return pThis->pDrvMedia->pfnIoBufFree(pThis->pDrvMedia, pv, cb);
+}
+
 /* -=-=-=-=- IBlockAsync -=-=-=-=- */
 
@@ -873 +889 @@
     pThis->IBlock.pfnGetType                = drvblockGetType;
     pThis->IBlock.pfnGetUuid                = drvblockGetUuid;
+    pThis->IBlock.pfnIoBufAlloc             = drvblockIoBufAlloc;
+    pThis->IBlock.pfnIoBufFree              = drvblockIoBufFree;
 
     /* IBlockBios. */

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

@@ -37 +37 @@
 #include <iprt/pipe.h>
 #include <iprt/system.h>
+#include <iprt/memsafer.h>
 
 #ifdef VBOX_WITH_INIP
@@ -1857 +1858 @@
 }
 
+/** @copydoc PDMIMEDIA::pfnIoBufAlloc */
+static DECLCALLBACK(int) drvvdIoBufAlloc(PPDMIMEDIA pInterface, size_t cb, void **ppvNew)
+{
+    LogFlowFunc(("\n"));
+    int rc = VINF_SUCCESS;
+    void *pvNew = NULL;
+    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
+
+    /* Configured encryption requires locked down memory. */
+    if (pThis->pCfgCrypto)
+        pvNew = RTMemSaferAllocZ(cb);
+    else
+    {
+        cb = RT_ALIGN_Z(cb, _4K);
+        pvNew = RTMemPageAlloc(cb);
+    }
+
+    if (RT_LIKELY(pvNew))
+        *ppvNew = pvNew;
+    else
+        rc = VERR_NO_MEMORY;
+
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+}
+
+/** @copydoc PDMIMEDIA::pfnIoBufFree */
+static DECLCALLBACK(int) drvvdIoBufFree(PPDMIMEDIA pInterface, void *pv, size_t cb)
+{
+    LogFlowFunc(("\n"));
+    int rc = VINF_SUCCESS;
+    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
+
+    if (pThis->pCfgCrypto)
+        RTMemSaferFree(pv, cb);
+    else
+    {
+        cb = RT_ALIGN_Z(cb, _4K);
+        RTMemPageFree(pv, cb);
+    }
+
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+}
+
+
 /*******************************************************************************
 *   Async Media interface methods                                              *
@@ -2387 +2434 @@
     pThis->IMedia.pfnGetUuid             = drvvdGetUuid;
     pThis->IMedia.pfnDiscard             = drvvdDiscard;
+    pThis->IMedia.pfnIoBufAlloc          = drvvdIoBufAlloc;
+    pThis->IMedia.pfnIoBufFree           = drvvdIoBufFree;
 
     /* IMediaAsync */