Changeset 31616 in vbox

Timestamp:

Aug 12, 2010 6:15:04 PM (14 years ago)

Author:

vboxsync

Message:

iSCSI: Reattach when the target hangs up. Poll doesn't return with the error flag but indicates that there is data to read

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (5 diffs)

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

@@ -805 +805 @@
         pImage->aCmdsWaiting[idx] = NULL;
 
-        /* Get the tail. */
-        pTail = pHead;
-        while (pTail->pNext)
-            pTail = pTail->pNext;
-
-        /* Concatenate. */
-        pTail->pNext = pIScsiCmdHead;
-        pIScsiCmdHead = pHead;
+        if (pHead)
+        {
+            /* Get the tail. */
+            pTail = pHead;
+            while (pTail->pNext)
+                pTail = pTail->pNext;
+
+            /* Concatenate. */
+            pTail->pNext = pIScsiCmdHead;
+            pIScsiCmdHead = pHead;
+        }
     }
 
@@ -2239 +2242 @@
     rc = pImage->pInterfaceNetCallbacks->pfnReadNB(pImage->Socket, pImage->pbRecvPDUBufCur,
                                                    pImage->cbRecvPDUResidual, &cbActuallyRead);
+    if (RT_SUCCESS(rc) && cbActuallyRead == 0)
+        rc = VERR_BROKEN_PIPE;
+
     if (RT_SUCCESS(rc))
     {
@@ -3133 +3139 @@
 
 /**
+ * Reattaches the to the target after an error aborting
+ * pending commands and resending them.
+ *
+ * @param    pImage    iSCSI connection state.
+ */
+static void iscsiReattach(PISCSIIMAGE pImage)
+{
+    int rc = VINF_SUCCESS;
+    PISCSICMD pIScsiCmdHead = NULL;
+    PISCSICMD pIScsiCmd = NULL;
+    PISCSICMD pIScsiCmdCur = NULL;
+    PISCSIPDUTX pIScsiPDUTx = NULL;
+
+    /* Close connection. */
+    iscsiTransportClose(pImage);
+    pImage->state = ISCSISTATE_FREE;
+
+    /* Reset PDU we are receiving. */
+    iscsiRecvPDUReset(pImage);
+
+    /*
+     * Abort all PDUs we are about to transmit,
+     * the command need a new Itt if the relogin is successful.
+     */
+    while (pImage->pIScsiPDUTxHead)
+    {
+        pIScsiPDUTx = pImage->pIScsiPDUTxHead;
+        pImage->pIScsiPDUTxHead = pIScsiPDUTx->pNext;
+
+        pIScsiCmd = pIScsiPDUTx->pIScsiCmd;
+
+        if (pIScsiCmd)
+        {
+            /* Place on command list. */
+            pIScsiCmd->pNext = pIScsiCmdHead;
+            pIScsiCmdHead = pIScsiCmd;
+        }
+        RTMemFree(pIScsiPDUTx);
+    }
+
+    /* Clear the current PDU too. */
+    if (pImage->pIScsiPDUTxCur)
+    {
+        pIScsiPDUTx = pImage->pIScsiPDUTxCur;
+
+        pImage->pIScsiPDUTxCur = NULL;
+        pIScsiCmd = pIScsiPDUTx->pIScsiCmd;
+
+        if (pIScsiCmd)
+        {
+            pIScsiCmd->pNext = pIScsiCmdHead;
+            pIScsiCmdHead = pIScsiCmd;
+        }
+        RTMemFree(pIScsiPDUTx);
+    }
+
+    /*
+     * Get all commands which are waiting for a response
+     * They need to be resend too after a successful reconnect.
+     */
+    pIScsiCmd = iscsiCmdRemoveAll(pImage);
+
+    if (pIScsiCmd)
+    {
+        pIScsiCmdCur = pIScsiCmd;
+        while (pIScsiCmdCur->pNext)
+            pIScsiCmdCur = pIScsiCmdCur->pNext;
+
+        /*
+         * Place them in front of the list because they are the oldest requests
+         * and need to be processed first to minimize the risk to time out.
+         */
+        pIScsiCmdCur->pNext = pIScsiCmdHead;
+        pIScsiCmdHead = pIScsiCmd;
+    }
+
+    /* Try to attach. */
+    rc = iscsiAttach(pImage);
+    if (RT_SUCCESS(rc))
+    {
+        /* Phew, we have a connection again.
+         * Prepare new PDUs for the aborted commands.
+         */
+        while (pIScsiCmdHead)
+        {
+            pIScsiCmd = pIScsiCmdHead;
+            pIScsiCmdHead = pIScsiCmdHead->pNext;
+
+            rc = iscsiPDUTxPrepare(pImage, pIScsiCmd);
+            AssertRC(rc);
+        }
+    }
+    else
+    {
+        /*
+         * Still no luck, complete commands with error so the caller
+         * has a chance to inform the user and maybe resend the command.
+         */
+        while (pIScsiCmdHead)
+        {
+            pIScsiCmd = pIScsiCmdHead;
+            pIScsiCmdHead = pIScsiCmdHead->pNext;
+
+            iscsiCmdComplete(pImage, pIScsiCmd, VERR_BROKEN_PIPE);
+        }
+    }
+}
+
+/**
  * Internal. Main iSCSI I/O worker.
  */
@@ -3189 +3304 @@
                 LogFlow(("There is data on the socket\n"));
                 rc = iscsiRecvPDUAsync(pImage);
+                if (rc == VERR_BROKEN_PIPE)
+                    iscsiReattach(pImage);
                 if (RT_FAILURE(rc))
                     LogRel(("iSCSI: Handling incoming request failed %Rrc\n", rc));
@@ -3201 +3318 @@
             else if (fEvents & VD_INTERFACETCPNET_EVT_ERROR)
             {
-                PISCSICMD pIScsiCmdHead = NULL;
-                PISCSICMD pIScsiCmd = NULL;
-                PISCSICMD pIScsiCmdCur = NULL;
-                PISCSIPDUTX pIScsiPDUTx = NULL;
                 LogFlow(("An error ocurred\n"));
-
-                /* Close connection. */
-                iscsiTransportClose(pImage);
-                pImage->state = ISCSISTATE_FREE;
-
-                /* Reset PDU we are receiving. */
-                iscsiRecvPDUReset(pImage);
-
-                /*
-                 * Abort all PDUs we are about to transmit,
-                 * the command need a new Itt if the relogin is successful.
-                 */
-                while (pImage->pIScsiPDUTxHead)
-                {
-                    pIScsiPDUTx = pImage->pIScsiPDUTxHead;
-                    pImage->pIScsiPDUTxHead = pIScsiPDUTx->pNext;
-
-                    pIScsiCmd = pIScsiPDUTx->pIScsiCmd;
-
-                    if (pIScsiCmd)
-                    {
-                        /* Place on command list. */
-                        pIScsiCmd->pNext = pIScsiCmdHead;
-                        pIScsiCmdHead = pIScsiCmd;
-                    }
-                    RTMemFree(pIScsiPDUTx);
-                }
-
-                /* Clear the current PDU too. */
-                if (pImage->pIScsiPDUTxCur)
-                {
-                    pIScsiPDUTx = pImage->pIScsiPDUTxCur;
-
-                    pImage->pIScsiPDUTxCur = NULL;
-                    pIScsiCmd = pIScsiPDUTx->pIScsiCmd;
-
-                    if (pIScsiCmd)
-                    {
-                        pIScsiCmd->pNext = pIScsiCmdHead;
-                        pIScsiCmdHead = pIScsiCmd;
-                    }
-                    RTMemFree(pIScsiPDUTx);
-                }
-
-                /*
-                 * Get all commands which are waiting for a response
-                 * They need to be resend too after a successful reconnect.
-                 */
-                pIScsiCmd = iscsiCmdRemoveAll(pImage);
-
-                pIScsiCmdCur = pIScsiCmd;
-                while (pIScsiCmdCur->pNext)
-                    pIScsiCmdCur = pIScsiCmdCur->pNext;
-
-                /*
-                 * Place them in front of the list because they are the oldest requests
-                 * and need to be processed first to minimize the risk to time out.
-                 */
-                pIScsiCmdCur->pNext = pIScsiCmdHead;
-                pIScsiCmdHead = pIScsiCmd;
-
-                /* Try to attach. */
-                rc = iscsiAttach(pImage);
-                if (RT_SUCCESS(rc))
-                {
-                    /* Phew, we have a connection again.
-                     * Prepare new PDUs for the aborted commands.
-                     */
-                    while (pIScsiCmdHead)
-                    {
-                        pIScsiCmd = pIScsiCmdHead;
-                        pIScsiCmdHead = pIScsiCmdHead->pNext;
-
-                        rc = iscsiPDUTxPrepare(pImage, pIScsiCmd);
-                        AssertRC(rc);
-                    }
-                }
-                else
-                {
-                    /*
-                     * Still no luck, complete commands with error so the caller
-                     * has a chance to inform the user and maybe resend the command.
-                     */
-                    while (pIScsiCmdHead)
-                    {
-                        pIScsiCmd = pIScsiCmdHead;
-                        pIScsiCmdHead = pIScsiCmdHead->pNext;
-
-                        iscsiCmdComplete(pImage, pIScsiCmd, VERR_BROKEN_PIPE);
-                    }
-                }
+                iscsiReattach(pImage);
             }
             else