Changeset 38140 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jul 25, 2011 10:01:03 AM (13 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetBow: fix for using multiple host NICs, caused by using duplicate VNIC IDs.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• solaris/VBoxNetFltBow-solaris.c (modified) (11 diffs)

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

@@ -184 +184 @@
             /** Handle to list of created VNICs. */
             list_t hVNICs;
-            /** Instance number while creating VNICs. */
-            uint64_t uInstance;
             /** The MAC address of the host interface. */
             RTMAC MacAddr;

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

@@ -242 +242 @@
 /** The (common) global data. */
 static VBOXNETFLTGLOBALS g_VBoxNetFltSolarisGlobals;
+/** Global next-free VNIC Id (never decrements). */
+static volatile uint64_t g_VBoxNetFltSolarisVNICId = 0;
 
 
@@ -254 +256 @@
 LOCAL int vboxNetFltSolarisReportInfo(PVBOXNETFLTINS pThis, mac_handle_t hInterface, bool fIsVNIC);
 LOCAL int vboxNetFltSolarisInitVNIC(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC);
-LOCAL int vboxNetFltSolarisInitVNICTemplate(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC, PVBOXNETFLTVNICTEMPLATE pVNICTemplate);
+LOCAL int vboxNetFltSolarisInitVNICTemplate(PVBOXNETFLTINS pThis, PVBOXNETFLTVNICTEMPLATE pVNICTemplate);
 LOCAL PVBOXNETFLTVNIC vboxNetFltSolarisAllocVNIC(void);
 LOCAL void vboxNetFltSolarisFreeVNIC(PVBOXNETFLTVNIC pVNIC);
@@ -876 +878 @@
  *
  * @param   pThis           The VM connection instance.
- * @param   pVNIC           Pointer to the VNIC.
  * @param   pVNICTemplate   Pointer to a VNIC template to initialize.
  *
  * @returns VBox status code.
  */
-LOCAL int vboxNetFltSolarisInitVNICTemplate(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC, PVBOXNETFLTVNICTEMPLATE pVNICTemplate)
+LOCAL int vboxNetFltSolarisInitVNICTemplate(PVBOXNETFLTINS pThis, PVBOXNETFLTVNICTEMPLATE pVNICTemplate)
 {
     LogFlow((DEVICE_NAME ":vboxNetFltSolarisInitVNICTemplate pThis=%p pVNIC=%p pVNICTemplate=%p\n", pThis, pVNIC, pVNICTemplate));
@@ -1061 +1062 @@
     AssertReturn(ppVNIC, VERR_INVALID_POINTER);
 
+    int rc = VERR_INVALID_STATE;
     PVBOXNETFLTVNIC pVNIC = vboxNetFltSolarisAllocVNIC();
     if (RT_UNLIKELY(!pVNIC))
         return VERR_NO_MEMORY;
-
-    RTStrPrintf(pVNIC->szName, sizeof(pVNIC->szName), "%s%RU64", VBOXBOW_VNIC_NAME, pThis->u.s.uInstance);
 
     /*
@@ -1086 +1086 @@
     int MacLen                    = sizeof(GuestMac);
     uint32_t fFlags               = 0;
-    int rc                        = VERR_INVALID_STATE;
 
     if (pThis->u.s.fIsVNICTemplate)
@@ -1100 +1099 @@
          * Initialize the VNIC template.
          */
-        rc = vboxNetFltSolarisInitVNICTemplate(pThis, pVNIC, pVNIC->pVNICTemplate);
+        rc = vboxNetFltSolarisInitVNICTemplate(pThis, pVNIC->pVNICTemplate);
         if (RT_FAILURE(rc))
         {
@@ -1124 +1123 @@
      * be a physical interface.
      */
+    rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx); AssertRC(rc);
+    RTStrPrintf(pVNIC->szName, sizeof(pVNIC->szName), "%s%RU64", VBOXBOW_VNIC_NAME, g_VBoxNetFltSolarisVNICId);
     rc = vnic_create(pVNIC->szName, pszLinkName, &AddrType, &MacLen, GuestMac.au8, &MacSlot, 0 /* Mac-Prefix Length */, uVLANId,
                         fFlags, &pVNIC->hLinkId, &Diag, NULL /* Reserved */);
@@ -1129 +1130 @@
     {
         pVNIC->fCreated = true;
+        ASMAtomicIncU64(&g_VBoxNetFltSolarisVNICId);
+        RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
 
         /*
@@ -1142 +1145 @@
             if (RT_SUCCESS(rc))
             {
-                pThis->u.s.uInstance++;
                 LogFlow((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC successfully created VNIC '%s' over '%s' with random mac %.6Rhxs\n",
                          pVNIC->szName, pszLinkName, &GuestMac));
@@ -1165 +1167 @@
     else
     {
+        RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
+
         LogRel((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC failed to create VNIC '%s' over '%s' rc=%d Diag=%d\n", pVNIC->szName,
                     pszLinkName, rc, Diag));
@@ -1325 +1329 @@
     pThis->u.s.fIsVNICTemplate = false;
     list_create(&pThis->u.s.hVNICs, sizeof(VBOXNETFLTVNIC), offsetof(VBOXNETFLTVNIC, hNode));
-    pThis->u.s.uInstance       = 0;
     pThis->u.s.hNotify         = NULL;
     RT_ZERO(pThis->u.s.MacAddr);