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

Timestamp:

Jul 8, 2020 8:16:48 AM (5 years ago)

Author:

vboxsync

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

139017

Message:

Devices/Storage/DevLsiLogicSCSI: Use the default devie critical section to improve behavior with SMP guests and some other smaller fixes, bugref:9767

File:

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

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

@@ -1376 +1376 @@
                         pThis->cMessage = LSILOGIC_REG_DOORBELL_GET_SIZE(u32);
                         pThis->iMessage = 0;
-                        AssertMsg(pThis->cMessage <= RT_ELEMENTS(pThis->aMessage),
-                                  ("Message doesn't fit into the buffer, cMessage=%u", pThis->cMessage));
+
+                        /* This is not supposed to happen and the result is undefined, just stay in the current state. */
+                        AssertMsgReturn(pThis->cMessage <= RT_ELEMENTS(pThis->aMessage),
+                                        ("Message doesn't fit into the buffer, cMessage=%u", pThis->cMessage),
+                                        VINF_SUCCESS);
+
                         pThis->enmDoorbellState = LSILOGICDOORBELLSTATE_FN_HANDSHAKE;
                         /* Update the interrupt status to notify the guest that a doorbell function was started. */
@@ -1416 +1420 @@
                                                              (PMptMessageHdr)pThis->aMessage, &pThis->ReplyBuffer);
                     AssertRC(rc);
+
+                    pThis->iMessage = 0;
                 }
 #endif
@@ -1978 +1984 @@
                 return cbCopied - RT_MIN(cbSkip, cbCopied);
 
-            uint32_t cbCopyThis           = SGEntry.Simple32.u24Length;
+            uint32_t cbCopyThis           = RT_MIN(SGEntry.Simple32.u24Length, cbCopy);
             RTGCPHYS GCPhysAddrDataBuffer = SGEntry.Simple32.u32DataBufferAddressLow;
 
@@ -5285 +5291 @@
     /*
      * Create critical sections protecting the reply post and free queues.
-     * Note! We do our own syncronization, so NOP the default crit sect for the device.
      */
-    rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
-    AssertRCReturn(rc, rc);
-
     rc = PDMDevHlpCritSectInit(pDevIns, &pThis->ReplyFreeQueueCritSect, RT_SRC_POS, "%sRFQ", szDevTag);
     if (RT_FAILURE(rc))
@@ -5547 +5549 @@
     PLSILOGICSCSI pThis = PDMDEVINS_2_DATA(pDevIns, PLSILOGICSCSI);
 
-    /* Replicate the critsect configuration: */
-    int rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
-    AssertRCReturn(rc, rc);
-
     /* Setup callbacks for this context: */
-    rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsReg, lsilogicIOPortWrite, lsilogicIOPortRead, NULL /*pvUser*/);
+    int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsReg, lsilogicIOPortWrite, lsilogicIOPortRead, NULL /*pvUser*/);
     AssertRCReturn(rc, rc);