Changeset 28830 in vbox for trunk

Timestamp:

Apr 27, 2010 2:05:25 PM (15 years ago)

Author:

vboxsync

Message:

IntNet,VBoxNetFlt: Cleaned up the locking protocol between IntNet and NetFlt. Eleminated the out-bound trunk lock that IntNet always took when calling NetFlt.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (19 diffs)
• src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c (modified) (16 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (10 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (modified) (9 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (16 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (5 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.c (modified) (6 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.h (modified) (16 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c (modified) (12 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c (modified) (19 diffs)

trunk/include/VBox/intnet.h

@@ -402 +402 @@
      *                      set!
      *
-     * @remarks Will only grab the switch table spinlock (interrupt safe).
+     * @remarks Will only grab the switch table spinlock (interrupt safe).  May
+     *          signal an event semaphore iff we're racing network cleanup.  The
+     *          caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(INTNETSWDECISION, pfnPreRecv,(PINTNETTRUNKSWPORT pSwitchPort,
@@ -411 +413 @@
      *
      * The frame may be modified when the trunk port on the switch is set to share
-     * the mac address of the host when hitting the wire. Currently rames containing
-     * ARP packets are subject to this, later other protocols like NDP/ICMPv6 may
-     * need editing as well when operating in this mode.
+     * the mac address of the host when hitting the wire.  Currently frames
+     * containing ARP packets are subject to this, later other protocols like
+     * NDP/ICMPv6 may need editing as well when operating in this mode.  The edited
+     * packet should be forwarded to the host/wire when @c false is returned.
      *
      * @returns true if we've handled it and it should be dropped.
@@ -419 +422 @@
      *
      * @param   pSwitchPort Pointer to this structure.
-     * @param   pSG         The (scatter /) gather structure for the frame.
-     *                      This will only be use during the call, so a temporary one can
-     *                      be used. The Phys member will not be used.
-     * @param   fSrc        Where this frame comes from. Only one bit should be set!
-     *
-     * @remarks Will grab the network semaphore.
+     * @param   pSG         The (scatter /) gather structure for the frame.  This
+     *                      will only be use during the call, so a temporary one can
+     *                      be used.  The Phys member will not be used.
+     * @param   fSrc        Where this frame comes from.  Exactly one bit shall be
+     *                      set!
+     *
+     * @remarks Will only grab the switch table spinlock (interrupt safe).  Will
+     *          signal event semaphores.  The caller must be busy when calling.
      *
      * @remarks NAT and TAP will use this interface.
      *
-     * @todo    Do any of the host require notification before frame modifications? If so,
-     *          we'll add a callback to INTNETTRUNKIFPORT for this (pfnSGModifying) and
-     *          a SG flag.
+     * @todo    Do any of the host require notification before frame modifications?
+     *          If so, we'll add a callback to INTNETTRUNKIFPORT for this
+     *          (pfnSGModifying) and a SG flag.
      */
     DECLR0CALLBACKMEMBER(bool, pfnRecv,(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG, uint32_t fSrc));
@@ -440 +445 @@
      * @param   pSG         Pointer to the (scatter /) gather structure.
      *
-     * @remarks Will not grab any locks.
+     * @remarks Will not grab any locks.  The caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(void, pfnSGRetain,(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG));
@@ -447 +452 @@
      * Release a SG.
      *
-     * This is called by the pfnXmit code when done with a SG. This may safe
+     * This is called by the pfnXmit code when done with a SG.  This may safe
      * be done in an asynchronous manner.
      *
@@ -453 +458 @@
      * @param   pSG         Pointer to the (scatter /) gather structure.
      *
-     * @remarks Will grab the network semaphore.
+     * @remarks May signal an event semaphore later on, currently code won't though.
+     *          The caller is busy when making this call.
      */
     DECLR0CALLBACKMEMBER(void, pfnSGRelease,(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG));
@@ -462 +468 @@
      * By enabling physical addresses in the scatter / gather segments it should
      * be possible to save some unnecessary address translation and memory locking
-     * in the network stack. (Internal networking knows the physical address for
-     * all the INTNETBUF data and that it's locked memory.) There is a negative
+     * in the network stack.  (Internal networking knows the physical address for
+     * all the INTNETBUF data and that it's locked memory.)  There is a negative
      * side effects though, frames that crosses page boundraries will require
      * multiple scather / gather segments.
@@ -472 +478 @@
      * @param   fEnable     Whether to enable or disable it.
      *
-     * @remarks Will grab the network semaphore.
+     * @remarks Will not grab any locks.  The caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(bool, pfnSetSGPhys,(PINTNETTRUNKSWPORT pSwitchPort, bool fEnable));
@@ -485 +491 @@
      * @param   pMacAddr            The MAC address.
      *
-     * @remarks May take a spinlock or two.
+     * @remarks May take a spinlock or two.  The caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(void, pfnReportMacAddress,(PINTNETTRUNKSWPORT pSwitchPort, PCRTMAC pMacAddr));
@@ -499 +505 @@
      *                              promiscuous mode, false if not.
      *
-     * @remarks May take a spinlock or two.
+     * @remarks May take a spinlock or two.  The caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(void, pfnReportPromiscuousMode,(PINTNETTRUNKSWPORT pSwitchPort, bool fPromiscuous));
@@ -515 +521 @@
      * @param   fDst                The destination mask (INTNETTRUNKDIR_XXX).
      *
-     * @remarks Does not take any locks.
+     * @remarks Does not take any locks.  The caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(void, pfnReportGsoCapabilities,(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fGsoCapabilities, uint32_t fDst));
@@ -531 +537 @@
      * @param   fDst                The destination mask (INTNETTRUNKDIR_XXX).
      *
-     * @remarks Does not take any locks.
+     * @remarks Does not take any locks.  The caller must be busy when calling.
      */
     DECLR0CALLBACKMEMBER(void, pfnReportNoPreemptDsts,(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fNoPreemptDsts));
@@ -543 +549 @@
 
 
+/**
+ * The trunk interface state used set by INTNETTRUNKIFPORT::pfnSetState.
+ */
+typedef enum INTNETTRUNKIFSTATE
+{
+    /** The invalid zero entry. */
+    INTNETTRUNKIFSTATE_INVALID = 0,
+    /** The trunk is inactive.  No calls to INTNETTRUNKSWPORT::pfnRecv or
+     *  INTNETTRUNKSWPORT::pfnPreRecv.  Calling other methods is OK. */
+    INTNETTRUNKIFSTATE_INACTIVE,
+    /** The trunk is active, no restrictions on methods or anything. */
+    INTNETTRUNKIFSTATE_ACTIVE,
+    /** The trunk is about to be disconnected from the internal network.  No
+     *  calls to any INTNETRUNKSWPORT methods. */
+    INTNETTRUNKIFSTATE_DISCONNECTING,
+    /** The end of the valid states. */
+    INTNETTRUNKIFSTATE_END,
+    /** The usual 32-bit type blow up hack. */
+    INTNETTRUNKIFSTATE_32BIT_HACK = 0x7fffffff
+} INTNETTRUNKIFSTATE;
+
 /** Pointer to the interface side of a trunk port. */
 typedef struct INTNETTRUNKIFPORT *PINTNETTRUNKIFPORT;
 /**
- * This is the port on the trunk interface, i.e. the driver
- * side which the internal network is connected to.
+ * This is the port on the trunk interface, i.e. the driver side which the
+ * internal network is connected to.
  *
  * This is only used for the in-kernel trunk connections.
- *
- * @remarks The internal network side is responsible for serializing all calls
- *          to this interface. This is (assumed) to be implemented using a lock
- *          that is only ever taken before a call to this interface. The lock
- *          is referred to as the out-bound trunk port lock.
  */
 typedef struct INTNETTRUNKIFPORT
@@ -568 +590 @@
      * @param   pIfPort     Pointer to this structure.
      *
-     * @remarks The caller may own any locks or none at all, we don't care.
+     * @remarks May own the big mutex, no spinlocks.
      */
     DECLR0CALLBACKMEMBER(void, pfnRetain,(PINTNETTRUNKIFPORT pIfPort));
@@ -580 +602 @@
      * @param   pIfPort     Pointer to this structure.
      *
-     * @remarks Only the out-bound trunk port lock, unless the caller is certain the
-     *          call is not going to cause destruction (wont happen).
+     * @remarks May own the big mutex, no spinlocks.
      */
     DECLR0CALLBACKMEMBER(void, pfnRelease,(PINTNETTRUNKIFPORT pIfPort));
@@ -593 +614 @@
      * @param   pIfPort     Pointer to this structure.
      *
-     * @remarks Called holding the out-bound trunk port lock.
+     * @remarks Owns the big mutex.
      */
     DECLR0CALLBACKMEMBER(void, pfnDisconnectAndRelease,(PINTNETTRUNKIFPORT pIfPort));
 
     /**
-     * Changes the active state of the interface.
-     *
-     * The interface is created in the suspended (non-active) state and then activated
-     * when the VM/network is started. It may be suspended and re-activated later
-     * for various reasons. It will finally be suspended again before disconnecting
-     * the interface from the internal network, however, this might be done immediately
-     * before disconnecting and may leave an incoming frame waiting on the internal network
-     * semaphore. So, after the final suspend a pfnWaitForIdle is always called to make sure
-     * the interface is idle before pfnDisconnectAndRelease is called.
+     * Changes the state of the trunk interface.
+     *
+     * The interface is created in the inactive state (INTNETTRUNKIFSTATE_INACTIVE).
+     * When the first connect VM or service is activated, the internal network
+     * activates the trunk (INTNETTRUNKIFSTATE_ACTIVE).  The state may then be set
+     * back and forth between INACTIVE and ACTIVE as VMs are paused, added and
+     * removed.
+     *
+     * Eventually though, the network is destroyed as a result of there being no
+     * more VMs left in it and the state is changed to disconnecting
+     * (INTNETTRUNKIFSTATE_DISCONNECTING) and pfnWaitForIdle is called to make sure
+     * there are no active calls in either direction when pfnDisconnectAndRelease is
+     * called.
      *
      * A typical operation to performed by this method is to enable/disable promiscuous
-     * mode on the host network interface. (This is the reason we cannot call this when
-     * owning any semaphores.)
+     * mode on the host network interface when entering/leaving the active state.
      *
      * @returns The previous state.
      *
      * @param   pIfPort     Pointer to this structure.
-     * @param   fActive     True if the new state is 'active', false if the new state is 'suspended'.
-     *
-     * @remarks Called holding the out-bound trunk port lock.
-     */
-    DECLR0CALLBACKMEMBER(bool, pfnSetActive,(PINTNETTRUNKIFPORT pIfPort, bool fActive));
+     * @param   enmState    The new state.
+     *
+     * @remarks Owns the big mutex.  No racing pfnSetState, pfnWaitForIdle,
+     *          pfnDisconnectAndRelease or INTNETTRUNKFACTORY::pfnCreateAndConnect
+     *          calls.
+     */
+    DECLR0CALLBACKMEMBER(INTNETTRUNKIFSTATE, pfnSetState,(PINTNETTRUNKIFPORT pIfPort, INTNETTRUNKIFSTATE enmState));
 
     /**
      * Waits for the interface to become idle.
      *
-     * This method must be called before disconnecting and releasing the
-     * object in order to prevent racing incoming/outgoing frames and device
+     * This method must be called before disconnecting and releasing the object in
+     * order to prevent racing incoming/outgoing frames and device
      * enabling/disabling.
      *
@@ -634 +660 @@
      *                      an indefinite wait.
      *
-     * @remarks Called holding the out-bound trunk port lock.
+     * @remarks Owns the big mutex.  No racing pfnDisconnectAndRelease.
      */
     DECLR0CALLBACKMEMBER(int, pfnWaitForIdle,(PINTNETTRUNKIFPORT pIfPort, uint32_t cMillies));
-
-    /**
-     * Gets the MAC address of the host network interface that we're attached to.
-     *
-     * @param   pIfPort     Pointer to this structure.
-     * @param   pMac        Where to store the host MAC address.
-     *
-     * @remarks Called while owning the network and the out-bound trunk port semaphores.
-     */
-    DECLR0CALLBACKMEMBER(void, pfnGetMacAddress,(PINTNETTRUNKIFPORT pIfPort, PRTMAC pMac));
-
-    /**
-     * Tests whether the host is operating the interface is promiscuous mode.
-     *
-     * The default behavior of the internal networking 'switch' is to 'autodetect'
-     * promiscuous mode on the trunk port, which is when this method is used.
-     * For security reasons this default may of course be overridden so that the
-     * host cannot sniff at what's going on.
-     *
-     * Note that this differs from operating the trunk port on the switch in
-     * 'promiscuous' mode, because that relates to the bits going to the wire.
-     *
-     * @returns true / false.
-     *
-     * @param   pIfPort     Pointer to this structure.
-     *
-     * @remarks Usuaully called while owning the network and the out-bound trunk
-     *          port semaphores.
-     */
-    DECLR0CALLBACKMEMBER(bool, pfnIsPromiscuous,(PINTNETTRUNKIFPORT pIfPort));
 
     /**
@@ -679 +675 @@
      * @param   fDst        The destination mask. At least one bit will be set.
      *
-     * @remarks Called holding the out-bound trunk port lock.
-     *
-     * @remarks TAP and NAT will use this interface for all their traffic, see pfnIsHostMac.
-     *
-     * @todo
+     * @remarks No locks.  May be called concurrently on several threads.
      */
     DECLR0CALLBACKMEMBER(int, pfnXmit,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG, uint32_t fDst));
@@ -743 +735 @@
 
 /** The UUID for the (current) trunk factory. (case sensitive) */
-#define INTNETTRUNKFACTORY_UUID_STR     "5d347cb7-98e3-411f-916a-67c4becae09b"
+#define INTNETTRUNKFACTORY_UUID_STR     "1849823d-33ed-4f23-a32f-ef7203ee2b9f"
 
 /** @name INTNETTRUNKFACTORY::pfnCreateAndConnect flags.

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c

@@ -37 +37 @@
 
 #ifdef VBOXANETADP_DO_NOT_USE_NETFLT
+#error "this code is broken"
 
 #include <VBox/sup.h>
@@ -107 +108 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     Log(("vboxNetAdpSetStateWithLock: pThis=%p, state=%d.\n", pThis, enmNewState));
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     vboxNetAdpSetState(pThis, enmNewState);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 }
 
@@ -125 +126 @@
     VBOXNETADPSTATE enmState;
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     enmState = vboxNetAdpGetState(pThis);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
     Log(("vboxNetAdpGetStateWithLock: pThis=%p, state=%d.\n", pThis, enmState));
     return enmState;
@@ -148 +149 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     enmActualState = vboxNetAdpGetState(pThis); /** @todo r=bird: ASMAtomicCmpXchgU32()*/
     if (enmActualState == enmOldState)
@@ -154 +155 @@
     else
         fRc = false;
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     if (fRc)
@@ -179 +180 @@
         RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
         PVBOXNETADP pThis = &pGlobals->aAdapters[i];
-        RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
         if (    vboxNetAdpGetState(pThis)
             &&  !strcmp(pThis->szName, pszName))
         {
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
             return pThis;
         }
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
     }
     return NULL;
@@ -346 +347 @@
     AssertPtr(pThis);
     Assert(pThis->MyPort.u32Version == INTNETTRUNKIFPORT_VERSION);
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     if (vboxNetAdpGetState(pThis) == kVBoxNetAdpState_Active)
     {
@@ -353 +354 @@
         vboxNetAdpBusy(pThis);
     }
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
     Log(("vboxNetAdpPrepareToReceive: fCanReceive=%d.\n", fCanReceive));
 
@@ -416 +417 @@
      * Do a retain/busy, invoke the OS specific code.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     if (vboxNetAdpGetState(pThis) != kVBoxNetAdpState_Active)
     {
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
         Log(("vboxNetAdpReceive: Dropping incoming packet for inactive interface %s.\n",
              pThis->szName));
@@ -426 +427 @@
     vboxNetAdpRetain(pThis);
     vboxNetAdpBusy(pThis);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     rc = vboxNetAdpPortOsXmit(pThis, pSG, fDst);
@@ -504 +505 @@
 
     Log(("vboxNetAdpPortSetActive: pThis=%p, fActive=%d, state before: %d.\n", pThis, fActive, vboxNetAdpGetState(pThis)));
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
 
     fPreviouslyActive = vboxNetAdpGetState(pThis) == kVBoxNetAdpState_Active;
@@ -522 +523 @@
     }
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
     Log(("vboxNetAdpPortSetActive: state after: %RTbool.\n", vboxNetAdpGetState(pThis)));
     return fPreviouslyActive;
@@ -550 +551 @@
      * Disconnect and release it.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     //Assert(vboxNetAdpGetState(pThis) == kVBoxNetAdpState_Connected);
     Assert(!pThis->cBusy);
     vboxNetAdpSetState(pThis, kVBoxNetAdpState_Transitional);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     vboxNetAdpOsDisconnectIt(pThis);
     pThis->pSwitchPort = NULL;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     vboxNetAdpSetState(pThis, kVBoxNetAdpState_Available);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     vboxNetAdpRelease(pThis);
@@ -606 +607 @@
             rc = vboxNetAdpOsCreate(pThis, &Mac);
             *ppNew = pThis;
-            RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+            RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
             vboxNetAdpSetState(pThis, kVBoxNetAdpState_Available);
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
             return rc;
         }
@@ -622 +623 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     if (vboxNetAdpGetState(pThis) != kVBoxNetAdpState_Available || pThis->cBusy)
     {
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
         return VERR_INTNET_FLT_IF_BUSY;
     }
     vboxNetAdpSetState(pThis, kVBoxNetAdpState_Transitional);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
     vboxNetAdpRelease(pThis);
 
     vboxNetAdpOsDestroy(pThis);
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     vboxNetAdpSetState(pThis, kVBoxNetAdpState_Invalid);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     return rc;
@@ -842 +843 @@
     pNew->MyPort.pfnRelease             = vboxNetAdpPortRelease;
     pNew->MyPort.pfnDisconnectAndRelease= vboxNetAdpPortDisconnectAndRelease;
-    pNew->MyPort.pfnSetActive           = vboxNetAdpPortSetActive;
+    pNew->MyPort.pfnSetState            = vboxNetAdpPortSetState;
     pNew->MyPort.pfnWaitForIdle         = vboxNetAdpPortWaitForIdle;
-    pNew->MyPort.pfnGetMacAddress       = vboxNetAdpPortGetMacAddress;
     pNew->MyPort.pfnXmit                = vboxNetAdpPortXmit;
     pNew->MyPort.u32VersionEnd          = INTNETTRUNKIFPORT_VERSION;

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -104 +104 @@
     /** The current interface state. */
     VBOXNETFTLINSSTATE volatile enmState;
-    /** Active / Suspended indicator. */
+    /** The trunk state. */
+    INTNETTRUNKIFSTATE volatile enmTrunkState;
     bool volatile fActive;
     /** Disconnected from the host network interface. */
@@ -325 +326 @@
 
 DECLHIDDEN(void) vboxNetFltRetain(PVBOXNETFLTINS pThis, bool fBusy);
+DECLHIDDEN(bool) vboxNetFltTryRetainBusyActive(PVBOXNETFLTINS pThis);
+DECLHIDDEN(bool) vboxNetFltTryRetainBusyNotDisconnected(PVBOXNETFLTINS pThis);
 DECLHIDDEN(void) vboxNetFltRelease(PVBOXNETFLTINS pThis, bool fBusy);
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -233 +233 @@
      * Be careful here to avoid problems racing the detached callback.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     if (!ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost))
     {
@@ -240 +240 @@
             ifnet_reference(pIfNet);
     }
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     return pIfNet;
@@ -664 +664 @@
      * behind it in order to avoid problematic races with the detached callback.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
 
     pIfNet = (ifnet_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfNet);
@@ -677 +677 @@
     ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     if (pIfNet)
@@ -817 +817 @@
      * Active? Retain the instance and increment the busy counter.
      */
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-    const bool fActive = ASMAtomicUoReadBool(&pThis->fActive);
-    if (fActive)
-        vboxNetFltRetain(pThis, true /* fBusy */);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-    if (!fActive)
+    if (!vboxNetFltTryRetainBusyActive(pThis))
         return 0;
 
@@ -919 +913 @@
 
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfNet, pIfNet);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     /*
@@ -945 +939 @@
         Assert(err || pIfFilter);
 
-        RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
         pIfNet = (ifnet_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfNet);
         if (pIfNet && !err)
@@ -953 +947 @@
             pIfNet = NULL; /* don't dereference it */
         }
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
         /* Report capabilities. */
-        if (!pIfNet)
+        if (   !pIfNet
+            && vboxNetFltTryRetainBusyNotDisconnected(pThis))
         {
             Assert(pThis->pSwitchPort);
@@ -963 +958 @@
             pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,  INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
             pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+            vboxNetFltRelease(pThis, true /*fBusy*/);
         }
     }
@@ -1163 +1159 @@
      * Carefully obtain the interface filter reference and detach it.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     pIfFilter = (interface_filter_t)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pIfFilter);
     if (pIfFilter)
         ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pIfFilter, NULL);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     if (pIfFilter)

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

@@ -316 +316 @@
     bool fActive;
 
-    fActive = ASMAtomicUoReadBool(&pThis->fActive);
+    fActive = vboxNetFltTryRetainBusyActive(pThis);
 
     NGI_GET_M(item, m);
@@ -338 +338 @@
         {
             ether_demux(ifp, m);
+            if (fActive)
+                vboxNetFltRelease(pThis, true /*fBusy*/);
             return (0);
         }
@@ -345 +347 @@
         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
     }
-    /**
+    /*
      * Handle mbufs on the outgoing hook, frames going to the interface
      */
@@ -351 +353 @@
     {
         if (mtag != NULL || !fActive)
-            return ether_output_frame(ifp, m);
+        {
+            int rc = ether_output_frame(ifp, m);
+            if (fActive)
+                vboxNetFltRelease(pThis, true /*fBusy*/);
+            return rc;
+        }
         mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
         _IF_ENQUEUE(&pThis->u.s.outq, m);
@@ -361 +368 @@
         m_freem(m);
     }
+
+    if (fActive)
+        vboxNetFltRelease(pThis, true /*fBusy*/);
     return (0);
 }
@@ -370 +380 @@
 
     /* Prevent node shutdown if we're active */
-    fActive = ASMAtomicUoReadBool(&pThis->fActive);
-    if (fActive)
+    if (pThis->enmTrunkState == INTNETTRUNKIFSTATE_ACTIVE)
         return (EBUSY);
     NG_NODE_UNREF(node);
@@ -548 +557 @@
         return VERR_INTERNAL_ERROR;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+
     ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.ifp, ifp);
     pThis->u.s.node = node;
