[packages/kernel] - updated imq patch to latest upstream
baggins
baggins at pld-linux.org
Sun Jun 28 17:28:12 CEST 2015
commit fa14fc8782e9a90b2da87ce7c42646b8b7151f85
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jun 28 17:27:50 2015 +0200
- updated imq patch to latest upstream
kernel-imq.patch | 541 +++++++++++++++++++++++--------------------------------
1 file changed, 229 insertions(+), 312 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index 04760d2..dc0dc2a 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1,45 +1,8 @@
-net: add Intermediate Queueing Device (imq)
-
-From: Jussi Kivilinna <jussi.kivilinna at iki.fi>
-
-This patch is for kernel version 3.12.4+.
-
-See: http://linuximq.net/
-
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
----
- 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
+index df51d60..e937550 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -203,6 +203,125 @@ config RIONET_RX_SIZE
+@@ -220,6 +220,125 @@ config RIONET_RX_SIZE
depends on RIONET
default "128"
@@ -54,7 +17,7 @@ index b45b240..5a20da0 100644
+ 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/
++ 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.
@@ -82,7 +45,7 @@ index b45b240..5a20da0 100644
+ This settings are specially usefull when trying to use IMQ
+ to shape NATed clients.
+
-+ More information can be found at: www.linuximq.net
++ More information can be found at: https://github.com/imq/linuximq
+
+ If not sure leave the default settings alone.
+
@@ -97,7 +60,7 @@ index b45b240..5a20da0 100644
+ PREROUTING: After NAT
+ POSTROUTING: After NAT
+
-+ More information can be found at: www.linuximq.net
++ More information can be found at: https://github.com/imq/linuximq
+
+ If not sure leave the default settings alone.
+
@@ -112,7 +75,7 @@ index b45b240..5a20da0 100644
+ PREROUTING: After NAT
+ POSTROUTING: Before NAT
+
-+ More information can be found at: www.linuximq.net
++ More information can be found at: https://github.com/imq/linuximq
+
+ If not sure leave the default settings alone.
+
@@ -127,7 +90,7 @@ index b45b240..5a20da0 100644
+ PREROUTING: Before NAT
+ POSTROUTING: After NAT
+
-+ More information can be found at: www.linuximq.net
++ More information can be found at: https://github.com/imq/linuximq
+
+ If not sure leave the default settings alone.
+
@@ -142,7 +105,7 @@ index b45b240..5a20da0 100644
+ PREROUTING: Before NAT
+ POSTROUTING: Before NAT
+
-+ More information can be found at: www.linuximq.net
++ More information can be found at: https://github.com/imq/linuximq
+
+ If not sure leave the default settings alone.
+
@@ -158,18 +121,18 @@ index b45b240..5a20da0 100644
+
+ The default value is 16.
+
-+ More information can be found at: www.linuximq.net
++ 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"
- select CRC32
+ depends on INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
-index 3fef8a8..12dafc0 100644
+index e25fdd7..b411742 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_BONDING) += bonding/
+@@ -10,6 +10,7 @@ obj-$(CONFIG_IPVLAN) += ipvlan/
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_IFB) += ifb.o
@@ -179,10 +142,10 @@ index 3fef8a8..12dafc0 100644
obj-$(CONFIG_MII) += mii.o
diff --git a/drivers/net/imq.c b/drivers/net/imq.c
new file mode 100644
-index 0000000..801bc8c
+index 0000000..b010f39
--- /dev/null
+++ b/drivers/net/imq.c
-@@ -0,0 +1,1012 @@
+@@ -0,0 +1,903 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -195,141 +158,7 @@ index 0000000..801bc8c
+ *
+ * The first version was written by Martin Devera, <devik at cdi.cz>
+ *
-+ * Credits: Jan Rafaj <imq2t at cedric.vabo.cz>
-+ * - Update patch to 2.4.21
-+ * Sebastian Strollo <sstrollo at nortelnetworks.com>
-+ * - Fix "Dead-loop on netdevice imq"-issue
-+ * Marcel Sebek <sebek64 at post.cz>
-+ * - 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 <xiaosuo at gmail.com>.
-+ *
-+ * 2011/03/18 - (Jussi Kivilinna)
-+ * - Port to 2.6.38
-+ *
-+ * 2011/07/12 - (syoder89 at 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 <germanomichel at gmail.com>
-+ * - Fix IMQ for net namespaces
-+ *
-+ * 2011/11/04 - Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
-+ * - 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 <jussi.kivilinna at mbnet.fi>
-+ * - Port to 3.2
-+ *
-+ * 2012/03/19 - Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
-+ * - Port to 3.3
-+ *
-+ * 2012/12/12 - Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
-+ * - Port to 3.7
-+ * - Fix checkpatch.pl warnings
-+ *
-+ * 2013/09/10 - Jussi Kivilinna <jussi.kivilinna at iki.fi>
-+ * - 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 <jussi.kivilinna at iki.fi>
-+ * - Port to 3.11
-+ *
-+ * 2013/11/12 - Jussi Kivilinna <jussi.kivilinna at iki.fi>
-+ * - 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 Creditis.txt
+ */
+
+#include <linux/module.h>
@@ -359,11 +188,7 @@ 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[] = {
+ {
@@ -429,6 +254,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)
+{
@@ -812,9 +638,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 +648,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 +657,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,7 +700,7 @@ 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 netdev_queue *txq;
+ spinlock_t *root_lock;
@@ -938,20 +764,49 @@ index 0000000..801bc8c
+ qdisc_enqueue_root(skb_shared, q); /* 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);
++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret);
++ HARD_TX_UNLOCK(dev, txq);
++ } else {
++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret);
++ }
++ }
++ }
++#endif
++ rcu_read_unlock_bh();
+ retval = 0;
+ goto out;
+ } else {
@@ -979,14 +834,11 @@ index 0000000..801bc8c
+out:
+ 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(const struct nf_hook_ops *hook_ops,
++ 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)
@@ -1147,8 +999,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,13 +1040,15 @@ 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("http://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 --git a/include/linux/imq.h b/include/linux/imq.h
new file mode 100644
index 0000000..1babb09
@@ -1214,6 +1068,30 @@ index 0000000..1babb09
+
+#endif /* _IMQ_H */
+
+diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
+index 05b9a69..0c35dff 100644
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -3276,6 +3276,19 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
+ } \
+ }
+
++#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 --git a/include/linux/netfilter/xt_IMQ.h b/include/linux/netfilter/xt_IMQ.h
new file mode 100644
index 0000000..9b07230
@@ -1262,20 +1140,20 @@ index 0000000..198ac01
+#endif /* _IP6T_IMQ_H */
+
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index f66f346..d699b19 100644
+index f15154a..d76d31a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -33,6 +33,9 @@
- #include <linux/dma-mapping.h>
+@@ -35,6 +35,9 @@
#include <linux/netdev_features.h>
+ #include <linux/sched.h>
#include <net/flow_keys.h>
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+#include <linux/imq.h>
+#endif
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -418,6 +421,9 @@ struct sk_buff {
+ /* A. Checksumming of received packets by device.
+ *
+@@ -540,6 +543,9 @@ struct sk_buff {
* first. This is owned by whoever has the skb queued ATM.
*/
char cb[48] __aligned(8);
@@ -1284,81 +1162,83 @@ 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);
+@@ -549,6 +555,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
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
struct nf_bridge_info *nf_bridge;
#endif
-@@ -490,6 +490,9 @@ struct sk_buff {
- __u16 tc_verd; /* traffic control verdict */
- #endif
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ __u8 imq_flags:IMQ_F_BITS;
-+#endif
-
- union {
- __wsum csum;
-@@ -625,6 +637,12 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
- return (struct rtable *)skb_dst(skb);
- }
+@@ -616,6 +625,9 @@ struct sk_buff {
+ __u8 inner_protocol_type:1;
+ __u8 remcsum_offload:1;
+ /* 3 or 5 bit hole */
++ #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++ __u8 imq_flags:IMQ_F_BITS;
++ #endif
+ #ifdef CONFIG_NET_SCHED
+ __u16 tc_index; /* traffic control index */
+@@ -766,6 +778,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);
-@@ -2435,6 +2453,10 @@ static inline void nf_reset(struct sk_buff *skb)
- nf_conntrack_put(skb->nfct);
- skb->nfct = NULL;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ skb->imq_flags = 0;
-+ skb->nf_queue_entry = NULL;
-+#endif
- #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
- nf_bridge_put(skb->nf_bridge);
- skb->nf_bridge = NULL;
-@@ -2635,6 +2653,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
+ extern struct kmem_cache *skbuff_head_cache;
+
+ void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
+@@ -3216,6 +3234,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src,
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
#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
+index d81d584..1adc20d 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);
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_release_refs(struct nf_queue_entry *entry);
+diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
+index 2342bf1..149dec9 100644
+--- a/include/net/pkt_sched.h
++++ b/include/net/pkt_sched.h
+@@ -104,6 +104,8 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
+
+ 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 --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
-index f7dc0eb..58c46a9 100644
+index ef1b1f8..079e5ff 100644
--- a/include/uapi/linux/netfilter.h
+++ b/include/uapi/linux/netfilter.h
@@ -13,7 +13,8 @@
@@ -1372,10 +1252,10 @@ index f7dc0eb..58c46a9 100644
/* 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
+index aa82f9a..c931d04 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -131,6 +131,9 @@
+@@ -135,6 +135,9 @@
#include <linux/if_macvlan.h>
#include <linux/errqueue.h>
#include <linux/hrtimer.h>
@@ -1385,29 +1265,48 @@ index 3d13874..9842f21 100644
#include "net-sysfs.h"
-@@ -2618,7 +2618,11 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2646,7 +2649,12 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,
unsigned int len;
int rc;
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ if ((!list_empty(&ptype_all) || !list_empty(&dev->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) || !list_empty(&dev->ptype_all))
+#endif
dev_queue_xmit_nit(skb, dev);
len = skb->len;
+@@ -2684,6 +2692,7 @@ out:
+ *ret = rc;
+ return skb;
+ }
++EXPORT_SYMBOL(dev_hard_start_xmit);
+
+ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
+ netdev_features_t features)
+@@ -2772,6 +2781,7 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d
+ }
+ return head;
+ }
++EXPORT_SYMBOL(validate_xmit_skb_list);
+
+ static void qdisc_pkt_len_init(struct sk_buff *skb)
+ {
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index c28c7fe..a5f1888 100644
+index 41ec022..307f02d 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -73,6 +73,84 @@
+@@ -79,6 +79,86 @@
struct kmem_cache *skbuff_head_cache __read_mostly;
static struct kmem_cache *skbuff_fclone_cache __read_mostly;
+#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);
@@ -1486,7 +1385,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)
+@@ -691,6 +771,28 @@ static void skb_release_head_state(struct sk_buff *skb)
WARN_ON(in_irq());
skb->destructor(skb);
}
@@ -1515,18 +1414,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)
- #ifdef CONFIG_XFRM
+@@ -813,6 +915,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new->sp = secpath_get(old->sp);
#endif
+ __nf_copy(new, old, false);
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ new->cb_next = NULL;
+ /*skb_copy_stored_cb(new, old);*/
+#endif
- __nf_copy(new, old, false);
/* Note : this field could be in headers_start/headers_end section
-@@ -3112,6 +3217,13 @@ void __init skb_init(void)
+ * It is not yet because we do not want to have a 16 bit hole
+@@ -3342,6 +3448,13 @@ void __init skb_init(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);
@@ -1541,10 +1440,10 @@ index c28c7fe..a5f1888 100644
/**
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
-index b6fa35e..08dcfef 100644
+index bc09cb9..9b6ef9f 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)
+@@ -64,9 +64,6 @@ static int ip6_finish_output2(struct sock *sk, struct sk_buff *skb)
struct in6_addr *nexthop;
int ret;
@@ -1554,25 +1453,25 @@ 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)
+@@ -143,6 +140,13 @@ int ip6_output(struct sock *sk, struct sk_buff *skb)
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, 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
+index a0f3e6a3..64239c0 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -630,6 +630,18 @@ config NETFILTER_XT_TARGET_LOG
+@@ -771,6 +771,18 @@ config NETFILTER_XT_TARGET_LOG
To compile it as a module, choose M here. If unsure, say N.
@@ -1592,10 +1491,10 @@ index 6e839b6..45ac31c 100644
tristate '"MARK" target support'
depends on NETFILTER_ADVANCED
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index c3a0a12..9647f06 100644
+index a87d8b8..d1080ff 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -82,6 +82,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
+@@ -109,6 +109,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
@@ -1604,41 +1503,41 @@ index c3a0a12..9647f06 100644
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
+index e616301..302798c 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
-@@ -191,9 +191,11 @@ next_hook:
+@@ -178,9 +178,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);
++ (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
+ int err = nf_queue(skb, elem, state,
+- 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
+index ea7f367..06fe0d6 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);
+@@ -18,7 +18,7 @@ unsigned int nf_iterate(struct list_head *head, struct sk_buff *skb,
+
+ /* nf_queue.c */
+ int nf_queue(struct sk_buff *skb, struct nf_hook_ops *elem,
+- struct nf_hook_state *state, unsigned int queuenum);
++ struct nf_hook_state *state, 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
+index 2e88032..8524715 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
-@@ -27,6 +27,23 @@
+@@ -28,6 +28,23 @@
*/
static const struct nf_queue_handler __rcu *queue_handler __read_mostly;
@@ -1662,17 +1561,17 @@ 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)
+@@ -112,7 +129,8 @@ EXPORT_SYMBOL_GPL(nf_queue_entry_get_refs);
+ int nf_queue(struct sk_buff *skb,
+ struct nf_hook_ops *elem,
+ struct nf_hook_state *state,
+- unsigned int queuenum)
++ unsigned int queuenum,
++ unsigned int queuetype)
{
int status = -ENOENT;
struct nf_queue_entry *entry = NULL;
-@@ -115,7 +133,17 @@ int nf_queue(struct sk_buff *skb,
+@@ -122,7 +140,17 @@ int nf_queue(struct sk_buff *skb,
/* QUEUE == DROP if no one is waiting, to be safe. */
rcu_read_lock();
@@ -1691,22 +1590,21 @@ index 5d24b1f..28317dc 100644
if (!qh) {
status = -ESRCH;
goto err_unlock;
-@@ -205,9 +233,11 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
+@@ -208,8 +236,10 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
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);
+ err = nf_queue(skb, elem, &entry->state,
+- 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
+index 0000000..86d7b84
--- /dev/null
+++ b/net/netfilter/xt_IMQ.c
@@ -0,0 +1,72 @@
@@ -1776,9 +1674,28 @@ 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("http://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 --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
+index 6efca30..a4e448f 100644
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -108,6 +108,14 @@ static struct sk_buff *dequeue_skb(struct Qdisc *q, bool *validate,
+ 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);
++
+ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
+ struct netdev_queue *dev_queue,
+ struct Qdisc *q)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/fa14fc8782e9a90b2da87ce7c42646b8b7151f85
More information about the pld-cvs-commit
mailing list