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

Timestamp:

Feb 6, 2007 10:53:20 AM (18 years ago)

Author:

vboxsync

Message:

Slirp must be protected by a lock due to recent async send changes.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevPCNet.cpp (modified) (1 diff)
• DrvNAT.cpp (modified) (17 diffs)

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

@@ -3780 +3780 @@
             pData->Led.Asserted.s.fError = pData->Led.Actual.s.fError = 1;
         }
+        Assert(!PDMCritSectIsOwner(&pData->CritSect));
         pData->pDrv->pfnNotifyLinkChanged(pData->pDrv, enmState);
     }

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

@@ -36 +36 @@
 #include <iprt/file.h>
 #include <iprt/string.h>
+#include <iprt/critsect.h>
 
 #include "Builtins.h"
@@ -54 +55 @@
     /** Pointer to the driver instance. */
     PPDMDRVINS              pDrvIns;
-
+    /** Slirp critical section. */
+    RTCRITSECT              CritSect;
 } DRVNAT, *PDRVNAT;
 
@@ -73 +75 @@
 /** The thread id of the select thread (drvNATSelectThread()). */
 static RTTHREAD         g_ThreadSelect;
-
-static RTCRITSECT       g_CritSectSlirp;
 #endif
 
@@ -89 +89 @@
 static DECLCALLBACK(int) drvNATSend(PPDMINETWORKCONNECTOR pInterface, const void *pvBuf, size_t cb)
 {
+    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVNAT    pData = PDMINS2DATA(pDrvIns, PDRVNAT);
+
     LogFlow(("drvNATSend: pvBuf=%p cb=%#x\n", pvBuf, cb));
     Log2(("drvNATSend: pvBuf=%p cb=%#x\n"
           "%.*Vhxd\n",
           pvBuf, cb, cb, pvBuf));
+
+    int rc = RTCritSectEnter(&pData->CritSect);
+    AssertReleaseRC(rc);
+
     slirp_input((uint8_t *)pvBuf, cb);
+    RTCritSectLeave(&pData->CritSect);
     return VINF_SUCCESS;
 }
@@ -124 +132 @@
 static DECLCALLBACK(void) drvNATNotifyLinkChanged(PPDMINETWORKCONNECTOR pInterface, PDMNETWORKLINKSTATE enmLinkState)
 {
+    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVNAT    pData = PDMINS2DATA(pDrvIns, PDRVNAT);
+
     LogFlow(("drvNATNotifyLinkChanged: enmLinkState=%d\n", enmLinkState));
+
+    int rc = RTCritSectEnter(&pData->CritSect);
+    AssertReleaseRC(rc);
     switch (enmLinkState)
     {
@@ -131 +145 @@
             slirp_link_up();
             break;
+
         case PDMNETWORKLINKSTATE_DOWN:
         case PDMNETWORKLINKSTATE_DOWN_RESUME:
@@ -136 +151 @@
             slirp_link_down();
             break;
+
         default:
             AssertMsgFailed(("drvNATNotifyLinkChanged: unexpected link state %d\n", enmLinkState));
     }
+    RTCritSectLeave(&pData->CritSect);
 }
 
@@ -162 +179 @@
 static DECLCALLBACK(void) drvNATPoller(PPDMDRVINS pDrvIns)
 {
+    PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     fd_set  ReadFDs;
     fd_set  WriteFDs;
@@ -169 +187 @@
     FD_ZERO(&WriteFDs);
     FD_ZERO(&XcptFDs);
+
+    int rc = RTCritSectEnter(&pData->CritSect);
+    AssertReleaseRC(rc);
+
     slirp_select_fill(&cFDs, &ReadFDs, &WriteFDs, &XcptFDs);
 
@@ -175 +197 @@
     if (cReadFDs >= 0)
         slirp_select_poll(&ReadFDs, &WriteFDs, &XcptFDs);
+
+    RTCritSectLeave(&pData->CritSect);
 }
 
@@ -185 +209 @@
 int slirp_can_output(void)
 {
+    int rcCanSend = 0;
+
+    Assert(RTCritSectIsOwner(&g_pDrv->CritSect));
+    RTCritSectLeave(&g_pDrv->CritSect);
+
     if (g_pDrv)
-        return g_pDrv->pPort->pfnCanReceive(g_pDrv->pPort);
-    return 0;
+        rcCanSend = g_pDrv->pPort->pfnCanReceive(g_pDrv->pPort);
+
+    int rc = RTCritSectEnter(&g_pDrv->CritSect);
+    AssertReleaseRC(rc);
+
+    return rcCanSend;
 }
 
@@ -202 +235 @@
     if (g_pDrv)
     {
+        Assert(RTCritSectIsOwner(&g_pDrv->CritSect));
+        RTCritSectLeave(&g_pDrv->CritSect);
+
         int rc = g_pDrv->pPort->pfnReceive(g_pDrv->pPort, pu8Buf, cb);
-        AssertRC(rc); NOREF(rc);
+        AssertRC(rc);
+
+        rc = RTCritSectEnter(&g_pDrv->CritSect);
+        AssertReleaseRC(rc);
     }
 }
@@ -242 +281 @@
 static DECLCALLBACK(void) drvNATDestruct(PPDMDRVINS pDrvIns)
 {
+    PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
+
     LogFlow(("drvNATDestruct:\n"));
+
 #if ARCH_BITS == 64
     LogRel(("NAT: g_cpvHashUsed=%RU32 g_cpvHashCollisions=%RU32 g_cpvHashInserts=%RU64 g_cpvHashDone=%RU64\n",
@@ -248 +290 @@
 #endif 
     slirp_term();
+    RTCritSectDelete(&pData->CritSect);
     g_pDrv = NULL;
 }
@@ -368 +411 @@
                                 N_("Configuration error: the above device/driver didn't export the network port interface!\n"));
 
-#if 0
     /*
-     * The slirp lock and thread sem.
+     * The slirp lock..
      */
-    int rc = RTCritSectInit(&g_CritSectSlirp);
+    int rc = RTCritSectInit(&pData->CritSect);
     if (VBOX_FAILURE(rc))
         return rc;
+#if 0
     rc = RTSemEventCreate(&g_EventSem);
     if (VBOX_SUCCESS(rc))
@@ -386 +429 @@
         {
 #endif
-            int rc;
             /*
              * Initialize slirp.
@@ -428 +470 @@
         g_EventSem = NULL;
     }
-    RTCritSectDelete(&g_CritSectSlirp);
 #endif
+    RTCritSectDelete(&pData->CritSect);
     return rc;
 }