Changeset 28723 in vbox for trunk

Timestamp:

Apr 25, 2010 9:50:56 PM (15 years ago)

Author:

vboxsync

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

60595

Message:

IntNet/NetFlt: Added INTNETTRUNKSWPORT::pfnReportGsoCapabilities and enabled ring-0 transmission for linux hosts and wires.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (2 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.c (modified) (1 diff)

trunk/include/VBox/intnet.h

@@ -519 +519 @@
      * @param   fDst                The destination mask (INTNETTRUNKDIR_XXX).
      *
-     * @remarks May take a spinlock or two.
+     * @remarks Does not take any locks.
      */
     DECLR0CALLBACKMEMBER(void, pfnReportGsoCapabilities,(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fGsoCapabilities, uint32_t fDst));
+
+    /**
+     * Reports the no-preemption-xmit capabilities of the host and wire.
+     *
+     * This is supposed to be used only when creating, connecting or reconnecting
+     * the trunk.  It is assumed that the GSO capabilities are kind of static the
+     * rest of the time.
+     *
+     * @param   pSwitchPort         Pointer to this structure.
+     * @param   fNoPreemptDsts      The destinations  (INTNETTRUNKDIR_XXX) which it
+     *                              is safe to transmit to with preemption disabled.
+     * @param   fDst                The destination mask (INTNETTRUNKDIR_XXX).
+     *
+     * @remarks Does not take any locks.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnReportNoPreemptDsts,(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fNoPreemptDsts));
 
     /** Structure version number. (INTNETTRUNKSWPORT_VERSION) */
@@ -731 +747 @@
 
 /** The UUID for the (current) trunk factory. (case sensitive) */
-#define INTNETTRUNKFACTORY_UUID_STR     "7eb192c8-6ee3-4d0a-96fb-f51ce7381354"
+#define INTNETTRUNKFACTORY_UUID_STR     "5d347cb7-98e3-411f-916a-67c4becae09b"
 
 /** @name INTNETTRUNKFACTORY::pfnCreateAndConnect flags.

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

@@ -4285 +4285 @@
 /** @copydoc INTNETTRUNKSWPORT::pfnReportGsoCapabilities */
 static DECLCALLBACK(void) intnetR0TrunkIfPortReportGsoCapabilities(PINTNETTRUNKSWPORT pSwitchPort,
-                                                                  uint32_t fGsoCapabilities, uint32_t fDst)
+                                                                   uint32_t fGsoCapabilities, uint32_t fDst)
 {
     PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
@@ -4299 +4299 @@
     if (fDst & INTNETTRUNKDIR_WIRE)
         pThis->fWireGsoCapabilites = fGsoCapabilities;
+}
+
+
+/** @copydoc INTNETTRUNKSWPORT::pfnReportNoPreemptDsts */
+static DECLCALLBACK(void) intnetR0TrunkIfPortReportNoPreemptDsts(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fNoPreemptDsts)
+{
+    PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
+    Assert(!(fNoPreemptDsts & ~INTNETTRUNKDIR_VALID_MASK));
+
+    pThis->fNoPreemptDsts = fNoPreemptDsts;
 }
 
@@ -4727 +4737 @@
         pTrunk->SwitchPort.pfnReportPromiscuousMode   = intnetR0TrunkIfPortReportPromiscuousMode;
         pTrunk->SwitchPort.pfnReportGsoCapabilities   = intnetR0TrunkIfPortReportGsoCapabilities;
+        pTrunk->SwitchPort.pfnReportNoPreemptDsts     = intnetR0TrunkIfPortReportNoPreemptDsts;
         pTrunk->SwitchPort.u32VersionEnd              = INTNETTRUNKSWPORT_VERSION;
         pTrunk->FastMutex3                = NIL_RTSEMFASTMUTEX;

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

@@ -966 +966 @@
             pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltDarwinIsPromiscuous(pThis));
             pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,  INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
         }
     }

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

@@ -579 +579 @@
     pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltFreeBsdIsPromiscuous(pThis));
     pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+    pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
 
     return VINF_SUCCESS;

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

@@ -1378 +1378 @@
         pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
         pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltLinuxPromiscuous(pThis));
+        pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
     }
     else
@@ -1663 +1664 @@
      * Report the GSO capabilities of the host and device (if connected).
      */
+    /** @todo duplicate work here now? Attach */
 #if defined(VBOXNETFLT_WITH_GSO_XMIT_HOST)
     pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort,

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

@@ -2620 +2620 @@
             pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false);
             pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,  INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
 
             /*

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

@@ -848 +848 @@
                             pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false); /** @todo Promisc */
                             pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-
+                            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
 
                             LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface successfully attached over '%s'\n", pThis->szName));

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

@@ -3282 +3282 @@
                                 pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,
                                                                              INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+                                /** @todo We should be able to do pfnXmit at DISPATCH_LEVEL... */
+                                pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
                             }
                             return;