Changeset 22393 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Aug 21, 2009 5:01:35 PM (16 years ago)

Author:

vboxsync

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

51350

Message:

Solaris/VBoxNetFlt: Timed polling for dynamic Ipv6 stream attachment (disabled).

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris

Files:

• VBoxNetFlt-solaris.c (modified) (11 diffs)
• vboxflt.conf (modified) (1 diff)

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

@@ -39 +39 @@
 #include <iprt/err.h>
 #include <iprt/ctype.h>
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+# include <iprt/timer.h>
+#endif
 
 #include <inet/ip.h>
@@ -87 +90 @@
 *******************************************************************************/
 /** The module name. */
-#define DEVICE_NAME              "vboxflt"
+#define DEVICE_NAME                     "vboxflt"
 /** The module descriptions as seen in 'modinfo'. */
-#define DEVICE_DESC_DRV          "VirtualBox NetDrv"
-#define DEVICE_DESC_MOD          "VirtualBox NetMod"
+#define DEVICE_DESC_DRV                 "VirtualBox NetDrv"
+#define DEVICE_DESC_MOD                 "VirtualBox NetMod"
 
 #if defined(DEBUG_ramshankar)
@@ -97 +100 @@
 # undef LogFlow
 # define LogFlow    LogRel
+#endif
+
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+/** Driver properties */
+# define VBOXNETFLT_IP6POLLINTERVAL      "ipv6-pollinterval"
 #endif
 
@@ -313 +321 @@
 typedef struct vboxnetflt_promisc_stream_t
 {
-    vboxnetflt_stream_t Stream;           /* The generic stream */
+    vboxnetflt_stream_t Stream;           /* dedicated/promiscuous stream */
     bool fPromisc;                        /* cached promiscous value */
     bool fRawMode;                        /* whether raw mode request was successful */
     uint32_t ModeReqId;                   /* track MIOCTLs for swallowing our fake request acknowledgements */
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+    PRTTIMER pIp6Timer;                   /* ipv6 stream poll timer for dynamic ipv6 stream attachment */
+#endif
     size_t cLoopback;                     /* loopback queue size list */
     PVBOXNETFLTPACKETID pHead;            /* loopback packet identifier head */
@@ -673 +684 @@
         pPromiscStream->pTail = NULL;
         pPromiscStream->cLoopback = 0;
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+        pPromiscStream->pIp6Timer = NULL;
+#endif
         pStream = (vboxnetflt_stream_t *)pPromiscStream;
     }
@@ -838 +852 @@
         pPromiscStream->pTail = NULL;
         pPromiscStream->cLoopback = 0;
+
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+        /*
+         * Sheer paranoia.
+         */
+        if (pPromiscStream->pIp6Timer != NULL)
+        {
+            RTTimerStop(pPromiscStream->pIp6Timer);
+            RTTimerDestroy(pPromiscStream->pIp6Timer);
+            ASMAtomicUoWritePtr((void * volatile *)&pPromiscStream->pIp6Timer, NULL);
+        }
+#endif
 
         RTSemFastMutexRelease(pStream->pThis->u.s.hFastMtx);
@@ -1700 +1726 @@
 /**
  * Opens up the DLPI style 2 link that requires explicit PPA attach
- * phase. 
+ * phase.
  *
  * @returns VBox status code.
@@ -1797 +1823 @@
         /*
          * Try DLPI style 2.
-         */        
+         */
         rc = vboxNetFltSolarisOpenStyle2(pThis, &DevId);
         if (RT_FAILURE(rc))
@@ -2294 +2320 @@
     }
     else
+    {
         LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachIp6: failed to get IPv6 flags.\n", pThis->szName));
+        rc = VERR_INTNET_FLT_IF_NOT_FOUND;
+    }
 
     ldi_close(Ip6DevHandle, FREAD | FWRITE, kcred);
@@ -2305 +2334 @@
 
 
-/**
- * Wrapper for attaching ourselves to the interface.
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+/**
+ * Ipv6 dynamic attachment timer callback to attach to the Ipv6 stream if needed.
+ *
+ * @param   pThis           Pointer to the timer.
+ * @param   pvData          Opaque pointer to the instance.
+ * @param   iTick           Timer tick (unused).
+ */
+static void vboxNetFltSolarispIp6Timer(PRTTIMER pTimer, void *pvData, uint64_t iTick)
+{
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarispIp6Timer pTimer=%p pvData=%p\n", pTimer, pvData));
+
+    /** @todo this callback takes a good deal of time attaching to the Ipv6 stream, optimize it. */
+    PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)pvData;
+    if (   RT_LIKELY(pThis)
+        && RT_LIKELY(pTimer))
+    {
+        vboxnetflt_stream_t *pIp6Stream  = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIp6Stream);
+        if (!pIp6Stream)
+            vboxNetFltSolarisAttachIp6(pThis, true /* fAttach */);
+    }
+
+    NOREF(iTick);
+}
+
+
+/**
+ * Setups up a kernel timer based on the driver property for attaching to IPv6 stream
+ * whenever the stream gets plumbed for the interface.
  *
  * @returns VBox status code.
  * @param   pThis           The instance.
  */