@@ -564 +574 @@
     TASK_INIT(&pThis->u.s.tskout, 0, vboxNetFltFreeBSDoutput, pThis);
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     NG_NODE_SET_PRIVATE(node, pThis);
@@ -575 +585 @@
     /** @todo keep these reports up to date, either by polling for changes or
      *        intercept some control flow if possible. */
-    Assert(pThis->pSwitchPort);
-    pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-    pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltFreeBsdIsPromiscuous(pThis));
-    pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-    pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+    if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+    {
+        Assert(pThis->pSwitchPort);
+        pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+        pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltFreeBsdIsPromiscuous(pThis));
+        pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+        pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+        vboxNetFltRelease(pThis, true /*fBusy*/);
+    }
 
     return VINF_SUCCESS;

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

@@ -351 +351 @@
     pOverride->pVBoxNetFlt          = pThis;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp); /* (this isn't necessary, but so what) */
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp); /* (this isn't necessary, but so what) */
     ASMAtomicXchgPtr((void * volatile *)&pDev->netdev_ops, pOverride);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 }
 
@@ -368 +368 @@
     RTSPINLOCKTMP               Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     if (!pDev)
         pDev = (struct net_device *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pDev);
@@ -387 +387 @@
     else
         pOverride = NULL;
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     if (pOverride)
@@ -1216 +1216 @@
 {
     PVBOXNETFLTINS  pThis   = VBOX_FLT_XT_TO_INST(pWork);
-    RTSPINLOCKTMP   Tmp     = RTSPINLOCKTMP_INITIALIZER;
     struct sk_buff *pBuf;
 
@@ -1224 +1223 @@
      * Active? Retain the instance and increment the busy counter.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-    if (ASMAtomicUoReadBool(&pThis->fActive))
-    {
-        vboxNetFltRetain(pThis, true /* fBusy */);
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-
+    if (vboxNetFltTryRetainBusyActive(pThis))
+    {
         while ((pBuf = skb_dequeue(&pThis->u.s.XmitQueue)) != NULL)
             vboxNetFltLinuxForwardToIntNet(pThis, pBuf);
@@ -1237 +1232 @@
     else
     {
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
         /** @todo Shouldn't we just drop the packets here? There is little point in
          *        making them accumulate when the VM is paused and it'll only waste
@@ -1256 +1250 @@
 {
 #ifdef VBOXNETFLT_WITH_GSO_XMIT_WIRE
-    struct net_device  *pDev;
-    PINTNETTRUNKSWPORT  pSwitchPort;
-    unsigned int        fFeatures;
-    RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
-
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-    pSwitchPort = pThis->pSwitchPort; /* this doesn't need to be here, but it doesn't harm. */
-    pDev = (struct net_device *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pDev);
-    if (pDev)
-        fFeatures = pDev->features;
-    else
-        fFeatures = 0;
-
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-
-    if (pThis->pSwitchPort)
-    {
-        /* Set/update the GSO capabilities of the NIC. */
-        uint32_t fGsoCapabilites = 0;
-        if (fFeatures & NETIF_F_TSO)
-            fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP);
-        if (fFeatures & NETIF_F_TSO6)
-            fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP);
+    if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+    {
+        struct net_device  *pDev;
+        PINTNETTRUNKSWPORT  pSwitchPort;
+        unsigned int        fFeatures;
+        RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
+
+        RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+
+        pSwitchPort = pThis->pSwitchPort; /* this doesn't need to be here, but it doesn't harm. */
+        pDev = (struct net_device *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pDev);
+        if (pDev)
+            fFeatures = pDev->features;
+        else
+            fFeatures = 0;
+
+        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
+
+        if (pThis->pSwitchPort)
+        {
+            /* Set/update the GSO capabilities of the NIC. */
+            uint32_t fGsoCapabilites = 0;
+            if (fFeatures & NETIF_F_TSO)
+                fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP);
+            if (fFeatures & NETIF_F_TSO6)
+                fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP);
 # if 0 /** @todo GSO: Test UDP offloading (UFO) on linux. */
-        if (fFeatures & NETIF_F_UFO)
-            fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP);
-        if (fFeatures & NETIF_F_UFO)
-            fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP);
+            if (fFeatures & NETIF_F_UFO)
+                fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP);
+            if (fFeatures & NETIF_F_UFO)
+                fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP);
 # endif
