1 net: add Intermediate Queueing Device (imq)
3 From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
5 This patch is for kernel version 3.12.4+.
7 See: http://linuximq.net/
9 Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
11 drivers/net/Kconfig | 119 ++++
12 drivers/net/Makefile | 1
13 drivers/net/imq.c | 1007 +++++++++++++++++++++++++++++++
14 include/linux/imq.h | 13
15 include/linux/netfilter/xt_IMQ.h | 9
16 include/linux/netfilter_ipv4/ipt_IMQ.h | 10
17 include/linux/netfilter_ipv6/ip6t_IMQ.h | 10
18 include/linux/skbuff.h | 22 +
19 include/net/netfilter/nf_queue.h | 6
20 include/uapi/linux/netfilter.h | 3
22 net/core/skbuff.c | 112 +++
23 net/ipv6/ip6_output.c | 10
24 net/netfilter/Kconfig | 12
25 net/netfilter/Makefile | 1
26 net/netfilter/core.c | 6
27 net/netfilter/nf_internals.h | 2
28 net/netfilter/nf_queue.c | 36 +
29 net/netfilter/xt_IMQ.c | 72 ++
30 19 files changed, 1449 insertions(+), 10 deletions(-)
31 create mode 100644 drivers/net/imq.c
32 create mode 100644 include/linux/imq.h
33 create mode 100644 include/linux/netfilter/xt_IMQ.h
34 create mode 100644 include/linux/netfilter_ipv4/ipt_IMQ.h
35 create mode 100644 include/linux/netfilter_ipv6/ip6t_IMQ.h
36 create mode 100644 net/netfilter/xt_IMQ.c
38 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
39 index b45b240..5a20da0 100644
40 --- a/drivers/net/Kconfig
41 +++ b/drivers/net/Kconfig
42 @@ -203,6 +203,125 @@ config RIONET_RX_SIZE
47 + tristate "IMQ (intermediate queueing device) support"
48 + depends on NETDEVICES && NETFILTER
50 + The IMQ device(s) is used as placeholder for QoS queueing
51 + disciplines. Every packet entering/leaving the IP stack can be
52 + directed through the IMQ device where it's enqueued/dequeued to the
53 + attached qdisc. This allows you to treat network devices as classes
54 + and distribute bandwidth among them. Iptables is used to specify
55 + through which IMQ device, if any, packets travel.
57 + More information at: http://www.linuximq.net/
59 + To compile this driver as a module, choose M here: the module
60 + will be called imq. If unsure, say N.
63 + prompt "IMQ behavior (PRE/POSTROUTING)"
65 + default IMQ_BEHAVIOR_AB
67 + This setting defines how IMQ behaves in respect to its
68 + hooking in PREROUTING and POSTROUTING.
70 + IMQ can work in any of the following ways:
72 + PREROUTING | POSTROUTING
73 + -----------------|-------------------
74 + #1 After NAT | After NAT
75 + #2 After NAT | Before NAT
76 + #3 Before NAT | After NAT
77 + #4 Before NAT | Before NAT
79 + The default behavior is to hook before NAT on PREROUTING
80 + and after NAT on POSTROUTING (#3).
82 + This settings are specially usefull when trying to use IMQ
83 + to shape NATed clients.
85 + More information can be found at: www.linuximq.net
87 + If not sure leave the default settings alone.
89 +config IMQ_BEHAVIOR_AA
92 + This setting defines how IMQ behaves in respect to its
93 + hooking in PREROUTING and POSTROUTING.
95 + Choosing this option will make IMQ hook like this:
97 + PREROUTING: After NAT
98 + POSTROUTING: After NAT
100 + More information can be found at: www.linuximq.net
102 + If not sure leave the default settings alone.
104 +config IMQ_BEHAVIOR_AB
107 + This setting defines how IMQ behaves in respect to its
108 + hooking in PREROUTING and POSTROUTING.
110 + Choosing this option will make IMQ hook like this:
112 + PREROUTING: After NAT
113 + POSTROUTING: Before NAT
115 + More information can be found at: www.linuximq.net
117 + If not sure leave the default settings alone.
119 +config IMQ_BEHAVIOR_BA
122 + This setting defines how IMQ behaves in respect to its
123 + hooking in PREROUTING and POSTROUTING.
125 + Choosing this option will make IMQ hook like this:
127 + PREROUTING: Before NAT
128 + POSTROUTING: After NAT
130 + More information can be found at: www.linuximq.net
132 + If not sure leave the default settings alone.
134 +config IMQ_BEHAVIOR_BB
137 + This setting defines how IMQ behaves in respect to its
138 + hooking in PREROUTING and POSTROUTING.
140 + Choosing this option will make IMQ hook like this:
142 + PREROUTING: Before NAT
143 + POSTROUTING: Before NAT
145 + More information can be found at: www.linuximq.net
147 + If not sure leave the default settings alone.
152 + int "Number of IMQ devices"
157 + This setting defines how many IMQ devices will be created.
159 + The default value is 16.
161 + More information can be found at: www.linuximq.net
163 + If not sure leave the default settings alone.
166 tristate "Universal TUN/TAP device driver support"
168 diff --git a/drivers/net/Makefile b/drivers/net/Makefile
169 index 3fef8a8..12dafc0 100644
170 --- a/drivers/net/Makefile
171 +++ b/drivers/net/Makefile
172 @@ -9,6 +9,7 @@ obj-$(CONFIG_BONDING) += bonding/
173 obj-$(CONFIG_DUMMY) += dummy.o
174 obj-$(CONFIG_EQUALIZER) += eql.o
175 obj-$(CONFIG_IFB) += ifb.o
176 +obj-$(CONFIG_IMQ) += imq.o
177 obj-$(CONFIG_MACVLAN) += macvlan.o
178 obj-$(CONFIG_MACVTAP) += macvtap.o
179 obj-$(CONFIG_MII) += mii.o
180 diff --git a/drivers/net/imq.c b/drivers/net/imq.c
182 index 0000000..801bc8c
184 +++ b/drivers/net/imq.c
187 + * Pseudo-driver for the intermediate queue device.
189 + * This program is free software; you can redistribute it and/or
190 + * modify it under the terms of the GNU General Public License
191 + * as published by the Free Software Foundation; either version
192 + * 2 of the License, or (at your option) any later version.
194 + * Authors: Patrick McHardy, <kaber@trash.net>
196 + * The first version was written by Martin Devera, <devik@cdi.cz>
198 + * Credits: Jan Rafaj <imq2t@cedric.vabo.cz>
199 + * - Update patch to 2.4.21
200 + * Sebastian Strollo <sstrollo@nortelnetworks.com>
201 + * - Fix "Dead-loop on netdevice imq"-issue
202 + * Marcel Sebek <sebek64@post.cz>
203 + * - Update to 2.6.2-rc1
205 + * After some time of inactivity there is a group taking care
206 + * of IMQ again: http://www.linuximq.net
209 + * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7
210 + * including the following changes:
212 + * - Correction of ipv6 support "+"s issue (Hasso Tepper)
213 + * - Correction of imq_init_devs() issue that resulted in
214 + * kernel OOPS unloading IMQ as module (Norbert Buchmuller)
215 + * - Addition of functionality to choose number of IMQ devices
216 + * during kernel config (Andre Correa)
217 + * - Addition of functionality to choose how IMQ hooks on
218 + * PRE and POSTROUTING (after or before NAT) (Andre Correa)
219 + * - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
222 + * 2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
223 + * released with almost no problems. 2.6.14-x was released
224 + * with some important changes: nfcache was removed; After
225 + * some weeks of trouble we figured out that some IMQ fields
226 + * in skb were missing in skbuff.c - skb_clone and copy_skb_header.
227 + * These functions are correctly patched by this new patch version.
229 + * Thanks for all who helped to figure out all the problems with
230 + * 2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
231 + * Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
232 + * I didn't forget anybody). I apologize again for my lack of time.
235 + * 2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
236 + * of qdisc_restart() and moved qdisc_run() to tasklet to avoid
237 + * recursive locking. New initialization routines to fix 'rmmod' not
238 + * working anymore. Used code from ifb.c. (Jussi Kivilinna)
240 + * 2008/08/06 - 2.6.26 - (JK)
241 + * - Replaced tasklet with 'netif_schedule()'.
242 + * - Cleaned up and added comments for imq_nf_queue().
245 + * - Add skb_save_cb/skb_restore_cb helper functions for backuping
246 + * control buffer. This is needed because qdisc-layer on kernels
247 + * 2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
248 + * - Add better locking for IMQ device. Hopefully this will solve
249 + * SMP issues. (Jussi Kivilinna)
252 + * - Port to 2.6.29 + fix rmmod not working
254 + * 2009/04/20 - (Jussi Kivilinna)
255 + * - Use netdevice feature flags to avoid extra packet handling
256 + * by core networking layer and possibly increase performance.
258 + * 2009/09/26 - (Jussi Kivilinna)
259 + * - Add imq_nf_reinject_lockless to fix deadlock with
260 + * imq_nf_queue/imq_nf_reinject.
262 + * 2009/12/08 - (Jussi Kivilinna)
264 + * - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
265 + * - Also add better error checking for skb->nf_queue_entry usage
267 + * 2010/02/25 - (Jussi Kivilinna)
270 + * 2010/08/15 - (Jussi Kivilinna)
272 + * - Simplify hook registration by using nf_register_hooks.
273 + * - nf_reinject doesn't need spinlock around it, therefore remove
274 + * imq_nf_reinject function. Other nf_reinject users protect
275 + * their own data with spinlock. With IMQ however all data is
276 + * needed is stored per skbuff, so no locking is needed.
277 + * - Changed IMQ to use 'separate' NF_IMQ_QUEUE instead of
278 + * NF_QUEUE, this allows working coexistance of IMQ and other
280 + * - Make IMQ multi-queue. Number of IMQ device queues can be
281 + * increased with 'numqueues' module parameters. Default number
282 + * of queues is 1, in other words by default IMQ works as
283 + * single-queue device. Multi-queue selection is based on
284 + * IFB multi-queue patch by Changli Gao <xiaosuo@gmail.com>.
286 + * 2011/03/18 - (Jussi Kivilinna)
289 + * 2011/07/12 - (syoder89@gmail.com)
290 + * - Crash fix that happens when the receiving interface has more
291 + * than one queue (add missing skb_set_queue_mapping in
292 + * imq_select_queue).
294 + * 2011/07/26 - (Jussi Kivilinna)
295 + * - Add queue mapping checks for packets exiting IMQ.
298 + * 2011/08/16 - (Jussi Kivilinna)
299 + * - Clear IFF_TX_SKB_SHARING flag that was added for linux 3.0.2
301 + * 2011/11/03 - Germano Michel <germanomichel@gmail.com>
302 + * - Fix IMQ for net namespaces
304 + * 2011/11/04 - Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
306 + * - Clean-up, move 'get imq device pointer by imqX name' to
307 + * separate function from imq_nf_queue().
309 + * 2012/01/05 - Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
312 + * 2012/03/19 - Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
315 + * 2012/12/12 - Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
317 + * - Fix checkpatch.pl warnings
319 + * 2013/09/10 - Jussi Kivilinna <jussi.kivilinna@iki.fi>
320 + * - Fixed GSO handling for 3.10, see imq_nf_queue() for comments.
321 + * - Don't copy skb->cb_next when copying or cloning skbuffs.
323 + * 2013/09/16 - Jussi Kivilinna <jussi.kivilinna@iki.fi>
326 + * 2013/11/12 - Jussi Kivilinna <jussi.kivilinna@iki.fi>
329 + * Also, many thanks to pablo Sebastian Greco for making the initial
330 + * patch and to those who helped the testing.
332 + * More info at: http://www.linuximq.net/ (Andre Correa)
335 +#include <linux/module.h>
336 +#include <linux/kernel.h>
337 +#include <linux/moduleparam.h>
338 +#include <linux/list.h>
339 +#include <linux/skbuff.h>
340 +#include <linux/netdevice.h>
341 +#include <linux/etherdevice.h>
342 +#include <linux/rtnetlink.h>
343 +#include <linux/if_arp.h>
344 +#include <linux/netfilter.h>
345 +#include <linux/netfilter_ipv4.h>
346 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
347 + #include <linux/netfilter_ipv6.h>
349 +#include <linux/imq.h>
350 +#include <net/pkt_sched.h>
351 +#include <net/netfilter/nf_queue.h>
352 +#include <net/sock.h>
353 +#include <linux/ip.h>
354 +#include <linux/ipv6.h>
355 +#include <linux/if_vlan.h>
356 +#include <linux/if_pppox.h>
358 +#include <net/ipv6.h>
360 +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num);
362 +static nf_hookfn imq_nf_hook;
364 +static struct nf_hook_ops imq_ops[] = {
366 + /* imq_ingress_ipv4 */
367 + .hook = imq_nf_hook,
368 + .owner = THIS_MODULE,
370 + .hooknum = NF_INET_PRE_ROUTING,
371 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
372 + .priority = NF_IP_PRI_MANGLE + 1,
374 + .priority = NF_IP_PRI_NAT_DST + 1,
378 + /* imq_egress_ipv4 */
379 + .hook = imq_nf_hook,
380 + .owner = THIS_MODULE,
382 + .hooknum = NF_INET_POST_ROUTING,
383 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
384 + .priority = NF_IP_PRI_LAST,
386 + .priority = NF_IP_PRI_NAT_SRC - 1,
389 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
391 + /* imq_ingress_ipv6 */
392 + .hook = imq_nf_hook,
393 + .owner = THIS_MODULE,
395 + .hooknum = NF_INET_PRE_ROUTING,
396 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
397 + .priority = NF_IP6_PRI_MANGLE + 1,
399 + .priority = NF_IP6_PRI_NAT_DST + 1,
403 + /* imq_egress_ipv6 */
404 + .hook = imq_nf_hook,
405 + .owner = THIS_MODULE,
407 + .hooknum = NF_INET_POST_ROUTING,
408 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
409 + .priority = NF_IP6_PRI_LAST,
411 + .priority = NF_IP6_PRI_NAT_SRC - 1,
417 +#if defined(CONFIG_IMQ_NUM_DEVS)
418 +static int numdevs = CONFIG_IMQ_NUM_DEVS;
420 +static int numdevs = IMQ_MAX_DEVS;
423 +static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
425 +#define IMQ_MAX_QUEUES 32
426 +static int numqueues = 1;
427 +static u32 imq_hashrnd;
429 +static inline __be16 pppoe_proto(const struct sk_buff *skb)
431 + return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN +
432 + sizeof(struct pppoe_hdr)));
435 +static u16 imq_hash(struct net_device *dev, struct sk_buff *skb)
437 + unsigned int pull_len;
438 + u16 protocol = skb->protocol;
450 + switch (protocol) {
451 + case htons(ETH_P_8021Q): {
452 + if (unlikely(skb_pull(skb, VLAN_HLEN) == NULL))
455 + pull_len += VLAN_HLEN;
456 + skb->network_header += VLAN_HLEN;
458 + protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
462 + case htons(ETH_P_PPP_SES): {
463 + if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) == NULL))
466 + pull_len += PPPOE_SES_HLEN;
467 + skb->network_header += PPPOE_SES_HLEN;
469 + protocol = pppoe_proto(skb);
473 + case htons(ETH_P_IP): {
474 + const struct iphdr *iph = ip_hdr(skb);
476 + if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr))))
479 + addr1 = iph->daddr;
480 + addr2 = iph->saddr;
482 + ip_proto = !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ?
484 + ihl = ip_hdrlen(skb);
488 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
489 + case htons(ETH_P_IPV6): {
490 + const struct ipv6hdr *iph = ipv6_hdr(skb);
493 + if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr))))
496 + addr1 = iph->daddr.s6_addr32[3];
497 + addr2 = iph->saddr.s6_addr32[3];
498 + ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto,
500 + if (unlikely(ihl < 0))
508 + if (pull_len != 0) {
509 + skb_push(skb, pull_len);
510 + skb->network_header -= pull_len;
513 + return (u16)(ntohs(protocol) % dev->real_num_tx_queues);
517 + swap(addr1, addr2);
519 + switch (ip_proto) {
526 + case IPPROTO_UDPLITE: {
527 + if (likely(skb_copy_bits(skb, ihl, &ports.in32, 4) >= 0)) {
528 + if (ports.in16[0] > ports.in16[1])
529 + swap(ports.in16[0], ports.in16[1]);
539 + if (pull_len != 0) {
540 + skb_push(skb, pull_len);
541 + skb->network_header -= pull_len;
544 + hash = jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto);
546 + return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32);
549 +static inline bool sk_tx_queue_recorded(struct sock *sk)
551 + return (sk_tx_queue_get(sk) >= 0);
554 +static struct netdev_queue *imq_select_queue(struct net_device *dev,
555 + struct sk_buff *skb)
557 + u16 queue_index = 0;
560 + if (likely(dev->real_num_tx_queues == 1))
563 + /* IMQ can be receiving ingress or engress packets. */
565 + /* Check first for if rx_queue is set */
566 + if (skb_rx_queue_recorded(skb)) {
567 + queue_index = skb_get_rx_queue(skb);
571 + /* Check if socket has tx_queue set */
572 + if (sk_tx_queue_recorded(skb->sk)) {
573 + queue_index = sk_tx_queue_get(skb->sk);
577 + /* Try use socket hash */
578 + if (skb->sk && skb->sk->sk_hash) {
579 + hash = skb->sk->sk_hash;
581 + (u16)(((u64)hash * dev->real_num_tx_queues) >> 32);
585 + /* Generate hash from packet data */
586 + queue_index = imq_hash(dev, skb);
589 + if (unlikely(queue_index >= dev->real_num_tx_queues))
590 + queue_index = (u16)((u32)queue_index % dev->real_num_tx_queues);
592 + skb_set_queue_mapping(skb, queue_index);
593 + return netdev_get_tx_queue(dev, queue_index);
596 +static struct net_device_stats *imq_get_stats(struct net_device *dev)
598 + return &dev->stats;
601 +/* called for packets kfree'd in qdiscs at places other than enqueue */
602 +static void imq_skb_destructor(struct sk_buff *skb)
604 + struct nf_queue_entry *entry = skb->nf_queue_entry;
606 + skb->nf_queue_entry = NULL;
609 + nf_queue_entry_release_refs(entry);
613 + skb_restore_cb(skb); /* kfree backup */
616 +static void imq_done_check_queue_mapping(struct sk_buff *skb,
617 + struct net_device *dev)
619 + unsigned int queue_index;
621 + /* Don't let queue_mapping be left too large after exiting IMQ */
622 + if (likely(skb->dev != dev && skb->dev != NULL)) {
623 + queue_index = skb_get_queue_mapping(skb);
624 + if (unlikely(queue_index >= skb->dev->real_num_tx_queues)) {
625 + queue_index = (u16)((u32)queue_index %
626 + skb->dev->real_num_tx_queues);
627 + skb_set_queue_mapping(skb, queue_index);
630 + /* skb->dev was IMQ device itself or NULL, be on safe side and
631 + * just clear queue mapping.
633 + skb_set_queue_mapping(skb, 0);
637 +static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
639 + struct nf_queue_entry *entry = skb->nf_queue_entry;
641 + skb->nf_queue_entry = NULL;
642 + dev->trans_start = jiffies;
644 + dev->stats.tx_bytes += skb->len;
645 + dev->stats.tx_packets++;
647 + if (unlikely(entry == NULL)) {
648 + /* We don't know what is going on here.. packet is queued for
649 + * imq device, but (probably) not by us.
651 + * If this packet was not send here by imq_nf_queue(), then
652 + * skb_save_cb() was not used and skb_free() should not show:
653 + * WARNING: IMQ: kfree_skb: skb->cb_next:..
655 + * WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
657 + * However if this message is shown, then IMQ is somehow broken
658 + * and you should report this to linuximq.net.
661 + /* imq_dev_xmit is black hole that eats all packets, report that
662 + * we eat this packet happily and increase dropped counters.
665 + dev->stats.tx_dropped++;
666 + dev_kfree_skb(skb);
668 + return NETDEV_TX_OK;
671 + skb_restore_cb(skb); /* restore skb->cb */
673 + skb->imq_flags = 0;
674 + skb->destructor = NULL;
676 + imq_done_check_queue_mapping(skb, dev);
678 + nf_reinject(entry, NF_ACCEPT);
680 + return NETDEV_TX_OK;
683 +static struct net_device *get_imq_device_by_index(int index)
685 + struct net_device *dev = NULL;
689 + /* get device by name and cache result */
690 + snprintf(buf, sizeof(buf), "imq%d", index);
692 + /* Search device from all namespaces. */
693 + for_each_net(net) {
694 + dev = dev_get_by_name(net, buf);
699 + if (WARN_ON_ONCE(dev == NULL)) {
700 + /* IMQ device not found. Exotic config? */
701 + return ERR_PTR(-ENODEV);
704 + imq_devs_cache[index] = dev;
710 +static struct nf_queue_entry *nf_queue_entry_dup(struct nf_queue_entry *e)
712 + struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC);
714 + if (nf_queue_entry_get_refs(entry))
721 +#ifdef CONFIG_BRIDGE_NETFILTER
722 +/* When called from bridge netfilter, skb->data must point to MAC header
723 + * before calling skb_gso_segment(). Else, original MAC header is lost
724 + * and segmented skbs will be sent to wrong destination.
726 +static void nf_bridge_adjust_skb_data(struct sk_buff *skb)
728 + if (skb->nf_bridge)
729 + __skb_push(skb, skb->network_header - skb->mac_header);
732 +static void nf_bridge_adjust_segmented_data(struct sk_buff *skb)
734 + if (skb->nf_bridge)
735 + __skb_pull(skb, skb->network_header - skb->mac_header);
738 +#define nf_bridge_adjust_skb_data(s) do {} while (0)
739 +#define nf_bridge_adjust_segmented_data(s) do {} while (0)
742 +static void free_entry(struct nf_queue_entry *entry)
744 + nf_queue_entry_release_refs(entry);
748 +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev);
750 +static int __imq_nf_queue_gso(struct nf_queue_entry *entry,
751 + struct net_device *dev, struct sk_buff *skb)
754 + struct nf_queue_entry *entry_seg;
756 + nf_bridge_adjust_segmented_data(skb);
758 + if (skb->next == NULL) { /* last packet, no need to copy entry */
759 + struct sk_buff *gso_skb = entry->skb;
761 + ret = __imq_nf_queue(entry, dev);
763 + entry->skb = gso_skb;
769 + entry_seg = nf_queue_entry_dup(entry);
771 + entry_seg->skb = skb;
772 + ret = __imq_nf_queue(entry_seg, dev);
774 + free_entry(entry_seg);
779 +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
781 + struct sk_buff *skb, *segs;
782 + struct net_device *dev;
783 + unsigned int queued;
784 + int index, retval, err;
786 + index = entry->skb->imq_flags & IMQ_F_IFMASK;
787 + if (unlikely(index > numdevs - 1)) {
788 + if (net_ratelimit())
789 + pr_warn("IMQ: invalid device specified, highest is %u\n",
795 + /* check for imq device by index from cache */
796 + dev = imq_devs_cache[index];
797 + if (unlikely(!dev)) {
798 + dev = get_imq_device_by_index(index);
800 + retval = PTR_ERR(dev);
805 + if (unlikely(!(dev->flags & IFF_UP))) {
806 + entry->skb->imq_flags = 0;
807 + retval = -ECANCELED;
811 + if (!skb_is_gso(entry->skb))
812 + return __imq_nf_queue(entry, dev);
814 + /* Since 3.10.x, GSO handling moved here as result of upstream commit
815 + * a5fedd43d5f6c94c71053a66e4c3d2e35f1731a2 (netfilter: move
816 + * skb_gso_segment into nfnetlink_queue module).
818 + * Following code replicates the gso handling from
819 + * 'net/netfilter/nfnetlink_queue_core.c':nfqnl_enqueue_packet().
824 + switch (entry->pf) {
826 + skb->protocol = htons(ETH_P_IP);
829 + skb->protocol = htons(ETH_P_IPV6);
833 + nf_bridge_adjust_skb_data(skb);
834 + segs = skb_gso_segment(skb, 0);
835 + /* Does not use PTR_ERR to limit the number of error codes that can be
836 + * returned by nf_queue. For instance, callers rely on -ECANCELED to
837 + * mean 'ignore this hook'.
845 + struct sk_buff *nskb = segs->next;
846 + if (nskb && nskb->next)
847 + nskb->cb_next = NULL;
849 + err = __imq_nf_queue_gso(entry, dev, segs);
858 + if (err) /* some segments are already queued */
865 + nf_bridge_adjust_segmented_data(skb);
871 +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev)
873 + struct sk_buff *skb_orig, *skb, *skb_shared;
875 + struct netdev_queue *txq;
876 + spinlock_t *root_lock;
878 + int retval = -EINVAL;
879 + unsigned int orig_queue_index;
881 + dev->last_rx = jiffies;
886 + /* skb has owner? => make clone */
887 + if (unlikely(skb->destructor)) {
889 + skb = skb_clone(skb, GFP_ATOMIC);
890 + if (unlikely(!skb)) {
894 + skb->cb_next = NULL;
898 + skb->nf_queue_entry = entry;
900 + dev->stats.rx_bytes += skb->len;
901 + dev->stats.rx_packets++;
904 + /* skb->dev == NULL causes problems, try the find cause. */
905 + if (net_ratelimit()) {
906 + dev_warn(&dev->dev,
907 + "received packet with skb->dev == NULL\n");
914 + /* Disables softirqs for lock below */
915 + rcu_read_lock_bh();
917 + /* Multi-queue selection */
918 + orig_queue_index = skb_get_queue_mapping(skb);
919 + txq = imq_select_queue(dev, skb);
921 + q = rcu_dereference(txq->qdisc);
922 + if (unlikely(!q->enqueue))
923 + goto packet_not_eaten_by_imq_dev;
925 + root_lock = qdisc_lock(q);
926 + spin_lock(root_lock);
928 + users = atomic_read(&skb->users);
930 + skb_shared = skb_get(skb); /* increase reference count by one */
932 + /* backup skb->cb, as qdisc layer will overwrite it */
933 + skb_save_cb(skb_shared);
934 + qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
936 + if (likely(atomic_read(&skb_shared->users) == users + 1)) {
937 + kfree_skb(skb_shared); /* decrease reference count by one */
939 + skb->destructor = &imq_skb_destructor;
942 + if (unlikely(skb_orig))
943 + kfree_skb(skb_orig); /* free original */
945 + spin_unlock(root_lock);
946 + rcu_read_unlock_bh();
948 + /* schedule qdisc dequeue */
949 + __netif_schedule(q);
954 + skb_restore_cb(skb_shared); /* restore skb->cb */
955 + skb->nf_queue_entry = NULL;
957 + * qdisc dropped packet and decreased skb reference count of
958 + * skb, so we don't really want to and try refree as that would
959 + * actually destroy the skb.
961 + spin_unlock(root_lock);
962 + goto packet_not_eaten_by_imq_dev;
965 +packet_not_eaten_by_imq_dev:
966 + skb_set_queue_mapping(skb, orig_queue_index);
967 + rcu_read_unlock_bh();
969 + /* cloned? restore original */
970 + if (unlikely(skb_orig)) {
972 + entry->skb = skb_orig;
979 +static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
980 + const struct net_device *indev,
981 + const struct net_device *outdev,
982 + int (*okfn)(struct sk_buff *))
984 + return (pskb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT;
987 +static int imq_close(struct net_device *dev)
989 + netif_stop_queue(dev);
993 +static int imq_open(struct net_device *dev)
995 + netif_start_queue(dev);
999 +static const struct net_device_ops imq_netdev_ops = {
1000 + .ndo_open = imq_open,
1001 + .ndo_stop = imq_close,
1002 + .ndo_start_xmit = imq_dev_xmit,
1003 + .ndo_get_stats = imq_get_stats,
1006 +static void imq_setup(struct net_device *dev)
1008 + dev->netdev_ops = &imq_netdev_ops;
1009 + dev->type = ARPHRD_VOID;
1010 + dev->mtu = 16000; /* too small? */
1011 + dev->tx_queue_len = 11000; /* too big? */
1012 + dev->flags = IFF_NOARP;
1013 + dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
1014 + NETIF_F_GSO | NETIF_F_HW_CSUM |
1016 + dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE |
1017 + IFF_TX_SKB_SHARING);
1020 +static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
1024 + if (tb[IFLA_ADDRESS]) {
1025 + if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
1029 + if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
1030 + ret = -EADDRNOTAVAIL;
1036 + pr_warn("IMQ: imq_validate failed (%d)\n", ret);
1040 +static struct rtnl_link_ops imq_link_ops __read_mostly = {
1043 + .setup = imq_setup,
1044 + .validate = imq_validate,
1047 +static const struct nf_queue_handler imq_nfqh = {
1048 + .outfn = imq_nf_queue,
1051 +static int __init imq_init_hooks(void)
1055 + nf_register_queue_imq_handler(&imq_nfqh);
1057 + ret = nf_register_hooks(imq_ops, ARRAY_SIZE(imq_ops));
1059 + nf_unregister_queue_imq_handler();
1064 +static int __init imq_init_one(int index)
1066 + struct net_device *dev;
1069 + dev = alloc_netdev_mq(0, "imq%d", imq_setup, numqueues);
1073 + ret = dev_alloc_name(dev, dev->name);
1077 + dev->rtnl_link_ops = &imq_link_ops;
1078 + ret = register_netdevice(dev);
1088 +static int __init imq_init_devs(void)
1092 + if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
1093 + pr_err("IMQ: numdevs has to be betweed 1 and %u\n",
1098 + if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) {
1099 + pr_err("IMQ: numqueues has to be betweed 1 and %u\n",
1104 + get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd));
1107 + err = __rtnl_link_register(&imq_link_ops);
1109 + for (i = 0; i < numdevs && !err; i++)
1110 + err = imq_init_one(i);
1113 + __rtnl_link_unregister(&imq_link_ops);
1114 + memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
1121 +static int __init imq_init_module(void)
1125 +#if defined(CONFIG_IMQ_NUM_DEVS)
1126 + BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
1127 + BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
1128 + BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
1131 + err = imq_init_devs();
1133 + pr_err("IMQ: Error trying imq_init_devs(net)\n");
1137 + err = imq_init_hooks();
1139 + pr_err(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
1140 + rtnl_link_unregister(&imq_link_ops);
1141 + memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
1145 + pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d)\n",
1146 + numdevs, numqueues);
1148 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
1149 + pr_info("\tHooking IMQ before NAT on PREROUTING.\n");
1151 + pr_info("\tHooking IMQ after NAT on PREROUTING.\n");
1153 +#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
1154 + pr_info("\tHooking IMQ before NAT on POSTROUTING.\n");
1156 + pr_info("\tHooking IMQ after NAT on POSTROUTING.\n");
1162 +static void __exit imq_unhook(void)
1164 + nf_unregister_hooks(imq_ops, ARRAY_SIZE(imq_ops));
1165 + nf_unregister_queue_imq_handler();
1168 +static void __exit imq_cleanup_devs(void)
1170 + rtnl_link_unregister(&imq_link_ops);
1171 + memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
1174 +static void __exit imq_exit_module(void)
1177 + imq_cleanup_devs();
1178 + pr_info("IMQ driver unloaded successfully.\n");
1181 +module_init(imq_init_module);
1182 +module_exit(imq_exit_module);
1184 +module_param(numdevs, int, 0);
1185 +module_param(numqueues, int, 0);
1186 +MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)");
1187 +MODULE_PARM_DESC(numqueues, "number of queues per IMQ device");
1188 +MODULE_AUTHOR("http://www.linuximq.net");
1189 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
1190 +MODULE_LICENSE("GPL");
1191 +MODULE_ALIAS_RTNL_LINK("imq");
1193 diff --git a/include/linux/imq.h b/include/linux/imq.h
1194 new file mode 100644
1195 index 0000000..1babb09
1197 +++ b/include/linux/imq.h
1202 +/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
1203 +#define IMQ_F_BITS 5
1205 +#define IMQ_F_IFMASK 0x0f
1206 +#define IMQ_F_ENQUEUE 0x10
1208 +#define IMQ_MAX_DEVS (IMQ_F_IFMASK + 1)
1210 +#endif /* _IMQ_H */
1212 diff --git a/include/linux/netfilter/xt_IMQ.h b/include/linux/netfilter/xt_IMQ.h
1213 new file mode 100644
1214 index 0000000..9b07230
1216 +++ b/include/linux/netfilter/xt_IMQ.h
1221 +struct xt_imq_info {
1222 + unsigned int todev; /* target imq device */
1225 +#endif /* _XT_IMQ_H */
1227 diff --git a/include/linux/netfilter_ipv4/ipt_IMQ.h b/include/linux/netfilter_ipv4/ipt_IMQ.h
1228 new file mode 100644
1229 index 0000000..7af320f
1231 +++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
1236 +/* Backwards compatibility for old userspace */
1237 +#include <linux/netfilter/xt_IMQ.h>
1239 +#define ipt_imq_info xt_imq_info
1241 +#endif /* _IPT_IMQ_H */
1243 diff --git a/include/linux/netfilter_ipv6/ip6t_IMQ.h b/include/linux/netfilter_ipv6/ip6t_IMQ.h
1244 new file mode 100644
1245 index 0000000..198ac01
1247 +++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
1249 +#ifndef _IP6T_IMQ_H
1250 +#define _IP6T_IMQ_H
1252 +/* Backwards compatibility for old userspace */
1253 +#include <linux/netfilter/xt_IMQ.h>
1255 +#define ip6t_imq_info xt_imq_info
1257 +#endif /* _IP6T_IMQ_H */
1259 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
1260 index f66f346..d699b19 100644
1261 --- a/include/linux/skbuff.h
1262 +++ b/include/linux/skbuff.h
1264 #include <linux/dma-mapping.h>
1265 #include <linux/netdev_features.h>
1266 #include <net/flow_keys.h>
1267 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1268 +#include <linux/imq.h>
1271 /* Don't change this without changing skb_csum_unnecessary! */
1272 #define CHECKSUM_NONE 0
1273 @@ -418,6 +421,9 @@ struct sk_buff {
1274 * first. This is owned by whoever has the skb queued ATM.
1276 char cb[48] __aligned(8);
1277 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1281 unsigned long _skb_refdst;
1283 @@ -453,6 +459,9 @@ struct sk_buff {
1284 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
1285 struct nf_conntrack *nfct;
1287 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1288 + struct nf_queue_entry *nf_queue_entry;
1290 #ifdef CONFIG_BRIDGE_NETFILTER
1291 struct nf_bridge_info *nf_bridge;
1293 @@ -490,6 +499,9 @@ struct sk_buff {
1295 __u8 encapsulation:1;
1296 /* 6/8 bit hole (depending on ndisc_nodetype presence) */
1297 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1298 + __u8 imq_flags:IMQ_F_BITS;
1300 kmemcheck_bitfield_end(flags2);
1302 #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL
1303 @@ -625,6 +637,12 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
1304 return (struct rtable *)skb_dst(skb);
1308 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1309 +extern int skb_save_cb(struct sk_buff *skb);
1310 +extern int skb_restore_cb(struct sk_buff *skb);
1313 extern void kfree_skb(struct sk_buff *skb);
1314 extern void kfree_skb_list(struct sk_buff *segs);
1315 extern void skb_tx_error(struct sk_buff *skb);
1316 @@ -2635,6 +2653,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
1317 nf_conntrack_get(src->nfct);
1318 dst->nfctinfo = src->nfctinfo;
1320 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1321 + dst->imq_flags = src->imq_flags;
1322 + dst->nf_queue_entry = src->nf_queue_entry;
1324 #ifdef CONFIG_BRIDGE_NETFILTER
1325 dst->nf_bridge = src->nf_bridge;
1326 nf_bridge_get(src->nf_bridge);
1327 diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
1328 index aaba4bb..f6e92a4 100644
1329 --- a/include/net/netfilter/nf_queue.h
1330 +++ b/include/net/netfilter/nf_queue.h
1331 @@ -29,6 +29,12 @@ struct nf_queue_handler {
1332 void nf_register_queue_handler(const struct nf_queue_handler *qh);
1333 void nf_unregister_queue_handler(void);
1334 extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
1335 +extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
1337 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1338 +extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
1339 +extern void nf_unregister_queue_imq_handler(void);
1342 bool nf_queue_entry_get_refs(struct nf_queue_entry *entry);
1343 void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
1344 diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
1345 index f7dc0eb..58c46a9 100644
1346 --- a/include/uapi/linux/netfilter.h
1347 +++ b/include/uapi/linux/netfilter.h
1352 -#define NF_MAX_VERDICT NF_STOP
1353 +#define NF_IMQ_QUEUE 6
1354 +#define NF_MAX_VERDICT NF_IMQ_QUEUE
1356 /* we overload the higher bits for encoding auxiliary data such as the queue
1357 * number or errno values. Not nice, but better than additional function
1358 diff --git a/net/core/dev.c b/net/core/dev.c
1359 index 3d13874..9842f21 100644
1360 --- a/net/core/dev.c
1361 +++ b/net/core/dev.c
1363 #include <linux/static_key.h>
1364 #include <linux/hashtable.h>
1365 #include <linux/vmalloc.h>
1366 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1367 +#include <linux/imq.h>
1370 #include "net-sysfs.h"
1372 @@ -2595,7 +2598,12 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
1376 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1377 + if (!list_empty(&ptype_all) &&
1378 + !(skb->imq_flags & IMQ_F_ENQUEUE))
1380 if (!list_empty(&ptype_all))
1382 dev_queue_xmit_nit(skb, dev);
1385 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
1386 index c28c7fe..a5f1888 100644
1387 --- a/net/core/skbuff.c
1388 +++ b/net/core/skbuff.c
1391 struct kmem_cache *skbuff_head_cache __read_mostly;
1392 static struct kmem_cache *skbuff_fclone_cache __read_mostly;
1393 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1394 +static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
1397 static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
1398 struct pipe_buffer *buf)
1399 @@ -92,6 +95,82 @@ static int sock_pipe_buf_steal(struct pipe_inode_info *pipe,
1403 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1404 +/* Control buffer save/restore for IMQ devices */
1405 +struct skb_cb_table {
1406 + char cb[48] __aligned(8);
1411 +static DEFINE_SPINLOCK(skb_cb_store_lock);
1413 +int skb_save_cb(struct sk_buff *skb)
1415 + struct skb_cb_table *next;
1417 + next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
1421 + BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
1423 + memcpy(next->cb, skb->cb, sizeof(skb->cb));
1424 + next->cb_next = skb->cb_next;
1426 + atomic_set(&next->refcnt, 1);
1428 + skb->cb_next = next;
1431 +EXPORT_SYMBOL(skb_save_cb);
1433 +int skb_restore_cb(struct sk_buff *skb)
1435 + struct skb_cb_table *next;
1437 + if (!skb->cb_next)
1440 + next = skb->cb_next;
1442 + BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
1444 + memcpy(skb->cb, next->cb, sizeof(skb->cb));
1445 + skb->cb_next = next->cb_next;
1447 + spin_lock(&skb_cb_store_lock);
1449 + if (atomic_dec_and_test(&next->refcnt))
1450 + kmem_cache_free(skbuff_cb_store_cache, next);
1452 + spin_unlock(&skb_cb_store_lock);
1456 +EXPORT_SYMBOL(skb_restore_cb);
1458 +static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
1460 + struct skb_cb_table *next;
1461 + struct sk_buff *old;
1463 + if (!__old->cb_next) {
1464 + new->cb_next = NULL;
1468 + spin_lock(&skb_cb_store_lock);
1470 + old = (struct sk_buff *)__old;
1472 + next = old->cb_next;
1473 + atomic_inc(&next->refcnt);
1474 + new->cb_next = next;
1476 + spin_unlock(&skb_cb_store_lock);
1480 /* Pipe buffer operations for a socket. */
1481 static const struct pipe_buf_operations sock_pipe_buf_ops = {
1482 @@ -577,6 +656,28 @@ static void skb_release_head_state(struct sk_buff *skb)
1484 skb->destructor(skb);
1486 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1488 + * This should not happen. When it does, avoid memleak by restoring
1489 + * the chain of cb-backups.
1491 + while (skb->cb_next != NULL) {
1492 + if (net_ratelimit())
1493 + pr_warn("IMQ: kfree_skb: skb->cb_next: %08x\n",
1494 + (unsigned int)skb->cb_next);
1496 + skb_restore_cb(skb);
1499 + * This should not happen either, nf_queue_entry is nullified in
1500 + * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
1501 + * leaking entry pointers, maybe memory. We don't know if this is
1502 + * pointer to already freed memory, or should this be freed.
1503 + * If this happens we need to add refcounting, etc for nf_queue_entry.
1505 + if (skb->nf_queue_entry && net_ratelimit())
1506 + pr_warn("%s\n", "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
1508 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
1509 nf_conntrack_put(skb->nfct);
1511 @@ -709,6 +810,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
1512 new->sp = secpath_get(old->sp);
1514 memcpy(new->cb, old->cb, sizeof(old->cb));
1515 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1516 + new->cb_next = NULL;
1517 + /*skb_copy_stored_cb(new, old);*/
1519 new->csum = old->csum;
1520 new->local_df = old->local_df;
1521 new->pkt_type = old->pkt_type;
1522 @@ -3112,6 +3217,13 @@ void __init skb_init(void)
1524 SLAB_HWCACHE_ALIGN|SLAB_PANIC,
1526 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1527 + skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
1528 + sizeof(struct skb_cb_table),
1530 + SLAB_HWCACHE_ALIGN|SLAB_PANIC,
1536 diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
1537 index b6fa35e..08dcfef 100644
1538 --- a/net/ipv6/ip6_output.c
1539 +++ b/net/ipv6/ip6_output.c
1540 @@ -64,9 +64,6 @@ static int ip6_finish_output2(struct sk_buff *skb)
1541 struct in6_addr *nexthop;
1544 - skb->protocol = htons(ETH_P_IPV6);
1547 if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
1548 struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
1550 @@ -143,6 +140,13 @@ int ip6_output(struct sk_buff *skb)
1555 + * IMQ-patch: moved setting skb->dev and skb->protocol from
1556 + * ip6_finish_output2 to fix crashing at netif_skb_features().
1558 + skb->protocol = htons(ETH_P_IPV6);
1561 return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, dev,
1563 !(IP6CB(skb)->flags & IP6SKB_REROUTED));
1564 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
1565 index 6e839b6..45ac31c 100644
1566 --- a/net/netfilter/Kconfig
1567 +++ b/net/netfilter/Kconfig
1568 @@ -630,6 +630,18 @@ config NETFILTER_XT_TARGET_LOG
1570 To compile it as a module, choose M here. If unsure, say N.
1572 +config NETFILTER_XT_TARGET_IMQ
1573 + tristate '"IMQ" target support'
1574 + depends on NETFILTER_XTABLES
1575 + depends on IP_NF_MANGLE || IP6_NF_MANGLE
1577 + default m if NETFILTER_ADVANCED=n
1579 + This option adds a `IMQ' target which is used to specify if and
1580 + to which imq device packets should get enqueued/dequeued.
1582 + To compile it as a module, choose M here. If unsure, say N.
1584 config NETFILTER_XT_TARGET_MARK
1585 tristate '"MARK" target support'
1586 depends on NETFILTER_ADVANCED
1587 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
1588 index c3a0a12..9647f06 100644
1589 --- a/net/netfilter/Makefile
1590 +++ b/net/netfilter/Makefile
1591 @@ -82,6 +82,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
1592 obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
1593 obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
1594 obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
1595 +obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
1596 obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
1597 obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o
1598 obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o
1599 diff --git a/net/netfilter/core.c b/net/netfilter/core.c
1600 index 593b16e..740cd69 100644
1601 --- a/net/netfilter/core.c
1602 +++ b/net/netfilter/core.c
1603 @@ -191,9 +191,11 @@ next_hook:
1604 ret = NF_DROP_GETERR(verdict);
1607 - } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
1608 + } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE ||
1609 + (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
1610 int err = nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
1611 - verdict >> NF_VERDICT_QBITS);
1612 + verdict >> NF_VERDICT_QBITS,
1613 + verdict & NF_VERDICT_MASK);
1615 if (err == -ECANCELED)
1617 diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h
1618 index 3deec99..c1a1397 100644
1619 --- a/net/netfilter/nf_internals.h
1620 +++ b/net/netfilter/nf_internals.h
1621 @@ -29,7 +29,7 @@ extern int nf_queue(struct sk_buff *skb,
1622 struct net_device *indev,
1623 struct net_device *outdev,
1624 int (*okfn)(struct sk_buff *),
1625 - unsigned int queuenum);
1626 + unsigned int queuenum, unsigned int queuetype);
1627 extern int __init netfilter_queue_init(void);
1630 diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
1631 index 5d24b1f..28317dc 100644
1632 --- a/net/netfilter/nf_queue.c
1633 +++ b/net/netfilter/nf_queue.c
1636 static const struct nf_queue_handler __rcu *queue_handler __read_mostly;
1638 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1639 +static const struct nf_queue_handler __rcu *queue_imq_handler __read_mostly;
1641 +void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
1643 + rcu_assign_pointer(queue_imq_handler, qh);
1645 +EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler);
1647 +void nf_unregister_queue_imq_handler(void)
1649 + RCU_INIT_POINTER(queue_imq_handler, NULL);
1650 + synchronize_rcu();
1652 +EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler);
1655 /* return EBUSY when somebody else is registered, return EEXIST if the
1656 * same handler is registered, return 0 in case of success. */
1657 void nf_register_queue_handler(const struct nf_queue_handler *qh)
1658 @@ -105,7 +122,8 @@ int nf_queue(struct sk_buff *skb,
1659 struct net_device *indev,
1660 struct net_device *outdev,
1661 int (*okfn)(struct sk_buff *),
1662 - unsigned int queuenum)
1663 + unsigned int queuenum,
1664 + unsigned int queuetype)
1666 int status = -ENOENT;
1667 struct nf_queue_entry *entry = NULL;
1668 @@ -115,7 +133,17 @@ int nf_queue(struct sk_buff *skb,
1669 /* QUEUE == DROP if no one is waiting, to be safe. */
1672 - qh = rcu_dereference(queue_handler);
1673 + if (queuetype == NF_IMQ_QUEUE) {
1674 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1675 + qh = rcu_dereference(queue_imq_handler);
1681 + qh = rcu_dereference(queue_handler);
1687 @@ -205,9 +233,11 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
1691 + case NF_IMQ_QUEUE:
1692 err = nf_queue(skb, elem, entry->pf, entry->hook,
1693 entry->indev, entry->outdev, entry->okfn,
1694 - verdict >> NF_VERDICT_QBITS);
1695 + verdict >> NF_VERDICT_QBITS,
1696 + verdict & NF_VERDICT_MASK);
1698 if (err == -ECANCELED)
1700 diff --git a/net/netfilter/xt_IMQ.c b/net/netfilter/xt_IMQ.c
1701 new file mode 100644
1702 index 0000000..1c3cd66
1704 +++ b/net/netfilter/xt_IMQ.c
1707 + * This target marks packets to be enqueued to an imq device
1709 +#include <linux/module.h>
1710 +#include <linux/skbuff.h>
1711 +#include <linux/netfilter/x_tables.h>
1712 +#include <linux/netfilter/xt_IMQ.h>
1713 +#include <linux/imq.h>
1715 +static unsigned int imq_target(struct sk_buff *pskb,
1716 + const struct xt_action_param *par)
1718 + const struct xt_imq_info *mr = par->targinfo;
1720 + pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
1722 + return XT_CONTINUE;
1725 +static int imq_checkentry(const struct xt_tgchk_param *par)
1727 + struct xt_imq_info *mr = par->targinfo;
1729 + if (mr->todev > IMQ_MAX_DEVS - 1) {
1730 + pr_warn("IMQ: invalid device specified, highest is %u\n",
1731 + IMQ_MAX_DEVS - 1);
1738 +static struct xt_target xt_imq_reg[] __read_mostly = {
1741 + .family = AF_INET,
1742 + .checkentry = imq_checkentry,
1743 + .target = imq_target,
1744 + .targetsize = sizeof(struct xt_imq_info),
1745 + .table = "mangle",
1750 + .family = AF_INET6,
1751 + .checkentry = imq_checkentry,
1752 + .target = imq_target,
1753 + .targetsize = sizeof(struct xt_imq_info),
1754 + .table = "mangle",
1759 +static int __init imq_init(void)
1761 + return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
1764 +static void __exit imq_fini(void)
1766 + xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
1769 +module_init(imq_init);
1770 +module_exit(imq_fini);
1772 +MODULE_AUTHOR("http://www.linuximq.net");
1773 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
1774 +MODULE_LICENSE("GPL");
1775 +MODULE_ALIAS("ipt_IMQ");
1776 +MODULE_ALIAS("ip6t_IMQ");