Changeset 66058 in vbox

Timestamp:

Mar 13, 2017 11:53:11 AM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage/VSCSI: Add possiblity for the LUN to attach opaque data to a VSCSI request for additional book keeping

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSIDevice.cpp (modified) (2 diffs)
• VSCSIInternal.h (modified) (3 diffs)
• VSCSIIoReq.cpp (modified) (1 diff)
• VSCSILunMmc.cpp (modified) (1 diff)
• VSCSILunSbc.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp

@@ -185 +185 @@
                                        rcReq, pVScsiReq->cbXfer);
 
+    if (pVScsiReq->pvLun)
+    {
+        if (vscsiDeviceLunIsPresent(pVScsiDevice, pVScsiReq->iLun))
+        {
+            PVSCSILUNINT pVScsiLun = pVScsiDevice->papVScsiLun[pVScsiReq->iLun];
+            pVScsiLun->pVScsiLunDesc->pfnVScsiLunReqFree(pVScsiLun, pVScsiReq, pVScsiReq->pvLun);
+        }
+        else
+            AssertLogRelMsgFailed(("vscsiDeviceReqComplete: LUN %u for VSCSI request %#p is not present but there is LUN specific data allocated\n",
+                                   pVScsiReq->iLun, pVScsiReq));
+
+        pVScsiReq->pvLun = NULL;
+    }
+
     RTMemCacheFree(pVScsiDevice->hCacheReq, pVScsiReq);
 }
@@ -396 +410 @@
     pVScsiReq->pvVScsiReqUser = pvVScsiReqUser;
     pVScsiReq->cbXfer         = 0;
+    pVScsiReq->pvLun          = NULL;
     RTSgBufInit(&pVScsiReq->SgBuf, paSGList, cSGListEntries);
 

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h

@@ -121 +121 @@
     /** Transfer size determined from the CDB. */
     size_t               cbXfer;
+    /** Pointer to the opaque data which may be allocated by the LUN
+     * the request is for. */
+    void                *pvLun;
 } VSCSIREQINT;
 
@@ -265 +268 @@
 
     /**
+     * Frees additional allocated resources for the given request if it was allocated before.
+     *
+     * @returns void.
+     * @param   pVScsiLun    The SCSI LUN instance.
+     * @param   pVScsiReq    The SCSI request.
+     * @param   pvScsiReqLun The opaque data allocated previously.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnVScsiLunReqFree, (PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq,
+                                                    void *pvScsiReqLun));
+
+    /**
      * Informs about a medium being inserted - optional.
      *
@@ -424 +438 @@
 
 /**
+ * Enqueue a new data transfer request - extended variant.
+ *
+ * @returns VBox status code.
+ * @param   pVScsiLun   The LUN instance which issued the request.
+ * @param   pVScsiReq   The virtual SCSI request associated with the transfer.
+ * @param   enmTxDir    Transfer direction.
+ * @param   uOffset     Start offset of the transfer.
+ * @param   paSegs      Pointer to the array holding the memory buffer segments.
+ * @param   cSegs       Number of segments in the array.
+ * @param   cbTransfer  Number of bytes to transfer.
+ */
+int vscsiIoReqTransferEnqueueEx(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq,
+                                VSCSIIOREQTXDIR enmTxDir, uint64_t uOffset,
+                                PCRTSGSEG paSegs, unsigned cSegs, size_t cbTransfer);
+
+/**
  * Enqueue a new unmap request.
  *

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp

@@ -92 +92 @@
 
 
+int vscsiIoReqTransferEnqueueEx(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq,
+                                VSCSIIOREQTXDIR enmTxDir, uint64_t uOffset,
+                                PCRTSGSEG paSegs, unsigned cSegs, size_t cbTransfer)
+{
+    int rc = VINF_SUCCESS;
+    PVSCSIIOREQINT pVScsiIoReq = NULL;
+
+    LogFlowFunc(("pVScsiLun=%#p pVScsiReq=%#p enmTxDir=%u uOffset=%llu cbTransfer=%u\n",
+                 pVScsiLun, pVScsiReq, enmTxDir, uOffset, cbTransfer));
+
+    rc = vscsiLunReqAlloc(pVScsiLun, (uintptr_t)pVScsiReq, &pVScsiIoReq);
+    if (RT_SUCCESS(rc))
+    {
+        pVScsiIoReq->pVScsiReq       = pVScsiReq;
+        pVScsiIoReq->pVScsiLun       = pVScsiLun;
+        pVScsiIoReq->enmTxDir        = enmTxDir;
+        pVScsiIoReq->u.Io.uOffset    = uOffset;
+        pVScsiIoReq->u.Io.cbTransfer = cbTransfer;
+        pVScsiIoReq->u.Io.paSeg      = paSegs;
+        pVScsiIoReq->u.Io.cSeg       = cSegs;
+
+        ASMAtomicIncU32(&pVScsiLun->IoReq.cReqOutstanding);
+
+        rc = vscsiLunReqTransferEnqueue(pVScsiLun, pVScsiIoReq);
+        if (RT_FAILURE(rc))
+        {
+            ASMAtomicDecU32(&pVScsiLun->IoReq.cReqOutstanding);
+            vscsiLunReqFree(pVScsiLun, pVScsiIoReq);
+        }
+    }
+
+    return rc;
+}
+
+
 int vscsiIoReqUnmapEnqueue(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq,
                            PRTRANGE paRanges, unsigned cRanges)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -1338 +1338 @@
     /** pfnVScsiLunReqProcess */
     vscsiLunMmcReqProcess,
+    /** pfnVScsiLunReqFree */
+    NULL,
     /** pfnVScsiLunMediumInserted */
     vscsiLunMmcMediumInserted,

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -616 +616 @@
     /** pfnVScsiLunReqProcess */
     vscsiLunSbcReqProcess,
+    /** pfnVScsiLunReqFree */
+    NULL,
     /** pfnVScsiLunMediumInserted */
     NULL,