-        pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, fGsoCapabilites, INTNETTRUNKDIR_WIRE);
+            pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, fGsoCapabilites, INTNETTRUNKDIR_WIRE);
+        }
+
+        vboxNetFltRelease(pThis, true /*fBusy*/);
     }
 #endif /* VBOXNETFLT_WITH_GSO_XMIT_WIRE */
@@ -1327 +1326 @@
     dev_hold(pDev);
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pDev, pDev);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) retained. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
@@ -1353 +1352 @@
      * the device notification handle.
      */
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     pDev = (struct net_device *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pDev);
     if (pDev)
@@ -1361 +1360 @@
         pDev = NULL; /* don't dereference it */
     }
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
     Log(("vboxNetFltLinuxAttachToInterface: this=%p: Packet handler installed.\n", pThis));
 
@@ -1371 +1370 @@
     {
         Assert(pThis->pSwitchPort);
-        vboxNetFltLinuxReportNicGsoCapabilities(pThis);
-        pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-        pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltLinuxPromiscuous(pThis));
-        pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+        if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+        {
+            vboxNetFltLinuxReportNicGsoCapabilities(pThis);
+            pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+            pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltLinuxPromiscuous(pThis));
+            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+            vboxNetFltRelease(pThis, true /*fBusy*/);
+        }
     }
     else
