linux.git/net/ipv4/ip_gre.c, branch v2.6.29

net: fix tunnels in netns after ndo_ changes

2008-11-24T01:26:26+00:00

dev_net_set() should be the very first thing after alloc_netdev().

"ndo_" changes turned simple assignment (which is OK to do before netns
assignment) into quite non-trivial operation (which is not OK, init_net was
used). This leads to incomplete initialisation of tunnel device in netns.

BUG: unable to handle kernel NULL pointer dereference at 00000004
IP: [] ip6_tnl_exit_net+0x37/0x4f
*pde = 00000000 
Oops: 0000 [#1] PREEMPT DEBUG_PAGEALLOC
last sysfs file: /sys/class/net/lo/operstate

Pid: 10, comm: netns Not tainted (2.6.28-rc6 #1) 
EIP: 0060:[] EFLAGS: 00010246 CPU: 0
EIP is at ip6_tnl_exit_net+0x37/0x4f
EAX: 00000000 EBX: 00000020 ECX: 00000000 EDX: 00000003
ESI: c5caef30 EDI: c782bbe8 EBP: c7909f50 ESP: c7909f48
 DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
Process netns (pid: 10, ti=c7908000 task=c7905780 task.ti=c7908000)
Stack:
 c03e75e0 c7390bc8 c7909f60 c0245448 c7390bd8 c7390bf0 c7909fa8 c012577a
 00000000 00000002 00000000 c0125736 c782bbe8 c7909f90 c0308fe3 c782bc04
 c7390bd4 c0245406 c084b718 c04f0770 c03ad785 c782bbe8 c782bc04 c782bc0c
Call Trace:
 [] ? cleanup_net+0x42/0x82
 [] ? run_workqueue+0xd6/0x1ae
 [] ? run_workqueue+0x92/0x1ae
 [] ? schedule+0x275/0x285
 [] ? cleanup_net+0x0/0x82
 [] ? worker_thread+0x81/0x8d
 [] ? autoremove_wake_function+0x0/0x33
 [] ? worker_thread+0x0/0x8d
 [] ? kthread+0x39/0x5e
 [] ? kthread+0x0/0x5e
 [] ? kernel_thread_helper+0x7/0x10
Code: db e8 05 ff ff ff 89 c6 e8 dc 04 f6 ff eb 08 8b 40 04 e8 38 89 f5 ff 8b 44 9e 04 85 c0 75 f0 43 83 fb 20 75 f2 8b 86 84 00 00 00 <8b> 40 04 e8 1c 89 f5 ff e8 98 04 f6 ff 89 f0 e8 f8 63 e6 ff 5b 
EIP: [] ip6_tnl_exit_net+0x37/0x4f SS:ESP 0068:c7909f48
---[ end trace 6c2f2328fccd3e0c ]---

Signed-off-by: Alexey Dobriyan 
Signed-off-by: David S. Miller

ipgre: convert to netdevice_ops

2008-11-21T04:34:29+00:00

Convert ipgre tunnel to netdevice ops.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

net: clean up net/ipv4/fib_frontend.c fib_hash.c ip_gre.c

2008-11-03T08:25:16+00:00

Signed-off-by: Jianjun Kong 
Signed-off-by: David S. Miller

gre: Initialise rtnl_link tunnel parameters properly

2008-10-11T19:20:15+00:00

Brown paper bag error of calling memset with sizeof(p) instead
of sizeof(*p).

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

gre: minor cleanups in netlink interface

2008-10-10T19:11:06+00:00

- use typeful helpers for IFLA_GRE_LOCAL/IFLA_GRE_REMOTE
- replace magic value by FIELD_SIZEOF
- use MODULE_ALIAS_RTNL_LINK macro

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

gre: fix copy and paste error

2008-10-10T19:10:30+00:00

The flags are dumped twice, the keys not at all.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

inet: Make tunnel RX/TX byte counters more consistent

2008-10-09T19:03:17+00:00

This patch makes the RX/TX byte counters for IPIP, GRE and SIT more
consistent.  Previously we included the external IP headers on the
way out but not when the packet is inbound.

The new scheme is to count payload only in both directions.  For
IPIP and SIT this simply means the exclusion of the external IP
header.  For GRE this means that we exclude the GRE header as
well.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

gre: Add Transparent Ethernet Bridging

2008-10-09T19:00:17+00:00

This patch adds support for Ethernet over GRE encapsulation.
This is exposed to user-space with a new link type of "gretap"
instead of "gre".  It will create an ARPHRD_ETHER device in
lieu of the usual ARPHRD_IPGRE.

Note that to preserver backwards compatibility all Transparent
Ethernet Bridging packets are passed to an ARPHRD_IPGRE tunnel
if its key matches and there is no ARPHRD_ETHER device whose
key matches more closely.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

gre: Add netlink interface

2008-10-09T18:59:55+00:00

This patch adds a netlink interface that will eventually displace
the existing ioctl interface.  It utilises the elegant rtnl_link_ops
mechanism.

This also means that user-space no longer needs to rely on the
tunnel interface being of type GRE to identify GRE tunnels.  The
identification can now occur using rtnl_link_ops.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

gre: Move MTU setting out of ipgre_tunnel_bind_dev

2008-10-09T18:59:32+00:00

This patch moves the dev->mtu setting out of ipgre_tunnel_bind_dev.
This is in prepartion of using rtnl_link where we'll need to make
the MTU setting conditional on whether the user has supplied an
MTU.  This also requires the move of the ipgre_tunnel_bind_dev
call out of the dev->init function so that we can access the user
parameters later.

This patch also adds a check to prevent setting the MTU below
the minimum of 68.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller