Changeset 52394 in vbox

Timestamp:

Aug 15, 2014 10:25:31 PM (10 years ago)

Author:

vboxsync

Message:

intnetR0TrunkIfPortDisconnect: Must always release the busy reference to the interface side (netflt) and must not trust pThis->pIfPort to be working as it's cleared before doing the busy waiting in intnetR0TrunkIfDestroy. So, pfnDisconnect has been extended with a pIfPort pointer as well as a function pointer to a busy-release function for pIfPort.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (7 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (7 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h (modified) (1 diff)

trunk/include/VBox/intnet.h

@@ -387 +387 @@
 
 
+/** Pointer to the interface side of a trunk port. */
+typedef struct INTNETTRUNKIFPORT *PINTNETTRUNKIFPORT;
+
+
+/**
+ * Special variation of INTNETTRUNKIFPORT::pfnRelease for use with
+ * INTNETTRUNKSWPORT::pfnDisconnect.
+ *
+ * @param   pIfPort     Pointer to the INTNETTRUNKIFPORT instance.
+ */
+typedef DECLCALLBACK(void) FNINTNETTRUNKIFPORTRELEASEBUSY(PINTNETTRUNKIFPORT pIfPort);
+/** Pointer to a FNINTNETTRUNKIFPORTRELEASEBUSY function. */
+typedef FNINTNETTRUNKIFPORTRELEASEBUSY *PFNINTNETTRUNKIFPORTRELEASEBUSY;
+
+
 /** Pointer to the switch side of a trunk port. */
 typedef struct INTNETTRUNKSWPORT *PINTNETTRUNKSWPORT;
@@ -566 +581 @@
      *
      * The caller shall must be busy when calling this method to prevent racing the
-     * network destruction code. This method will consume this busy reference
-     * (released via INTNETTRUNKIFPORT::pfnRelease).
+     * network destruction code. This method will always consume this busy reference
+     * (released via @a pfnReleaseBusy using @a pIfPort).
      *
      * The caller shall guarantee that there are absolutely no chance of concurrent
@@ -573 +588 @@
      *
      * @param   pSwitchPort         Pointer to this structure.
-     */
-    DECLR0CALLBACKMEMBER(void, pfnDisconnect,(PINTNETTRUNKSWPORT pSwitchPort));
+     * @param   pIfPort             The interface port structure corresponding to @a
+     *                              pSwitchPort and which should be used when
+     *                              calling @a pfnReleaseBusy.  This is required as
+     *                              the method may no longer have access to a valid
+     *                              @a pIfPort pointer.
+     * @param   pfnReleaseBusy      Callback for releasing the callers busy
+     *                              reference to it's side of things.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnDisconnect,(PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT pIfPort,
+                                              PFNINTNETTRUNKIFPORTRELEASEBUSY pfnReleaseBusy));
 #endif /* VBOX_WITH_INTNET_DISCONNECT */
 
@@ -583 +606 @@
 /** Version number for the INTNETTRUNKIFPORT::u32Version and INTNETTRUNKIFPORT::u32VersionEnd fields. */
 #ifdef VBOX_WITH_INTNET_DISCONNECT
-#define INTNETTRUNKSWPORT_VERSION   UINT32_C(0xA2CDf002)
-#else /* !VBOX_WITH_INTNET_DISCONNECT */
-#define INTNETTRUNKSWPORT_VERSION   UINT32_C(0xA2CDf001)
-#endif /* !VBOX_WITH_INTNET_DISCONNECT */
+# define INTNETTRUNKSWPORT_VERSION   UINT32_C(0xA2CDf003)
+#else
+# define INTNETTRUNKSWPORT_VERSION   UINT32_C(0xA2CDf001)
+#endif
 
 
@@ -610 +633 @@
 } 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
@@ -639 +661 @@
      * This must be called for every pfnRetain call.
      *
-     *
      * @param   pIfPort     Pointer to this structure.
      *
      * @remarks May own the big mutex, no spinlocks.
      */
-#ifdef VBOX_WITH_INTNET_DISCONNECT
-    DECLR0CALLBACKMEMBER(void, pfnRelease,(PINTNETTRUNKIFPORT pIfPort, bool fBusy));
-#else /* !VBOX_WITH_INTNET_DISCONNECT */
     DECLR0CALLBACKMEMBER(void, pfnRelease,(PINTNETTRUNKIFPORT pIfPort));
-#endif /* !VBOX_WITH_INTNET_DISCONNECT */
 
     /**
@@ -770 +787 @@
 
 /** Version number for the INTNETTRUNKIFPORT::u32Version and INTNETTRUNKIFPORT::u32VersionEnd fields. */