@@ -1381 +1384 @@
         vboxNetFltLinuxUnhookDev(pThis, pDev);
 #endif
-        RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
         ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pDev, NULL);
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
         dev_put(pDev);
         Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
@@ -1403 +1406 @@
 #endif
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     ASMAtomicWriteBool(&pThis->u.s.fRegistered, false);
     ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
     ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pDev, NULL);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     dev_remove_pack(&pThis->u.s.PacketType);
@@ -1423 +1426 @@
 {
     /* Check if we are not suspended and promiscuous mode has not been set. */
-    if (ASMAtomicUoReadBool(&pThis->fActive) && !ASMAtomicUoReadBool(&pThis->u.s.fPromiscuousSet))
+    if (   pThis->enmTrunkState == INTNETTRUNKIFSTATE_ACTIVE
+        && !ASMAtomicUoReadBool(&pThis->u.s.fPromiscuousSet))
     {
         /* Note that there is no need for locking as the kernel got hold of the lock already. */
@@ -1659 +1663 @@
     /*
      * Report the GSO capabilities of the host and device (if connected).
+     * Note! No need to mark ourselves busy here.
      */
     /** @todo duplicate work here now? Attach */
@@ -1694 +1699 @@
      *        ways. */
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
     pDev = (struct net_device *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pDev);
     fRegistered = ASMAtomicUoReadBool(&pThis->u.s.fRegistered);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     if (fRegistered)

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

@@ -995 +995 @@
              */
             RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-            RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-            const bool fActive = ASMAtomicUoReadBool(&pThis->fActive);
+            RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+            const bool fActive = pThis->enmTrunkState == INTNETTRUNKIFSTATE_ACTIVE;
             vboxNetFltRetain(pThis, true /* fBusy */);
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
             vboxnetflt_promisc_stream_t *pPromiscStream = (vboxnetflt_promisc_stream_t *)pStream;
@@ -1060 +1060 @@
                                 case DL_NOTE_LINK_UP:
                                 {
-                                    const bool fDisconnected = ASMAtomicUoReadBool(&pThis->fActive);
-                                    if (fDisconnected)
-                                    {
-                                        ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, false);
+                                    if (ASMAtomicXchgBool(&pThis->fDisconnectedFromHost, false))
                                         LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_UP.\n"));
-                                    }
                                     break;
                                 }
@@ -1071 +1067 @@
                                 case DL_NOTE_LINK_DOWN:
                                 {
-                                    const bool fDisconnected = ASMAtomicUoReadBool(&pThis->fActive);
-                                    if (!fDisconnected)
-                                    {
-                                        ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
+                                    if (!ASMAtomicXchgBool(&pThis->fDisconnectedFromHost, true))
                                         LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_DOWN.\n"));
-                                    }
                                     break;
                                 }
@@ -1384 +1376 @@
                  sizeof(pThis->u.s.MacAddr), &pThis->u.s.MacAddr));
 
