Changeset 25110 in vbox

Timestamp:

Nov 30, 2009 2:02:43 PM (15 years ago)

Author:

vboxsync

Message:

NAT: critical sections introduced. preventing signaling non-waiting semaphores.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (9 diffs)

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

@@ -170 +170 @@
     /** event to wakeup the guest receive thread */
     RTSEMEVENT              EventRecv;
+    RTCRITSECT              csEventRecv;
     /** event to wakeup the guest urgent receive thread */
     RTSEMEVENT              EventUrgRecv;
+    RTCRITSECT              csEventUrgRecv;
     /** Receive Req queue (deliver packets to the guest) */
     PRTREQQUEUE             pRecvReqQueue;
@@ -231 +233 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+    int rc;
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
@@ -237 +240 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
+        rc = RTCritSectEnter(&pThis->csEventRecv);
+        AssertReleaseRC(rc);
         RTReqProcess(pThis->pRecvReqQueue, 0);
+        rc = RTCritSectLeave(&pThis->csEventRecv);
+        AssertReleaseRC(rc);
         if (ASMAtomicReadU32(&pThis->cPkt) == 0) 
+        {
             RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
+        }
     }
     return VINF_SUCCESS;
@@ -248 +257 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    int rc = RTSemEventSignal(pThis->EventRecv);
+    int rc;
+    if (ASMAtomicReadU32(&pThis->cPkt) > 0) 
+    {
+        rc = RTCritSectEnter(&pThis->csEventRecv);
+        AssertReleaseRC(rc);
+        rc = RTSemEventSignal(pThis->EventRecv);
+        AssertReleaseRC(rc);
+        rc = RTCritSectLeave(&pThis->csEventRecv);
+    }
 
     STAM_COUNTER_INC(&pThis->StatNATRecvWakeups);
-    AssertReleaseRC(rc);
     return VINF_SUCCESS;
 }
@@ -264 +280 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
+        int rc;
+        rc = RTCritSectEnter(&pThis->csEventUrgRecv);
+        AssertReleaseRC(rc);
         RTReqProcess(pThis->pUrgRecvReqQueue, 0);
+        rc = RTCritSectLeave(&pThis->csEventUrgRecv);
+        AssertReleaseRC(rc);
         if (ASMAtomicReadU32(&pThis->cUrgPkt) == 0) 
-            RTSemEventWait(pThis->EventUrgRecv, RT_INDEFINITE_WAIT);
+        {
+            rc = RTSemEventWait(pThis->EventUrgRecv, RT_INDEFINITE_WAIT);
+            AssertReleaseRC(rc);
+        }
     }
     return VINF_SUCCESS;
@@ -273 +297 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    int rc = RTSemEventSignal(pThis->EventUrgRecv);
-
-    AssertReleaseRC(rc);
+    if (ASMAtomicReadU32(&pThis->cUrgPkt) > 0) 
+    {
+        int rc;
+        rc = RTCritSectEnter(&pThis->csEventUrgRecv);
+        AssertReleaseRC(rc);
+        rc = RTSemEventSignal(pThis->EventUrgRecv);
+        AssertReleaseRC(rc);
+        rc = RTCritSectLeave(&pThis->csEventUrgRecv);
+        AssertReleaseRC(rc);
+    }
+
     return VINF_SUCCESS;
 }
@@ -317 +349 @@
     while(ASMAtomicReadU32(&pThis->cUrgPkt) != 0)
     {
+        rc = RTCritSectLeave(&pThis->csEventRecv);
+        AssertReleaseRC(rc);
         rc = RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
         if (   RT_FAILURE(rc) 
@@ -322 +356 @@
                  || rc == VERR_INTERRUPTED))
             goto done_unlocked; 
+        rc = RTCritSectEnter(&pThis->csEventRecv);
+        AssertReleaseRC(rc);
     }
 
@@ -1135 +1171 @@
             rc = RTSemEventCreate(&pThis->EventRecv);
             rc = RTSemEventCreate(&pThis->EventUrgRecv);
+            rc = RTCritSectInit(&pThis->csEventRecv);
+            rc = RTCritSectInit(&pThis->csEventUrgRecv);
             rc = RTCritSectInit(&pThis->csDevAccess);
             rc = PDMDrvHlpTMTimerCreate(pThis->pDrvIns, TMCLOCK_REAL/*enmClock*/, drvNATSlowTimer,