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

Timestamp:

Jan 14, 2011 8:46:18 AM (14 years ago)

Author:

vboxsync

Message:

netflt: hard_start_xmit override support for pre-2.6.29 kernels

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (7 diffs)

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

@@ -828 +828 @@
 #ifdef VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
 
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+
+# include <linux/ethtool.h>
+
+typedef struct ethtool_ops OVR_OPSTYPE;
+# define OVR_OPS  ethtool_ops
+# define OVR_XMIT pfnStartXmit
+
+# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
+
+typedef struct net_device_ops OVR_OPSTYPE;
+# define OVR_OPS  netdev_ops
+# define OVR_XMIT pOrgOps->ndo_start_xmit
+
+# endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
+
 /**
  * The overridden net_device_ops of the device we're attached to.
  *
- * Requires Linux 2.6.29 or later.
+ * As there is no net_device_ops structure in pre-2.6.29 kernels we override
+ * ethtool_ops instead along with hard_start_xmit callback in net_device
+ * structure.
  *
- * This is a very dirty hack that was create to explore how much we can improve
- * the host to guest transfers by not CC'ing the NIC.
+ * This is a very dirty hack that was created to explore how much we can improve
+ * the host to guest transfers by not CC'ing the NIC. It turns out to be
+ * the only way to filter outgoing packets for devices without TX queue.
  */
 typedef struct VBoxNetDeviceOpsOverride
 {
     /** Our overridden ops. */
-    struct net_device_ops           Ops;
+    OVR_OPSTYPE                     Ops;
     /** Magic word. */
     uint32_t                        u32Magic;
     /** Pointer to the original ops. */
-    struct net_device_ops const    *pOrgOps;
+    OVR_OPSTYPE const              *pOrgOps;
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+    /** Pointer to the original hard_start_xmit function. */
+    int (*pfnStartXmit)(struct sk_buff *pSkb, struct net_device *pDev);
+# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
     /** Pointer to the net filter instance. */
     PVBOXNETFLTINS                  pVBoxNetFlt;
@@ -864 +887 @@
 static int vboxNetFltLinuxStartXmitFilter(struct sk_buff *pSkb, struct net_device *pDev)
 {
-    PVBOXNETDEVICEOPSOVERRIDE   pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->netdev_ops;
+    PVBOXNETDEVICEOPSOVERRIDE   pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->OVR_OPS;
     uint8_t                     abHdrBuf[sizeof(RTNETETHERHDR) + sizeof(uint32_t) + RTNETIPV4_MIN_LEN];
     PCRTNETETHERHDR             pEtherHdr;
@@ -916 +939 @@
     }
 
-    return pOverride->pOrgOps->ndo_start_xmit(pSkb, pDev);
+    return pOverride->OVR_XMIT(pSkb, pDev);
 }
 
@@ -933 +956 @@
     if (!pOverride)
         return;
-    pOverride->pOrgOps              = pDev->netdev_ops;
-    pOverride->Ops                  = *pDev->netdev_ops;
+    pOverride->pOrgOps              = pDev->OVR_OPS;
+    pOverride->Ops                  = *pDev->OVR_OPS;
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+    pOverride->pfnStartXmit         = pDev->hard_start_xmit;
+# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
     pOverride->Ops.ndo_start_xmit   = vboxNetFltLinuxStartXmitFilter;
+# endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
     pOverride->u32Magic             = VBOXNETDEVICEOPSOVERRIDE_MAGIC;
     pOverride->cTotal               = 0;
@@ -942 +969 @@
 
     RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp); /* (this isn't necessary, but so what) */
-    ASMAtomicWritePtr((void * volatile *)&pDev->netdev_ops, pOverride);
+    ASMAtomicWritePtr((void * volatile *)&pDev->OVR_OPS, pOverride);
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+    ASMAtomicXchgPtr((void * volatile *)&pDev->hard_start_xmit, vboxNetFltLinuxStartXmitFilter);
+# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
     RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 }
@@ -963 +993 @@
     if (VALID_PTR(pDev))
     {
-        pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->netdev_ops;
+        pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->OVR_OPS;
         if (    VALID_PTR(pOverride)
             &&  pOverride->u32Magic == VBOXNETDEVICEOPSOVERRIDE_MAGIC
@@ -969 +999 @@
            )
         {
-            ASMAtomicWritePtr((void * volatile *)&pDev->netdev_ops, pOverride->pOrgOps);
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+            ASMAtomicWritePtr((void * volatile *)&pDev->hard_start_xmit, pOverride->pfnStartXmit);
+# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+            ASMAtomicWritePtr((void * volatile *)&pDev->OVR_OPS, pOverride->pOrgOps);
             ASMAtomicWriteU32(&pOverride->u32Magic, 0);
         }