Changeset 37324 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jun 3, 2011 4:28:03 PM (14 years ago)

Author:

vboxsync

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

72079

Message:

TM,Devices: Fixed default critical section screwup and adjusted its usage in the devices.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (6 diffs)
• DevPCNet.cpp (modified) (3 diffs)
• DevVirtioNet.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -5833 +5833 @@
     /* Create Transmit Interrupt Delay Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kTxIntDelayTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "E1000 Transmit Interrupt Delay Timer", &pState->pTIDTimerR3);
     if (RT_FAILURE(rc))
@@ -5843 +5843 @@
     /* Create Transmit Absolute Delay Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kTxAbsDelayTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "E1000 Transmit Absolute Delay Timer", &pState->pTADTimerR3);
     if (RT_FAILURE(rc))
@@ -5855 +5855 @@
     /* Create Receive Interrupt Delay Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kRxIntDelayTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "E1000 Receive Interrupt Delay Timer", &pState->pRIDTimerR3);
     if (RT_FAILURE(rc))
@@ -5864 +5864 @@
     /* Create Receive Absolute Delay Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kRxAbsDelayTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "E1000 Receive Absolute Delay Timer", &pState->pRADTimerR3);
     if (RT_FAILURE(rc))
@@ -5874 +5874 @@
     /* Create Late Interrupt Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kLateIntTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "E1000 Late Interrupt Timer", &pState->pIntTimerR3);
     if (RT_FAILURE(rc))
@@ -5883 +5883 @@
     /* Create Link Up Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kLinkUpTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "E1000 Link Up Timer", &pState->pLUTimerR3);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -3916 +3916 @@
 {
     PCNetState *pThis = (PCNetState *)pvUser;
+    Assert(PDMCritSectIsOwner(&pThis->CritSect));
+
     STAM_PROFILE_ADV_START(&pThis->StatTimer, a);
     pcnetPollTimer(pThis);
@@ -3932 +3934 @@
 {
     PCNetState *pThis = (PCNetState *)pvUser;
-
-/** @todo why aren't we taking any critsect here?!? */
+    Assert(PDMCritSectIsOwner(&pThis->CritSect));
+
     pThis->aCSR[7] |= 0x0800; /* STINT */
     pcnetUpdateIrq(pThis);
@@ -5201 +5203 @@
         /* Software Interrupt timer */
         rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, pcnetTimerSoftInt, pThis, /** @todo r=bird: the locking here looks bogus now with SMP... */
-                                    TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "PCNet SoftInt Timer", &pThis->pTimerSoftIntR3);
+                                    TMTIMER_FLAGS_NO_CRIT_SECT, "PCNet SoftInt Timer", &pThis->pTimerSoftIntR3);
         if (RT_FAILURE(rc))
             return rc;
         pThis->pTimerSoftIntR0 = TMTimerR0Ptr(pThis->pTimerSoftIntR3);
         pThis->pTimerSoftIntRC = TMTimerRCPtr(pThis->pTimerSoftIntR3);
+        TMR3TimerSetCritSect(pThis->pTimerSoftIntR3, &pThis->CritSect);
     }
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, pcnetTimerRestore, pThis,

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -1997 +1997 @@
     /* Create Link Up Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, vnetLinkUpTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "VirtioNet Link Up Timer", &pState->pLinkUpTimer);
     if (RT_FAILURE(rc))
@@ -2005 +2005 @@
     /* Create Transmit Delay Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, vnetTxTimer, pState,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
+                                TMTIMER_FLAGS_NO_CRIT_SECT,
                                 "VirtioNet TX Delay Timer", &pState->pTxTimerR3);
     if (RT_FAILURE(rc))