Changeset 81752 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 9, 2019 10:21:23 AM (5 years ago)

Author:

vboxsync

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

134540

Message:

DevLsiLogicSCSI: Switched critsects and sup semaphores to device helper. Use fixed size buffer for controller type, avoiding the free call. bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (29 diffs)

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

@@ -362 +362 @@
     };
 
-    /** The support driver session handle. */
-    R3R0PTRTYPE(PSUPDRVSESSION)      pSupDrvSession;
     /** Worker thread. */
     R3PTRTYPE(PPDMTHREAD)            pThreadWrk;
@@ -643 +641 @@
 
     /* Write message context ID into reply post queue. */
-    rc = PDMCritSectEnter(&pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
+    rc = PDMDevHlpCritSectEnter(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
     AssertRC(rc);
 
@@ -651 +649 @@
         /* Set error code. */
         lsilogicSetIOCFaultCode(pThis, LSILOGIC_IOCSTATUS_INSUFFICIENT_RESOURCES);
-        PDMCritSectLeave(&pThis->ReplyPostQueueCritSect);
+        PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect);
         return;
     }
@@ -663 +661 @@
     lsilogicSetInterrupt(pThis, LSILOGIC_REG_HOST_INTR_STATUS_REPLY_INTR);
 
-    PDMCritSectLeave(&pThis->ReplyPostQueueCritSect);
+    PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect);
 }
 
@@ -700 +698 @@
         int rc;
         /* Grab a free reply message from the queue. */
-        rc = PDMCritSectEnter(&pThis->ReplyFreeQueueCritSect, VINF_SUCCESS);
+        rc = PDMDevHlpCritSectEnter(pThis->CTX_SUFF(pDevIns), &pThis->ReplyFreeQueueCritSect, VINF_SUCCESS);
         AssertRC(rc);
 
@@ -708 +706 @@
             /* Set error code. */
             lsilogicSetIOCFaultCode(pThis, LSILOGIC_IOCSTATUS_INSUFFICIENT_RESOURCES);
-            PDMCritSectLeave(&pThis->ReplyFreeQueueCritSect);
+            PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyFreeQueueCritSect);
             return;
         }
@@ -717 +715 @@
         pThis->uReplyFreeQueueNextAddressRead %= pThis->cReplyQueueEntries;
 
-        PDMCritSectLeave(&pThis->ReplyFreeQueueCritSect);
+        PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyFreeQueueCritSect);
 
         /* Build 64bit physical address. */
@@ -727 +725 @@
 
         /* Write low 32bits of reply frame into post reply queue. */
-        rc = PDMCritSectEnter(&pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
+        rc = PDMDevHlpCritSectEnter(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
         AssertRC(rc);
 
@@ -735 +733 @@
             /* Set error code. */
             lsilogicSetIOCFaultCode(pThis, LSILOGIC_IOCSTATUS_INSUFFICIENT_RESOURCES);
-            PDMCritSectLeave(&pThis->ReplyPostQueueCritSect);
+            PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect);
             return;
         }
@@ -754 +752 @@
         lsilogicSetInterrupt(pThis, LSILOGIC_REG_HOST_INTR_STATUS_REPLY_INTR);
 
-        PDMCritSectLeave(&pThis->ReplyPostQueueCritSect);
+        PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect);
 # else
         AssertMsgFailed(("This is not allowed to happen.\n"));