-#ifdef VBOX_WITH_INTNET_DISCONNECT
-#define INTNETTRUNKIFPORT_VERSION   UINT32_C(0xA2CDe002)
-#else /* !VBOX_WITH_INTNET_DISCONNECT */
 #define INTNETTRUNKIFPORT_VERSION   UINT32_C(0xA2CDe001)
-#endif /* !VBOX_WITH_INTNET_DISCONNECT */
 
 

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

@@ -450 +450 @@
 
 
-#ifdef VBOX_WITH_INTNET_DISCONNECT
 /*******************************************************************************
 *   Forward Declarations                                                       *
@@ -472 +471 @@
     return false;
 }
-#endif /* VBOX_WITH_INTNET_DISCONNECT */
 
 
@@ -5012 +5010 @@
 #ifdef VBOX_WITH_INTNET_DISCONNECT
 /** @copydoc INTNETTRUNKSWPORT::pfnDisconnect */
-static DECLCALLBACK(void) intnetR0TrunkIfPortDisconnect(PINTNETTRUNKSWPORT pSwitchPort)
+static DECLCALLBACK(void) intnetR0TrunkIfPortDisconnect(PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT pIfPort,
+                                                        PFNINTNETTRUNKIFPORTRELEASEBUSY pfnReleaseBusy)
 {
     PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
@@ -5037 +5036 @@
          * pointer after taking ownership of the big mutex.
          */
-        pThis->pIfPort->pfnRelease(pThis->pIfPort, true /*fBusy*/);
+        pfnReleaseBusy(pIfPort);
 
         RTSemMutexRequest(pIntNet->hMtxCreateOpenDestroy, RT_INDEFINITE_WAIT);
@@ -5044 +5043 @@
         {
             Assert(pNetwork->MacTab.pTrunk == pThis); /* Must be valid as long as tehre are no concurrent calls to this method. */
+            Assert(pThis->pIfPort == pIfPort);        /* Ditto */
 
             /*
@@ -5049 +5049 @@
              * intnetR0NetworkDestruct.
              */
-            pThis->pIfPort->pfnSetState(pThis->pIfPort, INTNETTRUNKIFSTATE_DISCONNECTING);
+            pIfPort->pfnSetState(pIfPort, INTNETTRUNKIFSTATE_DISCONNECTING);
 
             RTSpinlockAcquire(pNetwork->hAddrSpinlock);
@@ -5060 +5060 @@
         RTSemMutexRelease(pIntNet->hMtxCreateOpenDestroy);
     }
+    /*
+     * We must always release the busy reference.
+     */
+    else
+        pfnReleaseBusy(pIfPort);
 }
 #endif /* VBOX_WITH_INTNET_DISCONNECT */

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

@@ -749 +749 @@
 
 /**
- * @copydoc INTNETTRUNKIFPORT::pfnRetain
- */
-#ifdef VBOX_WITH_INTNET_DISCONNECT
-static DECLCALLBACK(void) vboxNetFltPortRelease(PINTNETTRUNKIFPORT pIfPort, bool fBusy)
-{
-    PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
-    vboxNetFltRelease(pThis, fBusy);
-}
-#else /* !VBOX_WITH_INTNET_DISCONNECT */
+ * @copydoc INTNETTRUNKIFPORT::pfnRelease
+ */
 static DECLCALLBACK(void) vboxNetFltPortRelease(PINTNETTRUNKIFPORT pIfPort)
 {
@@ -763 +756 @@
     vboxNetFltRelease(pThis, false /* fBusy */);
 }
-#endif /* !VBOX_WITH_INTNET_DISCONNECT */
+
+
+/**
+ * @callback_method_impl{FNINTNETTRUNKIFPORTRELEASEBUSY}
+ */
+DECLHIDDEN(DECLCALLBACK(void)) vboxNetFltPortReleaseBusy(PINTNETTRUNKIFPORT pIfPort)
+{
+    PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
+    vboxNetFltRelease(pThis, true /*fBusy*/);
+}
 
 

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

@@ -330 +330 @@
 DECLHIDDEN(PVBOXNETFLTINS) vboxNetFltFindInstance(PVBOXNETFLTGLOBALS pGlobals, const char *pszName);
 
+DECLHIDDEN(DECLCALLBACK(void)) vboxNetFltPortReleaseBusy(PINTNETTRUNKIFPORT pIfPort);
 DECLHIDDEN(void) vboxNetFltRetain(PVBOXNETFLTINS pThis, bool fBusy);
 DECLHIDDEN(bool) vboxNetFltTryRetainBusyActive(PVBOXNETFLTINS pThis);