Changeset 31586 in vbox

Timestamp:

Aug 11, 2010 10:20:12 PM (15 years ago)

Author:

vboxsync

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

64693

Message:

VBoxHDD: Needed enhancements for async iSCSI. Make it possible to let the backend take control over the I/O context and notify the VD layer when it is done.

Location:

trunk

Files:

• include/VBox/VBoxHDD.h (modified) (2 diffs)
• src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (8 diffs)

trunk/include/VBox/VBoxHDD.h

@@ -1750 +1750 @@
 
     /**
+     * Creates a segment array from the I/O context data buffer.
+     *
+     * @returns Number of bytes the array describes.
+     * @param  pvUser          The opaque user data passed on container creation.
+     * @param  pIoCtx          I/O context to copy the data from.
+     * @param  paSeg           The uninitialized segment array.
+     *                         If NULL pcSeg will contain the number of segments needed
+     *                         to describe the requested amount of data.
+     * @param  pcSeg           The number of segments the given array has.
+     *                         This will hold the actual number of entries needed upon return.
+     * @param  cbData          Number of bytes the new array should describe.
+     */
+    DECLR3CALLBACKMEMBER(size_t, pfnIoCtxSegArrayCreate, (void *pvUser, PVDIOCTX pIoCtx,
+                                                          PRTSGSEG paSeg, unsigned *pcSeg,
+                                                          size_t cbData));
+    /**
      * Marks the given number of bytes as completed and continues the I/O context.
      *
@@ -1755 +1771 @@
      * @param   pvUser         The opaque user data passed on container creation.
      * @param   pIoCtx         The I/O context.
+     * @param   rcReq          Status code the request completed with.
      * @param   cbCompleted    Number of bytes completed.
      */
     DECLR3CALLBACKMEMBER(void, pfnIoCtxCompleted, (void *pvUser, PVDIOCTX pIoCtx,
-                                                   size_t cbCompleted));
+                                                   int rcReq, size_t cbCompleted));
 } VDINTERFACEIO, *PVDINTERFACEIO;
 

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

@@ -905 +905 @@
         && !pIoCtx->cDataTransfersPending)
         rc = VINF_VD_ASYNC_IO_FINISHED;
-    else if (RT_SUCCESS(rc) || rc == VERR_VD_NOT_ENOUGH_METADATA)
+    else if (   RT_SUCCESS(rc)
+             || rc == VERR_VD_NOT_ENOUGH_METADATA
+             || rc == VERR_VD_IOCTX_HALT)
         rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
     else if (RT_FAILURE(rc) && (rc != VERR_VD_ASYNC_IO_IN_PROGRESS))
@@ -983 +985 @@
         else if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
             rc = VINF_SUCCESS;
+        else if (rc == VERR_VD_IOCTX_HALT)
+        {
+            uOffset  += cbThisRead;
+            cbToRead -= cbThisRead;
+            pIoCtx->fBlocked = true;
+        }
 
         if (RT_FAILURE(rc))
@@ -991 +999 @@
     } while (cbToRead != 0 && RT_SUCCESS(rc));
 
-    if (rc == VERR_VD_NOT_ENOUGH_METADATA)
+    if (   rc == VERR_VD_NOT_ENOUGH_METADATA
+        || rc == VERR_VD_IOCTX_HALT)
     {
         /* Save the current state. */
@@ -1451 +1460 @@
     if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
         rc = VINF_SUCCESS;
+    else if (rc == VERR_VD_IOCTX_HALT)
+    {
+        pIoCtx->fBlocked = true;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -1651 +1665 @@
         }
 
-        if (rc == VERR_VD_NOT_ENOUGH_METADATA)
+        if (rc == VERR_VD_IOCTX_HALT)
+        {
+            cbWrite -= cbThisWrite;
+            uOffset += cbThisWrite;
+            pIoCtx->fBlocked = true;
+            break;
+        }
+        else if (rc == VERR_VD_NOT_ENOUGH_METADATA)
             break;
 
@@ -1658 +1679 @@
     } while (cbWrite != 0 && (RT_SUCCESS(rc) || rc == VERR_VD_ASYNC_IO_IN_PROGRESS));
 
