Changeset 17184 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp

Timestamp:

Feb 27, 2009 12:37:35 AM (16 years ago)

Author:

vboxsync

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

43470

Message:

VBoxNetFlt: review of core changes, several review comments needing follow up. untested

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• VBoxNetAdp.c (modified) (28 diffs)
• darwin/VBoxNetAdp-darwin.cpp (modified) (1 diff)
• solaris/VBoxNetAdp-solaris.c (modified) (1 diff)

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

@@ -20 +20 @@
  */
 
+/** @page pg_netadp     VBoxNetAdp - Network Adapter
+ *
+ * This is a kernel module that creates a virtual interface that can be attached
+ * to an internal network.
+ *
+ * In the big picture we're one of the three trunk interface on the internal
+ * network, the one named "TAP Interface": @image html Networking_Overview.gif
+ *
+ */
+
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
-#define LOG_GROUP LOG_GROUP_NET_TAP_DRV
+#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
 #include "VBoxNetAdpInternal.h"
 
@@ -35 +45 @@
 #include <iprt/uuid.h>
 
+/** r=bird: why is this here in the agnositc code? */
 #ifndef RT_OS_SOLARIS
-#include <net/ethernet.h>
-#include <net/if_ether.h>
-#include <net/if_types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <sys/errno.h>
-#include <sys/param.h>
+# include <net/ethernet.h>
+# include <net/if_ether.h>
+# include <net/if_types.h>
+# include <sys/socket.h>
+# include <net/if.h>
+# include <net/if_dl.h>
+# include <sys/errno.h>
+# include <sys/param.h>
 #endif
 
@@ -79 +90 @@
 
 
+AssertCompileMemberSize(VBOXNETADP, enmState, sizeof(uint32_t));
 
 /**
@@ -107 +119 @@
     ASMAtomicWriteU32((uint32_t volatile *)&pThis->enmState, enmNewState);
 }
+
 
 /**
@@ -125 +138 @@
     RTSpinlockRelease(pThis->hSpinlock, &Tmp);
 }
-
 
 
@@ -147 +159 @@
 }
 
+
 /**
  * Checks and sets the enmState member atomically.
@@ -161 +174 @@
     bool fRc = true; /* be optimistic */
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-    enmActualState = vboxNetAdpGetState(pThis);
+    enmActualState = vboxNetAdpGetState(pThis); /** @todo r=bird: ASMAtomicCmpXchgU32()*/
     if (enmActualState == enmOldState)
         vboxNetAdpSetState(pThis, enmNewState);
@@ -168 +182 @@
         fRc = false;
     RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+
     if (fRc)
         Log(("vboxNetAdpCheckAndSetState: pThis=%p, state changed: %d -> %d.\n", pThis, enmOldState, enmNewState));
