]>
Commit | Line | Data |
---|---|---|
e2d28598 | 1 | diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig |
fa14fc87 | 2 | index df51d60..e937550 100644 |
e2d28598 JR |
3 | --- a/drivers/net/Kconfig |
4 | +++ b/drivers/net/Kconfig | |
fa14fc87 | 5 | @@ -220,6 +220,125 @@ config RIONET_RX_SIZE |
e2d28598 JR |
6 | depends on RIONET |
7 | default "128" | |
8 | ||
9 | +config IMQ | |
10 | + tristate "IMQ (intermediate queueing device) support" | |
11 | + depends on NETDEVICES && NETFILTER | |
12 | + ---help--- | |
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. | |
19 | + | |
fa14fc87 | 20 | + More information at: https://github.com/imq/linuximq |
e2d28598 JR |
21 | + |
22 | + To compile this driver as a module, choose M here: the module | |
23 | + will be called imq. If unsure, say N. | |
24 | + | |
25 | +choice | |
26 | + prompt "IMQ behavior (PRE/POSTROUTING)" | |
27 | + depends on IMQ | |
28 | + default IMQ_BEHAVIOR_AB | |
29 | + help | |
30 | + This setting defines how IMQ behaves in respect to its | |
31 | + hooking in PREROUTING and POSTROUTING. | |
32 | + | |
33 | + IMQ can work in any of the following ways: | |
34 | + | |
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 | |
41 | + | |
42 | + The default behavior is to hook before NAT on PREROUTING | |
43 | + and after NAT on POSTROUTING (#3). | |
44 | + | |
45 | + This settings are specially usefull when trying to use IMQ | |
46 | + to shape NATed clients. | |
47 | + | |
fa14fc87 | 48 | + More information can be found at: https://github.com/imq/linuximq |
e2d28598 JR |
49 | + |
50 | + If not sure leave the default settings alone. | |
51 | + | |
52 | +config IMQ_BEHAVIOR_AA | |
53 | + bool "IMQ AA" | |
54 | + help | |
55 | + This setting defines how IMQ behaves in respect to its | |
56 | + hooking in PREROUTING and POSTROUTING. | |
57 | + | |
58 | + Choosing this option will make IMQ hook like this: | |
59 | + | |
60 | + PREROUTING: After NAT | |
61 | + POSTROUTING: After NAT | |
62 | + | |
fa14fc87 | 63 | + More information can be found at: https://github.com/imq/linuximq |
e2d28598 JR |
64 | + |
65 | + If not sure leave the default settings alone. | |
66 | + | |
67 | +config IMQ_BEHAVIOR_AB | |
68 | + bool "IMQ AB" | |
69 | + help | |
70 | + This setting defines how IMQ behaves in respect to its | |
71 | + hooking in PREROUTING and POSTROUTING. | |
72 | + | |
73 | + Choosing this option will make IMQ hook like this: | |
74 | + | |
75 | + PREROUTING: After NAT | |
76 | + POSTROUTING: Before NAT | |
77 | + | |
fa14fc87 | 78 | + More information can be found at: https://github.com/imq/linuximq |
e2d28598 JR |
79 | + |
80 | + If not sure leave the default settings alone. | |
81 | + | |
82 | +config IMQ_BEHAVIOR_BA | |
83 | + bool "IMQ BA" | |
84 | + help | |
85 | + This setting defines how IMQ behaves in respect to its | |
86 | + hooking in PREROUTING and POSTROUTING. | |
87 | + | |
88 | + Choosing this option will make IMQ hook like this: | |
89 | + | |
90 | + PREROUTING: Before NAT | |
91 | + POSTROUTING: After NAT | |
92 | + | |
fa14fc87 | 93 | + More information can be found at: https://github.com/imq/linuximq |
e2d28598 JR |
94 | + |
95 | + If not sure leave the default settings alone. | |
96 | + | |
97 | +config IMQ_BEHAVIOR_BB | |
98 | + bool "IMQ BB" | |
99 | + help | |
100 | + This setting defines how IMQ behaves in respect to its | |
101 | + hooking in PREROUTING and POSTROUTING. | |
102 | + | |
103 | + Choosing this option will make IMQ hook like this: | |
104 | + | |
105 | + PREROUTING: Before NAT | |
106 | + POSTROUTING: Before NAT | |
107 | + | |
fa14fc87 | 108 | + More information can be found at: https://github.com/imq/linuximq |
e2d28598 JR |
109 | + |
110 | + If not sure leave the default settings alone. | |
111 | + | |
112 | +endchoice | |
113 | + | |
114 | +config IMQ_NUM_DEVS | |
115 | + int "Number of IMQ devices" | |
116 | + range 2 16 | |
117 | + depends on IMQ | |
118 | + default "16" | |
119 | + help | |
120 | + This setting defines how many IMQ devices will be created. | |
121 | + | |
122 | + The default value is 16. | |
123 | + | |
fa14fc87 | 124 | + More information can be found at: https://github.com/imq/linuximq |
e2d28598 JR |
125 | + |
126 | + If not sure leave the default settings alone. | |
127 | + | |
128 | config TUN | |
129 | tristate "Universal TUN/TAP device driver support" | |
fa14fc87 | 130 | depends on INET |
e2d28598 | 131 | diff --git a/drivers/net/Makefile b/drivers/net/Makefile |
fa14fc87 | 132 | index e25fdd7..b411742 100644 |
e2d28598 JR |
133 | --- a/drivers/net/Makefile |
134 | +++ b/drivers/net/Makefile | |
fa14fc87 | 135 | @@ -10,6 +10,7 @@ obj-$(CONFIG_IPVLAN) += ipvlan/ |
e2d28598 JR |
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 | |
144 | new file mode 100644 | |
ab036dbd | 145 | index 0000000..7702afd |
e2d28598 JR |
146 | --- /dev/null |
147 | +++ b/drivers/net/imq.c | |
ab036dbd | 148 | @@ -0,0 +1,910 @@ |
2380c486 JR |
149 | +/* |
150 | + * Pseudo-driver for the intermediate queue device. | |
151 | + * | |
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. | |
156 | + * | |
157 | + * Authors: Patrick McHardy, <kaber@trash.net> | |
158 | + * | |
159 | + * The first version was written by Martin Devera, <devik@cdi.cz> | |
160 | + * | |
fa14fc87 | 161 | + * See Creditis.txt |
2380c486 JR |
162 | + */ |
163 | + | |
164 | +#include <linux/module.h> | |
165 | +#include <linux/kernel.h> | |
166 | +#include <linux/moduleparam.h> | |
7f07242b | 167 | +#include <linux/list.h> |
2380c486 JR |
168 | +#include <linux/skbuff.h> |
169 | +#include <linux/netdevice.h> | |
7f07242b | 170 | +#include <linux/etherdevice.h> |
2380c486 JR |
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> | |
177 | +#endif | |
178 | +#include <linux/imq.h> | |
179 | +#include <net/pkt_sched.h> | |
180 | +#include <net/netfilter/nf_queue.h> | |
f6396b7e AM |
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> | |
186 | +#include <net/ip.h> | |
187 | +#include <net/ipv6.h> | |
188 | + | |
e2d28598 | 189 | +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num); |
2380c486 | 190 | + |
fa14fc87 | 191 | +static nf_hookfn imq_nf_hook; |
2380c486 | 192 | + |
f6396b7e AM |
193 | +static struct nf_hook_ops imq_ops[] = { |
194 | + { | |
195 | + /* imq_ingress_ipv4 */ | |
196 | + .hook = imq_nf_hook, | |
197 | + .owner = THIS_MODULE, | |
198 | + .pf = PF_INET, | |
199 | + .hooknum = NF_INET_PRE_ROUTING, | |
2380c486 | 200 | +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) |
f6396b7e | 201 | + .priority = NF_IP_PRI_MANGLE + 1, |
2380c486 | 202 | +#else |
f6396b7e | 203 | + .priority = NF_IP_PRI_NAT_DST + 1, |
2380c486 | 204 | +#endif |
f6396b7e AM |
205 | + }, |
206 | + { | |
207 | + /* imq_egress_ipv4 */ | |
208 | + .hook = imq_nf_hook, | |
209 | + .owner = THIS_MODULE, | |
210 | + .pf = PF_INET, | |
211 | + .hooknum = NF_INET_POST_ROUTING, | |
2380c486 | 212 | +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) |
f6396b7e | 213 | + .priority = NF_IP_PRI_LAST, |
2380c486 | 214 | +#else |
f6396b7e | 215 | + .priority = NF_IP_PRI_NAT_SRC - 1, |
2380c486 | 216 | +#endif |
f6396b7e | 217 | + }, |
2380c486 | 218 | +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
f6396b7e AM |
219 | + { |
220 | + /* imq_ingress_ipv6 */ | |
221 | + .hook = imq_nf_hook, | |
222 | + .owner = THIS_MODULE, | |
223 | + .pf = PF_INET6, | |
224 | + .hooknum = NF_INET_PRE_ROUTING, | |
2380c486 | 225 | +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) |
f6396b7e | 226 | + .priority = NF_IP6_PRI_MANGLE + 1, |
2380c486 | 227 | +#else |
f6396b7e | 228 | + .priority = NF_IP6_PRI_NAT_DST + 1, |
2380c486 | 229 | +#endif |
f6396b7e AM |
230 | + }, |
231 | + { | |
232 | + /* imq_egress_ipv6 */ | |
233 | + .hook = imq_nf_hook, | |
234 | + .owner = THIS_MODULE, | |
235 | + .pf = PF_INET6, | |
236 | + .hooknum = NF_INET_POST_ROUTING, | |
2380c486 | 237 | +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) |
f6396b7e | 238 | + .priority = NF_IP6_PRI_LAST, |
2380c486 | 239 | +#else |
f6396b7e | 240 | + .priority = NF_IP6_PRI_NAT_SRC - 1, |
2380c486 | 241 | +#endif |
f6396b7e | 242 | + }, |
2380c486 | 243 | +#endif |
f6396b7e | 244 | +}; |
2380c486 JR |
245 | + |
246 | +#if defined(CONFIG_IMQ_NUM_DEVS) | |
f6396b7e | 247 | +static int numdevs = CONFIG_IMQ_NUM_DEVS; |
2380c486 | 248 | +#else |
f6396b7e | 249 | +static int numdevs = IMQ_MAX_DEVS; |
2380c486 JR |
250 | +#endif |
251 | + | |
252 | +static struct net_device *imq_devs_cache[IMQ_MAX_DEVS]; | |
253 | + | |
a168f21d AM |
254 | +#define IMQ_MAX_QUEUES 32 |
255 | +static int numqueues = 1; | |
f6396b7e | 256 | +static u32 imq_hashrnd; |
fa14fc87 | 257 | +static int imq_dev_accurate_stats = 1; |
f6396b7e AM |
258 | + |
259 | +static inline __be16 pppoe_proto(const struct sk_buff *skb) | |
260 | +{ | |
261 | + return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN + | |
262 | + sizeof(struct pppoe_hdr))); | |
263 | +} | |
264 | + | |
265 | +static u16 imq_hash(struct net_device *dev, struct sk_buff *skb) | |
266 | +{ | |
267 | + unsigned int pull_len; | |
268 | + u16 protocol = skb->protocol; | |
269 | + u32 addr1, addr2; | |
270 | + u32 hash, ihl = 0; | |
271 | + union { | |
272 | + u16 in16[2]; | |
273 | + u32 in32; | |
274 | + } ports; | |
275 | + u8 ip_proto; | |
276 | + | |
277 | + pull_len = 0; | |
278 | + | |
279 | +recheck: | |
280 | + switch (protocol) { | |
281 | + case htons(ETH_P_8021Q): { | |
282 | + if (unlikely(skb_pull(skb, VLAN_HLEN) == NULL)) | |
283 | + goto other; | |
284 | + | |
285 | + pull_len += VLAN_HLEN; | |
286 | + skb->network_header += VLAN_HLEN; | |
287 | + | |
288 | + protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; | |
289 | + goto recheck; | |
290 | + } | |
291 | + | |
292 | + case htons(ETH_P_PPP_SES): { | |
293 | + if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) == NULL)) | |
294 | + goto other; | |
295 | + | |
296 | + pull_len += PPPOE_SES_HLEN; | |
297 | + skb->network_header += PPPOE_SES_HLEN; | |
298 | + | |
299 | + protocol = pppoe_proto(skb); | |
300 | + goto recheck; | |
301 | + } | |
302 | + | |
303 | + case htons(ETH_P_IP): { | |
304 | + const struct iphdr *iph = ip_hdr(skb); | |
305 | + | |
306 | + if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr)))) | |
307 | + goto other; | |
308 | + | |
309 | + addr1 = iph->daddr; | |
310 | + addr2 = iph->saddr; | |
311 | + | |
312 | + ip_proto = !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ? | |
313 | + iph->protocol : 0; | |
314 | + ihl = ip_hdrlen(skb); | |
315 | + | |
316 | + break; | |
317 | + } | |
318 | +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | |
319 | + case htons(ETH_P_IPV6): { | |
320 | + const struct ipv6hdr *iph = ipv6_hdr(skb); | |
4bf69007 AM |
321 | + __be16 fo = 0; |
322 | + | |
f6396b7e AM |
323 | + if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr)))) |
324 | + goto other; | |
325 | + | |
326 | + addr1 = iph->daddr.s6_addr32[3]; | |
327 | + addr2 = iph->saddr.s6_addr32[3]; | |
514e5dae AM |
328 | + ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto, |
329 | + &fo); | |
f6396b7e AM |
330 | + if (unlikely(ihl < 0)) |
331 | + goto other; | |
332 | + | |
333 | + break; | |
334 | + } | |
335 | +#endif | |
336 | + default: | |
337 | +other: | |
338 | + if (pull_len != 0) { | |
339 | + skb_push(skb, pull_len); | |
340 | + skb->network_header -= pull_len; | |
341 | + } | |
342 | + | |
343 | + return (u16)(ntohs(protocol) % dev->real_num_tx_queues); | |
344 | + } | |
345 | + | |
346 | + if (addr1 > addr2) | |
347 | + swap(addr1, addr2); | |
348 | + | |
349 | + switch (ip_proto) { | |
350 | + case IPPROTO_TCP: | |
351 | + case IPPROTO_UDP: | |
352 | + case IPPROTO_DCCP: | |
353 | + case IPPROTO_ESP: | |
354 | + case IPPROTO_AH: | |
355 | + case IPPROTO_SCTP: | |
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]); | |
360 | + break; | |
361 | + } | |
362 | + /* fall-through */ | |
363 | + } | |
364 | + default: | |
365 | + ports.in32 = 0; | |
366 | + break; | |
367 | + } | |
368 | + | |
369 | + if (pull_len != 0) { | |
370 | + skb_push(skb, pull_len); | |
371 | + skb->network_header -= pull_len; | |
372 | + } | |
373 | + | |
374 | + hash = jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto); | |
375 | + | |
376 | + return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); | |
377 | +} | |
378 | + | |
379 | +static inline bool sk_tx_queue_recorded(struct sock *sk) | |
380 | +{ | |
381 | + return (sk_tx_queue_get(sk) >= 0); | |
382 | +} | |
383 | + | |
384 | +static struct netdev_queue *imq_select_queue(struct net_device *dev, | |
385 | + struct sk_buff *skb) | |
386 | +{ | |
387 | + u16 queue_index = 0; | |
388 | + u32 hash; | |
389 | + | |
390 | + if (likely(dev->real_num_tx_queues == 1)) | |
391 | + goto out; | |
392 | + | |
393 | + /* IMQ can be receiving ingress or engress packets. */ | |
394 | + | |
395 | + /* Check first for if rx_queue is set */ | |
396 | + if (skb_rx_queue_recorded(skb)) { | |
397 | + queue_index = skb_get_rx_queue(skb); | |
398 | + goto out; | |
399 | + } | |
400 | + | |
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); | |
404 | + goto out; | |
405 | + } | |
406 | + | |
407 | + /* Try use socket hash */ | |
408 | + if (skb->sk && skb->sk->sk_hash) { | |
409 | + hash = skb->sk->sk_hash; | |
410 | + queue_index = | |
411 | + (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); | |
412 | + goto out; | |
413 | + } | |
414 | + | |
415 | + /* Generate hash from packet data */ | |
416 | + queue_index = imq_hash(dev, skb); | |
417 | + | |
418 | +out: | |
419 | + if (unlikely(queue_index >= dev->real_num_tx_queues)) | |
420 | + queue_index = (u16)((u32)queue_index % dev->real_num_tx_queues); | |
421 | + | |
a168f21d | 422 | + skb_set_queue_mapping(skb, queue_index); |
f6396b7e AM |
423 | + return netdev_get_tx_queue(dev, queue_index); |
424 | +} | |
425 | + | |
a168f21d AM |
426 | +static struct net_device_stats *imq_get_stats(struct net_device *dev) |
427 | +{ | |
428 | + return &dev->stats; | |
429 | +} | |
430 | + | |
431 | +/* called for packets kfree'd in qdiscs at places other than enqueue */ | |
432 | +static void imq_skb_destructor(struct sk_buff *skb) | |
433 | +{ | |
434 | + struct nf_queue_entry *entry = skb->nf_queue_entry; | |
435 | + | |
436 | + skb->nf_queue_entry = NULL; | |
437 | + | |
438 | + if (entry) { | |
439 | + nf_queue_entry_release_refs(entry); | |
440 | + kfree(entry); | |
441 | + } | |
442 | + | |
443 | + skb_restore_cb(skb); /* kfree backup */ | |
444 | +} | |
445 | + | |
446 | +static void imq_done_check_queue_mapping(struct sk_buff *skb, | |
447 | + struct net_device *dev) | |
448 | +{ | |
449 | + unsigned int queue_index; | |
450 | + | |
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); | |
458 | + } | |
459 | + } else { | |
460 | + /* skb->dev was IMQ device itself or NULL, be on safe side and | |
461 | + * just clear queue mapping. | |
462 | + */ | |
463 | + skb_set_queue_mapping(skb, 0); | |
464 | + } | |
465 | +} | |
466 | + | |
467 | +static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev) | |
468 | +{ | |
469 | + struct nf_queue_entry *entry = skb->nf_queue_entry; | |
470 | + | |
471 | + skb->nf_queue_entry = NULL; | |
472 | + dev->trans_start = jiffies; | |
473 | + | |
474 | + dev->stats.tx_bytes += skb->len; | |
475 | + dev->stats.tx_packets++; | |
476 | + | |
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. | |
480 | + * | |
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:.. | |
484 | + * and/or | |
485 | + * WARNING: IMQ: kfree_skb: skb->nf_queue_entry... | |
486 | + * | |
487 | + * However if this message is shown, then IMQ is somehow broken | |
488 | + * and you should report this to linuximq.net. | |
489 | + */ | |
490 | + | |
491 | + /* imq_dev_xmit is black hole that eats all packets, report that | |
492 | + * we eat this packet happily and increase dropped counters. | |
493 | + */ | |
494 | + | |
495 | + dev->stats.tx_dropped++; | |
496 | + dev_kfree_skb(skb); | |
497 | + | |
498 | + return NETDEV_TX_OK; | |
499 | + } | |
500 | + | |
501 | + skb_restore_cb(skb); /* restore skb->cb */ | |
502 | + | |
503 | + skb->imq_flags = 0; | |
504 | + skb->destructor = NULL; | |
505 | + | |
506 | + imq_done_check_queue_mapping(skb, dev); | |
507 | + | |
508 | + nf_reinject(entry, NF_ACCEPT); | |
509 | + | |
510 | + return NETDEV_TX_OK; | |
511 | +} | |
512 | + | |
3b94b3c4 AM |
513 | +static struct net_device *get_imq_device_by_index(int index) |
514 | +{ | |
515 | + struct net_device *dev = NULL; | |
516 | + struct net *net; | |
517 | + char buf[8]; | |
518 | + | |
519 | + /* get device by name and cache result */ | |
520 | + snprintf(buf, sizeof(buf), "imq%d", index); | |
521 | + | |
522 | + /* Search device from all namespaces. */ | |
523 | + for_each_net(net) { | |
524 | + dev = dev_get_by_name(net, buf); | |
525 | + if (dev) | |
526 | + break; | |
527 | + } | |
528 | + | |
529 | + if (WARN_ON_ONCE(dev == NULL)) { | |
530 | + /* IMQ device not found. Exotic config? */ | |
531 | + return ERR_PTR(-ENODEV); | |
532 | + } | |
533 | + | |
534 | + imq_devs_cache[index] = dev; | |
535 | + dev_put(dev); | |
536 | + | |
537 | + return dev; | |
538 | +} | |
539 | + | |
e2d28598 | 540 | +static struct nf_queue_entry *nf_queue_entry_dup(struct nf_queue_entry *e) |
2380c486 | 541 | +{ |
e2d28598 JR |
542 | + struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC); |
543 | + if (entry) { | |
544 | + if (nf_queue_entry_get_refs(entry)) | |
545 | + return entry; | |
546 | + kfree(entry); | |
547 | + } | |
548 | + return NULL; | |
549 | +} | |
550 | + | |
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. | |
555 | + */ | |
556 | +static void nf_bridge_adjust_skb_data(struct sk_buff *skb) | |
557 | +{ | |
558 | + if (skb->nf_bridge) | |
559 | + __skb_push(skb, skb->network_header - skb->mac_header); | |
560 | +} | |
561 | + | |
562 | +static void nf_bridge_adjust_segmented_data(struct sk_buff *skb) | |
563 | +{ | |
564 | + if (skb->nf_bridge) | |
565 | + __skb_pull(skb, skb->network_header - skb->mac_header); | |
566 | +} | |
567 | +#else | |
568 | +#define nf_bridge_adjust_skb_data(s) do {} while (0) | |
569 | +#define nf_bridge_adjust_segmented_data(s) do {} while (0) | |
570 | +#endif | |
571 | + | |
572 | +static void free_entry(struct nf_queue_entry *entry) | |
573 | +{ | |
574 | + nf_queue_entry_release_refs(entry); | |
575 | + kfree(entry); | |
576 | +} | |
577 | + | |
578 | +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev); | |
579 | + | |
580 | +static int __imq_nf_queue_gso(struct nf_queue_entry *entry, | |
581 | + struct net_device *dev, struct sk_buff *skb) | |
582 | +{ | |
583 | + int ret = -ENOMEM; | |
584 | + struct nf_queue_entry *entry_seg; | |
585 | + | |
586 | + nf_bridge_adjust_segmented_data(skb); | |
587 | + | |
588 | + if (skb->next == NULL) { /* last packet, no need to copy entry */ | |
589 | + struct sk_buff *gso_skb = entry->skb; | |
590 | + entry->skb = skb; | |
591 | + ret = __imq_nf_queue(entry, dev); | |
592 | + if (ret) | |
593 | + entry->skb = gso_skb; | |
594 | + return ret; | |
595 | + } | |
596 | + | |
597 | + skb->next = NULL; | |
598 | + | |
599 | + entry_seg = nf_queue_entry_dup(entry); | |
600 | + if (entry_seg) { | |
601 | + entry_seg->skb = skb; | |
602 | + ret = __imq_nf_queue(entry_seg, dev); | |
603 | + if (ret) | |
604 | + free_entry(entry_seg); | |
605 | + } | |
606 | + return ret; | |
607 | +} | |
608 | + | |
609 | +static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num) | |
610 | +{ | |
611 | + struct sk_buff *skb, *segs; | |
2380c486 | 612 | + struct net_device *dev; |
e2d28598 JR |
613 | + unsigned int queued; |
614 | + int index, retval, err; | |
7f07242b | 615 | + |
616 | + index = entry->skb->imq_flags & IMQ_F_IFMASK; | |
617 | + if (unlikely(index > numdevs - 1)) { | |
618 | + if (net_ratelimit()) | |
514e5dae AM |
619 | + pr_warn("IMQ: invalid device specified, highest is %u\n", |
620 | + numdevs - 1); | |
7f07242b | 621 | + retval = -EINVAL; |
e2d28598 | 622 | + goto out_no_dev; |
7f07242b | 623 | + } |
2380c486 JR |
624 | + |
625 | + /* check for imq device by index from cache */ | |
626 | + dev = imq_devs_cache[index]; | |
7f07242b | 627 | + if (unlikely(!dev)) { |
3b94b3c4 AM |
628 | + dev = get_imq_device_by_index(index); |
629 | + if (IS_ERR(dev)) { | |
630 | + retval = PTR_ERR(dev); | |
e2d28598 | 631 | + goto out_no_dev; |
2380c486 | 632 | + } |
2380c486 JR |
633 | + } |
634 | + | |
7f07242b | 635 | + if (unlikely(!(dev->flags & IFF_UP))) { |
2380c486 | 636 | + entry->skb->imq_flags = 0; |
e2d28598 JR |
637 | + retval = -ECANCELED; |
638 | + goto out_no_dev; | |
2380c486 | 639 | + } |
e2d28598 | 640 | + |
e2d28598 JR |
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). | |
644 | + * | |
645 | + * Following code replicates the gso handling from | |
646 | + * 'net/netfilter/nfnetlink_queue_core.c':nfqnl_enqueue_packet(). | |
647 | + */ | |
648 | + | |
649 | + skb = entry->skb; | |
650 | + | |
fa14fc87 | 651 | + switch (entry->state.pf) { |
e2d28598 JR |
652 | + case NFPROTO_IPV4: |
653 | + skb->protocol = htons(ETH_P_IP); | |
654 | + break; | |
655 | + case NFPROTO_IPV6: | |
656 | + skb->protocol = htons(ETH_P_IPV6); | |
657 | + break; | |
658 | + } | |
659 | + | |
fa14fc87 JR |
660 | + if (!skb_is_gso(entry->skb)) |
661 | + return __imq_nf_queue(entry, dev); | |
662 | + | |
e2d28598 JR |
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'. | |
668 | + */ | |
669 | + err = -ENOBUFS; | |
670 | + if (IS_ERR(segs)) | |
671 | + goto out_err; | |
672 | + queued = 0; | |
673 | + err = 0; | |
674 | + do { | |
675 | + struct sk_buff *nskb = segs->next; | |
676 | + if (nskb && nskb->next) | |
677 | + nskb->cb_next = NULL; | |
678 | + if (err == 0) | |
679 | + err = __imq_nf_queue_gso(entry, dev, segs); | |
680 | + if (err == 0) | |
681 | + queued++; | |
682 | + else | |
683 | + kfree_skb(segs); | |
684 | + segs = nskb; | |
685 | + } while (segs); | |
686 | + | |
687 | + if (queued) { | |
688 | + if (err) /* some segments are already queued */ | |
689 | + free_entry(entry); | |
690 | + kfree_skb(skb); | |
691 | + return 0; | |
692 | + } | |
693 | + | |
694 | +out_err: | |
695 | + nf_bridge_adjust_segmented_data(skb); | |
696 | + retval = err; | |
697 | +out_no_dev: | |
698 | + return retval; | |
699 | +} | |
700 | + | |
701 | +static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev) | |
702 | +{ | |
fa14fc87 | 703 | + struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd; |
e2d28598 JR |
704 | + struct Qdisc *q; |
705 | + struct netdev_queue *txq; | |
706 | + spinlock_t *root_lock; | |
707 | + int users; | |
708 | + int retval = -EINVAL; | |
709 | + unsigned int orig_queue_index; | |
710 | + | |
2380c486 JR |
711 | + dev->last_rx = jiffies; |
712 | + | |
7f07242b | 713 | + skb = entry->skb; |
714 | + skb_orig = NULL; | |
715 | + | |
716 | + /* skb has owner? => make clone */ | |
717 | + if (unlikely(skb->destructor)) { | |
718 | + skb_orig = skb; | |
719 | + skb = skb_clone(skb, GFP_ATOMIC); | |
f6396b7e | 720 | + if (unlikely(!skb)) { |
7f07242b | 721 | + retval = -ENOMEM; |
722 | + goto out; | |
723 | + } | |
e2d28598 | 724 | + skb->cb_next = NULL; |
7f07242b | 725 | + entry->skb = skb; |
2380c486 | 726 | + } |
2380c486 | 727 | + |
7f07242b | 728 | + skb->nf_queue_entry = entry; |
729 | + | |
730 | + dev->stats.rx_bytes += skb->len; | |
2380c486 JR |
731 | + dev->stats.rx_packets++; |
732 | + | |
a168f21d AM |
733 | + if (!skb->dev) { |
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"); | |
738 | + dump_stack(); | |
739 | + } | |
740 | + | |
741 | + skb->dev = dev; | |
742 | + } | |
743 | + | |
f6396b7e AM |
744 | + /* Disables softirqs for lock below */ |
745 | + rcu_read_lock_bh(); | |
746 | + | |
747 | + /* Multi-queue selection */ | |
a168f21d | 748 | + orig_queue_index = skb_get_queue_mapping(skb); |
f6396b7e | 749 | + txq = imq_select_queue(dev, skb); |
2380c486 | 750 | + |
7f07242b | 751 | + q = rcu_dereference(txq->qdisc); |
752 | + if (unlikely(!q->enqueue)) | |
753 | + goto packet_not_eaten_by_imq_dev; | |
2380c486 | 754 | + |
f6396b7e AM |
755 | + root_lock = qdisc_lock(q); |
756 | + spin_lock(root_lock); | |
7f07242b | 757 | + |
758 | + users = atomic_read(&skb->users); | |
759 | + | |
760 | + skb_shared = skb_get(skb); /* increase reference count by one */ | |
514e5dae AM |
761 | + |
762 | + /* backup skb->cb, as qdisc layer will overwrite it */ | |
763 | + skb_save_cb(skb_shared); | |
7f07242b | 764 | + qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */ |
765 | + | |
766 | + if (likely(atomic_read(&skb_shared->users) == users + 1)) { | |
fa14fc87 JR |
767 | + bool validate; |
768 | + | |
7f07242b | 769 | + kfree_skb(skb_shared); /* decrease reference count by one */ |
770 | + | |
771 | + skb->destructor = &imq_skb_destructor; | |
772 | + | |
fa14fc87 JR |
773 | + skb_popd = qdisc_dequeue_skb(q, &validate); |
774 | + | |
7f07242b | 775 | + /* cloned? */ |
f6396b7e | 776 | + if (unlikely(skb_orig)) |
7f07242b | 777 | + kfree_skb(skb_orig); /* free original */ |
778 | + | |
f6396b7e | 779 | + spin_unlock(root_lock); |
7f07242b | 780 | + |
fa14fc87 | 781 | +#if 0 |
7f07242b | 782 | + /* schedule qdisc dequeue */ |
783 | + __netif_schedule(q); | |
fa14fc87 JR |
784 | +#else |
785 | + if (likely(skb_popd)) { | |
786 | + /* Note that we validate skb (GSO, checksum, ...) outside of locks */ | |
787 | + if (validate) | |
788 | + skb_popd = validate_xmit_skb_list(skb_popd, dev); | |
789 | + | |
790 | + if (skb_popd) { | |
791 | + int dummy_ret; | |
792 | + int cpu = smp_processor_id(); /* ok because BHs are off */ | |
793 | + | |
794 | + txq = skb_get_tx_queue(dev, skb_popd); | |
795 | + /* | |
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. | |
798 | + */ | |
799 | + if (imq_dev_accurate_stats && txq->xmit_lock_owner != cpu) { | |
800 | + HARD_TX_LOCK(dev, txq, cpu); | |
ab036dbd AM |
801 | + if (!netif_xmit_frozen_or_stopped(txq)) { |
802 | + dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); | |
803 | + } | |
fa14fc87 JR |
804 | + HARD_TX_UNLOCK(dev, txq); |
805 | + } else { | |
ab036dbd AM |
806 | + if (!netif_xmit_frozen_or_stopped(txq)) { |
807 | + dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); | |
808 | + } | |
fa14fc87 JR |
809 | + } |
810 | + } | |
ab036dbd AM |
811 | + } else { |
812 | + /* No ready skb, then schedule it */ | |
813 | + __netif_schedule(q); | |
fa14fc87 JR |
814 | + } |
815 | +#endif | |
816 | + rcu_read_unlock_bh(); | |
7f07242b | 817 | + retval = 0; |
818 | + goto out; | |
819 | + } else { | |
820 | + skb_restore_cb(skb_shared); /* restore skb->cb */ | |
14f08cd0 | 821 | + skb->nf_queue_entry = NULL; |
514e5dae AM |
822 | + /* |
823 | + * qdisc dropped packet and decreased skb reference count of | |
7f07242b | 824 | + * skb, so we don't really want to and try refree as that would |
514e5dae AM |
825 | + * actually destroy the skb. |
826 | + */ | |
f6396b7e | 827 | + spin_unlock(root_lock); |
7f07242b | 828 | + goto packet_not_eaten_by_imq_dev; |
829 | + } | |
830 | + | |
831 | +packet_not_eaten_by_imq_dev: | |
a168f21d | 832 | + skb_set_queue_mapping(skb, orig_queue_index); |
f6396b7e AM |
833 | + rcu_read_unlock_bh(); |
834 | + | |
7f07242b | 835 | + /* cloned? restore original */ |
f6396b7e | 836 | + if (unlikely(skb_orig)) { |
7f07242b | 837 | + kfree_skb(skb); |
838 | + entry->skb = skb_orig; | |
839 | + } | |
840 | + retval = -1; | |
841 | +out: | |
842 | + return retval; | |
2380c486 | 843 | +} |
fa14fc87 JR |
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) | |
2380c486 | 847 | +{ |
fa14fc87 | 848 | + return (skb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT; |
2380c486 JR |
849 | +} |
850 | + | |
851 | +static int imq_close(struct net_device *dev) | |
852 | +{ | |
2380c486 | 853 | + netif_stop_queue(dev); |
2380c486 JR |
854 | + return 0; |
855 | +} | |
856 | + | |
857 | +static int imq_open(struct net_device *dev) | |
858 | +{ | |
2380c486 | 859 | + netif_start_queue(dev); |
2380c486 JR |
860 | + return 0; |
861 | +} | |
862 | + | |
7f07242b | 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, | |
868 | +}; | |
869 | + | |
2380c486 JR |
870 | +static void imq_setup(struct net_device *dev) |
871 | +{ | |
7f07242b | 872 | + dev->netdev_ops = &imq_netdev_ops; |
3b94b3c4 AM |
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 | | |
7f07242b | 878 | + NETIF_F_GSO | NETIF_F_HW_CSUM | |
879 | + NETIF_F_HIGHDMA; | |
3b94b3c4 AM |
880 | + dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | |
881 | + IFF_TX_SKB_SHARING); | |
7f07242b | 882 | +} |
883 | + | |
884 | +static int imq_validate(struct nlattr *tb[], struct nlattr *data[]) | |
885 | +{ | |
886 | + int ret = 0; | |
887 | + | |
888 | + if (tb[IFLA_ADDRESS]) { | |
889 | + if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) { | |
890 | + ret = -EINVAL; | |
891 | + goto end; | |
892 | + } | |
893 | + if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) { | |
894 | + ret = -EADDRNOTAVAIL; | |
895 | + goto end; | |
896 | + } | |
897 | + } | |
898 | + return 0; | |
899 | +end: | |
514e5dae | 900 | + pr_warn("IMQ: imq_validate failed (%d)\n", ret); |
7f07242b | 901 | + return ret; |
2380c486 JR |
902 | +} |
903 | + | |
904 | +static struct rtnl_link_ops imq_link_ops __read_mostly = { | |
905 | + .kind = "imq", | |
7f07242b | 906 | + .priv_size = 0, |
2380c486 | 907 | + .setup = imq_setup, |
7f07242b | 908 | + .validate = imq_validate, |
2380c486 JR |
909 | +}; |
910 | + | |
f6396b7e | 911 | +static const struct nf_queue_handler imq_nfqh = { |
f6396b7e AM |
912 | + .outfn = imq_nf_queue, |
913 | +}; | |
914 | + | |
2380c486 JR |
915 | +static int __init imq_init_hooks(void) |
916 | +{ | |
f6396b7e | 917 | + int ret; |
2380c486 | 918 | + |
f6396b7e | 919 | + nf_register_queue_imq_handler(&imq_nfqh); |
2380c486 | 920 | + |
f6396b7e AM |
921 | + ret = nf_register_hooks(imq_ops, ARRAY_SIZE(imq_ops)); |
922 | + if (ret < 0) | |
923 | + nf_unregister_queue_imq_handler(); | |
2380c486 | 924 | + |
f6396b7e | 925 | + return ret; |
2380c486 JR |
926 | +} |
927 | + | |
928 | +static int __init imq_init_one(int index) | |
929 | +{ | |
930 | + struct net_device *dev; | |
931 | + int ret; | |
932 | + | |
a1e1a866 | 933 | + dev = alloc_netdev_mq(0, "imq%d", NET_NAME_UNKNOWN, imq_setup, numqueues); |
2380c486 JR |
934 | + if (!dev) |
935 | + return -ENOMEM; | |
936 | + | |
937 | + ret = dev_alloc_name(dev, dev->name); | |
938 | + if (ret < 0) | |
939 | + goto fail; | |
940 | + | |
941 | + dev->rtnl_link_ops = &imq_link_ops; | |
942 | + ret = register_netdevice(dev); | |
943 | + if (ret < 0) | |
944 | + goto fail; | |
945 | + | |
946 | + return 0; | |
947 | +fail: | |
948 | + free_netdev(dev); | |
949 | + return ret; | |
950 | +} | |
951 | + | |
952 | +static int __init imq_init_devs(void) | |
953 | +{ | |
954 | + int err, i; | |
955 | + | |
7f07242b | 956 | + if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) { |
514e5dae | 957 | + pr_err("IMQ: numdevs has to be betweed 1 and %u\n", |
2380c486 JR |
958 | + IMQ_MAX_DEVS); |
959 | + return -EINVAL; | |
960 | + } | |
961 | + | |
f6396b7e | 962 | + if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) { |
514e5dae | 963 | + pr_err("IMQ: numqueues has to be betweed 1 and %u\n", |
f6396b7e AM |
964 | + IMQ_MAX_QUEUES); |
965 | + return -EINVAL; | |
966 | + } | |
967 | + | |
968 | + get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd)); | |
969 | + | |
2380c486 JR |
970 | + rtnl_lock(); |
971 | + err = __rtnl_link_register(&imq_link_ops); | |
972 | + | |
973 | + for (i = 0; i < numdevs && !err; i++) | |
974 | + err = imq_init_one(i); | |
975 | + | |
976 | + if (err) { | |
977 | + __rtnl_link_unregister(&imq_link_ops); | |
978 | + memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); | |
979 | + } | |
980 | + rtnl_unlock(); | |
981 | + | |
982 | + return err; | |
983 | +} | |
984 | + | |
985 | +static int __init imq_init_module(void) | |
986 | +{ | |
987 | + int err; | |
988 | + | |
7f07242b | 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); | |
993 | +#endif | |
994 | + | |
2380c486 JR |
995 | + err = imq_init_devs(); |
996 | + if (err) { | |
514e5dae | 997 | + pr_err("IMQ: Error trying imq_init_devs(net)\n"); |
2380c486 JR |
998 | + return err; |
999 | + } | |
1000 | + | |
1001 | + err = imq_init_hooks(); | |
1002 | + if (err) { | |
514e5dae | 1003 | + pr_err(KERN_ERR "IMQ: Error trying imq_init_hooks()\n"); |
2380c486 JR |
1004 | + rtnl_link_unregister(&imq_link_ops); |
1005 | + memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); | |
1006 | + return err; | |
1007 | + } | |
1008 | + | |
fa14fc87 JR |
1009 | + pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d, imq_dev_accurate_stats = %d)\n", |
1010 | + numdevs, numqueues, imq_dev_accurate_stats); | |
2380c486 JR |
1011 | + |
1012 | +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) | |
514e5dae | 1013 | + pr_info("\tHooking IMQ before NAT on PREROUTING.\n"); |
2380c486 | 1014 | +#else |
514e5dae | 1015 | + pr_info("\tHooking IMQ after NAT on PREROUTING.\n"); |
2380c486 JR |
1016 | +#endif |
1017 | +#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB) | |
514e5dae | 1018 | + pr_info("\tHooking IMQ before NAT on POSTROUTING.\n"); |
2380c486 | 1019 | +#else |
514e5dae | 1020 | + pr_info("\tHooking IMQ after NAT on POSTROUTING.\n"); |
2380c486 JR |
1021 | +#endif |
1022 | + | |
1023 | + return 0; | |
1024 | +} | |
1025 | + | |
1026 | +static void __exit imq_unhook(void) | |
1027 | +{ | |
f6396b7e | 1028 | + nf_unregister_hooks(imq_ops, ARRAY_SIZE(imq_ops)); |
7f07242b | 1029 | + nf_unregister_queue_imq_handler(); |
2380c486 JR |
1030 | +} |
1031 | + | |
1032 | +static void __exit imq_cleanup_devs(void) | |
1033 | +{ | |
1034 | + rtnl_link_unregister(&imq_link_ops); | |
1035 | + memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); | |
1036 | +} | |
1037 | + | |
1038 | +static void __exit imq_exit_module(void) | |
1039 | +{ | |
1040 | + imq_unhook(); | |
1041 | + imq_cleanup_devs(); | |
514e5dae | 1042 | + pr_info("IMQ driver unloaded successfully.\n"); |
2380c486 JR |
1043 | +} |
1044 | + | |
1045 | +module_init(imq_init_module); | |
1046 | +module_exit(imq_exit_module); | |
1047 | + | |
1048 | +module_param(numdevs, int, 0); | |
f6396b7e | 1049 | +module_param(numqueues, int, 0); |
fa14fc87 | 1050 | +module_param(imq_dev_accurate_stats, int, 0); |
514e5dae | 1051 | +MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)"); |
f6396b7e | 1052 | +MODULE_PARM_DESC(numqueues, "number of queues per IMQ device"); |
fa14fc87 JR |
1053 | +MODULE_PARM_DESC(imq_dev_accurate_stats, "Notify if need the accurate imq device stats"); |
1054 | + | |
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."); | |
2380c486 JR |
1057 | +MODULE_LICENSE("GPL"); |
1058 | +MODULE_ALIAS_RTNL_LINK("imq"); | |
e2d28598 JR |
1059 | diff --git a/include/linux/imq.h b/include/linux/imq.h |
1060 | new file mode 100644 | |
1061 | index 0000000..1babb09 | |
1062 | --- /dev/null | |
1063 | +++ b/include/linux/imq.h | |
7f07242b | 1064 | @@ -0,0 +1,13 @@ |
2380c486 JR |
1065 | +#ifndef _IMQ_H |
1066 | +#define _IMQ_H | |
1067 | + | |
7f07242b | 1068 | +/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */ |
1069 | +#define IMQ_F_BITS 5 | |
1070 | + | |
1071 | +#define IMQ_F_IFMASK 0x0f | |
1072 | +#define IMQ_F_ENQUEUE 0x10 | |
2380c486 | 1073 | + |
7f07242b | 1074 | +#define IMQ_MAX_DEVS (IMQ_F_IFMASK + 1) |
2380c486 JR |
1075 | + |
1076 | +#endif /* _IMQ_H */ | |
2380c486 | 1077 | + |
fa14fc87 JR |
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) | |
1083 | } \ | |
1084 | } | |
1085 | ||
1086 | +#define HARD_TX_LOCK_BH(dev, txq) { \ | |
1087 | + if ((dev->features & NETIF_F_LLTX) == 0) { \ | |
1088 | + __netif_tx_lock_bh(txq); \ | |
1089 | + } \ | |
1090 | +} | |
1091 | + | |
1092 | +#define HARD_TX_UNLOCK_BH(dev, txq) { \ | |
1093 | + if ((dev->features & NETIF_F_LLTX) == 0) { \ | |
1094 | + __netif_tx_unlock_bh(txq); \ | |
1095 | + } \ | |
1096 | +} | |
1097 | + | |
1098 | + | |
1099 | static inline void netif_tx_disable(struct net_device *dev) | |
1100 | { | |
1101 | unsigned int i; | |
e2d28598 JR |
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 | |
1105 | --- /dev/null | |
1106 | +++ b/include/linux/netfilter/xt_IMQ.h | |
7f07242b | 1107 | @@ -0,0 +1,9 @@ |
1108 | +#ifndef _XT_IMQ_H | |
1109 | +#define _XT_IMQ_H | |
1110 | + | |
1111 | +struct xt_imq_info { | |
2380c486 JR |
1112 | + unsigned int todev; /* target imq device */ |
1113 | +}; | |
1114 | + | |
7f07242b | 1115 | +#endif /* _XT_IMQ_H */ |
1116 | + | |
e2d28598 JR |
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 | |
1120 | --- /dev/null | |
1121 | +++ b/include/linux/netfilter_ipv4/ipt_IMQ.h | |
7f07242b | 1122 | @@ -0,0 +1,10 @@ |
1123 | +#ifndef _IPT_IMQ_H | |
1124 | +#define _IPT_IMQ_H | |
1125 | + | |
1126 | +/* Backwards compatibility for old userspace */ | |
1127 | +#include <linux/netfilter/xt_IMQ.h> | |
1128 | + | |
1129 | +#define ipt_imq_info xt_imq_info | |
1130 | + | |
2380c486 | 1131 | +#endif /* _IPT_IMQ_H */ |
7f07242b | 1132 | + |
e2d28598 JR |
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 | |
1136 | --- /dev/null | |
1137 | +++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h | |
7f07242b | 1138 | @@ -0,0 +1,10 @@ |
2380c486 JR |
1139 | +#ifndef _IP6T_IMQ_H |
1140 | +#define _IP6T_IMQ_H | |
1141 | + | |
7f07242b | 1142 | +/* Backwards compatibility for old userspace */ |
1143 | +#include <linux/netfilter/xt_IMQ.h> | |
1144 | + | |
1145 | +#define ip6t_imq_info xt_imq_info | |
2380c486 JR |
1146 | + |
1147 | +#endif /* _IP6T_IMQ_H */ | |
7f07242b | 1148 | + |
e2d28598 | 1149 | diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h |
ab036dbd | 1150 | index 4307e20..ebfe3f9 100644 |
e2d28598 JR |
1151 | --- a/include/linux/skbuff.h |
1152 | +++ b/include/linux/skbuff.h | |
fa14fc87 | 1153 | @@ -35,6 +35,9 @@ |
0acdeb19 | 1154 | #include <linux/netdev_features.h> |
fa14fc87 | 1155 | #include <linux/sched.h> |
7770d33f | 1156 | #include <net/flow_keys.h> |
7f07242b | 1157 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
1158 | +#include <linux/imq.h> | |
1159 | +#endif | |
1160 | ||
fa14fc87 JR |
1161 | /* A. Checksumming of received packets by device. |
1162 | * | |
1163 | @@ -540,6 +543,9 @@ struct sk_buff { | |
7f07242b | 1164 | * first. This is owned by whoever has the skb queued ATM. |
1165 | */ | |
ca0faea1 | 1166 | char cb[48] __aligned(8); |
7f07242b | 1167 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
1168 | + void *cb_next; | |
1169 | +#endif | |
1170 | ||
f6396b7e | 1171 | unsigned long _skb_refdst; |
fa14fc87 JR |
1172 | void (*destructor)(struct sk_buff *skb); |
1173 | @@ -549,6 +555,9 @@ struct sk_buff { | |
f6b6e03d AM |
1174 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
1175 | struct nf_conntrack *nfct; | |
2380c486 JR |
1176 | #endif |
1177 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
fa14fc87 | 1178 | + struct nf_queue_entry *nf_queue_entry; |
2380c486 | 1179 | +#endif |
e26ee53e | 1180 | #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) |
2380c486 JR |
1181 | struct nf_bridge_info *nf_bridge; |
1182 | #endif | |
fa14fc87 JR |
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; | |
1189 | + #endif | |
7f07242b | 1190 | |
fa14fc87 JR |
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); | |
7f07242b | 1197 | + |
1198 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
fa14fc87 JR |
1199 | +int skb_save_cb(struct sk_buff *skb); |
1200 | +int skb_restore_cb(struct sk_buff *skb); | |
7f07242b | 1201 | +#endif |
1202 | + | |
fa14fc87 JR |
1203 | extern struct kmem_cache *skbuff_head_cache; |
1204 | ||
1205 | void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); | |
ab036dbd | 1206 | @@ -3215,6 +3233,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src, |
e26ee53e JR |
1207 | if (copy) |
1208 | dst->nfctinfo = src->nfctinfo; | |
2380c486 JR |
1209 | #endif |
1210 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
fa14fc87 JR |
1211 | + dst->imq_flags = src->imq_flags; |
1212 | + dst->nf_queue_entry = src->nf_queue_entry; | |
2380c486 | 1213 | +#endif |
e26ee53e | 1214 | #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) |
2380c486 JR |
1215 | dst->nf_bridge = src->nf_bridge; |
1216 | nf_bridge_get(src->nf_bridge); | |
e2d28598 | 1217 | diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h |
ab036dbd | 1218 | index e863585..40904cb 100644 |
e2d28598 JR |
1219 | --- a/include/net/netfilter/nf_queue.h |
1220 | +++ b/include/net/netfilter/nf_queue.h | |
ab036dbd | 1221 | @@ -31,6 +31,12 @@ struct nf_queue_handler { |
514e5dae AM |
1222 | void nf_register_queue_handler(const struct nf_queue_handler *qh); |
1223 | void nf_unregister_queue_handler(void); | |
daf32129 | 1224 | void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); |
fa14fc87 | 1225 | +void nf_queue_entry_release_refs(struct nf_queue_entry *entry); |
7f07242b | 1226 | + |
1227 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
fa14fc87 JR |
1228 | +void nf_register_queue_imq_handler(const struct nf_queue_handler *qh); |
1229 | +void nf_unregister_queue_imq_handler(void); | |
7f07242b | 1230 | +#endif |
1231 | ||
e2d28598 JR |
1232 | bool nf_queue_entry_get_refs(struct nf_queue_entry *entry); |
1233 | void nf_queue_entry_release_refs(struct nf_queue_entry *entry); | |
fa14fc87 JR |
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, | |
1239 | ||
1240 | void __qdisc_run(struct Qdisc *q); | |
1241 | ||
1242 | +struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate); | |
1243 | + | |
1244 | static inline void qdisc_run(struct Qdisc *q) | |
1245 | { | |
1246 | if (qdisc_run_begin(q)) | |
e2d28598 | 1247 | diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h |
fa14fc87 | 1248 | index ef1b1f8..079e5ff 100644 |
e2d28598 JR |
1249 | --- a/include/uapi/linux/netfilter.h |
1250 | +++ b/include/uapi/linux/netfilter.h | |
514e5dae AM |
1251 | @@ -13,7 +13,8 @@ |
1252 | #define NF_QUEUE 3 | |
1253 | #define NF_REPEAT 4 | |
1254 | #define NF_STOP 5 | |
1255 | -#define NF_MAX_VERDICT NF_STOP | |
1256 | +#define NF_IMQ_QUEUE 6 | |
1257 | +#define NF_MAX_VERDICT NF_IMQ_QUEUE | |
1258 | ||
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 | |
e2d28598 | 1261 | diff --git a/net/core/dev.c b/net/core/dev.c |
ab036dbd | 1262 | index a42b232..259883b 100644 |
e2d28598 JR |
1263 | --- a/net/core/dev.c |
1264 | +++ b/net/core/dev.c | |
fa14fc87 | 1265 | @@ -135,6 +135,9 @@ |
daf32129 | 1266 | #include <linux/if_macvlan.h> |
a1e1a866 | 1267 | #include <linux/errqueue.h> |
03673fb0 | 1268 | #include <linux/hrtimer.h> |
2380c486 JR |
1269 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
1270 | +#include <linux/imq.h> | |
1271 | +#endif | |
514e5dae AM |
1272 | |
1273 | #include "net-sysfs.h" | |
1274 | ||
ab036dbd | 1275 | @@ -2642,7 +2645,12 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev, |
e26ee53e JR |
1276 | unsigned int len; |
1277 | int rc; | |
7f07242b | 1278 | |
2380c486 | 1279 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
fa14fc87 JR |
1280 | + if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) && |
1281 | + !(skb->imq_flags & IMQ_F_ENQUEUE)) | |
7af23471 | 1282 | +#else |
7e9cd9fe | 1283 | if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) |
2380c486 | 1284 | +#endif |
e26ee53e | 1285 | dev_queue_xmit_nit(skb, dev); |
2380c486 | 1286 | |
e26ee53e | 1287 | len = skb->len; |
ab036dbd | 1288 | @@ -2680,6 +2688,7 @@ out: |
fa14fc87 JR |
1289 | *ret = rc; |
1290 | return skb; | |
1291 | } | |
1292 | +EXPORT_SYMBOL(dev_hard_start_xmit); | |
1293 | ||
1294 | static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, | |
1295 | netdev_features_t features) | |
ab036dbd | 1296 | @@ -2768,6 +2777,7 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d |
fa14fc87 JR |
1297 | } |
1298 | return head; | |
1299 | } | |
1300 | +EXPORT_SYMBOL(validate_xmit_skb_list); | |
1301 | ||
1302 | static void qdisc_pkt_len_init(struct sk_buff *skb) | |
1303 | { | |
e2d28598 | 1304 | diff --git a/net/core/skbuff.c b/net/core/skbuff.c |
ab036dbd | 1305 | index 075d2e7..f19a692 100644 |
e2d28598 JR |
1306 | --- a/net/core/skbuff.c |
1307 | +++ b/net/core/skbuff.c | |
ab036dbd | 1308 | @@ -79,6 +79,87 @@ |
7f07242b | 1309 | |
4bf69007 | 1310 | struct kmem_cache *skbuff_head_cache __read_mostly; |
7f07242b | 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; | |
fa14fc87 | 1314 | +#endif |
9d7f2d61 | 1315 | + |
fa14fc87 | 1316 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
7f07242b | 1317 | +/* Control buffer save/restore for IMQ devices */ |
1318 | +struct skb_cb_table { | |
f6396b7e | 1319 | + char cb[48] __aligned(8); |
7f07242b | 1320 | + void *cb_next; |
1321 | + atomic_t refcnt; | |
7f07242b | 1322 | +}; |
2380c486 | 1323 | + |
7f07242b | 1324 | +static DEFINE_SPINLOCK(skb_cb_store_lock); |
1325 | + | |
1326 | +int skb_save_cb(struct sk_buff *skb) | |
2380c486 | 1327 | +{ |
7f07242b | 1328 | + struct skb_cb_table *next; |
1329 | + | |
1330 | + next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC); | |
1331 | + if (!next) | |
1332 | + return -ENOMEM; | |
2380c486 | 1333 | + |
7f07242b | 1334 | + BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb)); |
2380c486 | 1335 | + |
7f07242b | 1336 | + memcpy(next->cb, skb->cb, sizeof(skb->cb)); |
1337 | + next->cb_next = skb->cb_next; | |
1338 | + | |
1339 | + atomic_set(&next->refcnt, 1); | |
1340 | + | |
1341 | + skb->cb_next = next; | |
1342 | + return 0; | |
2380c486 | 1343 | +} |
7f07242b | 1344 | +EXPORT_SYMBOL(skb_save_cb); |
2380c486 | 1345 | + |
7f07242b | 1346 | +int skb_restore_cb(struct sk_buff *skb) |
2380c486 | 1347 | +{ |
7f07242b | 1348 | + struct skb_cb_table *next; |
2380c486 | 1349 | + |
7f07242b | 1350 | + if (!skb->cb_next) |
2380c486 | 1351 | + return 0; |
7f07242b | 1352 | + |
1353 | + next = skb->cb_next; | |
1354 | + | |
1355 | + BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb)); | |
1356 | + | |
1357 | + memcpy(skb->cb, next->cb, sizeof(skb->cb)); | |
1358 | + skb->cb_next = next->cb_next; | |
1359 | + | |
1360 | + spin_lock(&skb_cb_store_lock); | |
1361 | + | |
f6396b7e | 1362 | + if (atomic_dec_and_test(&next->refcnt)) |
7f07242b | 1363 | + kmem_cache_free(skbuff_cb_store_cache, next); |
2380c486 | 1364 | + |
7f07242b | 1365 | + spin_unlock(&skb_cb_store_lock); |
1366 | + | |
1367 | + return 0; | |
2380c486 | 1368 | +} |
7f07242b | 1369 | +EXPORT_SYMBOL(skb_restore_cb); |
2380c486 | 1370 | + |
ab036dbd | 1371 | +static void skb_copy_stored_cb(struct sk_buff * , const struct sk_buff * ) __attribute__ ((unused)); |
14f08cd0 | 1372 | +static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old) |
7f07242b | 1373 | +{ |
1374 | + struct skb_cb_table *next; | |
14f08cd0 | 1375 | + struct sk_buff *old; |
7f07242b | 1376 | + |
14f08cd0 | 1377 | + if (!__old->cb_next) { |
1378 | + new->cb_next = NULL; | |
7f07242b | 1379 | + return; |
1380 | + } | |
1381 | + | |
1382 | + spin_lock(&skb_cb_store_lock); | |
1383 | + | |
14f08cd0 | 1384 | + old = (struct sk_buff *)__old; |
1385 | + | |
7f07242b | 1386 | + next = old->cb_next; |
1387 | + atomic_inc(&next->refcnt); | |
1388 | + new->cb_next = next; | |
1389 | + | |
1390 | + spin_unlock(&skb_cb_store_lock); | |
1391 | +} | |
1392 | +#endif | |
1393 | ||
9d7f2d61 JR |
1394 | /** |
1395 | * skb_panic - private function for out-of-line support | |
ab036dbd | 1396 | @@ -691,6 +772,28 @@ static void skb_release_head_state(struct sk_buff *skb) |
7f07242b | 1397 | WARN_ON(in_irq()); |
1398 | skb->destructor(skb); | |
1399 | } | |
1400 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
4bf69007 AM |
1401 | + /* |
1402 | + * This should not happen. When it does, avoid memleak by restoring | |
1403 | + * the chain of cb-backups. | |
1404 | + */ | |
f6396b7e | 1405 | + while (skb->cb_next != NULL) { |
14f08cd0 | 1406 | + if (net_ratelimit()) |
514e5dae | 1407 | + pr_warn("IMQ: kfree_skb: skb->cb_next: %08x\n", |
ab036dbd | 1408 | + (unsigned int)(uintptr_t)skb->cb_next); |
14f08cd0 | 1409 | + |
7f07242b | 1410 | + skb_restore_cb(skb); |
1411 | + } | |
4bf69007 AM |
1412 | + /* |
1413 | + * This should not happen either, nf_queue_entry is nullified in | |
14f08cd0 | 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. | |
1418 | + */ | |
1419 | + if (skb->nf_queue_entry && net_ratelimit()) | |
514e5dae | 1420 | + pr_warn("%s\n", "IMQ: kfree_skb: skb->nf_queue_entry != NULL"); |
7f07242b | 1421 | +#endif |
0acdeb19 | 1422 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
7f07242b | 1423 | nf_conntrack_put(skb->nfct); |
7af23471 | 1424 | #endif |
ab036dbd | 1425 | @@ -813,6 +916,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) |
7f07242b | 1426 | new->sp = secpath_get(old->sp); |
1427 | #endif | |
fa14fc87 | 1428 | __nf_copy(new, old, false); |
7f07242b | 1429 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
e2d28598 JR |
1430 | + new->cb_next = NULL; |
1431 | + /*skb_copy_stored_cb(new, old);*/ | |
7f07242b | 1432 | +#endif |
e26ee53e JR |
1433 | |
1434 | /* Note : this field could be in headers_start/headers_end section | |
fa14fc87 | 1435 | * It is not yet because we do not want to have a 16 bit hole |
ab036dbd | 1436 | @@ -3343,6 +3450,13 @@ void __init skb_init(void) |
7f07242b | 1437 | 0, |
1438 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, | |
1439 | NULL); | |
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), | |
1443 | + 0, | |
1444 | + SLAB_HWCACHE_ALIGN|SLAB_PANIC, | |
1445 | + NULL); | |
1446 | +#endif | |
1447 | } | |
1448 | ||
1449 | /** | |
e2d28598 | 1450 | diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c |
fa14fc87 | 1451 | index bc09cb9..9b6ef9f 100644 |
e2d28598 JR |
1452 | --- a/net/ipv6/ip6_output.c |
1453 | +++ b/net/ipv6/ip6_output.c | |
fa14fc87 | 1454 | @@ -64,9 +64,6 @@ static int ip6_finish_output2(struct sock *sk, struct sk_buff *skb) |
514e5dae AM |
1455 | struct in6_addr *nexthop; |
1456 | int ret; | |
a168f21d AM |
1457 | |
1458 | - skb->protocol = htons(ETH_P_IPV6); | |
1459 | - skb->dev = dev; | |
1460 | - | |
1461 | if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) { | |
1462 | struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); | |
1463 | ||
fa14fc87 | 1464 | @@ -143,6 +140,13 @@ int ip6_output(struct sock *sk, struct sk_buff *skb) |
a168f21d | 1465 | return 0; |
f6396b7e | 1466 | } |
a168f21d | 1467 | |
514e5dae | 1468 | + /* |
fa14fc87 JR |
1469 | + * IMQ-patch: moved setting skb->dev and skb->protocol from |
1470 | + * ip6_finish_output2 to fix crashing at netif_skb_features(). | |
1471 | + */ | |
a168f21d AM |
1472 | + skb->protocol = htons(ETH_P_IPV6); |
1473 | + skb->dev = dev; | |
1474 | + | |
fa14fc87 JR |
1475 | return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, sk, skb, |
1476 | NULL, dev, | |
a168f21d | 1477 | ip6_finish_output, |
e2d28598 | 1478 | diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig |
fa14fc87 | 1479 | index a0f3e6a3..64239c0 100644 |
e2d28598 JR |
1480 | --- a/net/netfilter/Kconfig |
1481 | +++ b/net/netfilter/Kconfig | |
fa14fc87 | 1482 | @@ -771,6 +771,18 @@ config NETFILTER_XT_TARGET_LOG |
4bf69007 AM |
1483 | |
1484 | To compile it as a module, choose M here. If unsure, say N. | |
7f07242b | 1485 | |
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 | |
1490 | + select IMQ | |
1491 | + default m if NETFILTER_ADVANCED=n | |
1492 | + help | |
1493 | + This option adds a `IMQ' target which is used to specify if and | |
1494 | + to which imq device packets should get enqueued/dequeued. | |
2380c486 | 1495 | + |
7f07242b | 1496 | + To compile it as a module, choose M here. If unsure, say N. |
1497 | + | |
1498 | config NETFILTER_XT_TARGET_MARK | |
1499 | tristate '"MARK" target support' | |
f6396b7e | 1500 | depends on NETFILTER_ADVANCED |
e2d28598 | 1501 | diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile |
fa14fc87 | 1502 | index a87d8b8..d1080ff 100644 |
e2d28598 JR |
1503 | --- a/net/netfilter/Makefile |
1504 | +++ b/net/netfilter/Makefile | |
fa14fc87 | 1505 | @@ -109,6 +109,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o |
7f07242b | 1506 | obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o |
1507 | obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o | |
42d62c0a | 1508 | obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o |
4bf69007 | 1509 | +obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o |
14f08cd0 | 1510 | obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o |
42d62c0a | 1511 | obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o |
514e5dae | 1512 | obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o |
e2d28598 | 1513 | diff --git a/net/netfilter/core.c b/net/netfilter/core.c |
ab036dbd | 1514 | index 5d0c6fd..42d1c21 100644 |
e2d28598 JR |
1515 | --- a/net/netfilter/core.c |
1516 | +++ b/net/netfilter/core.c | |
ab036dbd | 1517 | @@ -179,9 +179,11 @@ next_hook: |
e2d28598 JR |
1518 | ret = NF_DROP_GETERR(verdict); |
1519 | if (ret == 0) | |
1520 | ret = -EPERM; | |
1521 | - } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) { | |
1522 | + } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE || | |
fa14fc87 JR |
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); | |
e2d28598 JR |
1528 | if (err < 0) { |
1529 | if (err == -ECANCELED) | |
1530 | goto next_hook; | |
1531 | diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h | |
ab036dbd | 1532 | index 3992106..35cbc7b 100644 |
e2d28598 JR |
1533 | --- a/net/netfilter/nf_internals.h |
1534 | +++ b/net/netfilter/nf_internals.h | |
fa14fc87 JR |
1535 | @@ -18,7 +18,7 @@ unsigned int nf_iterate(struct list_head *head, struct sk_buff *skb, |
1536 | ||
1537 | /* nf_queue.c */ | |
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); | |
64b6dafc | 1541 | void nf_queue_nf_hook_drop(struct nf_hook_ops *ops); |
daf32129 | 1542 | int __init netfilter_queue_init(void); |
f6396b7e | 1543 | |
e2d28598 | 1544 | diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c |
ab036dbd | 1545 | index cd60d39..2b0987d 100644 |
e2d28598 JR |
1546 | --- a/net/netfilter/nf_queue.c |
1547 | +++ b/net/netfilter/nf_queue.c | |
fa14fc87 | 1548 | @@ -28,6 +28,23 @@ |
514e5dae AM |
1549 | */ |
1550 | static const struct nf_queue_handler __rcu *queue_handler __read_mostly; | |
7f07242b | 1551 | |
1552 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
514e5dae | 1553 | +static const struct nf_queue_handler __rcu *queue_imq_handler __read_mostly; |
7f07242b | 1554 | + |
1555 | +void nf_register_queue_imq_handler(const struct nf_queue_handler *qh) | |
2380c486 | 1556 | +{ |
7f07242b | 1557 | + rcu_assign_pointer(queue_imq_handler, qh); |
2380c486 | 1558 | +} |
f6396b7e | 1559 | +EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler); |
2380c486 | 1560 | + |
7f07242b | 1561 | +void nf_unregister_queue_imq_handler(void) |
2380c486 | 1562 | +{ |
514e5dae AM |
1563 | + RCU_INIT_POINTER(queue_imq_handler, NULL); |
1564 | + synchronize_rcu(); | |
2380c486 | 1565 | +} |
f6396b7e | 1566 | +EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler); |
7f07242b | 1567 | +#endif |
2380c486 | 1568 | + |
7f07242b | 1569 | /* return EBUSY when somebody else is registered, return EEXIST if the |
1570 | * same handler is registered, return 0 in case of success. */ | |
514e5dae | 1571 | void nf_register_queue_handler(const struct nf_queue_handler *qh) |
ab036dbd | 1572 | @@ -129,7 +146,8 @@ void nf_queue_nf_hook_drop(struct nf_hook_ops *ops) |
fa14fc87 JR |
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) | |
f6396b7e | 1579 | { |
7af23471 | 1580 | int status = -ENOENT; |
f6396b7e | 1581 | struct nf_queue_entry *entry = NULL; |
ab036dbd | 1582 | @@ -139,7 +157,17 @@ int nf_queue(struct sk_buff *skb, |
7af23471 | 1583 | /* QUEUE == DROP if no one is waiting, to be safe. */ |
7f07242b | 1584 | rcu_read_lock(); |
1585 | ||
1716fcea | 1586 | - qh = rcu_dereference(queue_handler); |
a168f21d | 1587 | + if (queuetype == NF_IMQ_QUEUE) { |
7f07242b | 1588 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
f6396b7e | 1589 | + qh = rcu_dereference(queue_imq_handler); |
7af23471 | 1590 | +#else |
a168f21d AM |
1591 | + BUG(); |
1592 | + goto err_unlock; | |
7f07242b | 1593 | +#endif |
a168f21d | 1594 | + } else { |
1716fcea | 1595 | + qh = rcu_dereference(queue_handler); |
a168f21d AM |
1596 | + } |
1597 | + | |
7af23471 JR |
1598 | if (!qh) { |
1599 | status = -ESRCH; | |
7f07242b | 1600 | goto err_unlock; |
ab036dbd | 1601 | @@ -225,8 +253,10 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) |
a168f21d AM |
1602 | local_bh_enable(); |
1603 | break; | |
f6396b7e | 1604 | case NF_QUEUE: |
a168f21d | 1605 | + case NF_IMQ_QUEUE: |
fa14fc87 JR |
1606 | err = nf_queue(skb, elem, &entry->state, |
1607 | - verdict >> NF_VERDICT_QBITS); | |
1608 | + verdict >> NF_VERDICT_QBITS, | |
1609 | + verdict & NF_VERDICT_MASK); | |
7af23471 JR |
1610 | if (err < 0) { |
1611 | if (err == -ECANCELED) | |
1612 | goto next_hook; | |
e2d28598 JR |
1613 | diff --git a/net/netfilter/xt_IMQ.c b/net/netfilter/xt_IMQ.c |
1614 | new file mode 100644 | |
fa14fc87 | 1615 | index 0000000..86d7b84 |
e2d28598 JR |
1616 | --- /dev/null |
1617 | +++ b/net/netfilter/xt_IMQ.c | |
514e5dae | 1618 | @@ -0,0 +1,72 @@ |
2380c486 JR |
1619 | +/* |
1620 | + * This target marks packets to be enqueued to an imq device | |
1621 | + */ | |
1622 | +#include <linux/module.h> | |
1623 | +#include <linux/skbuff.h> | |
7f07242b | 1624 | +#include <linux/netfilter/x_tables.h> |
1625 | +#include <linux/netfilter/xt_IMQ.h> | |
2380c486 JR |
1626 | +#include <linux/imq.h> |
1627 | + | |
1628 | +static unsigned int imq_target(struct sk_buff *pskb, | |
f6396b7e | 1629 | + const struct xt_action_param *par) |
2380c486 | 1630 | +{ |
7f07242b | 1631 | + const struct xt_imq_info *mr = par->targinfo; |
2380c486 | 1632 | + |
7f07242b | 1633 | + pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE; |
2380c486 JR |
1634 | + |
1635 | + return XT_CONTINUE; | |
1636 | +} | |
1637 | + | |
f6396b7e | 1638 | +static int imq_checkentry(const struct xt_tgchk_param *par) |
2380c486 | 1639 | +{ |
7f07242b | 1640 | + struct xt_imq_info *mr = par->targinfo; |
2380c486 | 1641 | + |
7f07242b | 1642 | + if (mr->todev > IMQ_MAX_DEVS - 1) { |
514e5dae AM |
1643 | + pr_warn("IMQ: invalid device specified, highest is %u\n", |
1644 | + IMQ_MAX_DEVS - 1); | |
f6396b7e | 1645 | + return -EINVAL; |
2380c486 JR |
1646 | + } |
1647 | + | |
f6396b7e | 1648 | + return 0; |
2380c486 JR |
1649 | +} |
1650 | + | |
7f07242b | 1651 | +static struct xt_target xt_imq_reg[] __read_mostly = { |
1652 | + { | |
1653 | + .name = "IMQ", | |
1654 | + .family = AF_INET, | |
1655 | + .checkentry = imq_checkentry, | |
1656 | + .target = imq_target, | |
1657 | + .targetsize = sizeof(struct xt_imq_info), | |
1658 | + .table = "mangle", | |
1659 | + .me = THIS_MODULE | |
1660 | + }, | |
1661 | + { | |
1662 | + .name = "IMQ", | |
1663 | + .family = AF_INET6, | |
1664 | + .checkentry = imq_checkentry, | |
1665 | + .target = imq_target, | |
1666 | + .targetsize = sizeof(struct xt_imq_info), | |
1667 | + .table = "mangle", | |
1668 | + .me = THIS_MODULE | |
1669 | + }, | |
2380c486 JR |
1670 | +}; |
1671 | + | |
7f07242b | 1672 | +static int __init imq_init(void) |
2380c486 | 1673 | +{ |
7f07242b | 1674 | + return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); |
2380c486 JR |
1675 | +} |
1676 | + | |
7f07242b | 1677 | +static void __exit imq_fini(void) |
2380c486 | 1678 | +{ |
7f07242b | 1679 | + xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); |
2380c486 JR |
1680 | +} |
1681 | + | |
7f07242b | 1682 | +module_init(imq_init); |
1683 | +module_exit(imq_fini); | |
2380c486 | 1684 | + |
fa14fc87 JR |
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."); | |
2380c486 | 1687 | +MODULE_LICENSE("GPL"); |
7f07242b | 1688 | +MODULE_ALIAS("ipt_IMQ"); |
1689 | +MODULE_ALIAS("ip6t_IMQ"); | |
2380c486 | 1690 | + |
fa14fc87 JR |
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, | |
1696 | return skb; | |
1697 | } | |
1698 | ||
1699 | +struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate) | |
1700 | +{ | |
1701 | + int packets; | |
1702 | + | |
1703 | + return dequeue_skb(q, validate, &packets); | |
1704 | +} | |
1705 | +EXPORT_SYMBOL(qdisc_dequeue_skb); | |
1706 | + | |
1707 | static inline int handle_dev_cpu_collision(struct sk_buff *skb, | |
1708 | struct netdev_queue *dev_queue, | |
1709 | struct Qdisc *q) |