-diff -uNr linux-2.6.34/drivers/net/imq.c linux-2.6.34-imq/drivers/net/imq.c
---- linux-2.6.34/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.34-imq/drivers/net/imq.c 2010-06-02 10:05:45.752109073 +0300
-@@ -0,0 +1,635 @@
+diff -uNr linux-2.6.35/drivers/net/imq.c linux-2.6.35-imq-multiqueue-test1/drivers/net/imq.c
+--- linux-2.6.35/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.35-imq-multiqueue-test1/drivers/net/imq.c 2010-08-15 13:54:30.070063067 +0300
+@@ -0,0 +1,774 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
+ * I didn't forget anybody). I apologize again for my lack of time.
+ *
+ *
-+ * 2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
++ * 2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
+ * of qdisc_restart() and moved qdisc_run() to tasklet to avoid
+ * recursive locking. New initialization routines to fix 'rmmod' not
+ * working anymore. Used code from ifb.c. (Jussi Kivilinna)
+ * 2010/02/25 - (Jussi Kivilinna)
+ * - Port to 2.6.33
+ *
++ * 2010/08/15 - (Jussi Kivilinna)
++ * - Port to 2.6.35
++ * - Simplify hook registration by using nf_register_hooks.
++ * - nf_reinject doesn't need spinlock around it, therefore remove
++ * imq_nf_reinject function. Other nf_reinject users protect
++ * their own data with spinlock. With IMQ however all data is
++ * needed is stored per skbuff, so no locking is needed.
++ * - Changed IMQ to use 'separate' NF_IMQ_QUEUE instead of
++ * NF_QUEUE, this allows working coexistance of IMQ and other
++ * NF_QUEUE users.
++ * - Make IMQ multi-queue. Number of IMQ device queues can be
++ * increased with 'numqueues' module parameters. Default number
++ * of queues is 1, in other words by default IMQ works as
++ * single-queue device. Multi-queue selection is based on
++ * IFB multi-queue patch by Changli Gao <xiaosuo@gmail.com>.
++ *
+ * Also, many thanks to pablo Sebastian Greco for making the initial
+ * patch and to those who helped the testing.
+ *
+#include <linux/imq.h>
+#include <net/pkt_sched.h>
+#include <net/netfilter/nf_queue.h>
++#include <net/sock.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <linux/if_vlan.h>
++#include <linux/if_pppox.h>
++#include <net/ip.h>
++#include <net/ipv6.h>
++
++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num);
+
+static nf_hookfn imq_nf_hook;
+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+ .hook = imq_nf_hook,
-+ .owner = THIS_MODULE,
-+ .pf = PF_INET,
-+ .hooknum = NF_INET_PRE_ROUTING,
++static struct nf_hook_ops imq_ops[] = {
++ {
++ /* imq_ingress_ipv4 */
++ .hook = imq_nf_hook,
++ .owner = THIS_MODULE,
++ .pf = PF_INET,
++ .hooknum = NF_INET_PRE_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+ .priority = NF_IP_PRI_MANGLE + 1
++ .priority = NF_IP_PRI_MANGLE + 1,
+#else
-+ .priority = NF_IP_PRI_NAT_DST + 1
++ .priority = NF_IP_PRI_NAT_DST + 1,
+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+ .hook = imq_nf_hook,
-+ .owner = THIS_MODULE,
-+ .pf = PF_INET,
-+ .hooknum = NF_INET_POST_ROUTING,
++ },
++ {
++ /* imq_egress_ipv4 */
++ .hook = imq_nf_hook,
++ .owner = THIS_MODULE,
++ .pf = PF_INET,
++ .hooknum = NF_INET_POST_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+ .priority = NF_IP_PRI_LAST
++ .priority = NF_IP_PRI_LAST,
+#else
-+ .priority = NF_IP_PRI_NAT_SRC - 1
++ .priority = NF_IP_PRI_NAT_SRC - 1,
+#endif
-+};
-+
++ },
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+ .hook = imq_nf_hook,
-+ .owner = THIS_MODULE,
-+ .pf = PF_INET6,
-+ .hooknum = NF_INET_PRE_ROUTING,
++ {
++ /* imq_ingress_ipv6 */
++ .hook = imq_nf_hook,
++ .owner = THIS_MODULE,
++ .pf = PF_INET6,
++ .hooknum = NF_INET_PRE_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+ .priority = NF_IP6_PRI_MANGLE + 1
++ .priority = NF_IP6_PRI_MANGLE + 1,
+#else
-+ .priority = NF_IP6_PRI_NAT_DST + 1
++ .priority = NF_IP6_PRI_NAT_DST + 1,
+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+ .hook = imq_nf_hook,
-+ .owner = THIS_MODULE,
-+ .pf = PF_INET6,
-+ .hooknum = NF_INET_POST_ROUTING,
++ },
++ {
++ /* imq_egress_ipv6 */
++ .hook = imq_nf_hook,
++ .owner = THIS_MODULE,
++ .pf = PF_INET6,
++ .hooknum = NF_INET_POST_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+ .priority = NF_IP6_PRI_LAST
++ .priority = NF_IP6_PRI_LAST,
+#else
-+ .priority = NF_IP6_PRI_NAT_SRC - 1
++ .priority = NF_IP6_PRI_NAT_SRC - 1,
+#endif
-+};
++ },
+#endif
++};
+
+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
++static int numdevs = CONFIG_IMQ_NUM_DEVS;
+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
++static int numdevs = IMQ_MAX_DEVS;
+#endif
+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
++#define IMQ_MAX_QUEUES 32
++static int numqueues = 1;
++
++/*static DEFINE_SPINLOCK(imq_nf_queue_lock);*/
+
+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
+
+ skb_restore_cb(skb); /* kfree backup */
+}
+
-+/* locking not needed when called from imq_nf_queue */
-+static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
-+ unsigned int verdict)
-+{
-+ int status;
-+
-+ if (!entry->next_outfn) {
-+ nf_reinject(entry, verdict);
-+ return;
-+ }
-+
-+ status = entry->next_outfn(entry, entry->next_queuenum);
-+ if (status < 0) {
-+ nf_queue_entry_release_refs(entry);
-+ kfree_skb(entry->skb);
-+ kfree(entry);
-+ }
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+ int status;
-+
-+ if (!entry->next_outfn) {
-+ spin_lock_bh(&imq_nf_queue_lock);
-+ nf_reinject(entry, verdict);
-+ spin_unlock_bh(&imq_nf_queue_lock);
-+ return;
-+ }
-+
-+ rcu_read_lock();
-+ local_bh_disable();
-+ status = entry->next_outfn(entry, entry->next_queuenum);
-+ local_bh_enable();
-+ if (status < 0) {
-+ nf_queue_entry_release_refs(entry);
-+ kfree_skb(entry->skb);
-+ kfree(entry);
-+ }
-+
-+ rcu_read_unlock();
-+}
-+
+static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ struct nf_queue_entry *entry = skb->nf_queue_entry;
+ skb->imq_flags = 0;
+ skb->destructor = NULL;
+
-+ imq_nf_reinject(entry, NF_ACCEPT);
++ nf_reinject(entry, NF_ACCEPT);
+
+ return NETDEV_TX_OK;
+}
+
++static u32 imq_hashrnd;
++
++static inline __be16 pppoe_proto(const struct sk_buff *skb)
++{
++ return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN +
++ sizeof(struct pppoe_hdr)));
++}
++
++static u16 imq_hash(struct net_device *dev, struct sk_buff *skb)
++{
++ unsigned int pull_len;
++ u16 protocol = skb->protocol;
++ u32 addr1, addr2;
++ u32 hash, ihl = 0;
++ union {
++ u16 in16[2];
++ u32 in32;
++ } ports;
++ u8 ip_proto;
++
++ pull_len = 0;
++
++recheck:
++ switch (protocol) {
++ case htons(ETH_P_8021Q): {
++ if (unlikely(skb_pull(skb, VLAN_HLEN) == NULL))
++ goto other;
++
++ pull_len += VLAN_HLEN;
++ skb->network_header += VLAN_HLEN;
++
++ protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
++ goto recheck;
++ }
++
++ case htons(ETH_P_PPP_SES): {
++ if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) == NULL))
++ goto other;
++
++ pull_len += PPPOE_SES_HLEN;
++ skb->network_header += PPPOE_SES_HLEN;
++
++ protocol = pppoe_proto(skb);
++ goto recheck;
++ }
++
++ case htons(ETH_P_IP): {
++ const struct iphdr *iph = ip_hdr(skb);
++
++ if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr))))
++ goto other;
++
++ addr1 = iph->daddr;
++ addr2 = iph->saddr;
++
++ ip_proto = !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ?
++ iph->protocol : 0;
++ ihl = ip_hdrlen(skb);
++
++ break;
++ }
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++ case htons(ETH_P_IPV6): {
++ const struct ipv6hdr *iph = ipv6_hdr(skb);
++
++ if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr))))
++ goto other;
++
++ addr1 = iph->daddr.s6_addr32[3];
++ addr2 = iph->saddr.s6_addr32[3];
++ ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto);
++ if (unlikely(ihl < 0))
++ goto other;
++
++ break;
++ }
++#endif
++ default:
++other:
++ if (pull_len != 0) {
++ skb_push(skb, pull_len);
++ skb->network_header -= pull_len;
++ }
++
++ return (u16)(ntohs(protocol) % dev->real_num_tx_queues);
++ }
++
++ if (addr1 > addr2)
++ swap(addr1, addr2);
++
++ switch (ip_proto) {
++ case IPPROTO_TCP:
++ case IPPROTO_UDP:
++ case IPPROTO_DCCP:
++ case IPPROTO_ESP:
++ case IPPROTO_AH:
++ case IPPROTO_SCTP:
++ case IPPROTO_UDPLITE: {
++ if (likely(skb_copy_bits(skb, ihl, &ports.in32, 4) >= 0)) {
++ if (ports.in16[0] > ports.in16[1])
++ swap(ports.in16[0], ports.in16[1]);
++ break;
++ }
++ /* fall-through */
++ }
++ default:
++ ports.in32 = 0;
++ break;
++ }
++
++ if (pull_len != 0) {
++ skb_push(skb, pull_len);
++ skb->network_header -= pull_len;
++ }
++
++ hash = jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto);
++
++ return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32);
++}
++
++static inline bool sk_tx_queue_recorded(struct sock *sk)
++{
++ return (sk_tx_queue_get(sk) >= 0);
++}
++
++static struct netdev_queue *imq_select_queue(struct net_device *dev,
++ struct sk_buff *skb)
++{
++ u16 queue_index = 0;
++ u32 hash;
++
++ if (likely(dev->real_num_tx_queues == 1))
++ goto out;
++
++ /* IMQ can be receiving ingress or engress packets. */
++
++ /* Check first for if rx_queue is set */
++ if (skb_rx_queue_recorded(skb)) {
++ queue_index = skb_get_rx_queue(skb);
++ goto out;
++ }
++
++ /* Check if socket has tx_queue set */
++ if (sk_tx_queue_recorded(skb->sk)) {
++ queue_index = sk_tx_queue_get(skb->sk);
++ goto out;
++ }
++
++ /* Try use socket hash */
++ if (skb->sk && skb->sk->sk_hash) {
++ hash = skb->sk->sk_hash;
++ queue_index =
++ (u16)(((u64)hash * dev->real_num_tx_queues) >> 32);
++ goto out;
++ }
++
++ /* Generate hash from packet data */
++ queue_index = imq_hash(dev, skb);
++
++out:
++ if (unlikely(queue_index >= dev->real_num_tx_queues))
++ queue_index = (u16)((u32)queue_index % dev->real_num_tx_queues);
++
++ return netdev_get_tx_queue(dev, queue_index);
++}
++
+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
+{
+ struct net_device *dev;
+ struct sk_buff *skb_orig, *skb, *skb_shared;
+ struct Qdisc *q;
+ struct netdev_queue *txq;
++ spinlock_t *root_lock;
+ int users, index;
+ int retval = -EINVAL;
+
+ /* get device by name and cache result */
+ snprintf(buf, sizeof(buf), "imq%d", index);
+ dev = dev_get_by_name(&init_net, buf);
-+ if (!dev) {
++ if (unlikely(!dev)) {
+ /* not found ?!*/
+ BUG();
+ retval = -ENODEV;
+
+ if (unlikely(!(dev->flags & IFF_UP))) {
+ entry->skb->imq_flags = 0;
-+ imq_nf_reinject_lockless(entry, NF_ACCEPT);
++ nf_reinject(entry, NF_ACCEPT);
+ retval = 0;
+ goto out;
+ }
+ if (unlikely(skb->destructor)) {
+ skb_orig = skb;
+ skb = skb_clone(skb, GFP_ATOMIC);
-+ if (!skb) {
++ if (unlikely(!skb)) {
+ retval = -ENOMEM;
+ goto out;
+ }
+ dev->stats.rx_bytes += skb->len;
+ dev->stats.rx_packets++;
+
-+ txq = dev_pick_tx(dev, skb);
++ /* Disables softirqs for lock below */
++ rcu_read_lock_bh();
++
++ /* Multi-queue selection */
++ txq = imq_select_queue(dev, skb);
+
+ q = rcu_dereference(txq->qdisc);
+ if (unlikely(!q->enqueue))
+ goto packet_not_eaten_by_imq_dev;
+
-+ spin_lock_bh(qdisc_lock(q));
++ root_lock = qdisc_lock(q);
++ spin_lock(root_lock);
+
+ users = atomic_read(&skb->users);
+
+ skb->destructor = &imq_skb_destructor;
+
+ /* cloned? */
-+ if (skb_orig)
++ if (unlikely(skb_orig))
+ kfree_skb(skb_orig); /* free original */
+
-+ spin_unlock_bh(qdisc_lock(q));
++ spin_unlock(root_lock);
++ rcu_read_unlock_bh();
+
+ /* schedule qdisc dequeue */
+ __netif_schedule(q);
+ /* qdisc dropped packet and decreased skb reference count of
+ * skb, so we don't really want to and try refree as that would
+ * actually destroy the skb. */
-+ spin_unlock_bh(qdisc_lock(q));
++ spin_unlock(root_lock);
+ goto packet_not_eaten_by_imq_dev;
+ }
+
+packet_not_eaten_by_imq_dev:
++ rcu_read_unlock_bh();
++
+ /* cloned? restore original */
-+ if (skb_orig) {
++ if (unlikely(skb_orig)) {
+ kfree_skb(skb);
+ entry->skb = skb_orig;
+ }
+ return retval;
+}
+
-+static struct nf_queue_handler nfqh = {
-+ .name = "imq",
-+ .outfn = imq_nf_queue,
-+};
-+
+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
+ const struct net_device *indev,
+ const struct net_device *outdev,
+ int (*okfn)(struct sk_buff *))
+{
-+ if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+ return NF_QUEUE;
-+
-+ return NF_ACCEPT;
++ return (pskb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT;
+}
+
+static int imq_close(struct net_device *dev)
+ .validate = imq_validate,
+};
+
++static const struct nf_queue_handler imq_nfqh = {
++ .name = "imq",
++ .outfn = imq_nf_queue,
++};
++
+static int __init imq_init_hooks(void)
+{
-+ int err;
-+
-+ nf_register_queue_imq_handler(&nfqh);
-+
-+ err = nf_register_hook(&imq_ingress_ipv4);
-+ if (err)
-+ goto err1;
-+
-+ err = nf_register_hook(&imq_egress_ipv4);
-+ if (err)
-+ goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+ err = nf_register_hook(&imq_ingress_ipv6);
-+ if (err)
-+ goto err3;
++ int ret;
+
-+ err = nf_register_hook(&imq_egress_ipv6);
-+ if (err)
-+ goto err4;
-+#endif
++ nf_register_queue_imq_handler(&imq_nfqh);
+
-+ return 0;
++ ret = nf_register_hooks(imq_ops, ARRAY_SIZE(imq_ops));
++ if (ret < 0)
++ nf_unregister_queue_imq_handler();
+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+ nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+ nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+ nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+ nf_unregister_queue_imq_handler();
-+ return err;
++ return ret;
+}
+
+static int __init imq_init_one(int index)
+ struct net_device *dev;
+ int ret;
+
-+ dev = alloc_netdev(0, "imq%d", imq_setup);
++ dev = alloc_netdev_mq(0, "imq%d", imq_setup, numqueues);
+ if (!dev)
+ return -ENOMEM;
+
+ return -EINVAL;
+ }
+
++ if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) {
++ printk(KERN_ERR "IMQ: numqueues has to be betweed 1 and %u\n",
++ IMQ_MAX_QUEUES);
++ return -EINVAL;
++ }
++
++ get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd));
++
+ rtnl_lock();
+ err = __rtnl_link_register(&imq_link_ops);
+
+ return err;
+ }
+
-+ printk(KERN_INFO "IMQ driver loaded successfully.\n");
++ printk(KERN_INFO "IMQ driver loaded successfully. "
++ "(numdevs = %d, numqueues = %d)\n", numdevs, numqueues);
+
+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
+ printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
+
+static void __exit imq_unhook(void)
+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+ nf_unregister_hook(&imq_ingress_ipv6);
-+ nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+ nf_unregister_hook(&imq_ingress_ipv4);
-+ nf_unregister_hook(&imq_egress_ipv4);
-+
++ nf_unregister_hooks(imq_ops, ARRAY_SIZE(imq_ops));
+ nf_unregister_queue_imq_handler();
+}
+
+module_exit(imq_exit_module);
+
+module_param(numdevs, int, 0);
++module_param(numqueues, int, 0);
+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
+ "be created)");
++MODULE_PARM_DESC(numqueues, "number of queues per IMQ device");
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
+ "http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("imq");
+
-diff -uNr linux-2.6.34/drivers/net/Kconfig linux-2.6.34-imq/drivers/net/Kconfig
---- linux-2.6.34/drivers/net/Kconfig 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/drivers/net/Kconfig 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/drivers/net/Kconfig linux-2.6.35-imq-multiqueue-test1/drivers/net/Kconfig
+--- linux-2.6.35/drivers/net/Kconfig 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/drivers/net/Kconfig 2010-08-12 19:57:51.284627330 +0300
@@ -121,6 +121,129 @@
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
-diff -uNr linux-2.6.34/drivers/net/Makefile linux-2.6.34-imq/drivers/net/Makefile
---- linux-2.6.34/drivers/net/Makefile 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/drivers/net/Makefile 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/drivers/net/Makefile linux-2.6.35-imq-multiqueue-test1/drivers/net/Makefile
+--- linux-2.6.35/drivers/net/Makefile 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/drivers/net/Makefile 2010-08-12 19:57:51.291294790 +0300
@@ -169,6 +169,7 @@
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
-diff -uNr linux-2.6.34/include/linux/imq.h linux-2.6.34-imq/include/linux/imq.h
---- linux-2.6.34/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.34-imq/include/linux/imq.h 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/include/linux/imq.h linux-2.6.35-imq-multiqueue-test1/include/linux/imq.h
+--- linux-2.6.35/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.35-imq-multiqueue-test1/include/linux/imq.h 2010-08-12 19:57:51.324632058 +0300
@@ -0,0 +1,13 @@
+#ifndef _IMQ_H
+#define _IMQ_H
+
+#endif /* _IMQ_H */
+
-diff -uNr linux-2.6.34/include/linux/netdevice.h linux-2.6.34-imq/include/linux/netdevice.h
---- linux-2.6.34/include/linux/netdevice.h 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/include/linux/netdevice.h 2010-06-02 10:05:45.752109073 +0300
-@@ -1203,6 +1203,7 @@
- extern int dev_open(struct net_device *dev);
- extern int dev_close(struct net_device *dev);
- extern void dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int dev_queue_xmit(struct sk_buff *skb);
- extern int register_netdevice(struct net_device *dev);
- extern void unregister_netdevice_queue(struct net_device *dev,
-diff -uNr linux-2.6.34/include/linux/netfilter/xt_IMQ.h linux-2.6.34-imq/include/linux/netfilter/xt_IMQ.h
---- linux-2.6.34/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.34-imq/include/linux/netfilter/xt_IMQ.h 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/include/linux/netfilter/xt_IMQ.h linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter/xt_IMQ.h
+--- linux-2.6.35/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter/xt_IMQ.h 2010-08-12 19:57:51.344634424 +0300
@@ -0,0 +1,9 @@
+#ifndef _XT_IMQ_H
+#define _XT_IMQ_H
+
+#endif /* _XT_IMQ_H */
+
-diff -uNr linux-2.6.34/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.34-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-2.6.34/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.34-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/include/linux/netfilter.h linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter.h
+--- linux-2.6.35/include/linux/netfilter.h 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter.h 2010-08-12 19:57:51.374637975 +0300
+@@ -21,7 +21,8 @@
+ #define NF_QUEUE 3
+ #define NF_REPEAT 4
+ #define NF_STOP 5
+-#define NF_MAX_VERDICT NF_STOP
++#define NF_IMQ_QUEUE 6
++#define NF_MAX_VERDICT NF_IMQ_QUEUE
+
+ /* we overload the higher bits for encoding auxiliary data such as the queue
+ * number. Not nice, but better than additional function arguments. */
+diff -uNr linux-2.6.35/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-2.6.35/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter_ipv4/ipt_IMQ.h 2010-08-12 19:57:51.374637975 +0300
@@ -0,0 +1,10 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
+
+#endif /* _IPT_IMQ_H */
+
-diff -uNr linux-2.6.34/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.34-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-2.6.34/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.34-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-2.6.35/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.35-imq-multiqueue-test1/include/linux/netfilter_ipv6/ip6t_IMQ.h 2010-08-12 19:57:51.374637975 +0300
@@ -0,0 +1,10 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
+
+#endif /* _IP6T_IMQ_H */
+
-diff -uNr linux-2.6.34/include/linux/skbuff.h linux-2.6.34-imq/include/linux/skbuff.h
---- linux-2.6.34/include/linux/skbuff.h 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/include/linux/skbuff.h 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/include/linux/skbuff.h linux-2.6.35-imq-multiqueue-test1/include/linux/skbuff.h
+--- linux-2.6.35/include/linux/skbuff.h 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/include/linux/skbuff.h 2010-08-12 19:57:51.387972881 +0300
@@ -29,6 +29,9 @@
#include <linux/rcupdate.h>
#include <linux/dmaengine.h>
/* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0
-@@ -321,6 +324,9 @@
+@@ -327,6 +330,9 @@
* first. This is owned by whoever has the skb queued ATM.
*/
char cb[48] __aligned(8);
+ void *cb_next;
+#endif
- unsigned long _skb_dst;
+ unsigned long _skb_refdst;
#ifdef CONFIG_XFRM
-@@ -357,6 +363,9 @@
+@@ -363,6 +369,9 @@
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -378,6 +387,10 @@
+@@ -389,6 +398,10 @@
/* 0/14 bit hole */
#ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie;
#endif
-@@ -426,6 +439,12 @@
+@@ -487,6 +500,12 @@
return (struct rtable *)skb_dst(skb);
}
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
-@@ -1970,6 +1989,10 @@
+@@ -2034,6 +2053,10 @@
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
-diff -uNr linux-2.6.34/include/net/netfilter/nf_queue.h linux-2.6.34-imq/include/net/netfilter/nf_queue.h
---- linux-2.6.34/include/net/netfilter/nf_queue.h 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/include/net/netfilter/nf_queue.h 2010-06-02 10:05:45.752109073 +0300
-@@ -13,6 +13,12 @@
- struct net_device *indev;
- struct net_device *outdev;
- int (*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ int (*next_outfn)(struct nf_queue_entry *entry,
-+ unsigned int queuenum);
-+ unsigned int next_queuenum;
-+#endif
- };
-
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@
+diff -uNr linux-2.6.35/include/net/netfilter/nf_queue.h linux-2.6.35-imq-multiqueue-test1/include/net/netfilter/nf_queue.h
+--- linux-2.6.35/include/net/netfilter/nf_queue.h 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/include/net/netfilter/nf_queue.h 2010-08-12 19:57:51.394640341 +0300
+@@ -30,5 +30,11 @@
const struct nf_queue_handler *qh);
extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
+#endif
#endif /* _NF_QUEUE_H */
-diff -uNr linux-2.6.34/net/core/dev.c linux-2.6.34-imq/net/core/dev.c
---- linux-2.6.34/net/core/dev.c 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/net/core/dev.c 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/net/core/dev.c linux-2.6.35-imq-multiqueue-test1/net/core/dev.c
+--- linux-2.6.35/net/core/dev.c 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/core/dev.c 2010-08-12 19:57:51.464648614 +0300
@@ -98,6 +98,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1859,7 +1862,11 @@
+@@ -1931,7 +1934,11 @@
int rc = NETDEV_TX_OK;
if (likely(!skb->next)) {
+ )
dev_queue_xmit_nit(skb, dev);
- if (netif_needs_gso(dev, skb)) {
-@@ -1969,8 +1976,7 @@
+ /*
+@@ -2027,8 +2034,7 @@
return queue_index;
}
-static struct netdev_queue *dev_pick_tx(struct net_device *dev,
- struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
++static struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
{
- u16 queue_index;
+ int queue_index;
struct sock *sk = skb->sk;
-@@ -2000,6 +2006,7 @@
- skb_set_queue_mapping(skb, queue_index);
- return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
-
- static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- struct net_device *dev,
-diff -uNr linux-2.6.34/net/core/skbuff.c linux-2.6.34-imq/net/core/skbuff.c
---- linux-2.6.34/net/core/skbuff.c 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/net/core/skbuff.c 2010-06-02 10:05:45.752109073 +0300
+diff -uNr linux-2.6.35/net/core/skbuff.c linux-2.6.35-imq-multiqueue-test1/net/core/skbuff.c
+--- linux-2.6.35/net/core/skbuff.c 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/core/skbuff.c 2010-08-12 19:57:51.464648614 +0300
@@ -72,6 +72,9 @@
static struct kmem_cache *skbuff_head_cache __read_mostly;
static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
struct pipe_buffer *buf)
-@@ -91,6 +94,83 @@
+@@ -91,6 +94,82 @@
return 1;
}
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+/* Control buffer save/restore for IMQ devices */
+struct skb_cb_table {
++ char cb[48] __aligned(8);
+ void *cb_next;
+ atomic_t refcnt;
-+ char cb[48];
+};
+
+static DEFINE_SPINLOCK(skb_cb_store_lock);
+
+ spin_lock(&skb_cb_store_lock);
+
-+ if (atomic_dec_and_test(&next->refcnt)) {
++ if (atomic_dec_and_test(&next->refcnt))
+ kmem_cache_free(skbuff_cb_store_cache, next);
-+ }
+
+ spin_unlock(&skb_cb_store_lock);
+
/* Pipe buffer operations for a socket. */
static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +478,26 @@
+@@ -391,6 +470,26 @@
WARN_ON(in_irq());
skb->destructor(skb);
}
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ /* This should not happen. When it does, avoid memleak by restoring
+ the chain of cb-backups. */
-+ while(skb->cb_next != NULL) {
++ while (skb->cb_next != NULL) {
+ if (net_ratelimit())
+ printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
+ "%08x\n", (unsigned int)skb->cb_next);
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_conntrack_put(skb->nfct);
nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -538,6 +638,9 @@
+@@ -526,6 +625,9 @@
new->sp = secpath_get(old->sp);
#endif
memcpy(new->cb, old->cb, sizeof(old->cb));
new->csum = old->csum;
new->local_df = old->local_df;
new->pkt_type = old->pkt_type;
-@@ -2779,6 +2882,13 @@
+@@ -2776,6 +2878,13 @@
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);
}
/**
-diff -uNr linux-2.6.34/net/netfilter/Kconfig linux-2.6.34-imq/net/netfilter/Kconfig
---- linux-2.6.34/net/netfilter/Kconfig 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/net/netfilter/Kconfig 2010-06-02 10:05:45.762097870 +0300
-@@ -421,6 +421,18 @@
+diff -uNr linux-2.6.35/net/ipv4/netfilter/iptable_mangle.c linux-2.6.35-imq-multiqueue-test1/net/ipv4/netfilter/iptable_mangle.c
+--- linux-2.6.35/net/ipv4/netfilter/iptable_mangle.c 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/ipv4/netfilter/iptable_mangle.c 2010-08-12 19:57:51.501319617 +0300
+@@ -60,7 +60,8 @@
+ ret = ipt_do_table(skb, NF_INET_LOCAL_OUT, NULL, out,
+ dev_net(out)->ipv4.iptable_mangle);
+ /* Reroute for ANY change. */
+- if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE) {
++ if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE &&
++ ret != NF_IMQ_QUEUE) {
+ iph = ip_hdr(skb);
+
+ if (iph->saddr != saddr ||
+diff -uNr linux-2.6.35/net/netfilter/core.c linux-2.6.35-imq-multiqueue-test1/net/netfilter/core.c
+--- linux-2.6.35/net/netfilter/core.c 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/netfilter/core.c 2010-08-12 20:31:28.666436279 +0300
+@@ -182,6 +182,12 @@
+ if (!nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
+ verdict >> NF_VERDICT_BITS))
+ goto next_hook;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++ } else if ((verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
++ if (!nf_imq_queue(skb, elem, pf, hook, indev, outdev, okfn,
++ verdict >> NF_VERDICT_BITS))
++ goto next_hook;
++#endif
+ }
+ rcu_read_unlock();
+ return ret;
+diff -uNr linux-2.6.35/net/netfilter/Kconfig linux-2.6.35-imq-multiqueue-test1/net/netfilter/Kconfig
+--- linux-2.6.35/net/netfilter/Kconfig 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/netfilter/Kconfig 2010-08-12 19:57:51.567994165 +0300
+@@ -448,6 +448,18 @@
For more information on the LEDs available on your system, see
Documentation/leds-class.txt
+
config NETFILTER_XT_TARGET_MARK
tristate '"MARK" target support'
- default m if NETFILTER_ADVANCED=n
-diff -uNr linux-2.6.34/net/netfilter/Makefile linux-2.6.34-imq/net/netfilter/Makefile
---- linux-2.6.34/net/netfilter/Makefile 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/net/netfilter/Makefile 2010-06-02 10:05:45.762097870 +0300
-@@ -47,6 +47,7 @@
+ depends on NETFILTER_ADVANCED
+diff -uNr linux-2.6.35/net/netfilter/Makefile linux-2.6.35-imq-multiqueue-test1/net/netfilter/Makefile
+--- linux-2.6.35/net/netfilter/Makefile 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/netfilter/Makefile 2010-08-12 19:57:51.577995346 +0300
+@@ -50,6 +50,7 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
-diff -uNr linux-2.6.34/net/netfilter/nf_queue.c linux-2.6.34-imq/net/netfilter/nf_queue.c
---- linux-2.6.34/net/netfilter/nf_queue.c 2010-05-17 00:17:36.000000000 +0300
-+++ linux-2.6.34-imq/net/netfilter/nf_queue.c 2010-06-02 10:05:45.762097870 +0300
-@@ -21,6 +21,26 @@
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
+diff -uNr linux-2.6.35/net/netfilter/nf_internals.h linux-2.6.35-imq-multiqueue-test1/net/netfilter/nf_internals.h
+--- linux-2.6.35/net/netfilter/nf_internals.h 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/netfilter/nf_internals.h 2010-08-12 20:33:35.581440253 +0300
+@@ -30,6 +30,15 @@
+ struct net_device *outdev,
+ int (*okfn)(struct sk_buff *),
+ unsigned int queuenum);
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++extern int nf_imq_queue(struct sk_buff *skb,
++ struct list_head *elem,
++ u_int8_t pf, unsigned int hook,
++ struct net_device *indev,
++ struct net_device *outdev,
++ int (*okfn)(struct sk_buff *),
++ unsigned int queuenum);
++#endif
+ extern int __init netfilter_queue_init(void);
+
+ /* nf_log.c */
+diff -uNr linux-2.6.35/net/netfilter/nf_queue.c linux-2.6.35-imq-multiqueue-test1/net/netfilter/nf_queue.c
+--- linux-2.6.35/net/netfilter/nf_queue.c 2010-08-02 01:11:14.000000000 +0300
++++ linux-2.6.35-imq-multiqueue-test1/net/netfilter/nf_queue.c 2010-08-12 22:21:18.688483171 +0300
+@@ -22,6 +22,27 @@
static DEFINE_MUTEX(queue_handler_mutex);
+ rcu_assign_pointer(queue_imq_handler, qh);
+ mutex_unlock(&queue_handler_mutex);
+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
++EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler);
+
+void nf_unregister_queue_imq_handler(void)
+{
+ rcu_assign_pointer(queue_imq_handler, NULL);
+ mutex_unlock(&queue_handler_mutex);
+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
++EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler);
++
+#endif
+
/* return EBUSY when somebody else is registered, return EEXIST if the
* same handler is registered, return 0 in case of success. */
int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -81,7 +101,7 @@
+@@ -82,7 +103,7 @@
}
EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
{
/* Release those devices we held, or Alexey will kill me. */
if (entry->indev)
-@@ -101,6 +121,7 @@
+@@ -102,6 +123,7 @@
/* Drop reference to owner of hook which queued us. */
module_put(entry->elem->owner);
}
/*
* Any packet that leaves via this function must come back
-@@ -122,12 +143,26 @@
- #endif
- const struct nf_afinfo *afinfo;
- const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ const struct nf_queue_handler *qih = NULL;
-+#endif
-
+@@ -113,7 +135,8 @@
+ struct net_device *indev,
+ struct net_device *outdev,
+ int (*okfn)(struct sk_buff *),
+- unsigned int queuenum)
++ unsigned int queuenum,
++ bool imq_queue)
+ {
+ int status;
+ struct nf_queue_entry *entry = NULL;
+@@ -127,6 +150,11 @@
/* QUEUE == DROP if noone is waiting, to be safe. */
rcu_read_lock();
- qh = rcu_dereference(queue_handler[pf]);
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+ if (pf == PF_INET || pf == PF_INET6)
-+#else
-+ if (pf == PF_INET)
++ if (imq_queue)
++ qh = rcu_dereference(queue_imq_handler);
++ else
+#endif
-+ qih = rcu_dereference(queue_imq_handler);
-+
-+ if (!qh && !qih)
-+#else /* !IMQ */
+ qh = rcu_dereference(queue_handler[pf]);
if (!qh)
-+#endif
goto err_unlock;
+@@ -192,19 +220,20 @@
+ return 1;
+ }
- afinfo = nf_get_afinfo(pf);
-@@ -146,6 +181,10 @@
- .indev = indev,
- .outdev = outdev,
- .okfn = okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ .next_outfn = qh ? qh->outfn : NULL,
-+ .next_queuenum = queuenum,
-+#endif
- };
+-int nf_queue(struct sk_buff *skb,
++static int _nf_queue(struct sk_buff *skb,
+ struct list_head *elem,
+ u_int8_t pf, unsigned int hook,
+ struct net_device *indev,
+ struct net_device *outdev,
+ int (*okfn)(struct sk_buff *),
+- unsigned int queuenum)
++ unsigned int queuenum,
++ bool imq_queue)
+ {
+ struct sk_buff *segs;
- /* If it's going away, ignore hook. */
-@@ -171,8 +210,19 @@
- }
- #endif
- afinfo->saveroute(skb, entry);
+ if (!skb_is_gso(skb))
+ return __nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
+- queuenum);
++ queuenum, imq_queue);
+
+ switch (pf) {
+ case NFPROTO_IPV4:
+@@ -225,13 +254,39 @@
+
+ segs->next = NULL;
+ if (!__nf_queue(segs, elem, pf, hook, indev, outdev, okfn,
+- queuenum))
++ queuenum, imq_queue))
+ kfree_skb(segs);
+ segs = nskb;
+ } while (segs);
+ return 1;
+ }
+
++int nf_queue(struct sk_buff *skb,
++ struct list_head *elem,
++ u_int8_t pf, unsigned int hook,
++ struct net_device *indev,
++ struct net_device *outdev,
++ int (*okfn)(struct sk_buff *),
++ unsigned int queuenum)
++{
++ return _nf_queue(skb, elem, pf, hook, indev, outdev, okfn, queuenum,
++ false);
++}
+
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ if (qih) {
-+ status = qih->outfn(entry, queuenum);
-+ goto imq_skip_queue;
-+ }
++int nf_imq_queue(struct sk_buff *skb,
++ struct list_head *elem,
++ u_int8_t pf, unsigned int hook,
++ struct net_device *indev,
++ struct net_device *outdev,
++ int (*okfn)(struct sk_buff *),
++ unsigned int queuenum)
++{
++ return _nf_queue(skb, elem, pf, hook, indev, outdev, okfn, queuenum,
++ true);
++}
+#endif
+
- status = qh->outfn(entry, queuenum);
-
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- rcu_read_unlock();
-
- if (status < 0) {
-diff -uNr linux-2.6.34/net/netfilter/xt_IMQ.c linux-2.6.34-imq/net/netfilter/xt_IMQ.c
---- linux-2.6.34/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.34-imq/net/netfilter/xt_IMQ.c 2010-06-02 10:05:45.762097870 +0300
-@@ -0,0 +1,73 @@
+ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
+ {
+ struct sk_buff *skb = entry->skb;
+@@ -272,7 +327,13 @@
+ case NF_QUEUE:
+ if (!__nf_queue(skb, elem, entry->pf, entry->hook,
+ entry->indev, entry->outdev, entry->okfn,
+- verdict >> NF_VERDICT_BITS))
++ verdict >> NF_VERDICT_BITS, false))
++ goto next_hook;
++ break;
++ case NF_IMQ_QUEUE:
++ if (!__nf_queue(skb, elem, entry->pf, entry->hook,
++ entry->indev, entry->outdev, entry->okfn,
++ verdict >> NF_VERDICT_BITS, true))
+ goto next_hook;
+ break;
+ case NF_STOLEN:
+diff -uNr linux-2.6.35/net/netfilter/xt_IMQ.c linux-2.6.35-imq-multiqueue-test1/net/netfilter/xt_IMQ.c
+--- linux-2.6.35/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.35-imq-multiqueue-test1/net/netfilter/xt_IMQ.c 2010-08-12 22:10:20.657312054 +0300
+@@ -0,0 +1,74 @@
+/*
+ * This target marks packets to be enqueued to an imq device
+ */
+#include <linux/imq.h>
+
+static unsigned int imq_target(struct sk_buff *pskb,
-+ const struct xt_target_param *par)
++ const struct xt_action_param *par)
+{
+ const struct xt_imq_info *mr = par->targinfo;
+
+ return XT_CONTINUE;
+}
+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
++static int imq_checkentry(const struct xt_tgchk_param *par)
+{
+ struct xt_imq_info *mr = par->targinfo;
+
+ printk(KERN_WARNING
+ "IMQ: invalid device specified, highest is %u\n",
+ IMQ_MAX_DEVS - 1);
-+ return 0;
++ return -EINVAL;
+ }
+
-+ return 1;
++ return 0;
+}
+
+static struct xt_target xt_imq_reg[] __read_mostly = {
+module_exit(imq_fini);
+
+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. "
++ "See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_IMQ");
+MODULE_ALIAS("ip6t_IMQ");
projects / packages / kernel.git / commitdiff