aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMax Krasnyansky <maxk@qualcomm.com>2008-07-15 01:18:19 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-15 01:18:19 -0400
commitf271b2cc78f09c93ccd00a2056d3237134bf994c (patch)
tree25b379fa23a84627992c197d2e18793fd90c2a7e /include
parent89146504cbfeb120dd08ec7f9f8314c4986189b8 (diff)
tun: Fix/rewrite packet filtering logic
Please see the following thread to get some context on this http://marc.info/?l=linux-netdev&m=121564433018903&w=2 Basically the issue is that current multi-cast filtering stuff in the TUN/TAP driver is seriously broken. Original patch went in without proper review and ACK. It was broken and confusing to start with and subsequent patches broke it completely. To give you an idea of what's broken here are some of the issues: - Very confusing comments throughout the code that imply that the character device is a network interface in its own right, and that packets are passed between the two nics. Which is completely wrong. - Wrong set of ioctls is used for setting up filters. They look like shortcuts for manipulating state of the tun/tap network interface but in reality manipulate the state of the TX filter. - ioctls that were originally used for setting address of the the TX filter got "fixed" and now set the address of the network interface itself. Which made filter totaly useless. - Filtering is done too late. Instead of filtering early on, to avoid unnecessary wakeups, filtering is done in the read() call. The list goes on and on :) So the patch cleans all that up. It introduces simple and clean interface for setting up TX filters (TUNSETTXFILTER + tun_filter spec) and does filtering before enqueuing the packets. TX filtering is useful in the scenarios where TAP is part of a bridge, in which case it gets all broadcast, multicast and potentially other packets when the bridge is learning. So for example Ethernet tunnelling app may want to setup TX filters to avoid tunnelling multicast traffic. QEMU and other hypervisors can push RX filtering that is currently done in the guest into the host context therefore saving wakeups and unnecessary data transfer. Signed-off-by: Max Krasnyansky <maxk@qualcomm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_tun.h24
1 files changed, 21 insertions, 3 deletions
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 563fae542da6..4c6307ad9fdb 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -17,6 +17,7 @@
17#define __IF_TUN_H 17#define __IF_TUN_H
18 18
19#include <linux/types.h> 19#include <linux/types.h>
20#include <linux/if_ether.h>
20 21
21/* Read queue size */ 22/* Read queue size */
22#define TUN_READQ_SIZE 500 23#define TUN_READQ_SIZE 500
@@ -42,7 +43,8 @@
42#define TUNSETLINK _IOW('T', 205, int) 43#define TUNSETLINK _IOW('T', 205, int)
43#define TUNSETGROUP _IOW('T', 206, int) 44#define TUNSETGROUP _IOW('T', 206, int)
44#define TUNGETFEATURES _IOR('T', 207, unsigned int) 45#define TUNGETFEATURES _IOR('T', 207, unsigned int)
45#define TUNSETOFFLOAD _IOW('T', 208, unsigned int) 46#define TUNSETOFFLOAD _IOW('T', 208, unsigned int)
47#define TUNSETTXFILTER _IOW('T', 209, unsigned int)
46 48
47/* TUNSETIFF ifr flags */ 49/* TUNSETIFF ifr flags */
48#define IFF_TUN 0x0001 50#define IFF_TUN 0x0001
@@ -57,10 +59,26 @@
57#define TUN_F_TSO6 0x04 /* I can handle TSO for IPv6 packets */ 59#define TUN_F_TSO6 0x04 /* I can handle TSO for IPv6 packets */
58#define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */ 60#define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */
59 61
62/* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
63#define TUN_PKT_STRIP 0x0001
60struct tun_pi { 64struct tun_pi {
61 unsigned short flags; 65 __u16 flags;
62 __be16 proto; 66 __be16 proto;
63}; 67};
64#define TUN_PKT_STRIP 0x0001 68
69/*
70 * Filter spec (used for SETXXFILTER ioctls)
71 * This stuff is applicable only to the TAP (Ethernet) devices.
72 * If the count is zero the filter is disabled and the driver accepts
73 * all packets (promisc mode).
74 * If the filter is enabled in order to accept broadcast packets
75 * broadcast addr must be explicitly included in the addr list.
76 */
77#define TUN_FLT_ALLMULTI 0x0001 /* Accept all multicast packets */
78struct tun_filter {
79 __u16 flags; /* TUN_FLT_ flags see above */
80 __u16 count; /* Number of addresses */
81 __u8 addr[0][ETH_ALEN];
82};
65 83
66#endif /* __IF_TUN_H */ 84#endif /* __IF_TUN_H */