Changeset 40806 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Apr 6, 2012 9:05:19 PM (13 years ago)

Author:

vboxsync

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

77321

Message:

RTSpinlock: Redid the interface, eliminating NoInts and Tmp. Whether a spinlock is interrupt safe or not is now defined at creation time, preventing stupid bugs arrising from calling the wrong acquire and/or release methods somewhere. The saved flags are stored in the spinlock strucutre, eliminating the annoying Tmp variable. Needs testing on each platform before fixing the build burn.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (18 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -382 +382 @@
 {
     PVBOXNETDEVICEOPSOVERRIDE   pOverride;
-    RTSPINLOCKTMP               Tmp = RTSPINLOCKTMP_INITIALIZER;
 
     /* Cancel override if ethtool_ops is missing (host-only case, #5712) */
@@ -402 +401 @@
     pOverride->pVBoxNetFlt          = pThis;
 
-    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp); /* (this isn't necessary, but so what) */
+    RTSpinlockAcquire(pThis->hSpinlock); /* (this isn't necessary, but so what) */
     ASMAtomicWritePtr((void * volatile *)&pDev->OVR_OPS, pOverride);
 # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
     ASMAtomicXchgPtr((void * volatile *)&pDev->hard_start_xmit, vboxNetFltLinuxStartXmitFilter);
 # endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
-    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock);
 }
 
@@ -420 +419 @@
 {
     PVBOXNETDEVICEOPSOVERRIDE   pOverride;
-    RTSPINLOCKTMP               Tmp = RTSPINLOCKTMP_INITIALIZER;
-
-    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+
+    RTSpinlockAcquire(pThis->hSpinlock);
     if (!pDev)
         pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
@@ -444 +442 @@
     else
         pOverride = NULL;
-    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
     if (pOverride)
@@ -465 +463 @@
 {
 #if 0
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     struct net_device *pDev = NULL;
 
@@ -472 +469 @@
      * Be careful here to avoid problems racing the detached callback.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquire(pThis->hSpinlock);
     if (!ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost))
     {
@@ -489 +486 @@
         }
     }
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockRelease(pThis->hSpinlock);
 
     Log(("vboxNetFltLinuxRetainNetDev - done\n"));
@@ -1382 +1379 @@
         PINTNETTRUNKSWPORT  pSwitchPort;
         unsigned int        fFeatures;
-        RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
-
-        RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+
+        RTSpinlockAcquire(pThis->hSpinlock);
 
         pSwitchPort = pThis->pSwitchPort; /* this doesn't need to be here, but it doesn't harm. */
@@ -1393 +1389 @@
             fFeatures = 0;
 
-        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
         if (pThis->pSwitchPort)
@@ -1498 +1494 @@
 static int vboxNetFltLinuxAttachToInterface(PVBOXNETFLTINS pThis, struct net_device *pDev)
 {
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     LogFlow(("vboxNetFltLinuxAttachToInterface: pThis=%p (%s)\n", pThis, pThis->szName));
 
@@ -1506 +1501 @@
     dev_hold(pDev);
 
-    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquire(pThis->hSpinlock);
     ASMAtomicUoWritePtr(&pThis->u.s.pDev, pDev);
-    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
     Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) retained. ref=%d\n",
@@ -1546 +1541 @@
      * the device notification handle.
      */
-    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquire(pThis->hSpinlock);
     pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
     if (pDev)
@@ -1554 +1549 @@
         pDev = NULL; /* don't dereference it */
     }
-    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock);
     Log(("vboxNetFltLinuxAttachToInterface: this=%p: Packet handler installed.\n", pThis));
 
@@ -1578 +1573 @@
         vboxNetFltLinuxUnhookDev(pThis, pDev);
 #endif
-        RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+        RTSpinlockAcquire(pThis->hSpinlock);
         ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
-        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock);
         dev_put(pDev);
         Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) released. ref=%d\n",
@@ -1599 +1594 @@
 static int vboxNetFltLinuxUnregisterDevice(PVBOXNETFLTINS pThis, struct net_device *pDev)
 {
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-
     Assert(!pThis->fDisconnectedFromHost);
 
@@ -1607 +1600 @@
 #endif
 
-    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquire(pThis->hSpinlock);
     ASMAtomicWriteBool(&pThis->u.s.fRegistered, false);
     ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
     ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
-    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
     dev_remove_pack(&pThis->u.s.PacketType);
@@ -1902 +1895 @@
     struct net_device  *pDev;
     bool                fRegistered;
-    RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
 
 #ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
@@ -1913 +1905 @@
      *        ways. */
 
-    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquire(pThis->hSpinlock);
     pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
     fRegistered = ASMAtomicUoReadBool(&pThis->u.s.fRegistered);
-    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
     if (fRegistered)