Changeset 29588 in vbox

Timestamp:

May 17, 2010 10:32:29 PM (15 years ago)

Author:

vboxsync

Message:

LsiLogic: The request queue should have the same size as the reply queue or we risk overwriting completed requests by others causing timeouts in the guest

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevLsiLogicSCSI.cpp (modified) (6 diffs)
• DevLsiLogicSCSI.h (modified) (1 diff)

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

@@ -550 +550 @@
 {
     int rc;
+
+    LogFlowFunc(("pLsiLogic=%#p u32MessageContext=%#x\n", pLsiLogic, u32MessageContext));
+
     AssertMsg(!pLsiLogic->fDoorbellInProgress, ("We are in a doorbell function\n"));
 
@@ -734 +737 @@
         {
             PMptSCSITaskManagementRequest pTaskMgmtReq = (PMptSCSITaskManagementRequest)pMessageHdr;
+
+            LogFlow(("u8TaskType=%u\n", pTaskMgmtReq->u8TaskType));
+            LogFlow(("u32TaskMessageContext=%#x\n", pTaskMgmtReq->u32TaskMessageContext));
 
             pReply->SCSITaskManagement.u8MessageLength     = 6;     /* 6 32bit dwords. */
@@ -3757 +3763 @@
 }
 
+/**
+ * Allocate the queues.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pThis     The LsiLogic device instance.
+ */
+static int lsilogicQueuesAlloc(PLSILOGICSCSI pThis)
+{
+    PVM pVM = PDMDevHlpGetVM(pThis->pDevInsR3);
+    uint32_t cbQueues;
+
+    Assert(!pThis->pReplyFreeQueueBaseR3);
+
+    cbQueues  = 2*pThis->cReplyQueueEntries * sizeof(uint32_t);
+    cbQueues += pThis->cRequestQueueEntries * sizeof(uint32_t);
+    int rc = MMHyperAlloc(pVM, cbQueues, 1, MM_TAG_PDM_DEVICE_USER,
+                          (void **)&pThis->pReplyFreeQueueBaseR3);
+    if (RT_FAILURE(rc))
+        return VERR_NO_MEMORY;
+    pThis->pReplyFreeQueueBaseR0 = MMHyperR3ToR0(pVM, (void *)pThis->pReplyFreeQueueBaseR3);
+    pThis->pReplyFreeQueueBaseRC = MMHyperR3ToRC(pVM, (void *)pThis->pReplyFreeQueueBaseR3);
+
+    pThis->pReplyPostQueueBaseR3 = pThis->pReplyFreeQueueBaseR3 + pThis->cReplyQueueEntries;
+    pThis->pReplyPostQueueBaseR0 = MMHyperR3ToR0(pVM, (void *)pThis->pReplyPostQueueBaseR3);
+    pThis->pReplyPostQueueBaseRC = MMHyperR3ToRC(pVM, (void *)pThis->pReplyPostQueueBaseR3);
+
+    pThis->pRequestQueueBaseR3   = pThis->pReplyPostQueueBaseR3 + pThis->cReplyQueueEntries;
+    pThis->pRequestQueueBaseR0   = MMHyperR3ToR0(pVM, (void *)pThis->pRequestQueueBaseR3);
+    pThis->pRequestQueueBaseRC   = MMHyperR3ToRC(pVM, (void *)pThis->pRequestQueueBaseR3);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Free the hyper memory used or the queues.
+ *
+ * @returns nothing.
+ *
+ * @param   pThis     The LsiLogic device instance.
+ */
+static void lsilogicQueuesFree(PLSILOGICSCSI pThis)
+{
+    PVM pVM = PDMDevHlpGetVM(pThis->pDevInsR3);
+    int rc = VINF_SUCCESS;
+
+    AssertPtr(pThis->pReplyFreeQueueBaseR3);
+
+    rc = MMHyperFree(pVM, (void *)pThis->pReplyFreeQueueBaseR3);
+    AssertRC(rc);
+
+    pThis->pReplyFreeQueueBaseR3 = NULL;
+    pThis->pReplyPostQueueBaseR3 = NULL;
+    pThis->pRequestQueueBaseR3   = NULL;
+}
+
 static DECLCALLBACK(int) lsilogicLiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
 {
@@ -4007 +4069 @@
     SSMR3GetU16   (pSSM, &pLsiLogic->cbReplyFrame);
     SSMR3GetU32   (pSSM, &pLsiLogic->iDiagnosticAccess);
-    SSMR3GetU32   (pSSM, &pLsiLogic->cReplyQueueEntries);
-    SSMR3GetU32   (pSSM, &pLsiLogic->cRequestQueueEntries);
+
+    uint32_t cReplyQueueEntries, cRequestQueueEntries;
+    SSMR3GetU32   (pSSM, &cReplyQueueEntries);
+    SSMR3GetU32   (pSSM, &cRequestQueueEntries);
+
+    if (   cReplyQueueEntries != pLsiLogic->cReplyQueueEntries
+        || cRequestQueueEntries != pLsiLogic->cRequestQueueEntries)
+    {
+        LogFlow(("Reallocating queues cReplyQueueEntries=%u cRequestQueuEntries=%u\n",
+                 cReplyQueueEntries, cRequestQueueEntries));
+        lsilogicQueuesFree(pLsiLogic);
+        pLsiLogic->cReplyQueueEntries = cReplyQueueEntries;
+        pLsiLogic->cRequestQueueEntries = cRequestQueueEntries;
+        rc = lsilogicQueuesAlloc(pLsiLogic);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
     SSMR3GetU32   (pSSM, (uint32_t *)&pLsiLogic->uReplyFreeQueueNextEntryFreeWrite);
     SSMR3GetU32   (pSSM, (uint32_t *)&pLsiLogic->uReplyFreeQueueNextAddressRead);
@@ -4408 +4486 @@
     int rc = VINF_SUCCESS;
     char *pszCtrlType = NULL;
-    PVM pVM = PDMDevHlpGetVM(pDevIns);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
@@ -4549 +4626 @@
      * Allocate memory for the queues.
      */
-    uint32_t cbQueues;
-
-    cbQueues  = 2*pThis->cReplyQueueEntries * sizeof(uint32_t);
-    cbQueues += pThis->cRequestQueueEntries * sizeof(uint32_t);
-    rc = MMHyperAlloc(pVM, cbQueues, 1, MM_TAG_PDM_DEVICE_USER,
-                      (void **)&pThis->pReplyFreeQueueBaseR3);
+    rc = lsilogicQueuesAlloc(pThis);
     if (RT_FAILURE(rc))
-        return VERR_NO_MEMORY;
-    pThis->pReplyFreeQueueBaseR0 = MMHyperR3ToR0(pVM, (void *)pThis->pReplyFreeQueueBaseR3);
-    pThis->pReplyFreeQueueBaseRC = MMHyperR3ToRC(pVM, (void *)pThis->pReplyFreeQueueBaseR3);
-
-    pThis->pReplyPostQueueBaseR3 = pThis->pReplyFreeQueueBaseR3 + pThis->cReplyQueueEntries;
-    pThis->pReplyPostQueueBaseR0 = MMHyperR3ToR0(pVM, (void *)pThis->pReplyPostQueueBaseR3);
-    pThis->pReplyPostQueueBaseRC = MMHyperR3ToRC(pVM, (void *)pThis->pReplyPostQueueBaseR3);
-
-    pThis->pRequestQueueBaseR3   = pThis->pReplyPostQueueBaseR3 + pThis->cReplyQueueEntries;
-    pThis->pRequestQueueBaseR0   = MMHyperR3ToR0(pVM, (void *)pThis->pRequestQueueBaseR3);
-    pThis->pRequestQueueBaseRC   = MMHyperR3ToRC(pVM, (void *)pThis->pRequestQueueBaseR3);
+        return rc;
 
     /*

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h

@@ -27 +27 @@
 #define LSILOGIC_SAS_ISA_IO_PORT 0x350
 
-#define LSILOGICSCSI_REQUEST_QUEUE_DEPTH_DEFAULT 1024
-#define LSILOGICSCSI_REPLY_QUEUE_DEPTH_DEFAULT   128
+#define LSILOGICSCSI_REQUEST_QUEUE_DEPTH_DEFAULT 256
+#define LSILOGICSCSI_REPLY_QUEUE_DEPTH_DEFAULT   256
 
 #define LSILOGICSCSI_MAXIMUM_CHAIN_DEPTH 3