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

Timestamp:

Apr 17, 2009 6:59:16 AM (16 years ago)

Author:

vboxsync

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

46057

Message:

#2954: Dynamic add/remove for virtual adapters. Moved all adapter-related code to vboxnetadp.ko

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxNetAdp.c (modified) (2 diffs)
• VBoxNetAdpInternal.h (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

@@ -24 +24 @@
 
 
-if1of ($(KBUILD_TARGET), solaris darwin)
+if1of ($(KBUILD_TARGET), solaris darwin linux)
 #
 # VBoxNetAdp - Virtual Network Adapter
@@ -34 +34 @@
 VBoxNetAdp_INST = $(INST_VBOXNETADP)$(if $(eq $(KBUILD_TARGET),darwin),Contents/MacOS/)
 VBoxNetAdp_NAME.solaris     = vboxnet
+VBoxNetAdp_NAME.linux       = vboxnetadp
+VBoxNetAdp_NOINST.linux     = true
 VBoxNetAdp_DEPS.solaris    += $(VBOX_SVN_REV_KMK)
 VBoxNetAdp_DEFS             = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
+VBoxNetAdp_DEFS.linux       = KBUILD_MODNAME=KBUILD_STR\(vboxnetadp\) KBUILD_BASENAME=KBUILD_STR\(vboxnetadp\) MODULE
 VBoxNetAdp_LDFLAGS.darwin   = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
 VBoxNetAdp_LDFLAGS.solaris += -N misc/gld -N drv/vboxdrv
+VBoxNetAdp_INCS.linux   := \
+        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
 VBoxNetAdp_INCS             = \
         .
@@ -44 +49 @@
 VBoxNetAdp_SOURCES.solaris  = \
         solaris/VBoxNetAdp-solaris.c
+VBoxNetAdp_SOURCES.linux   = \
+        linux/VBoxNetAdp-linux.c \
+        VBoxNetAdp.c
 VBoxNetAdp_SOURCES          =
 #VBoxNetAdp_SOURCES          = \
@@ -82 +90 @@
 endif # darwin
 
+ifeq ($(KBUILD_TARGET),linux)
+ #
+ # Install source files for compliation on Linux.
+ # files_vboxnetadp defines VBOX_VBOXNETADP_SOURCES.
+ #
+ include $(PATH_SUB_CURRENT)/linux/files_vboxnetadp
+ INSTALLS += VBoxNetAdp-src VBoxNetAdp-sh
+ VBoxNetAdp-src_INST    = bin/src/vboxnetadp/
+ VBoxNetAdp-src_MODE    = a+r,u+w
+ VBoxNetAdp-src_SOURCES = $(subst ",,$(VBOX_VBOXNETADP_SOURCES)) #"
+ VBoxNetAdp-src_SOURCES+= \
+        $(if $(VBOX_OSE),,\
+          $(PATH_VBoxNetAdp-src)/dkms.conf) \
+        $(PATH_VBoxNetAdp-src)/Makefile
+ VBoxNetAdp-src_CLEAN   = \
+        $(PATH_VBoxNetAdp-src)/dkms.conf \
+        $(PATH_VBoxNetAdp-src)/Makefile \
+        $(PATH_TARGET)/VBoxNetAdp-src-1.dep
+
+ VBoxNetAdp-sh_INST    = bin/src/vboxnetadp/
+ VBoxNetAdp-sh_MODE    = a+rx,u+w
+ VBoxNetAdp-sh_SOURCES = \
+        $(PATH_VBoxNetAdp-sh)/build_in_tmp \
+        $(if $(VBOX_OSE),,\
+          $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
+ VBoxNetAdp-sh_CLEAN   = $(PATH_VBoxNetAdp-sh)/build_in_tmp
+
+
+includedep $(PATH_TARGET)/VBoxNetAdp-src-1.dep
+$$(PATH_VBoxNetAdp-src)/Makefile: \
+                $(PATH_SUB_CURRENT)/linux/Makefile \
+                $$(if $$(eq $$(VBoxNetAdp/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
+                | $$(dir $$@)
+ifndef VBOX_WITH_HARDENING
+        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+else
+        $(QUIET)$(CP) -f $< $@
+endif
+        %$(QUIET2)$(RM) -f -- $(PATH_TARGET)/VBoxNetAdp-src-1.dep
+        %$(QUIET2)$(APPEND) '$(PATH_TARGET)/VBoxNetAdp-src-1.dep' 'VBoxNetAdp/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
+
+## Scripts needed for building the kernel modules
+
+$$(PATH_VBoxNetAdp-sh)/build_in_tmp: \
+                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
+                $(VBOX_VERSION_STAMP) \
+                | $$(dir $$@)
+        $(call MSG_TOOL,Creating,,$@)
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetadp;g" --output $@ $<
+        $(QUIET)chmod 0755 $@
+
+$$(PATH_VBoxNetAdp-src)/dkms.conf: \
+                $(PATH_SUB_CURRENT)/linux/dkms.conf \
+                $(VBOX_VERSION_STAMP) \
+                | $$(dir $$@)
+        $(call MSG_TOOL,Creating,,$@)
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
+
+endif # linux
+
 include $(KBUILD_PATH)/subfooter.kmk
 

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

@@ -36 +36 @@
 #include "VBoxNetAdpInternal.h"
 
-#include <VBox/sup.h>
 #include <VBox/log.h>
 #include <VBox/err.h>
+#include <iprt/string.h>
+
+#ifdef VBOXANETADP_DO_NOT_USE_NETFLT
+
+#include <VBox/sup.h>
 #include <iprt/assert.h>
-#include <iprt/string.h>
 #include <iprt/spinlock.h>
 #include <iprt/uuid.h>
@@ -1119 +1122 @@
 }
 
+#else /* !VBOXANETADP_DO_NOT_USE_NETFLT */
+
+
+VBOXNETADP g_aAdapters[VBOXNETADP_MAX_INSTANCES];
+
+
+
+/**
+ * Generate a suitable MAC address.
+ *
+ * @param   pThis       The instance.
+ * @param   pMac        Where to return the MAC address.
+ */
+DECLHIDDEN(void) vboxNetAdpComposeMACAddress(PVBOXNETADP pThis, PRTMAC pMac)
+{
+    /* Use a locally administered version of the OUI we use for the guest NICs. */
+    pMac->au8[0] = 0x08 | 2;
+    pMac->au8[1] = 0x00;
+    pMac->au8[2] = 0x27;
+
+    pMac->au8[3] = 0; /* pThis->uUnit >> 16; */
+    pMac->au8[4] = 0; /* pThis->uUnit >> 8; */
+    pMac->au8[5] = pThis->uUnit;
+}
+
+int vboxNetAdpCreate (PVBOXNETADP *ppNew)
+{
+    int rc;
+    unsigned i;
+    for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
+    {
+        PVBOXNETADP pThis = &g_aAdapters[i];
+
+        if (ASMAtomicCmpXchgU32((uint32_t volatile *)&pThis->enmState, kVBoxNetAdpState_Transitional, kVBoxNetAdpState_Invalid))
+        {
+            RTMAC Mac;
+            /* Found an empty slot -- use it. */
+            Log(("vboxNetAdpCreate: found empty slot: %d\n", i));
+            vboxNetAdpComposeMACAddress(pThis, &Mac);
+            rc = vboxNetAdpOsCreate(pThis, &Mac);
+            Log(("vboxNetAdpCreate: pThis=%p pThis->szName=%p\n", pThis, pThis->szName));
+            if (RT_SUCCESS(rc))
+            {
+                *ppNew = pThis;
+                ASMAtomicWriteU32((uint32_t volatile *)&pThis->enmState, kVBoxNetAdpState_Active);
+            }
+            else
+            {
+                ASMAtomicWriteU32((uint32_t volatile *)&pThis->enmState, kVBoxNetAdpState_Invalid);
+                Log(("vboxNetAdpCreate: vboxNetAdpOsCreate failed with '%Rrc'.\n", rc));
+            }
+            Log2(("VBoxNetAdpCreate: Created %s\n", g_aAdapters[i].szName));
+            for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
+                Log2(("VBoxNetAdpCreate: Scanning entry: state=%d name=%s\n", g_aAdapters[i].enmState, g_aAdapters[i].szName));
+            return rc;
+        }
+    }
+    Log(("vboxNetAdpCreate: no empty slots!\n"));
+
+    /* All slots in adapter array are busy. */
+    return VERR_OUT_OF_RESOURCES;
+}
+
+int vboxNetAdpDestroy (PVBOXNETADP pThis)
+{
+    int rc = VINF_SUCCESS;
+
+    if (!ASMAtomicCmpXchgU32((uint32_t volatile *)&pThis->enmState, kVBoxNetAdpState_Transitional, kVBoxNetAdpState_Active))
+        return VERR_INTNET_FLT_IF_BUSY;
+
+    vboxNetAdpOsDestroy(pThis);
+
+    ASMAtomicWriteU32((uint32_t volatile *)&pThis->enmState, kVBoxNetAdpState_Invalid);
+
+    return rc;
+}
+
+int  vboxNetAdpInit(void)
+{
+    unsigned i;
+    PVBOXNETADP pVboxnet0;
+    /*
+     * Init common members and call OS-specific init.
+     */
+    for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
+    {
+        g_aAdapters[i].enmState = kVBoxNetAdpState_Invalid;
+        g_aAdapters[i].uUnit    = i;
+        vboxNetAdpOsInit(&g_aAdapters[i]);
+    }
+
+    /* Create vboxnet0 */
+    return vboxNetAdpCreate(&pVboxnet0);
+}
+
+/**
+ * Finds an adapter by its name.
+ *
+ * @returns Pointer to the instance by the given name. NULL if not found.
+ * @param   pGlobals        The globals.
+ * @param   pszName         The name of the instance.
+ */
+PVBOXNETADP vboxNetAdpFindByName(const char *pszName)
+{
+    unsigned i;
+
+    for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
+    {
+        PVBOXNETADP pThis = &g_aAdapters[i];
+        Log2(("VBoxNetAdp: Scanning entry: state=%d name=%s\n", pThis->enmState, pThis->szName));
+        if (strncmp(pThis->szName, pszName, VBOXNETADP_MAX_NAME_LEN) == 0)
+            if (ASMAtomicReadU32((uint32_t volatile *)&pThis->enmState) == kVBoxNetAdpState_Active)
+                return pThis;
+    }
+    return NULL;
+}
+
+void vboxNetAdpShutdown(void)
+{
+    unsigned i;
+
+    /* Remove virtual adapters */
+    for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
+        vboxNetAdpDestroy(&g_aAdapters[i]);
+}
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -123 +123 @@
 #endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
     /** Corresponds to the digit at the end of device name. */
-    uint8_t           uUnit;
+    uint32_t          uUnit;
 
     union
@@ -141 +141 @@
             /** Protocol families attached to this adapter. */
             protocol_family_t aAttachedFamilies[VBOXNETADP_MAX_FAMILIES];
+            /** @} */
+# elif defined(RT_OS_LINUX)
+            /** @name Darwin instance data.
+             * @{ */
+            /** Pointer to Linux network device structure. */
+            struct net_device *pNetDev;
+            /** @} */
 # else
 # error PORTME
@@ -154 +161 @@
 # endif
 #elif defined(RT_OS_LINUX)
-        uint8_t abPadding[320];
+        uint8_t abPadding[64];
 #else
         uint8_t abPadding[64];
@@ -165 +172 @@
 typedef VBOXNETADP *PVBOXNETADP;
 
+DECLHIDDEN(int) vboxNetAdpInit(void);
+DECLHIDDEN(void) vboxNetAdpShutdown(void);
+DECLHIDDEN(int) vboxNetAdpCreate (PVBOXNETADP *ppNew);
+DECLHIDDEN(int) vboxNetAdpDestroy(PVBOXNETADP pThis);
+DECLHIDDEN(PVBOXNETADP) vboxNetAdpFindByName(const char *pszName);
+
 #ifdef VBOXANETADP_DO_NOT_USE_NETFLT
 /**
@@ -288 +301 @@
 DECLHIDDEN(int) vboxNetAdpOsConnectIt(PVBOXNETADP pThis);
 
+/** @} */
+#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */
+
 /**
  * This is called to perform OS-specific structure initializations.
@@ -320 +336 @@
 DECLHIDDEN(int) vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMac);
 
-/** @} */
-#endif /* !VBOXANETADP_DO_NOT_USE_NETFLT */