@@ -176 +191 @@
 
 
-
+/**
+ * Finds a instance by its name, the caller does the locking.
+ *
+ *
+ * @returns Pointer to the instance by the given name. NULL if not found.
+ * @param   pGlobals        The globals.
+ * @param   pszName         The name of the instance.
+ */
 static PVBOXNETADP vboxNetAdpFind(PVBOXNETADPGLOBALS pGlobals, const char *pszName)
 {
@@ -186 +208 @@
         PVBOXNETADP pThis = &pGlobals->aAdapters[i];
         RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-        if (vboxNetAdpGetState(pThis)
-            && !strcmp(pThis->szName, pszName))
+        if (    vboxNetAdpGetState(pThis)
+            &&  !strcmp(pThis->szName, pszName))
         {
             RTSpinlockRelease(pThis->hSpinlock, &Tmp);
@@ -196 +218 @@
     return NULL;
 }
+
 
 /**
@@ -226 +249 @@
 }
 
+
 /**
  * Decrements the busy counter and does idle wakeup.
@@ -254 +278 @@
         Assert(cBusy < UINT32_MAX / 2);
 }
+
 
 /**
@@ -285 +310 @@
 }
 
+
 /**
  * Increments busy counter.
@@ -309 +335 @@
 }
 
+
 /**
  * Checks if receive is possible and increases busy and ref counters if so.
@@ -335 +362 @@
     return fCanReceive;
 }
+
 
 /**
@@ -356 +384 @@
     vboxNetAdpRelease(pThis);
 }
+
 
 /**
@@ -424 +453 @@
     vboxNetAdpBusy(pThis);
     RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+
     rc = vboxNetAdpPortOsXmit(pThis, pSG, fDst);
     vboxNetAdpIdle(pThis);
@@ -543 +573 @@
     Log(("vboxNetAdpPortSetActive: pThis=%p, fActive=%d, state before: %d.\n", pThis, fActive, vboxNetAdpGetState(pThis)));
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
     fPreviouslyActive = vboxNetAdpGetState(pThis) == kVBoxNetAdpState_Active;
     if (fPreviouslyActive != fActive)
@@ -558 +589 @@
         }
     }
+
     RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-    Log(("vboxNetAdpPortSetActive: state after: %d.\n", vboxNetAdpGetState(pThis)));
+    Log(("vboxNetAdpPortSetActive: state after: %RTbool.\n", vboxNetAdpGetState(pThis)));
     return fPreviouslyActive;
 }
@@ -633 +665 @@
         RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
         PVBOXNETADP pThis = &pGlobals->aAdapters[i];
-    
+
         if (vboxNetAdpCheckAndSetState(pThis, kVBoxNetAdpState_Invalid, kVBoxNetAdpState_Transitional))
         {
@@ -657 +689 @@
     int rc = VINF_SUCCESS;
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    
+
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
     if (vboxNetAdpGetState(pThis) != kVBoxNetAdpState_Available || pThis->cBusy)
@@ -716 +748 @@
 }
 
+
 /**
  * @copydoc INTNETTRUNKFACTORY::pfnCreateAndConnect
  */
 static DECLCALLBACK(int) vboxNetAdpFactoryCreateAndConnect(PINTNETTRUNKFACTORY pIfFactory, const char *pszName,
-                                                           PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT *ppIfPort, bool fNoPromisc)
-{
+                                                           PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags,
+                                                           PINTNETTRUNKIFPORT *ppIfPort)
+{
+    PVBOXNETADPGLOBALS pGlobals = (PVBOXNETADPGLOBALS)((uint8_t *)pIfFactory - RT_OFFSETOF(VBOXNETADPGLOBALS, TrunkFactory));
     PVBOXNETADP pThis;
     int rc;
-    PVBOXNETADPGLOBALS pGlobals = (PVBOXNETADPGLOBALS)((uint8_t *)pIfFactory - RT_OFFSETOF(VBOXNETADPGLOBALS, TrunkFactory));
-
-    LogFlow(("vboxNetAdpFactoryCreateAndConnect: pszName=%p:{%s}\n", pszName, pszName));
+
+    LogFlow(("vboxNetAdpFactoryCreateAndConnect: pszName=%p:{%s} fFlags=%#x\n", pszName, pszName, fFlags));
     Assert(pGlobals->cFactoryRefs > 0);
+    AssertMsgReturn(fFlags,
+                    ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
 
     /*
@@ -749 +785 @@
     return rc;
 }
+
 
 /**
@@ -956 +993 @@
 }
 
+
 /**
  * Called by the native part when the OS wants the driver to unload.
@@ -966 +1004 @@
 {
     int rc = vboxNetAdpTryDeleteIdc(pGlobals);
-    if(RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         vboxNetAdpDeleteGlobalsBase(pGlobals);
@@ -1037 +1075 @@
         if (RT_SUCCESS(rc))
         {
-            /* @todo REMOVE ME! */
+#if 1 /** @todo REMOVE ME! */
             PVBOXNETADP pTmp;
             rc = vboxNetAdpCreate(&pGlobals->TrunkFactory, &pTmp);
             if (RT_FAILURE(rc))
                 Log(("Failed to create vboxnet0, rc=%Rrc.\n", rc));
+#endif
             Log(("VBoxNetAdp: pSession=%p\n", SUPR0IdcGetSession(&pGlobals->SupDrvIDC)));
             return rc;
@@ -1083 +1122 @@
     return rc;
 }
+

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

@@ -32 +32 @@
 #undef PVM
 
-#define LOG_GROUP LOG_GROUP_NET_TAP_DRV
+#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
 #include <VBox/log.h>
 #include <VBox/err.h>

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

@@ -27 +27 @@
 #endif
 
-#define LOG_GROUP LOG_GROUP_NET_TAP_DRV
+#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
 #include <VBox/log.h>
 #include <VBox/err.h>