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

Timestamp:

Jun 1, 2012 4:46:34 PM (13 years ago)

Author:

vboxsync

Message:

netflt: fix dev unregistration issues on kernels 3.2.18 and newer (#6225)

File:

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

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

@@ -1536 +1536 @@
     pThis->u.s.PacketType.func = vboxNetFltLinuxPacketHandler;
     dev_add_pack(&pThis->u.s.PacketType);
+    ASMAtomicUoWriteBool(&pThis->u.s.fPacketHandler, true);
+    Log(("vboxNetFltLinuxAttachToInterface: this=%p: Packet handler installed.\n", pThis));
 
 #ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
@@ -1560 +1562 @@
     }
     RTSpinlockReleaseNoInts(pThis->hSpinlock);
-    Log(("vboxNetFltLinuxAttachToInterface: this=%p: Packet handler installed.\n", pThis));
 
     /*
@@ -1604 +1605 @@
 static int vboxNetFltLinuxUnregisterDevice(PVBOXNETFLTINS pThis, struct net_device *pDev)
 {
+    bool fRegistered;
     Assert(!pThis->fDisconnectedFromHost);
 
@@ -1610 +1612 @@
 #endif
 
+    if (ASMAtomicCmpXchgBool(&pThis->u.s.fPacketHandler, false, true))
+    {
+        dev_remove_pack(&pThis->u.s.PacketType);
+        Log(("vboxNetFltLinuxUnregisterDevice: this=%p: packet handler removed.\n", pThis));
+    }
+
     RTSpinlockAcquire(pThis->hSpinlock);
-    ASMAtomicWriteBool(&pThis->u.s.fRegistered, false);
-    ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
-    ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
+    fRegistered = ASMAtomicXchgBool(&pThis->u.s.fRegistered, false);
+    if (fRegistered)
+    {
+        ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
+        ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
+    }
     RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
-    dev_remove_pack(&pThis->u.s.PacketType);
+    if (fRegistered)
+    {
 #ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
-    skb_queue_purge(&pThis->u.s.XmitQueue);
-#endif
-    Log(("vboxNetFltLinuxUnregisterDevice: this=%p: Packet handler removed, xmit queue purged.\n", pThis));
-    Log(("vboxNetFltLinuxUnregisterDevice: Device %p(%s) released. ref=%d\n",
-         pDev, pDev->name,
+        skb_queue_purge(&pThis->u.s.XmitQueue);
+#endif
+        Log(("vboxNetFltLinuxUnregisterDevice: this=%p: xmit queue purged.\n", pThis));
+        Log(("vboxNetFltLinuxUnregisterDevice: Device %p(%s) released. ref=%d\n",
+             pDev, pDev->name,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-         netdev_refcnt_read(pDev)
+             netdev_refcnt_read(pDev)
 #else
-         atomic_read(&pDev->refcnt)
-#endif
-         ));
-    dev_put(pDev);
+             atomic_read(&pDev->refcnt)
+#endif
+           ));
+        dev_put(pDev);
+    }
 
     return NOTIFY_OK;
@@ -1870 +1883 @@
      * we don't want the handler to forward packets to disconnected switch.
      */
-    dev_remove_pack(&pThis->u.s.PacketType);
+    if (ASMAtomicCmpXchgBool(&pThis->u.s.fPacketHandler, false, true))
+    {
+        dev_remove_pack(&pThis->u.s.PacketType);
+        Log(("vboxNetFltOsDisconnectIt: this=%p: Packet handler removed.\n", pThis));
+    }
     return VINF_SUCCESS;
 }
@@ -1917 +1934 @@
     RTSpinlockAcquire(pThis->hSpinlock);
     pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
-    fRegistered = ASMAtomicUoReadBool(&pThis->u.s.fRegistered);
+    fRegistered = ASMAtomicXchgBool(&pThis->u.s.fRegistered, false);
     RTSpinlockReleaseNoInts(pThis->hSpinlock);
 
@@ -1927 +1944 @@
         skb_queue_purge(&pThis->u.s.XmitQueue);
 #endif
-        Log(("vboxNetFltOsDeleteInstance: this=%p: Packet handler removed, xmit queue purged.\n", pThis));
+        Log(("vboxNetFltOsDeleteInstance: this=%p: xmit queue purged.\n", pThis));
         Log(("vboxNetFltOsDeleteInstance: Device %p(%s) released. ref=%d\n",
              pDev, pDev->name,
@@ -1974 +1991 @@
      */
     ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
-    pThis->u.s.fRegistered = false;
+    pThis->u.s.fRegistered     = false;
     pThis->u.s.fPromiscuousSet = false;
+    pThis->u.s.fPacketHandler  = false;
     memset(&pThis->u.s.PacketType, 0, sizeof(pThis->u.s.PacketType));
 #ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE