1 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
2 index df51d60..e937550 100644
3 --- a/drivers/net/Kconfig
4 +++ b/drivers/net/Kconfig
5 @@ -220,6 +220,125 @@ config RIONET_RX_SIZE
10 + tristate "IMQ (intermediate queueing device) support"
11 + depends on NETDEVICES && NETFILTER
13 + The IMQ device(s) is used as placeholder for QoS queueing
14 + disciplines. Every packet entering/leaving the IP stack can be
15 + directed through the IMQ device where it's enqueued/dequeued to the
16 + attached qdisc. This allows you to treat network devices as classes
17 + and distribute bandwidth among them. Iptables is used to specify
18 + through which IMQ device, if any, packets travel.
20 + More information at: https://github.com/imq/linuximq
22 + To compile this driver as a module, choose M here: the module
23 + will be called imq. If unsure, say N.
26 + prompt "IMQ behavior (PRE/POSTROUTING)"
28 + default IMQ_BEHAVIOR_AB
30 + This setting defines how IMQ behaves in respect to its
31 + hooking in PREROUTING and POSTROUTING.
33 + IMQ can work in any of the following ways:
35 + PREROUTING | POSTROUTING
36 + -----------------|-------------------
37 + #1 After NAT | After NAT
38 + #2 After NAT | Before NAT
39 + #3 Before NAT | After NAT
40 + #4 Before NAT | Before NAT
42 + The default behavior is to hook before NAT on PREROUTING
43 + and after NAT on POSTROUTING (#3).
45 + This settings are specially usefull when trying to use IMQ
46 + to shape NATed clients.
48 + More information can be found at: https://github.com/imq/linuximq
50 + If not sure leave the default settings alone.
52 +config IMQ_BEHAVIOR_AA
55 + This setting defines how IMQ behaves in respect to its
56 + hooking in PREROUTING and POSTROUTING.
58 + Choosing this option will make IMQ hook like this:
60 + PREROUTING: After NAT
61 + POSTROUTING: After NAT
63 + More information can be found at: https://github.com/imq/linuximq
65 + If not sure leave the default settings alone.
67 +config IMQ_BEHAVIOR_AB
70 + This setting defines how IMQ behaves in respect to its
71 + hooking in PREROUTING and POSTROUTING.
73 + Choosing this option will make IMQ hook like this:
75 + PREROUTING: After NAT
76 + POSTROUTING: Before NAT
78 + More information can be found at: https://github.com/imq/linuximq
80 + If not sure leave the default settings alone.
82 +config IMQ_BEHAVIOR_BA
85 + This setting defines how IMQ behaves in respect to its
86 + hooking in PREROUTING and POSTROUTING.
88 + Choosing this option will make IMQ hook like this:
90 + PREROUTING: Before NAT
91 + POSTROUTING: After NAT
93 + More information can be found at: https://github.com/imq/linuximq
95 + If not sure leave the default settings alone.
97 +config IMQ_BEHAVIOR_BB
100 + This setting defines how IMQ behaves in respect to its
101 + hooking in PREROUTING and POSTROUTING.
103 + Choosing this option will make IMQ hook like this:
105 + PREROUTING: Before NAT
106 + POSTROUTING: Before NAT
108 + More information can be found at: https://github.com/imq/linuximq
110 + If not sure leave the default settings alone.
115 + int "Number of IMQ devices"
120 + This setting defines how many IMQ devices will be created.
122 + The default value is 16.
124 + More information can be found at: https://github.com/imq/linuximq
126 + If not sure leave the default settings alone.
129 tristate "Universal TUN/TAP device driver support"
131 diff --git a/drivers/net/Makefile b/drivers/net/Makefile
132 index e25fdd7..b411742 100644
133 --- a/drivers/net/Makefile
134 +++ b/drivers/net/Makefile
135 @@ -10,6 +10,7 @@ obj-$(CONFIG_IPVLAN) += ipvlan/
136 obj-$(CONFIG_DUMMY) += dummy.o
137 obj-$(CONFIG_EQUALIZER) += eql.o
138 obj-$(CONFIG_IFB) += ifb.o
139 +obj-$(CONFIG_IMQ) += imq.o
140 obj-$(CONFIG_MACVLAN) += macvlan.o
141 obj-$(CONFIG_MACVTAP) += macvtap.o
142 obj-$(CONFIG_MII) += mii.o
143 diff --git a/drivers/net/imq.c b/drivers/net/imq.c
145 index 0000000..7702afd
147 +++ b/drivers/net/imq.c
150 + * Pseudo-driver for the intermediate queue device.
152 + * This program is free software; you can redistribute it and/or
153 + * modify it under the terms of the GNU General Public License
154 + * as published by the Free Software Foundation; either version
155 + * 2 of the License, or (at your option) any later version.
157 + * Authors: Patrick McHardy, <kaber@trash.net>
159 + * The first version was written by Martin Devera, <devik@cdi.cz>
164 +#include <linux/module.h>
165 +#include <linux/kernel.h>
166 +#include <linux/moduleparam.h>
167 +#include <linux/list.h>
168 +#include <linux/skbuff.h>
169 +#include <linux/netdevice.h>
170 +#include <linux/etherdevice.h>
171 +#include <linux/rtnetlink.h>
172 +#include <linux/if_arp.h>
173 +#include <linux/netfilter.h>
174 +#include <linux/netfilter_ipv4.h>
175 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
176 + #include <linux/netfilter_ipv6.h>
178 +#include <linux/imq.h>
179 +#include <net/pkt_sched.h>
180 +#include <net/netfilter/nf_queue.h>
181 +#include <net/sock.h>
182 +#include <linux/ip.h>
183 +#include <linux/ipv6.h>
184 +#include <linux/if_vlan.h>
185 +#include <linux/if_pppox.h>
187 +#include <net/ipv6.h>
189 +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num);
191 +static nf_hookfn imq_nf_hook;
193 +static struct nf_hook_ops imq_ops[] = {
195 + /* imq_ingress_ipv4 */
196 + .hook = imq_nf_hook,
197 + .owner = THIS_MODULE,
199 + .hooknum = NF_INET_PRE_ROUTING,
200 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
201 + .priority = NF_IP_PRI_MANGLE + 1,
203 + .priority = NF_IP_PRI_NAT_DST + 1,
207 + /* imq_egress_ipv4 */
208 + .hook = imq_nf_hook,
209 + .owner = THIS_MODULE,
211 + .hooknum = NF_INET_POST_ROUTING,
212 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
213 + .priority = NF_IP_PRI_LAST,
215 + .priority = NF_IP_PRI_NAT_SRC - 1,
218 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
220 + /* imq_ingress_ipv6 */
221 + .hook = imq_nf_hook,
222 + .owner = THIS_MODULE,
224 + .hooknum = NF_INET_PRE_ROUTING,
225 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
226 + .priority = NF_IP6_PRI_MANGLE + 1,
228 + .priority = NF_IP6_PRI_NAT_DST + 1,
232 + /* imq_egress_ipv6 */
233 + .hook = imq_nf_hook,
234 + .owner = THIS_MODULE,
236 + .hooknum = NF_INET_POST_ROUTING,
237 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
238 + .priority = NF_IP6_PRI_LAST,
240 + .priority = NF_IP6_PRI_NAT_SRC - 1,
246 +#if defined(CONFIG_IMQ_NUM_DEVS)
247 +static int numdevs = CONFIG_IMQ_NUM_DEVS;
249 +static int numdevs = IMQ_MAX_DEVS;
252 +static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
254 +#define IMQ_MAX_QUEUES 32
255 +static int numqueues = 1;
256 +static u32 imq_hashrnd;
257 +static int imq_dev_accurate_stats = 1;
259 +static inline __be16 pppoe_proto(const struct sk_buff *skb)
261 + return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN +
262 + sizeof(struct pppoe_hdr)));
265 +static u16 imq_hash(struct net_device *dev, struct sk_buff *skb)
267 + unsigned int pull_len;
268 + u16 protocol = skb->protocol;
280 + switch (protocol) {
281 + case htons(ETH_P_8021Q): {
282 + if (unlikely(skb_pull(skb, VLAN_HLEN) == NULL))
285 + pull_len += VLAN_HLEN;
286 + skb->network_header += VLAN_HLEN;
288 + protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
292 + case htons(ETH_P_PPP_SES): {
293 + if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) == NULL))
296 + pull_len += PPPOE_SES_HLEN;
297 + skb->network_header += PPPOE_SES_HLEN;
299 + protocol = pppoe_proto(skb);
303 + case htons(ETH_P_IP): {
304 + const struct iphdr *iph = ip_hdr(skb);
306 + if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr))))
309 + addr1 = iph->daddr;
310 + addr2 = iph->saddr;
312 + ip_proto = !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ?
314 + ihl = ip_hdrlen(skb);
318 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
319 + case htons(ETH_P_IPV6): {
320 + const struct ipv6hdr *iph = ipv6_hdr(skb);
323 + if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr))))
326 + addr1 = iph->daddr.s6_addr32[3];
327 + addr2 = iph->saddr.s6_addr32[3];
328 + ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto,
330 + if (unlikely(ihl < 0))
338 + if (pull_len != 0) {
339 + skb_push(skb, pull_len);
340 + skb->network_header -= pull_len;
343 + return (u16)(ntohs(protocol) % dev->real_num_tx_queues);
347 + swap(addr1, addr2);
349 + switch (ip_proto) {
356 + case IPPROTO_UDPLITE: {
357 + if (likely(skb_copy_bits(skb, ihl, &ports.in32, 4) >= 0)) {
358 + if (ports.in16[0] > ports.in16[1])
359 + swap(ports.in16[0], ports.in16[1]);
369 + if (pull_len != 0) {
370 + skb_push(skb, pull_len);
371 + skb->network_header -= pull_len;
374 + hash = jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto);
376 + return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32);
379 +static inline bool sk_tx_queue_recorded(struct sock *sk)
381 + return (sk_tx_queue_get(sk) >= 0);
384 +static struct netdev_queue *imq_select_queue(struct net_device *dev,
385 + struct sk_buff *skb)
387 + u16 queue_index = 0;
390 + if (likely(dev->real_num_tx_queues == 1))
393 + /* IMQ can be receiving ingress or engress packets. */
395 + /* Check first for if rx_queue is set */
396 + if (skb_rx_queue_recorded(skb)) {
397 + queue_index = skb_get_rx_queue(skb);
401 + /* Check if socket has tx_queue set */
402 + if (sk_tx_queue_recorded(skb->sk)) {
403 + queue_index = sk_tx_queue_get(skb->sk);
407 + /* Try use socket hash */
408 + if (skb->sk && skb->sk->sk_hash) {
409 + hash = skb->sk->sk_hash;
411 + (u16)(((u64)hash * dev->real_num_tx_queues) >> 32);
415 + /* Generate hash from packet data */
416 + queue_index = imq_hash(dev, skb);
419 + if (unlikely(queue_index >= dev->real_num_tx_queues))
420 + queue_index = (u16)((u32)queue_index % dev->real_num_tx_queues);
422 + skb_set_queue_mapping(skb, queue_index);
423 + return netdev_get_tx_queue(dev, queue_index);
426 +static struct net_device_stats *imq_get_stats(struct net_device *dev)
428 + return &dev->stats;
431 +/* called for packets kfree'd in qdiscs at places other than enqueue */
432 +static void imq_skb_destructor(struct sk_buff *skb)
434 + struct nf_queue_entry *entry = skb->nf_queue_entry;
436 + skb->nf_queue_entry = NULL;
439 + nf_queue_entry_release_refs(entry);
443 + skb_restore_cb(skb); /* kfree backup */
446 +static void imq_done_check_queue_mapping(struct sk_buff *skb,
447 + struct net_device *dev)
449 + unsigned int queue_index;
451 + /* Don't let queue_mapping be left too large after exiting IMQ */
452 + if (likely(skb->dev != dev && skb->dev != NULL)) {
453 + queue_index = skb_get_queue_mapping(skb);
454 + if (unlikely(queue_index >= skb->dev->real_num_tx_queues)) {
455 + queue_index = (u16)((u32)queue_index %
456 + skb->dev->real_num_tx_queues);
457 + skb_set_queue_mapping(skb, queue_index);
460 + /* skb->dev was IMQ device itself or NULL, be on safe side and
461 + * just clear queue mapping.
463 + skb_set_queue_mapping(skb, 0);
467 +static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
469 + struct nf_queue_entry *entry = skb->nf_queue_entry;
471 + skb->nf_queue_entry = NULL;
472 + dev->trans_start = jiffies;
474 + dev->stats.tx_bytes += skb->len;
475 + dev->stats.tx_packets++;
477 + if (unlikely(entry == NULL)) {
478 + /* We don't know what is going on here.. packet is queued for
479 + * imq device, but (probably) not by us.
481 + * If this packet was not send here by imq_nf_queue(), then
482 + * skb_save_cb() was not used and skb_free() should not show:
483 + * WARNING: IMQ: kfree_skb: skb->cb_next:..
485 + * WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
487 + * However if this message is shown, then IMQ is somehow broken
488 + * and you should report this to linuximq.net.
491 + /* imq_dev_xmit is black hole that eats all packets, report that
492 + * we eat this packet happily and increase dropped counters.
495 + dev->stats.tx_dropped++;
496 + dev_kfree_skb(skb);
498 + return NETDEV_TX_OK;
501 + skb_restore_cb(skb); /* restore skb->cb */
503 + skb->imq_flags = 0;
504 + skb->destructor = NULL;
506 + imq_done_check_queue_mapping(skb, dev);
508 + nf_reinject(entry, NF_ACCEPT);
510 + return NETDEV_TX_OK;
513 +static struct net_device *get_imq_device_by_index(int index)
515 + struct net_device *dev = NULL;
519 + /* get device by name and cache result */
520 + snprintf(buf, sizeof(buf), "imq%d", index);
522 + /* Search device from all namespaces. */
523 + for_each_net(net) {
524 + dev = dev_get_by_name(net, buf);
529 + if (WARN_ON_ONCE(dev == NULL)) {
530 + /* IMQ device not found. Exotic config? */
531 + return ERR_PTR(-ENODEV);
534 + imq_devs_cache[index] = dev;
540 +static struct nf_queue_entry *nf_queue_entry_dup(struct nf_queue_entry *e)
542 + struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC);
544 + if (nf_queue_entry_get_refs(entry))
551 +#ifdef CONFIG_BRIDGE_NETFILTER
552 +/* When called from bridge netfilter, skb->data must point to MAC header
553 + * before calling skb_gso_segment(). Else, original MAC header is lost
554 + * and segmented skbs will be sent to wrong destination.
556 +static void nf_bridge_adjust_skb_data(struct sk_buff *skb)
558 + if (skb->nf_bridge)
559 + __skb_push(skb, skb->network_header - skb->mac_header);
562 +static void nf_bridge_adjust_segmented_data(struct sk_buff *skb)
564 + if (skb->nf_bridge)
565 + __skb_pull(skb, skb->network_header - skb->mac_header);
568 +#define nf_bridge_adjust_skb_data(s) do {} while (0)
569 +#define nf_bridge_adjust_segmented_data(s) do {} while (0)
572 +static void free_entry(struct nf_queue_entry *entry)
574 + nf_queue_entry_release_refs(entry);
578 +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev);
580 +static int __imq_nf_queue_gso(struct nf_queue_entry *entry,
581 + struct net_device *dev, struct sk_buff *skb)
584 + struct nf_queue_entry *entry_seg;
586 + nf_bridge_adjust_segmented_data(skb);
588 + if (skb->next == NULL) { /* last packet, no need to copy entry */
589 + struct sk_buff *gso_skb = entry->skb;
591 + ret = __imq_nf_queue(entry, dev);
593 + entry->skb = gso_skb;
599 + entry_seg = nf_queue_entry_dup(entry);
601 + entry_seg->skb = skb;
602 + ret = __imq_nf_queue(entry_seg, dev);
604 + free_entry(entry_seg);
609 +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
611 + struct sk_buff *skb, *segs;
612 + struct net_device *dev;
613 + unsigned int queued;
614 + int index, retval, err;
616 + index = entry->skb->imq_flags & IMQ_F_IFMASK;
617 + if (unlikely(index > numdevs - 1)) {
618 + if (net_ratelimit())
619 + pr_warn("IMQ: invalid device specified, highest is %u\n",
625 + /* check for imq device by index from cache */
626 + dev = imq_devs_cache[index];
627 + if (unlikely(!dev)) {
628 + dev = get_imq_device_by_index(index);
630 + retval = PTR_ERR(dev);
635 + if (unlikely(!(dev->flags & IFF_UP))) {
636 + entry->skb->imq_flags = 0;
637 + retval = -ECANCELED;
641 + /* Since 3.10.x, GSO handling moved here as result of upstream commit
642 + * a5fedd43d5f6c94c71053a66e4c3d2e35f1731a2 (netfilter: move
643 + * skb_gso_segment into nfnetlink_queue module).
645 + * Following code replicates the gso handling from
646 + * 'net/netfilter/nfnetlink_queue_core.c':nfqnl_enqueue_packet().
651 + switch (entry->state.pf) {
653 + skb->protocol = htons(ETH_P_IP);
656 + skb->protocol = htons(ETH_P_IPV6);
660 + if (!skb_is_gso(entry->skb))
661 + return __imq_nf_queue(entry, dev);
663 + nf_bridge_adjust_skb_data(skb);
664 + segs = skb_gso_segment(skb, 0);
665 + /* Does not use PTR_ERR to limit the number of error codes that can be
666 + * returned by nf_queue. For instance, callers rely on -ECANCELED to
667 + * mean 'ignore this hook'.
675 + struct sk_buff *nskb = segs->next;
676 + if (nskb && nskb->next)
677 + nskb->cb_next = NULL;
679 + err = __imq_nf_queue_gso(entry, dev, segs);
688 + if (err) /* some segments are already queued */
695 + nf_bridge_adjust_segmented_data(skb);
701 +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev)
703 + struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd;
705 + struct netdev_queue *txq;
706 + spinlock_t *root_lock;
708 + int retval = -EINVAL;
709 + unsigned int orig_queue_index;
711 + dev->last_rx = jiffies;
716 + /* skb has owner? => make clone */
717 + if (unlikely(skb->destructor)) {
719 + skb = skb_clone(skb, GFP_ATOMIC);
720 + if (unlikely(!skb)) {
724 + skb->cb_next = NULL;
728 + skb->nf_queue_entry = entry;
730 + dev->stats.rx_bytes += skb->len;
731 + dev->stats.rx_packets++;
734 + /* skb->dev == NULL causes problems, try the find cause. */
735 + if (net_ratelimit()) {
736 + dev_warn(&dev->dev,
737 + "received packet with skb->dev == NULL\n");
744 + /* Disables softirqs for lock below */
745 + rcu_read_lock_bh();
747 + /* Multi-queue selection */
748 + orig_queue_index = skb_get_queue_mapping(skb);
749 + txq = imq_select_queue(dev, skb);
751 + q = rcu_dereference(txq->qdisc);
752 + if (unlikely(!q->enqueue))
753 + goto packet_not_eaten_by_imq_dev;
755 + root_lock = qdisc_lock(q);
756 + spin_lock(root_lock);
758 + users = atomic_read(&skb->users);
760 + skb_shared = skb_get(skb); /* increase reference count by one */
762 + /* backup skb->cb, as qdisc layer will overwrite it */
763 + skb_save_cb(skb_shared);
764 + qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
766 + if (likely(atomic_read(&skb_shared->users) == users + 1)) {
769 + kfree_skb(skb_shared); /* decrease reference count by one */
771 + skb->destructor = &imq_skb_destructor;
773 + skb_popd = qdisc_dequeue_skb(q, &validate);
776 + if (unlikely(skb_orig))
777 + kfree_skb(skb_orig); /* free original */
779 + spin_unlock(root_lock);
782 + /* schedule qdisc dequeue */
783 + __netif_schedule(q);
785 + if (likely(skb_popd)) {
786 + /* Note that we validate skb (GSO, checksum, ...) outside of locks */
788 + skb_popd = validate_xmit_skb_list(skb_popd, dev);
792 + int cpu = smp_processor_id(); /* ok because BHs are off */
794 + txq = skb_get_tx_queue(dev, skb_popd);
796 + IMQ device will not be frozen or stoped, and it always be successful.
797 + So we need not check its status and return value to accelerate.
799 + if (imq_dev_accurate_stats && txq->xmit_lock_owner != cpu) {
800 + HARD_TX_LOCK(dev, txq, cpu);
801 + if (!netif_xmit_frozen_or_stopped(txq)) {
802 + dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret);
804 + HARD_TX_UNLOCK(dev, txq);
806 + if (!netif_xmit_frozen_or_stopped(txq)) {
807 + dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret);
812 + /* No ready skb, then schedule it */
813 + __netif_schedule(q);
816 + rcu_read_unlock_bh();
820 + skb_restore_cb(skb_shared); /* restore skb->cb */
821 + skb->nf_queue_entry = NULL;
823 + * qdisc dropped packet and decreased skb reference count of
824 + * skb, so we don't really want to and try refree as that would
825 + * actually destroy the skb.
827 + spin_unlock(root_lock);
828 + goto packet_not_eaten_by_imq_dev;
831 +packet_not_eaten_by_imq_dev:
832 + skb_set_queue_mapping(skb, orig_queue_index);
833 + rcu_read_unlock_bh();
835 + /* cloned? restore original */
836 + if (unlikely(skb_orig)) {
838 + entry->skb = skb_orig;
844 +static unsigned int imq_nf_hook(const struct nf_hook_ops *hook_ops,
845 + struct sk_buff *skb,
846 + const struct nf_hook_state *state)
848 + return (skb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT;
851 +static int imq_close(struct net_device *dev)
853 + netif_stop_queue(dev);
857 +static int imq_open(struct net_device *dev)
859 + netif_start_queue(dev);
863 +static const struct net_device_ops imq_netdev_ops = {
864 + .ndo_open = imq_open,
865 + .ndo_stop = imq_close,
866 + .ndo_start_xmit = imq_dev_xmit,
867 + .ndo_get_stats = imq_get_stats,
870 +static void imq_setup(struct net_device *dev)
872 + dev->netdev_ops = &imq_netdev_ops;
873 + dev->type = ARPHRD_VOID;
874 + dev->mtu = 16000; /* too small? */
875 + dev->tx_queue_len = 11000; /* too big? */
876 + dev->flags = IFF_NOARP;
877 + dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
878 + NETIF_F_GSO | NETIF_F_HW_CSUM |
880 + dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE |
881 + IFF_TX_SKB_SHARING);
884 +static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
888 + if (tb[IFLA_ADDRESS]) {
889 + if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
893 + if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
894 + ret = -EADDRNOTAVAIL;
900 + pr_warn("IMQ: imq_validate failed (%d)\n", ret);
904 +static struct rtnl_link_ops imq_link_ops __read_mostly = {
907 + .setup = imq_setup,
908 + .validate = imq_validate,
911 +static const struct nf_queue_handler imq_nfqh = {
912 + .outfn = imq_nf_queue,
915 +static int __init imq_init_hooks(void)
919 + nf_register_queue_imq_handler(&imq_nfqh);
921 + ret = nf_register_hooks(imq_ops, ARRAY_SIZE(imq_ops));
923 + nf_unregister_queue_imq_handler();
928 +static int __init imq_init_one(int index)
930 + struct net_device *dev;
933 + dev = alloc_netdev_mq(0, "imq%d", NET_NAME_UNKNOWN, imq_setup, numqueues);
937 + ret = dev_alloc_name(dev, dev->name);
941 + dev->rtnl_link_ops = &imq_link_ops;
942 + ret = register_netdevice(dev);
952 +static int __init imq_init_devs(void)
956 + if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
957 + pr_err("IMQ: numdevs has to be betweed 1 and %u\n",
962 + if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) {
963 + pr_err("IMQ: numqueues has to be betweed 1 and %u\n",
968 + get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd));
971 + err = __rtnl_link_register(&imq_link_ops);
973 + for (i = 0; i < numdevs && !err; i++)
974 + err = imq_init_one(i);
977 + __rtnl_link_unregister(&imq_link_ops);
978 + memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
985 +static int __init imq_init_module(void)
989 +#if defined(CONFIG_IMQ_NUM_DEVS)
990 + BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
991 + BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
992 + BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
995 + err = imq_init_devs();
997 + pr_err("IMQ: Error trying imq_init_devs(net)\n");
1001 + err = imq_init_hooks();
1003 + pr_err(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
1004 + rtnl_link_unregister(&imq_link_ops);
1005 + memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
1009 + pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d, imq_dev_accurate_stats = %d)\n",
1010 + numdevs, numqueues, imq_dev_accurate_stats);
1012 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
1013 + pr_info("\tHooking IMQ before NAT on PREROUTING.\n");
1015 + pr_info("\tHooking IMQ after NAT on PREROUTING.\n");
1017 +#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
1018 + pr_info("\tHooking IMQ before NAT on POSTROUTING.\n");
1020 + pr_info("\tHooking IMQ after NAT on POSTROUTING.\n");
1026 +static void __exit imq_unhook(void)
1028 + nf_unregister_hooks(imq_ops, ARRAY_SIZE(imq_ops));
1029 + nf_unregister_queue_imq_handler();
1032 +static void __exit imq_cleanup_devs(void)
1034 + rtnl_link_unregister(&imq_link_ops);
1035 + memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
1038 +static void __exit imq_exit_module(void)
1041 + imq_cleanup_devs();
1042 + pr_info("IMQ driver unloaded successfully.\n");
1045 +module_init(imq_init_module);
1046 +module_exit(imq_exit_module);
1048 +module_param(numdevs, int, 0);
1049 +module_param(numqueues, int, 0);
1050 +module_param(imq_dev_accurate_stats, int, 0);
1051 +MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)");
1052 +MODULE_PARM_DESC(numqueues, "number of queues per IMQ device");
1053 +MODULE_PARM_DESC(imq_dev_accurate_stats, "Notify if need the accurate imq device stats");
1055 +MODULE_AUTHOR("http://https://github.com/imq/linuximq");
1056 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information.");
1057 +MODULE_LICENSE("GPL");
1058 +MODULE_ALIAS_RTNL_LINK("imq");
1059 diff --git a/include/linux/imq.h b/include/linux/imq.h
1060 new file mode 100644
1061 index 0000000..1babb09
1063 +++ b/include/linux/imq.h
1068 +/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
1069 +#define IMQ_F_BITS 5
1071 +#define IMQ_F_IFMASK 0x0f
1072 +#define IMQ_F_ENQUEUE 0x10
1074 +#define IMQ_MAX_DEVS (IMQ_F_IFMASK + 1)
1076 +#endif /* _IMQ_H */
1078 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
1079 index 05b9a69..0c35dff 100644
1080 --- a/include/linux/netdevice.h
1081 +++ b/include/linux/netdevice.h
1082 @@ -3276,6 +3276,19 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
1086 +#define HARD_TX_LOCK_BH(dev, txq) { \
1087 + if ((dev->features & NETIF_F_LLTX) == 0) { \
1088 + __netif_tx_lock_bh(txq); \
1092 +#define HARD_TX_UNLOCK_BH(dev, txq) { \
1093 + if ((dev->features & NETIF_F_LLTX) == 0) { \
1094 + __netif_tx_unlock_bh(txq); \
1099 static inline void netif_tx_disable(struct net_device *dev)
1102 diff --git a/include/linux/netfilter/xt_IMQ.h b/include/linux/netfilter/xt_IMQ.h
1103 new file mode 100644
1104 index 0000000..9b07230
1106 +++ b/include/linux/netfilter/xt_IMQ.h
1111 +struct xt_imq_info {
1112 + unsigned int todev; /* target imq device */
1115 +#endif /* _XT_IMQ_H */
1117 diff --git a/include/linux/netfilter_ipv4/ipt_IMQ.h b/include/linux/netfilter_ipv4/ipt_IMQ.h
1118 new file mode 100644
1119 index 0000000..7af320f
1121 +++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
1126 +/* Backwards compatibility for old userspace */
1127 +#include <linux/netfilter/xt_IMQ.h>
1129 +#define ipt_imq_info xt_imq_info
1131 +#endif /* _IPT_IMQ_H */
1133 diff --git a/include/linux/netfilter_ipv6/ip6t_IMQ.h b/include/linux/netfilter_ipv6/ip6t_IMQ.h
1134 new file mode 100644
1135 index 0000000..198ac01
1137 +++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
1139 +#ifndef _IP6T_IMQ_H
1140 +#define _IP6T_IMQ_H
1142 +/* Backwards compatibility for old userspace */
1143 +#include <linux/netfilter/xt_IMQ.h>
1145 +#define ip6t_imq_info xt_imq_info
1147 +#endif /* _IP6T_IMQ_H */
1149 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
1150 index 4307e20..ebfe3f9 100644
1151 --- a/include/linux/skbuff.h
1152 +++ b/include/linux/skbuff.h
1154 #include <linux/netdev_features.h>
1155 #include <linux/sched.h>
1156 #include <net/flow_keys.h>
1157 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1158 +#include <linux/imq.h>
1161 /* A. Checksumming of received packets by device.
1163 @@ -540,6 +543,9 @@ struct sk_buff {
1164 * first. This is owned by whoever has the skb queued ATM.
1166 char cb[48] __aligned(8);
1167 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1171 unsigned long _skb_refdst;
1172 void (*destructor)(struct sk_buff *skb);
1173 @@ -549,6 +555,9 @@ struct sk_buff {
1174 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
1175 struct nf_conntrack *nfct;
1177 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1178 + struct nf_queue_entry *nf_queue_entry;
1180 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
1181 struct nf_bridge_info *nf_bridge;
1183 @@ -616,6 +625,9 @@ struct sk_buff {
1184 __u8 inner_protocol_type:1;
1185 __u8 remcsum_offload:1;
1186 /* 3 or 5 bit hole */
1187 + #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1188 + __u8 imq_flags:IMQ_F_BITS;
1191 #ifdef CONFIG_NET_SCHED
1192 __u16 tc_index; /* traffic control index */
1193 @@ -766,6 +778,12 @@ void kfree_skb_list(struct sk_buff *segs);
1194 void skb_tx_error(struct sk_buff *skb);
1195 void consume_skb(struct sk_buff *skb);
1196 void __kfree_skb(struct sk_buff *skb);
1198 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1199 +int skb_save_cb(struct sk_buff *skb);
1200 +int skb_restore_cb(struct sk_buff *skb);
1203 extern struct kmem_cache *skbuff_head_cache;
1205 void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
1206 @@ -3215,6 +3233,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src,
1208 dst->nfctinfo = src->nfctinfo;
1210 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1211 + dst->imq_flags = src->imq_flags;
1212 + dst->nf_queue_entry = src->nf_queue_entry;
1214 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
1215 dst->nf_bridge = src->nf_bridge;
1216 nf_bridge_get(src->nf_bridge);
1217 diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
1218 index e863585..40904cb 100644
1219 --- a/include/net/netfilter/nf_queue.h
1220 +++ b/include/net/netfilter/nf_queue.h
1221 @@ -31,6 +31,12 @@ struct nf_queue_handler {
1222 void nf_register_queue_handler(const struct nf_queue_handler *qh);
1223 void nf_unregister_queue_handler(void);
1224 void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
1225 +void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
1227 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1228 +void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
1229 +void nf_unregister_queue_imq_handler(void);
1232 bool nf_queue_entry_get_refs(struct nf_queue_entry *entry);
1233 void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
1234 diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
1235 index 2342bf1..149dec9 100644
1236 --- a/include/net/pkt_sched.h
1237 +++ b/include/net/pkt_sched.h
1238 @@ -104,6 +104,8 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
1240 void __qdisc_run(struct Qdisc *q);
1242 +struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate);
1244 static inline void qdisc_run(struct Qdisc *q)
1246 if (qdisc_run_begin(q))
1247 diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
1248 index ef1b1f8..079e5ff 100644
1249 --- a/include/uapi/linux/netfilter.h
1250 +++ b/include/uapi/linux/netfilter.h
1255 -#define NF_MAX_VERDICT NF_STOP
1256 +#define NF_IMQ_QUEUE 6
1257 +#define NF_MAX_VERDICT NF_IMQ_QUEUE
1259 /* we overload the higher bits for encoding auxiliary data such as the queue
1260 * number or errno values. Not nice, but better than additional function
1261 diff --git a/net/core/dev.c b/net/core/dev.c
1262 index a42b232..259883b 100644
1263 --- a/net/core/dev.c
1264 +++ b/net/core/dev.c
1266 #include <linux/if_macvlan.h>
1267 #include <linux/errqueue.h>
1268 #include <linux/hrtimer.h>
1269 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1270 +#include <linux/imq.h>
1273 #include "net-sysfs.h"
1275 @@ -2642,7 +2645,12 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,
1279 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1280 + if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) &&
1281 + !(skb->imq_flags & IMQ_F_ENQUEUE))
1283 if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
1285 dev_queue_xmit_nit(skb, dev);
1288 @@ -2680,6 +2688,7 @@ out:
1292 +EXPORT_SYMBOL(dev_hard_start_xmit);
1294 static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
1295 netdev_features_t features)
1296 @@ -2768,6 +2777,7 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d
1300 +EXPORT_SYMBOL(validate_xmit_skb_list);
1302 static void qdisc_pkt_len_init(struct sk_buff *skb)
1304 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
1305 index 075d2e7..f19a692 100644
1306 --- a/net/core/skbuff.c
1307 +++ b/net/core/skbuff.c
1310 struct kmem_cache *skbuff_head_cache __read_mostly;
1311 static struct kmem_cache *skbuff_fclone_cache __read_mostly;
1312 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1313 +static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
1316 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1317 +/* Control buffer save/restore for IMQ devices */
1318 +struct skb_cb_table {
1319 + char cb[48] __aligned(8);
1324 +static DEFINE_SPINLOCK(skb_cb_store_lock);
1326 +int skb_save_cb(struct sk_buff *skb)
1328 + struct skb_cb_table *next;
1330 + next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
1334 + BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
1336 + memcpy(next->cb, skb->cb, sizeof(skb->cb));
1337 + next->cb_next = skb->cb_next;
1339 + atomic_set(&next->refcnt, 1);
1341 + skb->cb_next = next;
1344 +EXPORT_SYMBOL(skb_save_cb);
1346 +int skb_restore_cb(struct sk_buff *skb)
1348 + struct skb_cb_table *next;
1350 + if (!skb->cb_next)
1353 + next = skb->cb_next;
1355 + BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
1357 + memcpy(skb->cb, next->cb, sizeof(skb->cb));
1358 + skb->cb_next = next->cb_next;
1360 + spin_lock(&skb_cb_store_lock);
1362 + if (atomic_dec_and_test(&next->refcnt))
1363 + kmem_cache_free(skbuff_cb_store_cache, next);
1365 + spin_unlock(&skb_cb_store_lock);
1369 +EXPORT_SYMBOL(skb_restore_cb);
1371 +static void skb_copy_stored_cb(struct sk_buff * , const struct sk_buff * ) __attribute__ ((unused));
1372 +static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
1374 + struct skb_cb_table *next;
1375 + struct sk_buff *old;
1377 + if (!__old->cb_next) {
1378 + new->cb_next = NULL;
1382 + spin_lock(&skb_cb_store_lock);
1384 + old = (struct sk_buff *)__old;
1386 + next = old->cb_next;
1387 + atomic_inc(&next->refcnt);
1388 + new->cb_next = next;
1390 + spin_unlock(&skb_cb_store_lock);
1395 * skb_panic - private function for out-of-line support
1396 @@ -691,6 +772,28 @@ static void skb_release_head_state(struct sk_buff *skb)
1398 skb->destructor(skb);
1400 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1402 + * This should not happen. When it does, avoid memleak by restoring
1403 + * the chain of cb-backups.
1405 + while (skb->cb_next != NULL) {
1406 + if (net_ratelimit())
1407 + pr_warn("IMQ: kfree_skb: skb->cb_next: %08x\n",
1408 + (unsigned int)(uintptr_t)skb->cb_next);
1410 + skb_restore_cb(skb);
1413 + * This should not happen either, nf_queue_entry is nullified in
1414 + * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
1415 + * leaking entry pointers, maybe memory. We don't know if this is
1416 + * pointer to already freed memory, or should this be freed.
1417 + * If this happens we need to add refcounting, etc for nf_queue_entry.
1419 + if (skb->nf_queue_entry && net_ratelimit())
1420 + pr_warn("%s\n", "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
1422 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
1423 nf_conntrack_put(skb->nfct);
1425 @@ -813,6 +916,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
1426 new->sp = secpath_get(old->sp);
1428 __nf_copy(new, old, false);
1429 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1430 + new->cb_next = NULL;
1431 + /*skb_copy_stored_cb(new, old);*/
1434 /* Note : this field could be in headers_start/headers_end section
1435 * It is not yet because we do not want to have a 16 bit hole
1436 @@ -3343,6 +3450,13 @@ void __init skb_init(void)
1438 SLAB_HWCACHE_ALIGN|SLAB_PANIC,
1440 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1441 + skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
1442 + sizeof(struct skb_cb_table),
1444 + SLAB_HWCACHE_ALIGN|SLAB_PANIC,
1450 diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
1451 index bc09cb9..9b6ef9f 100644
1452 --- a/net/ipv6/ip6_output.c
1453 +++ b/net/ipv6/ip6_output.c
1454 @@ -64,9 +64,6 @@ static int ip6_finish_output2(struct sock *sk, struct sk_buff *skb)
1455 struct in6_addr *nexthop;
1458 - skb->protocol = htons(ETH_P_IPV6);
1461 if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
1462 struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
1464 @@ -143,6 +140,13 @@ int ip6_output(struct sock *sk, struct sk_buff *skb)
1469 + * IMQ-patch: moved setting skb->dev and skb->protocol from
1470 + * ip6_finish_output2 to fix crashing at netif_skb_features().
1472 + skb->protocol = htons(ETH_P_IPV6);
1475 return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, sk, skb,
1478 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
1479 index a0f3e6a3..64239c0 100644
1480 --- a/net/netfilter/Kconfig
1481 +++ b/net/netfilter/Kconfig
1482 @@ -771,6 +771,18 @@ config NETFILTER_XT_TARGET_LOG
1484 To compile it as a module, choose M here. If unsure, say N.
1486 +config NETFILTER_XT_TARGET_IMQ
1487 + tristate '"IMQ" target support'
1488 + depends on NETFILTER_XTABLES
1489 + depends on IP_NF_MANGLE || IP6_NF_MANGLE
1491 + default m if NETFILTER_ADVANCED=n
1493 + This option adds a `IMQ' target which is used to specify if and
1494 + to which imq device packets should get enqueued/dequeued.
1496 + To compile it as a module, choose M here. If unsure, say N.
1498 config NETFILTER_XT_TARGET_MARK
1499 tristate '"MARK" target support'
1500 depends on NETFILTER_ADVANCED
1501 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
1502 index a87d8b8..d1080ff 100644
1503 --- a/net/netfilter/Makefile
1504 +++ b/net/netfilter/Makefile
1505 @@ -109,6 +109,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
1506 obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
1507 obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
1508 obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
1509 +obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
1510 obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
1511 obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o
1512 obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o
1513 diff --git a/net/netfilter/core.c b/net/netfilter/core.c
1514 index 5d0c6fd..42d1c21 100644
1515 --- a/net/netfilter/core.c
1516 +++ b/net/netfilter/core.c
1517 @@ -179,9 +179,11 @@ next_hook:
1518 ret = NF_DROP_GETERR(verdict);
1521 - } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
1522 + } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE ||
1523 + (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
1524 int err = nf_queue(skb, elem, state,
1525 - verdict >> NF_VERDICT_QBITS);
1526 + verdict >> NF_VERDICT_QBITS,
1527 + verdict & NF_VERDICT_MASK);
1529 if (err == -ECANCELED)
1531 diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h
1532 index 3992106..35cbc7b 100644
1533 --- a/net/netfilter/nf_internals.h
1534 +++ b/net/netfilter/nf_internals.h
1535 @@ -18,7 +18,7 @@ unsigned int nf_iterate(struct list_head *head, struct sk_buff *skb,
1538 int nf_queue(struct sk_buff *skb, struct nf_hook_ops *elem,
1539 - struct nf_hook_state *state, unsigned int queuenum);
1540 + struct nf_hook_state *state, unsigned int queuenum, unsigned int queuetype);
1541 void nf_queue_nf_hook_drop(struct nf_hook_ops *ops);
1542 int __init netfilter_queue_init(void);
1544 diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
1545 index cd60d39..2b0987d 100644
1546 --- a/net/netfilter/nf_queue.c
1547 +++ b/net/netfilter/nf_queue.c
1550 static const struct nf_queue_handler __rcu *queue_handler __read_mostly;
1552 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1553 +static const struct nf_queue_handler __rcu *queue_imq_handler __read_mostly;
1555 +void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
1557 + rcu_assign_pointer(queue_imq_handler, qh);
1559 +EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler);
1561 +void nf_unregister_queue_imq_handler(void)
1563 + RCU_INIT_POINTER(queue_imq_handler, NULL);
1564 + synchronize_rcu();
1566 +EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler);
1569 /* return EBUSY when somebody else is registered, return EEXIST if the
1570 * same handler is registered, return 0 in case of success. */
1571 void nf_register_queue_handler(const struct nf_queue_handler *qh)
1572 @@ -129,7 +146,8 @@ void nf_queue_nf_hook_drop(struct nf_hook_ops *ops)
1573 int nf_queue(struct sk_buff *skb,
1574 struct nf_hook_ops *elem,
1575 struct nf_hook_state *state,
1576 - unsigned int queuenum)
1577 + unsigned int queuenum,
1578 + unsigned int queuetype)
1580 int status = -ENOENT;
1581 struct nf_queue_entry *entry = NULL;
1582 @@ -139,7 +157,17 @@ int nf_queue(struct sk_buff *skb,
1583 /* QUEUE == DROP if no one is waiting, to be safe. */
1586 - qh = rcu_dereference(queue_handler);
1587 + if (queuetype == NF_IMQ_QUEUE) {
1588 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
1589 + qh = rcu_dereference(queue_imq_handler);
1595 + qh = rcu_dereference(queue_handler);
1601 @@ -225,8 +253,10 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
1605 + case NF_IMQ_QUEUE:
1606 err = nf_queue(skb, elem, &entry->state,
1607 - verdict >> NF_VERDICT_QBITS);
1608 + verdict >> NF_VERDICT_QBITS,
1609 + verdict & NF_VERDICT_MASK);
1611 if (err == -ECANCELED)
1613 diff --git a/net/netfilter/xt_IMQ.c b/net/netfilter/xt_IMQ.c
1614 new file mode 100644
1615 index 0000000..86d7b84
1617 +++ b/net/netfilter/xt_IMQ.c
1620 + * This target marks packets to be enqueued to an imq device
1622 +#include <linux/module.h>
1623 +#include <linux/skbuff.h>
1624 +#include <linux/netfilter/x_tables.h>
1625 +#include <linux/netfilter/xt_IMQ.h>
1626 +#include <linux/imq.h>
1628 +static unsigned int imq_target(struct sk_buff *pskb,
1629 + const struct xt_action_param *par)
1631 + const struct xt_imq_info *mr = par->targinfo;
1633 + pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
1635 + return XT_CONTINUE;
1638 +static int imq_checkentry(const struct xt_tgchk_param *par)
1640 + struct xt_imq_info *mr = par->targinfo;
1642 + if (mr->todev > IMQ_MAX_DEVS - 1) {
1643 + pr_warn("IMQ: invalid device specified, highest is %u\n",
1644 + IMQ_MAX_DEVS - 1);
1651 +static struct xt_target xt_imq_reg[] __read_mostly = {
1654 + .family = AF_INET,
1655 + .checkentry = imq_checkentry,
1656 + .target = imq_target,
1657 + .targetsize = sizeof(struct xt_imq_info),
1658 + .table = "mangle",
1663 + .family = AF_INET6,
1664 + .checkentry = imq_checkentry,
1665 + .target = imq_target,
1666 + .targetsize = sizeof(struct xt_imq_info),
1667 + .table = "mangle",
1672 +static int __init imq_init(void)
1674 + return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
1677 +static void __exit imq_fini(void)
1679 + xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
1682 +module_init(imq_init);
1683 +module_exit(imq_fini);
1685 +MODULE_AUTHOR("http://https://github.com/imq/linuximq");
1686 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information.");
1687 +MODULE_LICENSE("GPL");
1688 +MODULE_ALIAS("ipt_IMQ");
1689 +MODULE_ALIAS("ip6t_IMQ");
1691 diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
1692 index 6efca30..a4e448f 100644
1693 --- a/net/sched/sch_generic.c
1694 +++ b/net/sched/sch_generic.c
1695 @@ -108,6 +108,14 @@ static struct sk_buff *dequeue_skb(struct Qdisc *q, bool *validate,
1699 +struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate)
1703 + return dequeue_skb(q, validate, &packets);
1705 +EXPORT_SYMBOL(qdisc_dequeue_skb);
1707 static inline int handle_dev_cpu_collision(struct sk_buff *skb,
1708 struct netdev_queue *dev_queue,