@@ -1257 +1255 @@
         case LSILOGIC_REG_REPLY_QUEUE:
         {
-            int rc = PDMCritSectEnter(&pThis->ReplyFreeQueueWriteCritSect, VINF_IOM_R3_MMIO_WRITE);
+            int rc = PDMDevHlpCritSectEnter(pThis->CTX_SUFF(pDevIns), &pThis->ReplyFreeQueueWriteCritSect, VINF_IOM_R3_MMIO_WRITE);
             if (rc != VINF_SUCCESS)
                 return rc;
@@ -1264 +1262 @@
             pThis->uReplyFreeQueueNextEntryFreeWrite++;
             pThis->uReplyFreeQueueNextEntryFreeWrite %= pThis->cReplyQueueEntries;
-            PDMCritSectLeave(&pThis->ReplyFreeQueueWriteCritSect);
+            PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyFreeQueueWriteCritSect);
             break;
         }
         case LSILOGIC_REG_REQUEST_QUEUE:
         {
-            int rc = PDMCritSectEnter(&pThis->RequestQueueCritSect, VINF_IOM_R3_MMIO_WRITE);
+            int rc = PDMDevHlpCritSectEnter(pThis->CTX_SUFF(pDevIns), &pThis->RequestQueueCritSect, VINF_IOM_R3_MMIO_WRITE);
             if (rc != VINF_SUCCESS)
                 return rc;
@@ -1286 +1284 @@
             uNextWrite %= pThis->cRequestQueueEntries;
             ASMAtomicWriteU32(&pThis->uRequestQueueNextEntryFreeWrite, uNextWrite);
-            PDMCritSectLeave(&pThis->RequestQueueCritSect);
+            PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->RequestQueueCritSect);
 
             /* Send notification to R3 if there is not one sent already. Do this
@@ -1295 +1293 @@
                 {
                     LogFlowFunc(("Signal event semaphore\n"));
-                    rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+                    rc = PDMDevHlpSUPSemEventSignal(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess);
                     AssertRC(rc);
                 }
@@ -1531 +1529 @@
         case LSILOGIC_REG_REPLY_QUEUE:
         {
-            rc = PDMCritSectEnter(&pThis->ReplyPostQueueCritSect, VINF_IOM_R3_MMIO_READ);
+            rc = PDMDevHlpCritSectEnter(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect, VINF_IOM_R3_MMIO_READ);
             if (rc != VINF_SUCCESS)
                 break;
@@ -1551 +1549 @@
                 lsilogicClearInterrupt(pThis, LSILOGIC_REG_HOST_INTR_STATUS_REPLY_INTR);
             }
-            PDMCritSectLeave(&pThis->ReplyPostQueueCritSect);
+            PDMDevHlpCritSectLeave(pThis->CTX_SUFF(pDevIns), &pThis->ReplyPostQueueCritSect);
 
             Log(("%s: Returning address %#x\n", __FUNCTION__, u32));
@@ -3916 +3914 @@
         /* Notify the worker thread that there are pending requests. */
         LogFlowFunc(("Signal event semaphore\n"));
-        rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+        rc = PDMDevHlpSUPSemEventSignal(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess);
         AssertRC(rc);
     }
@@ -3945 +3943 @@
         /* Notify the worker thread that there are pending requests. */
         LogFlowFunc(("Signal event semaphore\n"));
-        rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+        rc = PDMDevHlpSUPSemEventSignal(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess);
         AssertRC(rc);
     }
@@ -4198 +4196 @@
         {
             Assert(ASMAtomicReadBool(&pThis->fWrkThreadSleeping));
-            rc = SUPSemEventWaitNoResume(pThis->pSupDrvSession, pThis->hEvtProcess, RT_INDEFINITE_WAIT);
+            rc = PDMDevHlpSUPSemEventWaitNoResume(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess, RT_INDEFINITE_WAIT);
             AssertLogRelMsgReturn(RT_SUCCESS(rc) || rc == VERR_INTERRUPTED, ("%Rrc\n", rc), rc);
             if (RT_UNLIKELY(pThread->enmState != PDMTHREADSTATE_RUNNING))
@@ -4313 +4311 @@
     RT_NOREF(pThread);
     PLSILOGICSCSI pThis = PDMDEVINS_2_DATA(pDevIns, PLSILOGICSCSI);
-    return SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+    return PDMDevHlpSUPSemEventSignal(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess);
 }
 
@@ -4330 +4328 @@
         /* Notify the worker thread that there are pending requests. */
         LogFlowFunc(("Signal event semaphore\n"));
-        int rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+        int rc = PDMDevHlpSUPSemEventSignal(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess);
         AssertRC(rc);
     }