-static int vboxNetFltSolarisAttachToInterface(PVBOXNETFLTINS pThis)
-{
-    int rc = vboxNetFltSolarisOpenStream(pThis);
-    if (RT_SUCCESS(rc))
-    {
-        rc = vboxNetFltSolarisAttachIp4(pThis, true /* fAttach */);
-        if (RT_SUCCESS(rc))
-        {
-            vboxNetFltSolarisAttachIp6(pThis, true /* fAttach */);
-            /* Ignore Ipv6 binding errors as it's optional. */
-
-            ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, false);
+static int vboxNetFltSolarisSetupIp6Polling(PVBOXNETFLTINS pThis)
+{
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling pThis=%p\n", pThis));
+
+    int rc = VINF_SUCCESS;
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
+    if (RT_LIKELY(pPromiscStream))
+    {
+        if (RT_LIKELY(pPromiscStream->pIp6Timer == NULL))
+        {
+            /*
+             * Get the user prop. for polling interval.
+             */
+            int Interval = ddi_getprop(DDI_DEV_T_ANY, g_pVBoxNetFltSolarisDip, DDI_PROP_DONTPASS, VBOXNETFLT_IP6POLLINTERVAL, -1 /* default */);
+            if (Interval == -1)
+            {
+                LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: no poll interval property specified. Skipping Ipv6 polling.\n"));
+                return VINF_SUCCESS;
+            }
+
+            if (Interval < 1 || Interval > 120)
+            {
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between 1 and 120 secs.\n",
+                    Interval));
+                return VINF_SUCCESS;
+            }
+
+            /*
+             * Setup kernel poll timer.
+             */
+            rc = RTTimerCreateEx(&pPromiscStream->pIp6Timer, Interval * (uint64_t)1000000000, RTTIMER_FLAGS_CPU_ALL,
+                                vboxNetFltSolarispIp6Timer, (void *)pThis);
+            if (RT_SUCCESS(rc))
+                rc = RTTimerStart(pPromiscStream->pIp6Timer, 0 /* fire ASAP */);
         }
         else
-            vboxNetFltSolarisCloseStream(pThis);
-    }
-    else
-        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface vboxNetFltSolarisOpenStream failed rc=%Rrc\n", rc));
-
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Polling already started.\n"));
+    }
     return rc;
 }
-
+#endif
 
 /**
@@ -2351 +2426 @@
     if (pThis->u.s.pvIp6Stream)
         rc = vboxNetFltSolarisAttachIp6(pThis, false /* fAttach */);
+
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
+    if (   pPromiscStream
+        && pPromiscStream->pIp6Timer == NULL)
+    {
+        RTTimerStop(pPromiscStream->pIp6Timer);
+        RTTimerDestroy(pPromiscStream->pIp6Timer);
+        ASMAtomicUoWritePtr((void * volatile *)&pPromiscStream->pIp6Timer, NULL);
+    }
+#endif
+
+    return rc;
+}
+
+
+/**
+ * Wrapper for attaching ourselves to the interface.
+ *
+ * @returns VBox status code.
+ * @param   pThis           The instance.
+ */
+static int vboxNetFltSolarisAttachToInterface(PVBOXNETFLTINS pThis)
+{
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface pThis=%p\n", pThis));
+
+    int rc = vboxNetFltSolarisOpenStream(pThis);
+    if (RT_SUCCESS(rc))
+    {
+        rc = vboxNetFltSolarisAttachIp4(pThis, true /* fAttach */);
+        if (RT_SUCCESS(rc))
+        {
+            int rc2 = vboxNetFltSolarisAttachIp6(pThis, true /* fAttach */);
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+            if (rc2 == VERR_INTNET_FLT_IF_NOT_FOUND)
+            {
+                rc = vboxNetFltSolarisSetupIp6Polling(pThis);
+                if (RT_FAILURE(rc))
+                {
+                    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pvIp6Stream, NULL);
+                    vboxNetFltSolarisDetachFromInterface(pThis);
+                }
+            }
+            else
+#endif
+                ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, false);
+        }
+        else
+            vboxNetFltSolarisCloseStream(pThis);
+    }
+    else
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface vboxNetFltSolarisOpenStream failed rc=%Rrc\n", rc));
 
     return rc;

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf

@@ -24 +24 @@
 #
 name="vboxflt" parent="pseudo" instance=0;
+
+# If the interface being used does not have Ipv6 plumbed and you want
+# vboxflt to automatically attach to it by checking for Ipv6 stream every
+# "ipv6-pollinterval" seconds.
+#
+# By default this is disabled meaning if the interface does not have Ipv6
+# plumbed when the virtual machine starts, guest<->host Ipv6 will not work
+# though guest<->remote Ipv6 would work.
+#
+# Enable if you have a dynamically plumbing/unplumbing Ipv6 interface for
+# which you want vboxflt to adjust accordingly, otherwise keep this disabled.
+# Enabling this option will have some minor performance penalty.
+#ipv6-pollinterval=3
+