Changeset 30140 in vbox for trunk/src

Timestamp:

Jun 9, 2010 8:08:25 PM (15 years ago)

Author:

vboxsync

Message:

BusLogic: Fix race leading to I/O hang

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevBusLogic.cpp (modified) (7 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -25 +25 @@
 #include <VBox/pdmdev.h>
 #include <VBox/pdmifs.h>
+#include <VBox/pdmcritsect.h>
 #include <VBox/scsi.h>
 #include <iprt/asm.h>
@@ -365 +366 @@
 #endif
 
+    /** Critical section protecting access to the interrupt status register. */
+    PDMCRITSECT                     CritSectIntr;
+
     /** Cache for task states. */
     R3PTRTYPE(RTMEMCACHE)           hTaskCache;
@@ -920 +924 @@
     pTaskState->MailboxGuest.u.in.uCompletionCode = uMailboxCompletionCode;
 
+    int rc = PDMCritSectEnter(&pBusLogic->CritSectIntr, VINF_SUCCESS);
+    AssertRC(rc);
     RTGCPHYS GCPhysAddrMailboxIncoming = pBusLogic->GCPhysAddrMailboxIncomingBase + (pBusLogic->uMailboxIncomingPositionCurrent * sizeof(Mailbox));
     RTGCPHYS GCPhysAddrCCB = (RTGCPHYS)pTaskState->MailboxGuest.u32PhysAddrCCB;
@@ -939 +945 @@
     if (pBusLogic->fIRQEnabled)
         buslogicSetInterrupt(pBusLogic);
+
+    PDMCritSectLeave(&pBusLogic->CritSectIntr);
 }
 
@@ -1544 +1552 @@
         case BUSLOGIC_REGISTER_CONTROL:
         {
+            rc = PDMCritSectEnter(&pBusLogic->CritSectIntr, VINF_IOM_HC_IOPORT_WRITE);
+            if (rc != VINF_SUCCESS)
+                return rc;
+
             if (uVal & BUSLOGIC_REGISTER_CONTROL_INTERRUPT_RESET)
                 buslogicClearInterrupt(pBusLogic);
+
+            PDMCritSectLeave(&pBusLogic->CritSectIntr);
 
             if ((uVal & BUSLOGIC_REGISTER_CONTROL_HARD_RESET) || (uVal & BUSLOGIC_REGISTER_CONTROL_SOFT_RESET))
@@ -2619 +2633 @@
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
 
+    PDMR3CritSectDelete(&pThis->CritSectIntr);
+
     int rc = RTMemCacheDestroy(pThis->hTaskCache);
     AssertMsgRC(rc, ("Destroying task cache failed rc=%Rrc\n", rc));
@@ -2713 +2729 @@
     pThis->pNotifierQueueR0 = PDMQueueR0Ptr(pThis->pNotifierQueueR3);
     pThis->pNotifierQueueRC = PDMQueueRCPtr(pThis->pNotifierQueueR3);
+
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSectIntr, RT_SRC_POS, "BusLogic-Intr");
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("BusLogic: cannot create critical section"));
 
     /* Initialize per device state. */

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1462 +1462 @@
     GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueR0);
     GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueRC);
+    GEN_CHECK_OFF(BUSLOGIC, CritSectIntr);
     GEN_CHECK_OFF(BUSLOGIC, hTaskCache);
     GEN_CHECK_OFF(BUSLOGIC, VBoxSCSI);