-        vboxNetFltRetain(pThis, true /*fBusy*/);
-        Assert(pThis->pSwitchPort);
-        if (pThis->pSwitchPort)
-            pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-        vboxNetFltRelease(pThis, true /*fBusy*/);
+        if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+        {
+            Assert(pThis->pSwitchPort);
+            if (pThis->pSwitchPort)
+                pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+            vboxNetFltRelease(pThis, true /*fBusy*/);
+        }
     }
     else
@@ -2611 +2605 @@
              * Report promiscuousness and capabilities.
              */
-            Assert(pThis->pSwitchPort);
-            /** @todo There is no easy way of obtaining the global host side promiscuous
-             * counter. Currently we just return false.  */
-            pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false);
-            pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,  INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+            if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+            {
+                Assert(pThis->pSwitchPort);
+                /** @todo There is no easy way of obtaining the global host side promiscuous
+                 * counter. Currently we just return false.  */
+                pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false);
+                pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,  INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+                pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+                vboxNetFltRelease(pThis, true /*fBusy*/);
+            }
 
             /*

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

@@ -619 +619 @@
      * Active? Retain the instance and increment the busy counter.
      */
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-    const bool fActive = ASMAtomicUoReadBool(&pThis->fActive);
-    if (fActive)
-        vboxNetFltRetain(pThis, true /* fBusy */);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-    if (!fActive)
+    if (!vboxNetFltTryRetainBusyActive(pThis))
         return;
 
