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

Timestamp:

Oct 10, 2024 8:07:33 AM (5 months ago)

Author:

vboxsync

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

165069

Message:

DevBusLogic: CritSectIntr also needs to protect uMailboxIncomingPositionCurrent (see bugref:10740).

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (3 diffs)

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

@@ -420 +420 @@
     RTGCPHYS                        GCPhysAddrMailboxIncomingBase;
 
-    /** Critical section protecting access to the interrupt status register. */
+    /** Critical section protecting access to the interrupt status register and uMailboxIncomingPositionCurrent. */
     PDMCRITSECT                     CritSectIntr;
 
@@ -1391 +1391 @@
     MbxIn.u.in.uCompletionCode     = uMailboxCompletionCode;
 
+    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSectIntr, VINF_SUCCESS);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSectIntr, rc);
+
     RTGCPHYS GCPhysAddrMailboxIncoming = pThis->GCPhysAddrMailboxIncomingBase
                                        + (   pThis->uMailboxIncomingPositionCurrent
                                           * (pThis->fMbxIs24Bit ? sizeof(Mailbox24) : sizeof(Mailbox32)) );
 
+    /* Advance to next mailbox position. */
+    pThis->uMailboxIncomingPositionCurrent++;
+    if (pThis->uMailboxIncomingPositionCurrent >= pThis->cMailbox)
+        pThis->uMailboxIncomingPositionCurrent = 0;
+
+    PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSectIntr);
+
     if (uMailboxCompletionCode != BUSLOGIC_MAILBOX_INCOMING_COMPLETION_ABORTED_NOT_FOUND)
     {
-        LogFlowFunc(("Completing CCB %RGp hstat=%u, dstat=%u, outgoing mailbox at %RGp\n", GCPhysAddrCCB,
+        LogFlowFunc(("Completing CCB %RGp hstat=%u, dstat=%u, incoming mailbox at %RGp\n", GCPhysAddrCCB,
                      uHostAdapterStatus, uDeviceStatus, GCPhysAddrMailboxIncoming));
 
@@ -1430 +1440 @@
     }
 
-    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSectIntr, VINF_SUCCESS);
+    rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSectIntr, VINF_SUCCESS);
     PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSectIntr, rc);
-
-    /* Advance to next mailbox position. */
-    pThis->uMailboxIncomingPositionCurrent++;
-    if (pThis->uMailboxIncomingPositionCurrent >= pThis->cMailbox)
-        pThis->uMailboxIncomingPositionCurrent = 0;
 
 # ifdef LOG_ENABLED