-    if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS || rc == VERR_VD_NOT_ENOUGH_METADATA)
+    if (   rc == VERR_VD_ASYNC_IO_IN_PROGRESS
+        || rc == VERR_VD_NOT_ENOUGH_METADATA
+        || rc == VERR_VD_IOCTX_HALT)
     {
         /*
@@ -2801 +2824 @@
 }
 
+static size_t vdIOIoCtxSegArrayCreate(void *pvUser, PVDIOCTX pIoCtx,
+                                     PRTSGSEG paSeg, unsigned *pcSeg,
+                                     size_t cbData)
+{
+    PVDIMAGE pImage = (PVDIMAGE)pvUser;
+    PVBOXHDD pDisk  = pImage->pDisk;
+    size_t cbCreated = 0;
+
+    VD_THREAD_IS_CRITSECT_OWNER(pDisk);
+
+    cbCreated = RTSgBufSegArrayCreate(&pIoCtx->SgBuf, paSeg, pcSeg, cbData);
+    Assert(!paSeg || cbData == cbCreated);
+
+    return cbCreated;
+}
+
+static void vdIOIoCtxCompleted(void *pvUser, PVDIOCTX pIoCtx, int rcReq,
+                               size_t cbCompleted)
+{
+    /* Continue */
+    pIoCtx->fBlocked = false;
+    ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbCompleted);
+
+    /* Clear the pointer to next transfer function in case we have nothing to transfer anymore.
+     * @todo: Find a better way to prevent vdIoCtxContinue from calling the read/write helper again. */
+    if (!pIoCtx->cbTransferLeft)
+        pIoCtx->pfnIoCtxTransfer = NULL;
+
+    vdIoCtxContinue(pIoCtx, rcReq);
+}
+
 /**
  * VD I/O interface callback for opening a file (limited version for VDGetFormat).
@@ -3124 +3178 @@
 
             /* Create the I/O callback table. */
-            pDisk->VDIIOCallbacks.cbSize             = sizeof(VDINTERFACEIO);
-            pDisk->VDIIOCallbacks.enmInterface       = VDINTERFACETYPE_IO;
-            pDisk->VDIIOCallbacks.pfnOpen            = vdIOOpen;
-            pDisk->VDIIOCallbacks.pfnClose           = vdIOClose;
-            pDisk->VDIIOCallbacks.pfnGetSize         = vdIOGetSize;
-            pDisk->VDIIOCallbacks.pfnSetSize         = vdIOSetSize;
-            pDisk->VDIIOCallbacks.pfnReadSync        = vdIOReadSync;
-            pDisk->VDIIOCallbacks.pfnWriteSync       = vdIOWriteSync;
-            pDisk->VDIIOCallbacks.pfnFlushSync       = vdIOFlushSync;
-            pDisk->VDIIOCallbacks.pfnReadUserAsync   = vdIOReadUserAsync;
-            pDisk->VDIIOCallbacks.pfnWriteUserAsync  = vdIOWriteUserAsync;
-            pDisk->VDIIOCallbacks.pfnReadMetaAsync   = vdIOReadMetaAsync;
-            pDisk->VDIIOCallbacks.pfnWriteMetaAsync  = vdIOWriteMetaAsync;
-            pDisk->VDIIOCallbacks.pfnMetaXferRelease = vdIOMetaXferRelease;
-            pDisk->VDIIOCallbacks.pfnFlushAsync      = vdIOFlushAsync;
-            pDisk->VDIIOCallbacks.pfnIoCtxCopyFrom   = vdIOIoCtxCopyFrom;
-            pDisk->VDIIOCallbacks.pfnIoCtxCopyTo     = vdIOIoCtxCopyTo;
-            pDisk->VDIIOCallbacks.pfnIoCtxSet        = vdIOIoCtxSet;
+            pDisk->VDIIOCallbacks.cbSize                 = sizeof(VDINTERFACEIO);
+            pDisk->VDIIOCallbacks.enmInterface           = VDINTERFACETYPE_IO;
+            pDisk->VDIIOCallbacks.pfnOpen                = vdIOOpen;
+            pDisk->VDIIOCallbacks.pfnClose               = vdIOClose;
+            pDisk->VDIIOCallbacks.pfnGetSize             = vdIOGetSize;
+            pDisk->VDIIOCallbacks.pfnSetSize             = vdIOSetSize;
+            pDisk->VDIIOCallbacks.pfnReadSync            = vdIOReadSync;
+            pDisk->VDIIOCallbacks.pfnWriteSync           = vdIOWriteSync;
+            pDisk->VDIIOCallbacks.pfnFlushSync           = vdIOFlushSync;
+            pDisk->VDIIOCallbacks.pfnReadUserAsync       = vdIOReadUserAsync;
+            pDisk->VDIIOCallbacks.pfnWriteUserAsync      = vdIOWriteUserAsync;
+            pDisk->VDIIOCallbacks.pfnReadMetaAsync       = vdIOReadMetaAsync;
+            pDisk->VDIIOCallbacks.pfnWriteMetaAsync      = vdIOWriteMetaAsync;
+            pDisk->VDIIOCallbacks.pfnMetaXferRelease     = vdIOMetaXferRelease;
+            pDisk->VDIIOCallbacks.pfnFlushAsync          = vdIOFlushAsync;
+            pDisk->VDIIOCallbacks.pfnIoCtxCopyFrom       = vdIOIoCtxCopyFrom;
+            pDisk->VDIIOCallbacks.pfnIoCtxCopyTo         = vdIOIoCtxCopyTo;
+            pDisk->VDIIOCallbacks.pfnIoCtxSet            = vdIOIoCtxSet;
+            pDisk->VDIIOCallbacks.pfnIoCtxSegArrayCreate = vdIOIoCtxSegArrayCreate;
+            pDisk->VDIIOCallbacks.pfnIoCtxCompleted      = vdIOIoCtxCompleted;
 
             *ppDisk = pDisk;