linux.git/net/ipv6, branch v3.11-rc2

ndisc: bool initializations should use true and false

2013-07-16T19:13:31+00:00

Signed-off-by: Daniel Baluta 
Signed-off-by: David S. Miller

ipv6: only static routes qualify for equal cost multipathing

2013-07-12T23:29:54+00:00

Static routes in this case are non-expiring routes which did not get
configured by autoconf or by icmpv6 redirects.

To make sure we actually get an ecmp route while searching for the first
one in this fib6_node's leafs, also make sure it matches the ecmp route
assumptions.

v2:
a) Removed RTF_EXPIRE check in dst.from chain. The check of RTF_ADDRCONF
   already ensures that this route, even if added again without
   RTF_EXPIRES (in case of a RA announcement with infinite timeout),
   does not cause the rt6i_nsiblings logic to go wrong if a later RA
   updates the expiration time later.

v3:
a) Allow RTF_EXPIRES routes to enter the ecmp route set. We have to do so,
   because an pmtu event could update the RTF_EXPIRES flag and we would
   not count this route, if another route joins this set. We now filter
   only for RTF_GATEWAY|RTF_ADDRCONF|RTF_DYNAMIC, which are flags that
   don't get changed after rt6_info construction.

Cc: Nicolas Dichtel 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

ipv6: fix route selection if kernel is not compiled with CONFIG_IPV6_ROUTER_PREF

2013-07-11T18:51:10+00:00

This is a follow-up patch to 3630d40067a21d4dfbadc6002bb469ce26ac5d52
("ipv6: rt6_check_neigh should successfully verify neigh if no NUD
information are available").

Since the removal of rt->n in rt6_info we can end up with a dst ==
NULL in rt6_check_neigh. In case the kernel is not compiled with
CONFIG_IPV6_ROUTER_PREF we should also select a route with unkown
NUD state but we must not avoid doing round robin selection on routes
with the same target. So introduce and pass down a boolean ``do_rr'' to
indicate when we should update rt->rr_ptr. As soon as no route is valid
we do backtracking and do a lookup on a higher level in the fib trie.

v2:
a) Improved rt6_check_neigh logic (no need to create neighbour there)
   and documented return values.

v3:
a) Introduce enum rt6_nud_state to get rid of the magic numbers
   (thanks to David Miller).
b) Update and shorten commit message a bit to actualy reflect
   the source.

Reported-by: Pierre Emeriaud 
Cc: YOSHIFUJI Hideaki 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

ipv6: in case of link failure remove route directly instead of letting it expire

2013-07-11T02:45:39+00:00

We could end up expiring a route which is part of an ecmp route set. Doing
so would invalidate the rt->rt6i_nsiblings calculations and could provoke
the following panic:

[   80.144667] ------------[ cut here ]------------
[   80.145172] kernel BUG at net/ipv6/ip6_fib.c:733!
[   80.145172] invalid opcode: 0000 [#1] SMP
[   80.145172] Modules linked in: 8021q nf_conntrack_netbios_ns nf_conntrack_broadcast ipt_MASQUERADE ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 iptable_nat nf_nat_ipv4 nf_nat iptable_mangle nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ebtable_filter ebtables ip6table_filter ip6_tables
+snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device snd_pcm snd_page_alloc snd_timer virtio_balloon snd soundcore i2c_piix4 i2c_core virtio_net virtio_blk
[   80.145172] CPU: 1 PID: 786 Comm: ping6 Not tainted 3.10.0+ #118
[   80.145172] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[   80.145172] task: ffff880117fa0000 ti: ffff880118770000 task.ti: ffff880118770000
[   80.145172] RIP: 0010:[]  [] fib6_add+0x75d/0x830
[   80.145172] RSP: 0018:ffff880118771798  EFLAGS: 00010202
[   80.145172] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff88011350e480
[   80.145172] RDX: ffff88011350e238 RSI: 0000000000000004 RDI: ffff88011350f738
[   80.145172] RBP: ffff880118771848 R08: ffff880117903280 R09: 0000000000000001
[   80.145172] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88011350f680
[   80.145172] R13: ffff880117903280 R14: ffff880118771890 R15: ffff88011350ef90
[   80.145172] FS:  00007f02b5127740(0000) GS:ffff88011fd00000(0000) knlGS:0000000000000000
[   80.145172] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[   80.145172] CR2: 00007f981322a000 CR3: 00000001181b1000 CR4: 00000000000006e0
[   80.145172] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[   80.145172] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[   80.145172] Stack:
[   80.145172]  0000000000000001 ffff880100000000 ffff880100000000 ffff880117903280
[   80.145172]  0000000000000000 ffff880119a4cf00 0000000000000400 00000000000007fa
[   80.145172]  0000000000000000 0000000000000000 0000000000000000 ffff88011350f680
[   80.145172] Call Trace:
[   80.145172]  [] ? rt6_bind_peer+0x4b/0x90
[   80.145172]  [] __ip6_ins_rt+0x45/0x70
[   80.145172]  [] ip6_ins_rt+0x35/0x40
[   80.145172]  [] ip6_pol_route.isra.44+0x3a4/0x4b0
[   80.145172]  [] ip6_pol_route_output+0x2a/0x30
[   80.145172]  [] fib6_rule_action+0xd7/0x210
[   80.145172]  [] ? ip6_pol_route_input+0x30/0x30
[   80.145172]  [] fib_rules_lookup+0xc6/0x140
[   80.145172]  [] fib6_rule_lookup+0x44/0x80
[   80.145172]  [] ? ip6_pol_route_input+0x30/0x30
[   80.145172]  [] ip6_route_output+0x73/0xb0
[   80.145172]  [] ip6_dst_lookup_tail+0x2c3/0x2e0
[   80.145172]  [] ? list_del+0x11/0x40
[   80.145172]  [] ? remove_wait_queue+0x3c/0x50
[   80.145172]  [] ip6_dst_lookup_flow+0x3d/0xa0
[   80.145172]  [] rawv6_sendmsg+0x267/0xc20
[   80.145172]  [] inet_sendmsg+0x63/0xb0
[   80.145172]  [] ? selinux_socket_sendmsg+0x23/0x30
[   80.145172]  [] sock_sendmsg+0xa6/0xd0
[   80.145172]  [] SYSC_sendto+0x128/0x180
[   80.145172]  [] ? update_curr+0xec/0x170
[   80.145172]  [] ? kvm_clock_get_cycles+0x9/0x10
[   80.145172]  [] ? __getnstimeofday+0x3e/0xd0
[   80.145172]  [] SyS_sendto+0xe/0x10
[   80.145172]  [] system_call_fastpath+0x16/0x1b
[   80.145172] Code: fe ff ff 41 f6 45 2a 06 0f 85 ca fe ff ff 49 8b 7e 08 4c 89 ee e8 94 ef ff ff e9 b9 fe ff ff 48 8b 82 28 05 00 00 e9 01 ff ff ff <0f> 0b 49 8b 54 24 30 0d 00 00 40 00 89 83 14 01 00 00 48 89 53
[   80.145172] RIP  [] fib6_add+0x75d/0x830
[   80.145172]  RSP 
[   80.387413] ---[ end trace 02f20b7a8b81ed95 ]---
[   80.390154] Kernel panic - not syncing: Fatal exception in interrupt

Cc: Nicolas Dichtel 
Cc: YOSHIFUJI Hideaki 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

net: rename ll methods to busy-poll

2013-07-11T00:08:27+00:00

Rename ndo_ll_poll to ndo_busy_poll.
Rename sk_mark_ll to sk_mark_napi_id.
Rename skb_mark_ll to skb_mark_napi_id.
Correct all useres of these functions.
Update comments and defines  in include/net/busy_poll.h

Signed-off-by: Eliezer Tamir 
Signed-off-by: David S. Miller

net: rename include/net/ll_poll.h to include/net/busy_poll.h

2013-07-11T00:08:27+00:00

Rename the file and correct all the places where it is included.

Signed-off-by: Eliezer Tamir 
Signed-off-by: David S. Miller

sit: fix tunnel update via netlink

2013-07-04T21:55:47+00:00

The device can stand in another netns, hence we need to do the lookup in netns
tunnel->net.

Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller

ipv6: rt6_check_neigh should successfully verify neigh if no NUD information are available

2013-07-04T00:50:51+00:00

After the removal of rt->n we do not create a neighbour entry at route
insertion time (rt6_bind_neighbour is gone). As long as no neighbour is
created because of "useful traffic" we skip this routing entry because
rt6_check_neigh cannot pick up a valid neighbour (neigh == NULL) and
thus returns false.

This change was introduced by commit
887c95cc1da53f66a5890fdeab13414613010097 ("ipv6: Complete neighbour
entry removal from dst_entry.")

To quote RFC4191:
"If the host has no information about the router's reachability, then
the host assumes the router is reachable."

and also:
"A host MUST NOT probe a router's reachability in the absence of useful
traffic that the host would have sent to the router if it were reachable."

So, just assume the router is reachable and let's rt6_probe do the
rest. We don't need to create a neighbour on route insertion time.

If we don't compile with CONFIG_IPV6_ROUTER_PREF (RFC4191 support)
a neighbour is only valid if its nud_state is NUD_VALID. I did not find
any references that we should probe the router on route insertion time
via the other RFCs. So skip this route in that case.

v2:
a) use IS_ENABLED instead of #ifdefs (thanks to Sergei Shtylyov)

Reported-by: Pierre Emeriaud 
Cc: YOSHIFUJI Hideaki 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

net: ipv6: fix wrong ping_v6_sendmsg return value

2013-07-04T00:42:05+00:00

ping_v6_sendmsg currently returns 0 on success. It should return
the number of bytes written instead.

Signed-off-by: Lorenzo Colitti 
Signed-off-by: David S. Miller

net: ipv6: add missing lock in ping_v6_sendmsg

2013-07-04T00:40:58+00:00

Signed-off-by: Lorenzo Colitti 
Signed-off-by: David S. Miller