@@ -840 +834 @@
                              * Report MAC address, promiscuous mode and capabilities.
                              */
-                            Assert(pThis->pSwitchPort);
-                            pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-                            pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false); /** @todo Promisc */
-                            pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-                            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+                            if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+                            {
+                                Assert(pThis->pSwitchPort);
+                                pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+                                pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false); /** @todo Promisc */
+                                pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+                                pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+                                vboxNetFltRelease(pThis, true /*fBusy*/);
+                            }
 
                             LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface successfully attached over '%s'\n", pThis->szName));

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

@@ -1112 +1112 @@
 
     /* using the pPacketQueueSG as an indicator that the packet queue is initialized */
-    RTSpinlockAcquire((pInstance)->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts((pInstance)->hSpinlock, &Tmp);
     if(pWorker->pSG)
     {
         pSG = pWorker->pSG;
         pWorker->pSG = NULL;
-        RTSpinlockRelease((pInstance)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pInstance)->hSpinlock, &Tmp);
         KeSetEvent(&pWorker->KillEvent, 0, FALSE);
 
@@ -1131 +1131 @@
     else
     {
-        RTSpinlockRelease((pInstance)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pInstance)->hSpinlock, &Tmp);
     }
 }
@@ -3023 +3023 @@
     Assert(pThis->fDisconnectedFromHost);
     Assert(!pThis->fRediscoveryPending);
