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

Timestamp:

Apr 25, 2010 12:37:30 AM (15 years ago)

Author:

vboxsync

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

60575

Message:

VBoxNetFlt/linux: Added VBOXNETFLT_LINUX_NO_XMIT_QUEUE since we can call pfnRecv at interrupt / atomic time now.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• linux/VBoxNetFlt-linux.c (modified) (13 diffs)

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

@@ -170 +170 @@
             struct notifier_block Notifier;
             struct packet_type    PacketType;
+#  ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
             struct sk_buff_head   XmitQueue;
             struct work_struct    XmitTask;
+#  endif
             /** @} */
 # elif defined(RT_OS_SOLARIS)

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

@@ -23 +23 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define LOG_GROUP LOG_GROUP_NET_FLT_DRV
+#define VBOXNETFLT_LINUX_NO_XMIT_QUEUE
 #include "the-linux-kernel.h"
 #include "version-generated.h"
@@ -32 +34 @@
 #include <linux/ip.h>
 
-#define LOG_GROUP LOG_GROUP_NET_FLT_DRV
 #include <VBox/log.h>
 #include <VBox/err.h>
@@ -58 +59 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define VBOX_FLT_NB_TO_INST(pNB) ((PVBOXNETFLTINS)((uint8_t *)pNB - RT_OFFSETOF(VBOXNETFLTINS, u.s.Notifier)))
-#define VBOX_FLT_PT_TO_INST(pPT) ((PVBOXNETFLTINS)((uint8_t *)pPT - RT_OFFSETOF(VBOXNETFLTINS, u.s.PacketType)))
-#define VBOX_FLT_XT_TO_INST(pXT) ((PVBOXNETFLTINS)((uint8_t *)pXT - RT_OFFSETOF(VBOXNETFLTINS, u.s.XmitTask)))
+#define VBOX_FLT_NB_TO_INST(pNB)    RT_FROM_MEMBER(pNB, VBOXNETFLTINS, u.s.Notifier)
+#define VBOX_FLT_PT_TO_INST(pPT)    RT_FROM_MEMBER(pPT, VBOXNETFLTINS, u.s.PacketType)
+#ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
+# define VBOX_FLT_XT_TO_INST(pXT)   RT_FROM_MEMBER(pXT, VBOXNETFLTINS, u.s.XmitTask)
+#endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
@@ -121 +124 @@
 static int      VBoxNetFltLinuxInit(void);
 static void     VBoxNetFltLinuxUnload(void);
+static void     vboxNetFltLinuxForwardToIntNet(PVBOXNETFLTINS pThis, struct sk_buff *pBuf);
 
 
@@ -760 +764 @@
 #endif
 
+#ifdef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
+    /* Forward it to the internal network. */
+    vboxNetFltLinuxForwardToIntNet(pThis, pBuf);
+#else
     /* Add the packet to transmit queue and schedule the bottom half. */
     skb_queue_tail(&pThis->u.s.XmitQueue, pBuf);
@@ -765 +773 @@
     Log4(("vboxNetFltLinuxPacketHandler: scheduled work %p for sk_buff %p\n",
           &pThis->u.s.XmitTask, pBuf));
+#endif
 
     /* It does not really matter what we return, it is ignored by the kernel. */
@@ -1124 +1133 @@
 }
 
+/**
+ *
+ * @param   pBuf        The socket buffer.  This is consumed by this function.
+ */
 static void vboxNetFltLinuxForwardToIntNet(PVBOXNETFLTINS pThis, struct sk_buff *pBuf)
 {
@@ -1193 +1206 @@
 }
 
+#ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
 /**
  * Work queue handler that forwards the socket buffers queued by
@@ -1199 +1213 @@
  * @param   pWork               The work queue.
  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
 static void vboxNetFltLinuxXmitTask(struct work_struct *pWork)
-#else
+# else
 static void vboxNetFltLinuxXmitTask(void *pWork)
-#endif
+# endif
 {
     PVBOXNETFLTINS  pThis   = VBOX_FLT_XT_TO_INST(pWork);
@@ -1235 +1249 @@
     }
 }
+#endif /* !VBOXNETFLT_LINUX_NO_XMIT_QUEUE */
 
 /**
@@ -1398 +1413 @@
 
     dev_remove_pack(&pThis->u.s.PacketType);
+#ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
     skb_queue_purge(&pThis->u.s.XmitQueue);
+#endif
     Log(("vboxNetFltLinuxUnregisterDevice: this=%p: Packet handler removed, xmit queue purged.\n", pThis));
     Log(("vboxNetFltLinuxUnregisterDevice: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
@@ -1687 +1704 @@
     {
         dev_remove_pack(&pThis->u.s.PacketType);
+#ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
         skb_queue_purge(&pThis->u.s.XmitQueue);
+#endif
         Log(("vboxNetFltOsDeleteInstance: this=%p: Packet handler removed, xmit queue purged.\n", pThis));
         Log(("vboxNetFltOsDeleteInstance: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
@@ -1731 +1750 @@
     pThis->u.s.fPromiscuousSet = false;
     memset(&pThis->u.s.PacketType, 0, sizeof(pThis->u.s.PacketType));
+#ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
     skb_queue_head_init(&pThis->u.s.XmitQueue);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
     INIT_WORK(&pThis->u.s.XmitTask, vboxNetFltLinuxXmitTask);
-#else
+# else
     INIT_WORK(&pThis->u.s.XmitTask, vboxNetFltLinuxXmitTask, &pThis->u.s.XmitTask);
+# endif
 #endif