X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-imq.patch;h=87ee89ac682277f7f3ceef3ab2c724fcfc049e2f;hb=c3a24101b5ade7303992a22e257020aa12de5e7b;hp=12bd3d3b045c7617a17b5ab13c6c3cac5b8f2589;hpb=076b876ecc3a67cef4a0595132374ac1bea1d0be;p=packages%2Fkernel.git diff --git a/kernel-imq.patch b/kernel-imq.patch index 12bd3d3b..87ee89ac 100644 --- a/kernel-imq.patch +++ b/kernel-imq.patch @@ -1,188 +1,7 @@ -net: add Intermediate Queueing Device (imq) - -From: Jussi Kivilinna - -This patch is for kernel version 3.12.4+. - -See: http://linuximq.net/ - -Signed-off-by: Jussi Kivilinna ---- - drivers/net/Kconfig | 119 ++++ - drivers/net/Makefile | 1 - drivers/net/imq.c | 1007 +++++++++++++++++++++++++++++++ - include/linux/imq.h | 13 - include/linux/netfilter/xt_IMQ.h | 9 - include/linux/netfilter_ipv4/ipt_IMQ.h | 10 - include/linux/netfilter_ipv6/ip6t_IMQ.h | 10 - include/linux/skbuff.h | 22 + - include/net/netfilter/nf_queue.h | 6 - include/uapi/linux/netfilter.h | 3 - net/core/dev.c | 8 - net/core/skbuff.c | 112 +++ - net/ipv6/ip6_output.c | 10 - net/netfilter/Kconfig | 12 - net/netfilter/Makefile | 1 - net/netfilter/core.c | 6 - net/netfilter/nf_internals.h | 2 - net/netfilter/nf_queue.c | 36 + - net/netfilter/xt_IMQ.c | 72 ++ - 19 files changed, 1449 insertions(+), 10 deletions(-) - create mode 100644 drivers/net/imq.c - create mode 100644 include/linux/imq.h - create mode 100644 include/linux/netfilter/xt_IMQ.h - create mode 100644 include/linux/netfilter_ipv4/ipt_IMQ.h - create mode 100644 include/linux/netfilter_ipv6/ip6t_IMQ.h - create mode 100644 net/netfilter/xt_IMQ.c - -diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig -index b45b240..5a20da0 100644 ---- a/drivers/net/Kconfig -+++ b/drivers/net/Kconfig -@@ -203,6 +203,125 @@ config RIONET_RX_SIZE - depends on RIONET - default "128" - -+config IMQ -+ tristate "IMQ (intermediate queueing device) support" -+ depends on NETDEVICES && NETFILTER -+ ---help--- -+ The IMQ device(s) is used as placeholder for QoS queueing -+ disciplines. Every packet entering/leaving the IP stack can be -+ directed through the IMQ device where it's enqueued/dequeued to the -+ attached qdisc. This allows you to treat network devices as classes -+ and distribute bandwidth among them. Iptables is used to specify -+ through which IMQ device, if any, packets travel. -+ -+ More information at: http://www.linuximq.net/ -+ -+ To compile this driver as a module, choose M here: the module -+ will be called imq. If unsure, say N. -+ -+choice -+ prompt "IMQ behavior (PRE/POSTROUTING)" -+ depends on IMQ -+ default IMQ_BEHAVIOR_AB -+ help -+ This setting defines how IMQ behaves in respect to its -+ hooking in PREROUTING and POSTROUTING. -+ -+ IMQ can work in any of the following ways: -+ -+ PREROUTING | POSTROUTING -+ -----------------|------------------- -+ #1 After NAT | After NAT -+ #2 After NAT | Before NAT -+ #3 Before NAT | After NAT -+ #4 Before NAT | Before NAT -+ -+ The default behavior is to hook before NAT on PREROUTING -+ and after NAT on POSTROUTING (#3). -+ -+ This settings are specially usefull when trying to use IMQ -+ to shape NATed clients. -+ -+ More information can be found at: www.linuximq.net -+ -+ If not sure leave the default settings alone. -+ -+config IMQ_BEHAVIOR_AA -+ bool "IMQ AA" -+ help -+ This setting defines how IMQ behaves in respect to its -+ hooking in PREROUTING and POSTROUTING. -+ -+ Choosing this option will make IMQ hook like this: -+ -+ PREROUTING: After NAT -+ POSTROUTING: After NAT -+ -+ More information can be found at: www.linuximq.net -+ -+ If not sure leave the default settings alone. -+ -+config IMQ_BEHAVIOR_AB -+ bool "IMQ AB" -+ help -+ This setting defines how IMQ behaves in respect to its -+ hooking in PREROUTING and POSTROUTING. -+ -+ Choosing this option will make IMQ hook like this: -+ -+ PREROUTING: After NAT -+ POSTROUTING: Before NAT -+ -+ More information can be found at: www.linuximq.net -+ -+ If not sure leave the default settings alone. -+ -+config IMQ_BEHAVIOR_BA -+ bool "IMQ BA" -+ help -+ This setting defines how IMQ behaves in respect to its -+ hooking in PREROUTING and POSTROUTING. -+ -+ Choosing this option will make IMQ hook like this: -+ -+ PREROUTING: Before NAT -+ POSTROUTING: After NAT -+ -+ More information can be found at: www.linuximq.net -+ -+ If not sure leave the default settings alone. -+ -+config IMQ_BEHAVIOR_BB -+ bool "IMQ BB" -+ help -+ This setting defines how IMQ behaves in respect to its -+ hooking in PREROUTING and POSTROUTING. -+ -+ Choosing this option will make IMQ hook like this: -+ -+ PREROUTING: Before NAT -+ POSTROUTING: Before NAT -+ -+ More information can be found at: www.linuximq.net -+ -+ If not sure leave the default settings alone. -+ -+endchoice -+ -+config IMQ_NUM_DEVS -+ int "Number of IMQ devices" -+ range 2 16 -+ depends on IMQ -+ default "16" -+ help -+ This setting defines how many IMQ devices will be created. -+ -+ The default value is 16. -+ -+ More information can be found at: www.linuximq.net -+ -+ If not sure leave the default settings alone. -+ - config TUN - tristate "Universal TUN/TAP device driver support" - select CRC32 -diff --git a/drivers/net/Makefile b/drivers/net/Makefile -index 3fef8a8..12dafc0 100644 ---- a/drivers/net/Makefile -+++ b/drivers/net/Makefile -@@ -9,6 +9,7 @@ obj-$(CONFIG_BONDING) += bonding/ - obj-$(CONFIG_DUMMY) += dummy.o - obj-$(CONFIG_EQUALIZER) += eql.o - obj-$(CONFIG_IFB) += ifb.o -+obj-$(CONFIG_IMQ) += imq.o - obj-$(CONFIG_MACVLAN) += macvlan.o - obj-$(CONFIG_MACVTAP) += macvtap.o - obj-$(CONFIG_MII) += mii.o -diff --git a/drivers/net/imq.c b/drivers/net/imq.c -new file mode 100644 -index 0000000..801bc8c ---- /dev/null -+++ b/drivers/net/imq.c -@@ -0,0 +1,1012 @@ +diff -Naupr linux-4.10_orig/drivers/net/imq.c linux-4.10/drivers/net/imq.c +--- linux-4.10_orig/drivers/net/imq.c 1970-01-01 07:00:00.000000000 +0700 ++++ linux-4.10/drivers/net/imq.c 2017-02-28 19:03:58.883221583 +0700 +@@ -0,0 +1,945 @@ +/* + * Pseudo-driver for the intermediate queue device. + * @@ -195,141 +14,7 @@ index 0000000..801bc8c + * + * The first version was written by Martin Devera, + * -+ * Credits: Jan Rafaj -+ * - Update patch to 2.4.21 -+ * Sebastian Strollo -+ * - Fix "Dead-loop on netdevice imq"-issue -+ * Marcel Sebek -+ * - Update to 2.6.2-rc1 -+ * -+ * After some time of inactivity there is a group taking care -+ * of IMQ again: http://www.linuximq.net -+ * -+ * -+ * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7 -+ * including the following changes: -+ * -+ * - Correction of ipv6 support "+"s issue (Hasso Tepper) -+ * - Correction of imq_init_devs() issue that resulted in -+ * kernel OOPS unloading IMQ as module (Norbert Buchmuller) -+ * - Addition of functionality to choose number of IMQ devices -+ * during kernel config (Andre Correa) -+ * - Addition of functionality to choose how IMQ hooks on -+ * PRE and POSTROUTING (after or before NAT) (Andre Correa) -+ * - Cosmetic corrections (Norbert Buchmuller) (Andre Correa) -+ * -+ * -+ * 2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were -+ * released with almost no problems. 2.6.14-x was released -+ * with some important changes: nfcache was removed; After -+ * some weeks of trouble we figured out that some IMQ fields -+ * in skb were missing in skbuff.c - skb_clone and copy_skb_header. -+ * These functions are correctly patched by this new patch version. -+ * -+ * Thanks for all who helped to figure out all the problems with -+ * 2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX, -+ * Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully -+ * 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 -+ * 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) -+ * -+ * 2008/08/06 - 2.6.26 - (JK) -+ * - Replaced tasklet with 'netif_schedule()'. -+ * - Cleaned up and added comments for imq_nf_queue(). -+ * -+ * 2009/04/12 -+ * - Add skb_save_cb/skb_restore_cb helper functions for backuping -+ * control buffer. This is needed because qdisc-layer on kernels -+ * 2.6.27 and newer overwrite control buffer. (Jussi Kivilinna) -+ * - Add better locking for IMQ device. Hopefully this will solve -+ * SMP issues. (Jussi Kivilinna) -+ * - Port to 2.6.27 -+ * - Port to 2.6.28 -+ * - Port to 2.6.29 + fix rmmod not working -+ * -+ * 2009/04/20 - (Jussi Kivilinna) -+ * - Use netdevice feature flags to avoid extra packet handling -+ * by core networking layer and possibly increase performance. -+ * -+ * 2009/09/26 - (Jussi Kivilinna) -+ * - Add imq_nf_reinject_lockless to fix deadlock with -+ * imq_nf_queue/imq_nf_reinject. -+ * -+ * 2009/12/08 - (Jussi Kivilinna) -+ * - Port to 2.6.32 -+ * - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit() -+ * - Also add better error checking for skb->nf_queue_entry usage -+ * -+ * 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 . -+ * -+ * 2011/03/18 - (Jussi Kivilinna) -+ * - Port to 2.6.38 -+ * -+ * 2011/07/12 - (syoder89@gmail.com) -+ * - Crash fix that happens when the receiving interface has more -+ * than one queue (add missing skb_set_queue_mapping in -+ * imq_select_queue). -+ * -+ * 2011/07/26 - (Jussi Kivilinna) -+ * - Add queue mapping checks for packets exiting IMQ. -+ * - Port to 3.0 -+ * -+ * 2011/08/16 - (Jussi Kivilinna) -+ * - Clear IFF_TX_SKB_SHARING flag that was added for linux 3.0.2 -+ * -+ * 2011/11/03 - Germano Michel -+ * - Fix IMQ for net namespaces -+ * -+ * 2011/11/04 - Jussi Kivilinna -+ * - Port to 3.1 -+ * - Clean-up, move 'get imq device pointer by imqX name' to -+ * separate function from imq_nf_queue(). -+ * -+ * 2012/01/05 - Jussi Kivilinna -+ * - Port to 3.2 -+ * -+ * 2012/03/19 - Jussi Kivilinna -+ * - Port to 3.3 -+ * -+ * 2012/12/12 - Jussi Kivilinna -+ * - Port to 3.7 -+ * - Fix checkpatch.pl warnings -+ * -+ * 2013/09/10 - Jussi Kivilinna -+ * - Fixed GSO handling for 3.10, see imq_nf_queue() for comments. -+ * - Don't copy skb->cb_next when copying or cloning skbuffs. -+ * -+ * 2013/09/16 - Jussi Kivilinna -+ * - Port to 3.11 -+ * -+ * 2013/11/12 - Jussi Kivilinna -+ * - Port to 3.12 -+ * -+ * Also, many thanks to pablo Sebastian Greco for making the initial -+ * patch and to those who helped the testing. -+ * -+ * More info at: http://www.linuximq.net/ (Andre Correa) ++ * See Credits.txt + */ + +#include @@ -359,17 +44,12 @@ index 0000000..801bc8c + +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num); + -+static unsigned int imq_nf_hook(const struct nf_hook_ops *ops, -+ struct sk_buff *pskb, -+ const struct net_device *indev, -+ const struct net_device *outdev, -+ int (*okfn)(struct sk_buff *)); ++static nf_hookfn imq_nf_hook; + +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) @@ -381,7 +61,6 @@ index 0000000..801bc8c + { + /* 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) @@ -394,7 +73,6 @@ index 0000000..801bc8c + { + /* 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) @@ -406,7 +84,6 @@ index 0000000..801bc8c + { + /* 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) @@ -429,6 +106,7 @@ index 0000000..801bc8c +#define IMQ_MAX_QUEUES 32 +static int numqueues = 1; +static u32 imq_hashrnd; ++static int imq_dev_accurate_stats = 1; + +static inline __be16 pppoe_proto(const struct sk_buff *skb) +{ @@ -642,8 +320,10 @@ index 0000000..801bc8c +{ + struct nf_queue_entry *entry = skb->nf_queue_entry; + ++ rcu_read_lock(); ++ + skb->nf_queue_entry = NULL; -+ dev->trans_start = jiffies; ++ netif_trans_update(dev); + + dev->stats.tx_bytes += skb->len; + dev->stats.tx_packets++; @@ -669,6 +349,7 @@ index 0000000..801bc8c + dev->stats.tx_dropped++; + dev_kfree_skb(skb); + ++ rcu_read_unlock(); + return NETDEV_TX_OK; + } + @@ -681,6 +362,7 @@ index 0000000..801bc8c + + nf_reinject(entry, NF_ACCEPT); + ++ rcu_read_unlock(); + return NETDEV_TX_OK; +} + @@ -715,9 +397,8 @@ index 0000000..801bc8c +{ + struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC); + if (entry) { -+ if (nf_queue_entry_get_refs(entry)) -+ return entry; -+ kfree(entry); ++ nf_queue_entry_get_refs(entry); ++ return entry; + } + return NULL; +} @@ -812,9 +493,6 @@ index 0000000..801bc8c + goto out_no_dev; + } + -+ if (!skb_is_gso(entry->skb)) -+ return __imq_nf_queue(entry, dev); -+ + /* Since 3.10.x, GSO handling moved here as result of upstream commit + * a5fedd43d5f6c94c71053a66e4c3d2e35f1731a2 (netfilter: move + * skb_gso_segment into nfnetlink_queue module). @@ -825,7 +503,7 @@ index 0000000..801bc8c + + skb = entry->skb; + -+ switch (entry->pf) { ++ switch (entry->state.pf) { + case NFPROTO_IPV4: + skb->protocol = htons(ETH_P_IP); + break; @@ -834,6 +512,9 @@ index 0000000..801bc8c + break; + } + ++ if (!skb_is_gso(entry->skb)) ++ return __imq_nf_queue(entry, dev); ++ + nf_bridge_adjust_skb_data(skb); + segs = skb_gso_segment(skb, 0); + /* Does not use PTR_ERR to limit the number of error codes that can be @@ -874,8 +555,9 @@ index 0000000..801bc8c + +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev) +{ -+ struct sk_buff *skb_orig, *skb, *skb_shared; ++ struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd; + struct Qdisc *q; ++ struct sk_buff *to_free = NULL; + struct netdev_queue *txq; + spinlock_t *root_lock; + int users; @@ -899,8 +581,6 @@ index 0000000..801bc8c + entry->skb = skb; + } + -+ skb->nf_queue_entry = entry; -+ + dev->stats.rx_bytes += skb->len; + dev->stats.rx_packets++; + @@ -926,6 +606,7 @@ index 0000000..801bc8c + if (unlikely(!q->enqueue)) + goto packet_not_eaten_by_imq_dev; + ++ skb->nf_queue_entry = entry; + root_lock = qdisc_lock(q); + spin_lock(root_lock); + @@ -935,23 +616,58 @@ index 0000000..801bc8c + + /* backup skb->cb, as qdisc layer will overwrite it */ + skb_save_cb(skb_shared); -+ qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */ -+ ++ qdisc_enqueue_root(skb_shared, q, &to_free); /* might kfree_skb */ + if (likely(atomic_read(&skb_shared->users) == users + 1)) { ++ bool validate; ++ + kfree_skb(skb_shared); /* decrease reference count by one */ + + skb->destructor = &imq_skb_destructor; + ++ skb_popd = qdisc_dequeue_skb(q, &validate); ++ + /* cloned? */ + if (unlikely(skb_orig)) + kfree_skb(skb_orig); /* free original */ + + spin_unlock(root_lock); -+ rcu_read_unlock_bh(); + ++#if 0 + /* schedule qdisc dequeue */ + __netif_schedule(q); -+ ++#else ++ if (likely(skb_popd)) { ++ /* Note that we validate skb (GSO, checksum, ...) outside of locks */ ++ if (validate) ++ skb_popd = validate_xmit_skb_list(skb_popd, dev); ++ ++ if (skb_popd) { ++ int dummy_ret; ++ int cpu = smp_processor_id(); /* ok because BHs are off */ ++ ++ txq = skb_get_tx_queue(dev, skb_popd); ++ /* ++ IMQ device will not be frozen or stoped, and it always be successful. ++ So we need not check its status and return value to accelerate. ++ */ ++ if (imq_dev_accurate_stats && txq->xmit_lock_owner != cpu) { ++ HARD_TX_LOCK(dev, txq, cpu); ++ if (!netif_xmit_frozen_or_stopped(txq)) { ++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); ++ } ++ HARD_TX_UNLOCK(dev, txq); ++ } else { ++ if (!netif_xmit_frozen_or_stopped(txq)) { ++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); ++ } ++ } ++ } ++ } else { ++ /* No ready skb, then schedule it */ ++ __netif_schedule(q); ++ } ++#endif ++ rcu_read_unlock_bh(); + retval = 0; + goto out; + } else { @@ -977,16 +693,16 @@ index 0000000..801bc8c + } + retval = -1; +out: ++ if (unlikely(to_free)) { ++ kfree_skb_list(to_free); ++ } + return retval; +} -+ -+static unsigned int imq_nf_hook(const struct nf_hook_ops *ops, -+ struct sk_buff *pskb, -+ const struct net_device *indev, -+ const struct net_device *outdev, -+ int (*okfn)(struct sk_buff *)) ++static unsigned int imq_nf_hook(void *priv, ++ struct sk_buff *skb, ++ const struct nf_hook_state *state) +{ -+ return (pskb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT; ++ return (skb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT; +} + +static int imq_close(struct net_device *dev) @@ -1001,6 +717,10 @@ index 0000000..801bc8c + return 0; +} + ++static struct device_type imq_device_type = { ++ .name = "imq", ++}; ++ +static const struct net_device_ops imq_netdev_ops = { + .ndo_open = imq_open, + .ndo_stop = imq_close, @@ -1066,12 +786,39 @@ index 0000000..801bc8c + return ret; +} + ++#ifdef CONFIG_LOCKDEP ++ static struct lock_class_key imq_netdev_addr_lock_key; ++ ++ static void __init imq_dev_set_lockdep_one(struct net_device *dev, ++ struct netdev_queue *txq, void *arg) ++ { ++ /* ++ * the IMQ transmit locks can be taken recursively, ++ * for example with one IMQ rule for input- and one for ++ * output network devices in iptables! ++ * until we find a better solution ignore them. ++ */ ++ lockdep_set_novalidate_class(&txq->_xmit_lock); ++ } ++ ++ static void imq_dev_set_lockdep_class(struct net_device *dev) ++ { ++ lockdep_set_class_and_name(&dev->addr_list_lock, ++ &imq_netdev_addr_lock_key, "_xmit_addr_IMQ"); ++ netdev_for_each_tx_queue(dev, imq_dev_set_lockdep_one, NULL); ++} ++#else ++ static inline void imq_dev_set_lockdep_class(struct net_device *dev) ++ { ++ } ++#endif ++ +static int __init imq_init_one(int index) +{ + struct net_device *dev; + int ret; + -+ dev = alloc_netdev_mq(0, "imq%d", imq_setup, numqueues); ++ dev = alloc_netdev_mq(0, "imq%d", NET_NAME_UNKNOWN, imq_setup, numqueues); + if (!dev) + return -ENOMEM; + @@ -1080,10 +827,13 @@ index 0000000..801bc8c + goto fail; + + dev->rtnl_link_ops = &imq_link_ops; ++ SET_NETDEV_DEVTYPE(dev, &imq_device_type); + ret = register_netdevice(dev); + if (ret < 0) + goto fail; + ++ imq_dev_set_lockdep_class(dev); ++ + return 0; +fail: + free_netdev(dev); @@ -1147,8 +897,8 @@ index 0000000..801bc8c + return err; + } + -+ pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d)\n", -+ numdevs, numqueues); ++ pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d, imq_dev_accurate_stats = %d)\n", ++ numdevs, numqueues, imq_dev_accurate_stats); + +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) + pr_info("\tHooking IMQ before NAT on PREROUTING.\n"); @@ -1188,18 +938,158 @@ index 0000000..801bc8c + +module_param(numdevs, int, 0); +module_param(numqueues, int, 0); ++module_param(imq_dev_accurate_stats, 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_PARM_DESC(imq_dev_accurate_stats, "Notify if need the accurate imq device stats"); ++ ++MODULE_AUTHOR("https://github.com/imq/linuximq"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information."); +MODULE_LICENSE("GPL"); +MODULE_ALIAS_RTNL_LINK("imq"); +diff -Naupr linux-4.10_orig/drivers/net/Kconfig linux-4.10/drivers/net/Kconfig +--- linux-4.10_orig/drivers/net/Kconfig 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/drivers/net/Kconfig 2017-02-28 18:44:55.978280593 +0700 +@@ -260,6 +260,125 @@ config RIONET_RX_SIZE + depends on RIONET + default "128" + ++config IMQ ++ tristate "IMQ (intermediate queueing device) support" ++ depends on NETDEVICES && NETFILTER ++ ---help--- ++ The IMQ device(s) is used as placeholder for QoS queueing ++ disciplines. Every packet entering/leaving the IP stack can be ++ directed through the IMQ device where it's enqueued/dequeued to the ++ attached qdisc. This allows you to treat network devices as classes ++ and distribute bandwidth among them. Iptables is used to specify ++ through which IMQ device, if any, packets travel. ++ ++ More information at: https://github.com/imq/linuximq ++ ++ To compile this driver as a module, choose M here: the module ++ will be called imq. If unsure, say N. ++ ++choice ++ prompt "IMQ behavior (PRE/POSTROUTING)" ++ depends on IMQ ++ default IMQ_BEHAVIOR_AB ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ IMQ can work in any of the following ways: ++ ++ PREROUTING | POSTROUTING ++ -----------------|------------------- ++ #1 After NAT | After NAT ++ #2 After NAT | Before NAT ++ #3 Before NAT | After NAT ++ #4 Before NAT | Before NAT ++ ++ The default behavior is to hook before NAT on PREROUTING ++ and after NAT on POSTROUTING (#3). ++ ++ This settings are specially usefull when trying to use IMQ ++ to shape NATed clients. ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AA ++ bool "IMQ AA" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AB ++ bool "IMQ AB" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BA ++ bool "IMQ BA" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: After NAT + -diff --git a/include/linux/imq.h b/include/linux/imq.h -new file mode 100644 -index 0000000..1babb09 ---- /dev/null -+++ b/include/linux/imq.h ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BB ++ bool "IMQ BB" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++endchoice ++ ++config IMQ_NUM_DEVS ++ int "Number of IMQ devices" ++ range 2 16 ++ depends on IMQ ++ default "16" ++ help ++ This setting defines how many IMQ devices will be created. ++ ++ The default value is 16. ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ + config TUN + tristate "Universal TUN/TAP device driver support" + depends on INET +diff -Naupr linux-4.10_orig/drivers/net/Makefile linux-4.10/drivers/net/Makefile +--- linux-4.10_orig/drivers/net/Makefile 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/drivers/net/Makefile 2017-02-28 18:44:55.978280593 +0700 +@@ -11,6 +11,7 @@ obj-$(CONFIG_DUMMY) += dummy.o + obj-$(CONFIG_EQUALIZER) += eql.o + obj-$(CONFIG_IFB) += ifb.o + obj-$(CONFIG_MACSEC) += macsec.o ++obj-$(CONFIG_IMQ) += imq.o + obj-$(CONFIG_MACVLAN) += macvlan.o + obj-$(CONFIG_MACVTAP) += macvtap.o + obj-$(CONFIG_MII) += mii.o +diff -Naupr linux-4.10_orig/include/linux/imq.h linux-4.10/include/linux/imq.h +--- linux-4.10_orig/include/linux/imq.h 1970-01-01 07:00:00.000000000 +0700 ++++ linux-4.10/include/linux/imq.h 2017-02-28 18:44:55.978280593 +0700 @@ -0,0 +1,13 @@ +#ifndef _IMQ_H +#define _IMQ_H @@ -1214,11 +1104,32 @@ index 0000000..1babb09 + +#endif /* _IMQ_H */ + -diff --git a/include/linux/netfilter/xt_IMQ.h b/include/linux/netfilter/xt_IMQ.h -new file mode 100644 -index 0000000..9b07230 ---- /dev/null -+++ b/include/linux/netfilter/xt_IMQ.h +diff -Naupr linux-4.10_orig/include/linux/netdevice.h linux-4.10/include/linux/netdevice.h +--- linux-4.10_orig/include/linux/netdevice.h 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/include/linux/netdevice.h 2017-02-28 18:44:55.978280593 +0700 +@@ -3604,6 +3604,19 @@ static inline void netif_tx_unlock_bh(st + } \ + } + ++#define HARD_TX_LOCK_BH(dev, txq) { \ ++ if ((dev->features & NETIF_F_LLTX) == 0) { \ ++ __netif_tx_lock_bh(txq); \ ++ } \ ++} ++ ++#define HARD_TX_UNLOCK_BH(dev, txq) { \ ++ if ((dev->features & NETIF_F_LLTX) == 0) { \ ++ __netif_tx_unlock_bh(txq); \ ++ } \ ++} ++ ++ + static inline void netif_tx_disable(struct net_device *dev) + { + unsigned int i; +diff -Naupr linux-4.10_orig/include/linux/netfilter/xt_IMQ.h linux-4.10/include/linux/netfilter/xt_IMQ.h +--- linux-4.10_orig/include/linux/netfilter/xt_IMQ.h 1970-01-01 07:00:00.000000000 +0700 ++++ linux-4.10/include/linux/netfilter/xt_IMQ.h 2017-02-28 18:44:55.981613941 +0700 @@ -0,0 +1,9 @@ +#ifndef _XT_IMQ_H +#define _XT_IMQ_H @@ -1229,11 +1140,9 @@ index 0000000..9b07230 + +#endif /* _XT_IMQ_H */ + -diff --git a/include/linux/netfilter_ipv4/ipt_IMQ.h b/include/linux/netfilter_ipv4/ipt_IMQ.h -new file mode 100644 -index 0000000..7af320f ---- /dev/null -+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h +diff -Naupr linux-4.10_orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-4.10/include/linux/netfilter_ipv4/ipt_IMQ.h +--- linux-4.10_orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 07:00:00.000000000 +0700 ++++ linux-4.10/include/linux/netfilter_ipv4/ipt_IMQ.h 2017-02-28 18:44:55.981613941 +0700 @@ -0,0 +1,10 @@ +#ifndef _IPT_IMQ_H +#define _IPT_IMQ_H @@ -1245,11 +1154,9 @@ index 0000000..7af320f + +#endif /* _IPT_IMQ_H */ + -diff --git a/include/linux/netfilter_ipv6/ip6t_IMQ.h b/include/linux/netfilter_ipv6/ip6t_IMQ.h -new file mode 100644 -index 0000000..198ac01 ---- /dev/null -+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h +diff -Naupr linux-4.10_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-4.10/include/linux/netfilter_ipv6/ip6t_IMQ.h +--- linux-4.10_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 07:00:00.000000000 +0700 ++++ linux-4.10/include/linux/netfilter_ipv6/ip6t_IMQ.h 2017-02-28 18:44:55.981613941 +0700 @@ -0,0 +1,10 @@ +#ifndef _IP6T_IMQ_H +#define _IP6T_IMQ_H @@ -1261,21 +1168,21 @@ index 0000000..198ac01 + +#endif /* _IP6T_IMQ_H */ + -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index f66f346..d699b19 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -33,6 +33,9 @@ - #include - #include - #include +diff -Naupr linux-4.10_orig/include/linux/skbuff.h linux-4.10/include/linux/skbuff.h +--- linux-4.10_orig/include/linux/skbuff.h 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/include/linux/skbuff.h 2017-02-28 18:44:55.981613941 +0700 +@@ -39,6 +39,10 @@ + #include + #include + #include +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) +#include +#endif ++ - /* Don't change this without changing skb_csum_unnecessary! */ - #define CHECKSUM_NONE 0 -@@ -418,6 +421,9 @@ struct sk_buff { + /* The interface for checksum offload between the stack and networking drivers + * is as follows... +@@ -661,6 +665,9 @@ struct sk_buff { * first. This is owned by whoever has the skb queued ATM. */ char cb[48] __aligned(8); @@ -1284,120 +1191,156 @@ index f66f346..d699b19 100644 +#endif unsigned long _skb_refdst; - #ifdef CONFIG_XFRM -@@ -453,6 +459,9 @@ struct sk_buff { + void (*destructor)(struct sk_buff *skb); +@@ -670,6 +677,9 @@ struct sk_buff { #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) struct nf_conntrack *nfct; #endif +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+ struct nf_queue_entry *nf_queue_entry; ++ struct nf_queue_entry *nf_queue_entry; +#endif - #ifdef CONFIG_BRIDGE_NETFILTER + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) struct nf_bridge_info *nf_bridge; #endif -@@ -490,6 +490,9 @@ struct sk_buff { - __u8 csum_valid:1; - __u8 csum_complete_sw:1; - /* 3/5 bit hole (depending on ndisc_nodetype presence) */ +@@ -750,6 +760,9 @@ struct sk_buff { + __u8 offload_fwd_mark:1; + #endif + /* 2, 4 or 5 bit hole */ +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) + __u8 imq_flags:IMQ_F_BITS; +#endif - kmemcheck_bitfield_end(flags2); - - #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL -@@ -625,6 +637,12 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb) - return (struct rtable *)skb_dst(skb); - } + #ifdef CONFIG_NET_SCHED + __u16 tc_index; /* traffic control index */ +@@ -910,6 +923,12 @@ void kfree_skb_list(struct sk_buff *segs + void skb_tx_error(struct sk_buff *skb); + void consume_skb(struct sk_buff *skb); + void __kfree_skb(struct sk_buff *skb); + +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+extern int skb_save_cb(struct sk_buff *skb); -+extern int skb_restore_cb(struct sk_buff *skb); ++int skb_save_cb(struct sk_buff *skb); ++int skb_restore_cb(struct sk_buff *skb); +#endif + - void kfree_skb(struct sk_buff *skb); - void kfree_skb_list(struct sk_buff *segs); - void skb_tx_error(struct sk_buff *skb); -@@ -2635,6 +2653,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) - nf_conntrack_get(src->nfct); - dst->nfctinfo = src->nfctinfo; + extern struct kmem_cache *skbuff_head_cache; + + void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); +@@ -3607,6 +3626,10 @@ static inline void __nf_copy(struct sk_b + if (copy) + dst->nfctinfo = src->nfctinfo; #endif +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+ dst->imq_flags = src->imq_flags; -+ dst->nf_queue_entry = src->nf_queue_entry; ++ dst->imq_flags = src->imq_flags; ++ dst->nf_queue_entry = src->nf_queue_entry; +#endif - #ifdef CONFIG_BRIDGE_NETFILTER + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) dst->nf_bridge = src->nf_bridge; nf_bridge_get(src->nf_bridge); -diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h -index aaba4bb..f6e92a4 100644 ---- a/include/net/netfilter/nf_queue.h -+++ b/include/net/netfilter/nf_queue.h -@@ -29,6 +29,12 @@ struct nf_queue_handler { - void nf_register_queue_handler(const struct nf_queue_handler *qh); - void nf_unregister_queue_handler(void); +diff -Naupr linux-4.10_orig/include/net/netfilter/nf_queue.h linux-4.10/include/net/netfilter/nf_queue.h +--- linux-4.10_orig/include/net/netfilter/nf_queue.h 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/include/net/netfilter/nf_queue.h 2017-02-28 18:44:55.981613941 +0700 +@@ -31,6 +31,12 @@ struct nf_queue_handler { + void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh); + void nf_unregister_queue_handler(struct net *net); void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); -+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry); ++void nf_queue_entry_release_refs(struct nf_queue_entry *entry); + +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh); -+extern void nf_unregister_queue_imq_handler(void); ++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh); ++void nf_unregister_queue_imq_handler(void); +#endif - bool nf_queue_entry_get_refs(struct nf_queue_entry *entry); + void nf_queue_entry_get_refs(struct nf_queue_entry *entry); void nf_queue_entry_release_refs(struct nf_queue_entry *entry); -diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h -index f7dc0eb..58c46a9 100644 ---- a/include/uapi/linux/netfilter.h -+++ b/include/uapi/linux/netfilter.h -@@ -13,7 +13,8 @@ +diff -Naupr linux-4.10_orig/include/net/pkt_sched.h linux-4.10/include/net/pkt_sched.h +--- linux-4.10_orig/include/net/pkt_sched.h 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/include/net/pkt_sched.h 2017-02-28 18:44:55.981613941 +0700 +@@ -107,6 +107,8 @@ int sch_direct_xmit(struct sk_buff *skb, + + void __qdisc_run(struct Qdisc *q); + ++struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate); ++ + static inline void qdisc_run(struct Qdisc *q) + { + if (qdisc_run_begin(q)) +diff -Naupr linux-4.10_orig/include/net/sch_generic.h linux-4.10/include/net/sch_generic.h +--- linux-4.10_orig/include/net/sch_generic.h 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/include/net/sch_generic.h 2017-02-28 18:44:55.981613941 +0700 +@@ -518,6 +518,13 @@ static inline int qdisc_enqueue(struct s + return sch->enqueue(skb, sch, to_free); + } + ++static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch, ++ struct sk_buff **to_free) ++{ ++ qdisc_skb_cb(skb)->pkt_len = skb->len; ++ return qdisc_enqueue(skb, sch, to_free) & NET_XMIT_MASK; ++} ++ + static inline bool qdisc_is_percpu_stats(const struct Qdisc *q) + { + return q->flags & TCQ_F_CPUSTATS; +diff -Naupr linux-4.10_orig/include/uapi/linux/netfilter.h linux-4.10/include/uapi/linux/netfilter.h +--- linux-4.10_orig/include/uapi/linux/netfilter.h 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/include/uapi/linux/netfilter.h 2017-02-28 18:44:55.981613941 +0700 +@@ -14,7 +14,8 @@ #define NF_QUEUE 3 #define NF_REPEAT 4 - #define NF_STOP 5 + #define NF_STOP 5 /* Deprecated, for userspace nf_queue compatibility. */ -#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 or errno values. Not nice, but better than additional function -diff --git a/net/core/dev.c b/net/core/dev.c -index 3d13874..9842f21 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -131,6 +131,9 @@ - #include - #include - #include +diff -Naupr linux-4.10_orig/net/core/dev.c linux-4.10/net/core/dev.c +--- linux-4.10_orig/net/core/dev.c 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/core/dev.c 2017-02-28 18:44:55.984947288 +0700 +@@ -140,6 +140,9 @@ + #include + #include + #include +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) +#include +#endif #include "net-sysfs.h" -@@ -2595,7 +2598,12 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, - } - } +@@ -2881,7 +2884,12 @@ static int xmit_one(struct sk_buff *skb, + unsigned int len; + int rc; +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+ if (!list_empty(&ptype_all) && -+ !(skb->imq_flags & IMQ_F_ENQUEUE)) ++ if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) && ++ !(skb->imq_flags & IMQ_F_ENQUEUE)) +#else - if (!list_empty(&ptype_all)) + if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) +#endif - dev_queue_xmit_nit(skb, dev); + dev_queue_xmit_nit(skb, dev); - skb_len = skb->len; -diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index c28c7fe..a5f1888 100644 ---- a/net/core/skbuff.c -+++ b/net/core/skbuff.c -@@ -73,6 +73,84 @@ + len = skb->len; +@@ -2920,6 +2928,8 @@ out: + return skb; + } - struct kmem_cache *skbuff_head_cache __read_mostly; ++EXPORT_SYMBOL_GPL(dev_hard_start_xmit); ++ + static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, + netdev_features_t features) + { +diff -Naupr linux-4.10_orig/net/core/skbuff.c linux-4.10/net/core/skbuff.c +--- linux-4.10_orig/net/core/skbuff.c 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/core/skbuff.c 2017-02-28 18:44:55.984947288 +0700 +@@ -82,6 +82,87 @@ struct kmem_cache *skbuff_head_cache __r static struct kmem_cache *skbuff_fclone_cache __read_mostly; + int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS; + EXPORT_SYMBOL(sysctl_max_skb_frags); +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) +static struct kmem_cache *skbuff_cb_store_cache __read_mostly; ++#endif + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) +/* Control buffer save/restore for IMQ devices */ +struct skb_cb_table { + char cb[48] __aligned(8); @@ -1452,6 +1395,7 @@ index c28c7fe..a5f1888 100644 +} +EXPORT_SYMBOL(skb_restore_cb); + ++static void skb_copy_stored_cb(struct sk_buff * , const struct sk_buff * ) __attribute__ ((unused)); +static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old) +{ + struct skb_cb_table *next; @@ -1476,7 +1420,7 @@ index c28c7fe..a5f1888 100644 /** * skb_panic - private function for out-of-line support -@@ -577,6 +656,28 @@ static void skb_release_head_state(struct sk_buff *skb) +@@ -654,6 +735,28 @@ static void skb_release_head_state(struc WARN_ON(in_irq()); skb->destructor(skb); } @@ -1488,7 +1432,7 @@ index c28c7fe..a5f1888 100644 + while (skb->cb_next != NULL) { + if (net_ratelimit()) + pr_warn("IMQ: kfree_skb: skb->cb_next: %08x\n", -+ (unsigned int)skb->cb_next); ++ (unsigned int)(uintptr_t)skb->cb_next); + + skb_restore_cb(skb); + } @@ -1505,18 +1449,18 @@ index c28c7fe..a5f1888 100644 #if IS_ENABLED(CONFIG_NF_CONNTRACK) nf_conntrack_put(skb->nfct); #endif -@@ -709,6 +810,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) +@@ -843,6 +946,10 @@ static void __copy_skb_header(struct sk_ new->sp = secpath_get(old->sp); #endif - memcpy(new->cb, old->cb, sizeof(old->cb)); + __nf_copy(new, old, false); +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) + new->cb_next = NULL; + /*skb_copy_stored_cb(new, old);*/ +#endif - new->csum = old->csum; - new->local_df = old->local_df; - new->pkt_type = old->pkt_type; -@@ -3112,6 +3217,13 @@ void __init skb_init(void) + + /* Note : this field could be in headers_start/headers_end section + * It is not yet because we do not want to have a 16 bit hole +@@ -3465,6 +3572,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); @@ -1530,11 +1474,10 @@ index c28c7fe..a5f1888 100644 } /** -diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c -index b6fa35e..08dcfef 100644 ---- a/net/ipv6/ip6_output.c -+++ b/net/ipv6/ip6_output.c -@@ -64,9 +64,6 @@ static int ip6_finish_output2(struct sk_buff *skb) +diff -Naupr linux-4.10_orig/net/ipv6/ip6_output.c linux-4.10/net/ipv6/ip6_output.c +--- linux-4.10_orig/net/ipv6/ip6_output.c 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/ipv6/ip6_output.c 2017-02-28 18:44:55.988280636 +0700 +@@ -67,9 +67,6 @@ static int ip6_finish_output2(struct net struct in6_addr *nexthop; int ret; @@ -1544,25 +1487,39 @@ index b6fa35e..08dcfef 100644 if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) { struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); -@@ -143,6 +140,13 @@ int ip6_output(struct sk_buff *skb) +@@ -159,6 +156,13 @@ int ip6_output(struct net *net, struct s return 0; } + /* -+ * IMQ-patch: moved setting skb->dev and skb->protocol from -+ * ip6_finish_output2 to fix crashing at netif_skb_features(). -+ */ ++ * IMQ-patch: moved setting skb->dev and skb->protocol from ++ * ip6_finish_output2 to fix crashing at netif_skb_features(). ++ */ + skb->protocol = htons(ETH_P_IPV6); + skb->dev = dev; + - return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, dev, + return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, + net, sk, skb, NULL, dev, ip6_finish_output, - !(IP6CB(skb)->flags & IP6SKB_REROUTED)); -diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig -index 6e839b6..45ac31c 100644 ---- a/net/netfilter/Kconfig -+++ b/net/netfilter/Kconfig -@@ -630,6 +630,18 @@ config NETFILTER_XT_TARGET_LOG +diff -Naupr linux-4.10_orig/net/netfilter/core.c linux-4.10/net/netfilter/core.c +--- linux-4.10_orig/net/netfilter/core.c 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/netfilter/core.c 2017-02-28 18:44:55.988280636 +0700 +@@ -318,6 +318,11 @@ int nf_hook_slow(struct sk_buff *skb, st + if (ret == 0) + ret = -EPERM; + return ret; ++ case NF_IMQ_QUEUE: ++ ret = nf_queue(skb, state, &entry, verdict); ++ if (ret == -ECANCELED) ++ continue; ++ return ret; + case NF_QUEUE: + ret = nf_queue(skb, state, &entry, verdict); + if (ret == 1 && entry) +diff -Naupr linux-4.10_orig/net/netfilter/Kconfig linux-4.10/net/netfilter/Kconfig +--- linux-4.10_orig/net/netfilter/Kconfig 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/netfilter/Kconfig 2017-02-28 18:44:55.988280636 +0700 +@@ -852,6 +852,18 @@ config NETFILTER_XT_TARGET_LOG To compile it as a module, choose M here. If unsure, say N. @@ -1581,11 +1538,10 @@ index 6e839b6..45ac31c 100644 config NETFILTER_XT_TARGET_MARK tristate '"MARK" target support' depends on NETFILTER_ADVANCED -diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile -index c3a0a12..9647f06 100644 ---- a/net/netfilter/Makefile -+++ b/net/netfilter/Makefile -@@ -82,6 +82,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o +diff -Naupr linux-4.10_orig/net/netfilter/Makefile linux-4.10/net/netfilter/Makefile +--- linux-4.10_orig/net/netfilter/Makefile 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/netfilter/Makefile 2017-02-28 18:44:55.988280636 +0700 +@@ -125,6 +125,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o @@ -1593,44 +1549,12 @@ index c3a0a12..9647f06 100644 obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o -diff --git a/net/netfilter/core.c b/net/netfilter/core.c -index 593b16e..740cd69 100644 ---- a/net/netfilter/core.c -+++ b/net/netfilter/core.c -@@ -191,9 +191,11 @@ next_hook: - ret = NF_DROP_GETERR(verdict); - if (ret == 0) - ret = -EPERM; -- } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) { -+ } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE || -+ (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) { - int err = nf_queue(skb, elem, pf, hook, indev, outdev, okfn, -- verdict >> NF_VERDICT_QBITS); -+ verdict >> NF_VERDICT_QBITS, -+ verdict & NF_VERDICT_MASK); - if (err < 0) { - if (err == -ECANCELED) - goto next_hook; -diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h -index 3deec99..c1a1397 100644 ---- a/net/netfilter/nf_internals.h -+++ b/net/netfilter/nf_internals.h -@@ -29,7 +29,7 @@ extern int nf_queue(struct sk_buff *skb, - int nf_queue(struct sk_buff *skb, struct nf_hook_ops *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, unsigned int queuetype); - int __init netfilter_queue_init(void); - - /* nf_log.c */ -diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c -index 5d24b1f..28317dc 100644 ---- a/net/netfilter/nf_queue.c -+++ b/net/netfilter/nf_queue.c +diff -Naupr linux-4.10_orig/net/netfilter/nf_queue.c linux-4.10/net/netfilter/nf_queue.c +--- linux-4.10_orig/net/netfilter/nf_queue.c 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/netfilter/nf_queue.c 2017-02-28 18:44:55.988280636 +0700 @@ -27,6 +27,23 @@ + * receives, no matter what. */ - static const struct nf_queue_handler __rcu *queue_handler __read_mostly; +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) +static const struct nf_queue_handler __rcu *queue_imq_handler __read_mostly; @@ -1651,54 +1575,68 @@ index 5d24b1f..28317dc 100644 + /* return EBUSY when somebody else is registered, return EEXIST if the * same handler is registered, return 0 in case of success. */ - void nf_register_queue_handler(const struct nf_queue_handler *qh) -@@ -105,7 +122,8 @@ int nf_queue(struct sk_buff *skb, - struct net_device *indev, - struct net_device *outdev, - int (*okfn)(struct sk_buff *), -- unsigned int queuenum) -+ unsigned int queuenum, -+ unsigned int queuetype) + void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh) +@@ -108,16 +125,28 @@ void nf_queue_nf_hook_drop(struct net *n + } + + static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, +- struct nf_hook_entry *hook_entry, unsigned int queuenum) ++ struct nf_hook_entry *hook_entry, unsigned int verdict) { int status = -ENOENT; struct nf_queue_entry *entry = NULL; -@@ -115,7 +133,17 @@ int nf_queue(struct sk_buff *skb, - /* QUEUE == DROP if no one is waiting, to be safe. */ - rcu_read_lock(); + const struct nf_afinfo *afinfo; + const struct nf_queue_handler *qh; + struct net *net = state->net; ++ unsigned int queuetype = verdict & NF_VERDICT_MASK; ++ unsigned int queuenum = verdict >> NF_VERDICT_QBITS; -- qh = rcu_dereference(queue_handler); + /* QUEUE == DROP if no one is waiting, to be safe. */ +- qh = rcu_dereference(net->nf.queue_handler); + if (queuetype == NF_IMQ_QUEUE) { +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+ qh = rcu_dereference(queue_imq_handler); ++ qh = rcu_dereference(queue_imq_handler); +#else -+ BUG(); -+ goto err_unlock; ++ BUG(); ++ goto err_unlock; +#endif + } else { -+ qh = rcu_dereference(queue_handler); ++ qh = rcu_dereference(net->nf.queue_handler); + } + if (!qh) { status = -ESRCH; - goto err_unlock; -@@ -205,9 +233,11 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) + goto err; +@@ -164,8 +193,17 @@ int nf_queue(struct sk_buff *skb, struct + struct nf_hook_entry *entry = *entryp; + int ret; + +- ret = __nf_queue(skb, state, entry, verdict >> NF_VERDICT_QBITS); ++ ret = __nf_queue(skb, state, entry, verdict); + if (ret < 0) { ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* IMQ Bypass */ ++ if (ret == -ECANCELED && skb->imq_flags == 0) { ++ *entryp = rcu_dereference(entry->next); ++ return 1; ++ } ++#endif ++ + if (ret == -ESRCH && + (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS)) { + *entryp = rcu_dereference(entry->next); +@@ -232,6 +270,7 @@ okfn: local_bh_enable(); break; case NF_QUEUE: + case NF_IMQ_QUEUE: - err = nf_queue(skb, elem, entry->pf, entry->hook, - entry->indev, entry->outdev, entry->okfn, -- verdict >> NF_VERDICT_QBITS); -+ verdict >> NF_VERDICT_QBITS, -+ verdict & NF_VERDICT_MASK); - if (err < 0) { - if (err == -ECANCELED) - goto next_hook; -diff --git a/net/netfilter/xt_IMQ.c b/net/netfilter/xt_IMQ.c -new file mode 100644 -index 0000000..1c3cd66 ---- /dev/null -+++ b/net/netfilter/xt_IMQ.c + err = nf_queue(skb, &entry->state, &hook_entry, verdict); + if (err == 1) { + if (hook_entry) +diff -Naupr linux-4.10_orig/net/netfilter/xt_IMQ.c linux-4.10/net/netfilter/xt_IMQ.c +--- linux-4.10_orig/net/netfilter/xt_IMQ.c 1970-01-01 07:00:00.000000000 +0700 ++++ linux-4.10/net/netfilter/xt_IMQ.c 2017-02-28 18:44:55.988280636 +0700 @@ -0,0 +1,72 @@ +/* + * This target marks packets to be enqueued to an imq device @@ -1766,9 +1704,27 @@ index 0000000..1c3cd66 +module_init(imq_init); +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_AUTHOR("https://github.com/imq/linuximq"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information."); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_IMQ"); +MODULE_ALIAS("ip6t_IMQ"); + +diff -Naupr linux-4.10_orig/net/sched/sch_generic.c linux-4.10/net/sched/sch_generic.c +--- linux-4.10_orig/net/sched/sch_generic.c 2017-02-20 05:34:00.000000000 +0700 ++++ linux-4.10/net/sched/sch_generic.c 2017-02-28 18:44:55.988280636 +0700 +@@ -154,6 +154,14 @@ bulk: + return skb; + } + ++struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate) ++{ ++ int packets; ++ ++ return dequeue_skb(q, validate, &packets); ++} ++EXPORT_SYMBOL(qdisc_dequeue_skb); ++ + /* + * Transmit possibly several skbs, and handle the return status as + * required. Owning running seqcount bit guarantees that