-    Assert(!pThis->fActive);
+    Assert(pThis->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE);
 #ifndef VBOXNETADP
     Assert(pAdapt->PTState.OpState == kVBoxNetDevOpState_Deinitialized);
@@ -3255 +3255 @@
 //#endif
 
-                            RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
 
                             /* 4. mark as connected */
+                            RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
                             ASMAtomicUoWriteBool(&pThis->fDisconnectedFromHost, false);
-
-                            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                            RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
                             pAttachInfo->Status = VINF_SUCCESS;
@@ -3271 +3270 @@
                             /* 5. Report MAC address, promiscuousness and GSO capabilities. */
                             /** @todo Keep these up to date, esp. the promiscuous mode bit. */
-                            if (pThis->pSwitchPort)
+                            if (   pThis->pSwitchPort
+                                && vboxNetFltTryRetainBusyNotDisconnected(pThis))
                             {
                                 pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
@@ -3280 +3280 @@
                                 /** @todo We should be able to do pfnXmit at DISPATCH_LEVEL... */
                                 pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+                                vboxNetFltRelease(pThis, true /*fBusy*/);
                             }
                             return;

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.h

@@ -636 +636 @@
     pNetFlt = PADAPT_2_PVBOXNETFLTINS(pAdapt);
 
-    RTSpinlockAcquire((pNetFlt)->hSpinlock, &Tmp);
-    if(!ASMAtomicUoReadBool(&(pNetFlt)->fActive))
-    {
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts((pNetFlt)->hSpinlock, &Tmp);
+    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
+    {
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         return NULL;
     }
@@ -645 +645 @@
     if(!vboxNetFltWinDoReferenceDevice(pAdapt, &pAdapt->PTState))
     {
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         return NULL;
     }
@@ -651 +651 @@
     vboxNetFltRetain((pNetFlt), true /* fBusy */);
 
-    RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
 
     return pNetFlt;
@@ -660 +660 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    RTSpinlockAcquire((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts((pNetFlt)->hSpinlock, &Tmp);
 #ifndef VBOXNETADP
     if(!vboxNetFltWinDoReferenceDevices(pAdapt, &pAdapt->MPState, &pAdapt->PTState))
@@ -667 +667 @@
 #endif
     {
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         *pbNetFltActive = false;
         return false;
     }
 
-    if(!ASMAtomicUoReadBool(&(pNetFlt)->fActive))
+    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     {
         vboxNetFltWinReferenceModePassThru(pNetFlt);
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         *pbNetFltActive = false;
         return true;
@@ -682 +682 @@
     vboxNetFltRetain((pNetFlt), true /* fBusy */);
     vboxNetFltWinReferenceModeNetFlt(pNetFlt);
-    RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
 
     *pbNetFltActive = true;
@@ -704 +704 @@
     pNetFlt = PADAPT_2_PVBOXNETFLTINS(pAdapt);
 
-    RTSpinlockAcquire((pNetFlt)->hSpinlock, &Tmp);
-    if(!ASMAtomicUoReadBool(&(pNetFlt)->fActive))
-    {
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts((pNetFlt)->hSpinlock, &Tmp);
+    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
+    {
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         return NULL;
     }
@@ -713 +713 @@
     if(!vboxNetFltWinDoIncReferenceDevice(pAdapt, &pAdapt->PTState, v))
     {
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         return NULL;
     }
@@ -719 +719 @@
     vboxNetFltRetain((pNetFlt), true /* fBusy */);
 
-    RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
 
     /* we have marked it as busy, so can do the res references outside the lock */
@@ -742 +742 @@
     }
 
-    RTSpinlockAcquire((pNetFlt)->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts((pNetFlt)->hSpinlock, &Tmp);
 #ifndef VBOXNETADP
     if(!vboxNetFltWinDoIncReferenceDevices(pAdapt, &pAdapt->MPState, &pAdapt->PTState, v))
@@ -749 +749 @@
 #endif
     {
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         *pbNetFltActive = false;
         return false;
     }
 
-    if(!ASMAtomicUoReadBool(&(pNetFlt)->fActive))
+    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     {
         vboxNetFltWinIncReferenceModePassThru(pNetFlt, v);
 
-        RTSpinlockRelease((pNetFlt)->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts((pNetFlt)->hSpinlock, &Tmp);
         *pbNetFltActive = false;
         return true;
@@ -767 +767 @@
     vboxNetFltWinIncReferenceModeNetFlt(pNetFlt, v);
 
-    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
     /* we have marked it as busy, so can do the res references outside the lock */
@@ -833 +833 @@
     }
 
-    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 #ifdef VBOX_NETFLT_ONDEMAND_BIND
     if(vboxNetFltWinDoIncReferenceDevice(pAdapt, &pAdapt->PTState))
@@ -842 +842 @@
 #endif
     {
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         return true;
     }
 
-    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
     return false;
 }
@@ -854 +854 @@
     PVBOXNETFLTINS pNetFlt = PADAPT_2_PVBOXNETFLTINS(pAdapt);
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 #ifdef VBOX_NETFLT_ONDEMAND_BIND
     if(vboxNetFltWinDoReferenceDevice(pAdapt, &pAdapt->PTState))
@@ -863 +863 @@
 #endif
     {
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         return true;
     }
 
-    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
     return false;
 }

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c

@@ -486 +486 @@
      * fail any request comming later
      */
-    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
     ASMAtomicUoWriteBool(&pNetFlt->fDisconnectedFromHost, true);
@@ -494 +494 @@
     vboxNetFltWinSetOpState(&pAdapt->MPState, kVBoxNetDevOpState_Deinitializing);
 
-    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
     vboxNetFltWinWaitDereference(&pAdapt->MPState);
@@ -1001 +1001 @@
          * If the miniport below is binding, fail the request
          */
-        RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
         if (vboxNetFltWinGetOpState(&pAdapt->PTState) > kVBoxNetDevOpState_Initialized)
         {
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             Status = NDIS_STATUS_FAILURE;
             break;
@@ -1017 +1017 @@
         {
             pAdapt->bQueuedRequest = TRUE;
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             Status = NDIS_STATUS_PENDING;
             break;
@@ -1026 +1026 @@
         if (pAdapt->bStandingBy == TRUE)
         {
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             Status = NDIS_STATUS_FAILURE;
             break;
@@ -1032 +1032 @@
         pAdapt->bOutstandingRequests = TRUE;
 
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         if(Oid == OID_GEN_CURRENT_PACKET_FILTER && VBOXNETFLT_PROMISCUOUS_SUPPORTED(pAdapt))
         {
@@ -1050 +1050 @@
                 vboxNetFltWinDereferenceAdapt(pAdapt);
 
-                RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+                RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
                 pAdapt->bOutstandingRequests = FALSE;
-                RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+                RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
                 break;
             }
@@ -1346 +1346 @@
          * If the miniport below is unbinding, fail the request
          */
-        RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
         if (vboxNetFltWinGetOpState(&pAdapt->PTState) > kVBoxNetDevOpState_Initialized)
         {
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             Status = NDIS_STATUS_FAILURE;
             break;
@@ -1362 +1362 @@
         {
             pAdapt->bQueuedRequest = TRUE;
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             Status = NDIS_STATUS_PENDING;
             break;
@@ -1371 +1371 @@
         if (pAdapt->bStandingBy == TRUE)
         {
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             Status = NDIS_STATUS_FAILURE;
             break;
@@ -1377 +1377 @@
         pAdapt->bOutstandingRequests = TRUE;
 
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
         if(Oid == OID_GEN_CURRENT_PACKET_FILTER && VBOXNETFLT_PROMISCUOUS_SUPPORTED(pAdapt))
@@ -1413 +1413 @@
                     vboxNetFltWinDereferenceAdapt(pAdapt);
 
-                    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+                    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
                     pAdapt->bOutstandingRequests = FALSE;
-                    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+                    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
                     break;
                 }

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c

@@ -299 +299 @@
      * fail any request comming later
      */
-    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
     ASMAtomicUoWriteBool(&pNetFlt->fDisconnectedFromHost, true);
@@ -332 +332 @@
 
 
-    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
     if (CompleteRequest == TRUE)
@@ -583 +583 @@
             {
                 PVBOXNETFLTINS pNetFltIf = PADAPT_2_PVBOXNETFLTINS(pAdapt);
-                Assert(!pNetFltIf->fActive);
+                Assert(pNetFltIf->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE);
                 vboxNetFltWinDereferenceModePassThru(pNetFltIf);
                 vboxNetFltWinDereferenceAdapt(pAdapt);
@@ -613 +613 @@
               if(pAdapt->fProcessingPacketFilter == VBOXNETFLT_PFP_NETFLT)
               {
-                  Assert(pNetFltIf->fActive);
+                  Assert(pNetFltIf->enmTrunkState == INTNETTRUNKIFSTATE_ACTIVE);
                   if(Status == NDIS_STATUS_SUCCESS)
                   {
@@ -625 +625 @@
               else if(pAdapt->fProcessingPacketFilter == VBOXNETFLT_PFP_PASSTHRU)
               {
-                  Assert(!pNetFltIf->fActive);
+                  Assert(pNetFltIf->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE);
 
                   if(Status == NDIS_STATUS_SUCCESS)
@@ -849 +849 @@
     Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
     do{
-        RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
         Assert(pAdapt->cReceivedPacketCount < MAX_RECEIVE_PACKET_ARRAY_SIZE);
@@ -893 +893 @@
             }
         }
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
     } while(0);
 
@@ -1089 +1089 @@
     do
     {
-        RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
         if (pAdapt->cReceivedPacketCount > 0)
@@ -1103 +1103 @@
             pAdapt->cReceivedPacketCount = 0;
 
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
             if(!bReturn)
@@ -1132 +1132 @@
 
         /* we are here only in case pAdapt->cReceivedPacketCount == 0 */
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
     } while (FALSE);
 }
@@ -2112 +2112 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
     if(pAdapt->bClosingAdapter)
     {
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         Assert(0);
         return false;
@@ -2122 +2122 @@
     if (pAdapt->hBindingHandle == NULL)
     {
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         Assert(0);
         return false;
@@ -2128 +2128 @@
 
     pAdapt->bClosingAdapter = true;
-    RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
     /*
@@ -2177 +2177 @@
      * Set the Internal Device State, this blocks all new sends or receives
      */
-    RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
 
     vboxNetFltWinSetPowerState(&pAdapt->PTState, *pDeviceState);
@@ -2193 +2193 @@
             pAdapt->bStandingBy = TRUE;
         }
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 #ifndef VBOX_NETFLT_ONDEMAND_BIND
 
@@ -2218 +2218 @@
          * If the below miniport is going to low power state, complete the queued request
          */
-        RTSpinlockAcquire(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
         if (pAdapt->bQueuedRequest)
         {
             pAdapt->bQueuedRequest = FALSE;
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
             vboxNetFltWinPtRequestComplete(pAdapt, &pAdapt->Request, NDIS_STATUS_FAILURE);
         }
         else
         {
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         }
 #endif
@@ -2255 +2255 @@
 
 #ifdef VBOX_NETFLT_ONDEMAND_BIND
-        RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+        RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 #else
         /*
@@ -2268 +2268 @@
 
             pAdapt->bOutstandingRequests = TRUE;
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
 
             NdisRequest(&Status,
@@ -2284 +2284 @@
         else
         {
-            RTSpinlockRelease(pNetFlt->hSpinlock, &Tmp);
+            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         }