@@ -5224 +5222 @@
 static DECLCALLBACK(int) lsilogicR3Destruct(PPDMDEVINS pDevIns)
 {
+    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
     PLSILOGICSCSI pThis = PDMDEVINS_2_DATA(pDevIns, PLSILOGICSCSI);
-    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
-
-    PDMR3CritSectDelete(&pThis->ReplyFreeQueueCritSect);
-    PDMR3CritSectDelete(&pThis->ReplyPostQueueCritSect);
-    PDMR3CritSectDelete(&pThis->RequestQueueCritSect);
-    PDMR3CritSectDelete(&pThis->ReplyFreeQueueWriteCritSect);
+
+    PDMDevHlpCritSectDelete(pDevIns, &pThis->ReplyFreeQueueCritSect);
+    PDMDevHlpCritSectDelete(pDevIns, &pThis->ReplyPostQueueCritSect);
+    PDMDevHlpCritSectDelete(pDevIns, &pThis->RequestQueueCritSect);
+    PDMDevHlpCritSectDelete(pDevIns, &pThis->ReplyFreeQueueWriteCritSect);
 
     RTMemFree(pThis->paDeviceStates);
@@ -5237 +5235 @@
     if (pThis->hEvtProcess != NIL_SUPSEMEVENT)
     {
-        SUPSemEventClose(pThis->pSupDrvSession, pThis->hEvtProcess);
+        PDMDevHlpSUPSemEventClose(pThis->CTX_SUFF(pDevIns), pThis->hEvtProcess);
         pThis->hEvtProcess = NIL_SUPSEMEVENT;
     }
@@ -5252 +5250 @@
 static DECLCALLBACK(int) lsilogicR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PLSILOGICSCSI pThis = PDMDEVINS_2_DATA(pDevIns, PLSILOGICSCSI);
     PCPDMDEVHLPR3 pHlp  = pDevIns->pHlpR3;
     int           rc    = VINF_SUCCESS;
-    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -5303 +5301 @@
     Log(("%s: RequestQueueDepth=%u\n", __FUNCTION__, pThis->cRequestQueueEntries));
 
-    char *pszCtrlType;
-    rc = pHlp->pfnCFGMQueryStringAllocDef(pCfg, "ControllerType", &pszCtrlType, LSILOGICSCSI_PCI_SPI_CTRLNAME);
+    char szCtrlType[64];
+    rc = pHlp->pfnCFGMQueryStringDef(pCfg, "ControllerType", szCtrlType, sizeof(szCtrlType), LSILOGICSCSI_PCI_SPI_CTRLNAME);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("LsiLogic configuration error: failed to read ControllerType as string"));
-    Log(("%s: ControllerType=%s\n", __FUNCTION__, pszCtrlType));
-
-    rc = lsilogicR3GetCtrlTypeFromString(pThis, pszCtrlType);
-    MMR3HeapFree(pszCtrlType);
+    Log(("%s: ControllerType=%s\n", __FUNCTION__, szCtrlType));
+    rc = lsilogicR3GetCtrlTypeFromString(pThis, szCtrlType);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic configuration error: failed to determine controller type from string"));
 
     char szDevTag[20];
@@ -5317 +5315 @@
                 pThis->enmCtrlType == LSILOGICCTRLTYPE_SCSI_SPI ? "SPI" : "SAS",
                 iInstance);
-
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic configuration error: failed to determine controller type from string"));
 
     rc = pHlp->pfnCFGMQueryU8(pCfg, "NumPorts", &pThis->cPorts);
@@ -5375 +5370 @@
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-    pThis->pSupDrvSession = PDMDevHlpGetSupDrvSession(pDevIns);
     pThis->IBase.pfnQueryInterface = lsilogicR3StatusQueryInterface;
     pThis->ILeds.pfnQueryStatusLed = lsilogicR3StatusQueryStatusLed;
@@ -5462 +5456 @@
         pThis->cDeviceStates = pThis->cPorts * LSILOGICSCSI_PCI_SAS_DEVICES_PER_PORT_MAX;
     else
-        AssertMsgFailed(("Invalid controller type: %d\n", pThis->enmCtrlType));
+        AssertLogRelMsgFailedReturn(("Invalid controller type: %d\n", pThis->enmCtrlType), VERR_INTERNAL_ERROR_4);
 
     /*
@@ -5473 +5467 @@
                                    N_("LsiLogic: Failed to create worker thread %s"), szDevTag);
 
-    rc = SUPSemEventCreate(pThis->pSupDrvSession, &pThis->hEvtProcess);
+    rc = PDMDevHlpSUPSemEventCreate(pThis->CTX_SUFF(pDevIns), &pThis->hEvtProcess);
     if (RT_FAILURE(rc))
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,