linux-stable.git/drivers/net/vxlan.c, branch v3.13

{vxlan, inet6} Mark vxlan_dev flags with VXLAN_F_IPV6 properly

2014-01-04T01:36:00+00:00

Even if user doesn't supply the physical netdev to attach vxlan dev
to, and at the same time user want to vxlan sit top of IPv6, mark
vxlan_dev flags with VXLAN_F_IPV6 to create IPv6 based socket.
Otherwise kernel crashes safely every time spitting below messages,

Steps to reproduce:
ip link add vxlan0 type vxlan id 42 group ff0e::110
ip link set vxlan0 up

[   62.656266] BUG: unable to handle kernel NULL pointer dereference[   62.656320] ip (3008) used greatest stack depth: 3912 bytes left
 at 0000000000000046
[   62.656423] IP: [] ip6_route_output+0xbd/0xe0
[   62.656525] PGD 2c966067 PUD 2c9a2067 PMD 0
[   62.656674] Oops: 0000 [#1] SMP
[   62.656781] Modules linked in: vxlan netconsole deflate zlib_deflate af_key
[   62.657083] CPU: 1 PID: 2128 Comm: whoopsie Not tainted 3.12.0+ #182
[   62.657083] Hardware name: innotek GmbH VirtualBox, BIOS VirtualBox 12/01/2006
[   62.657083] task: ffff88002e2335d0 ti: ffff88002c94c000 task.ti: ffff88002c94c000
[   62.657083] RIP: 0010:[]  [] ip6_route_output+0xbd/0xe0
[   62.657083] RSP: 0000:ffff88002fd038f8  EFLAGS: 00210296
[   62.657083] RAX: 0000000000000000 RBX: ffff88002fd039e0 RCX: 0000000000000000
[   62.657083] RDX: ffff88002fd0eb68 RSI: ffff88002fd0d278 RDI: ffff88002fd0d278
[   62.657083] RBP: ffff88002fd03918 R08: 0000000002000000 R09: 0000000000000000
[   62.657083] R10: 00000000000001ff R11: 0000000000000000 R12: 0000000000000001
[   62.657083] R13: ffff88002d96b480 R14: ffffffff81c8e2c0 R15: 0000000000000001
[   62.657083] FS:  0000000000000000(0000) GS:ffff88002fd00000(0063) knlGS:00000000f693b740
[   62.657083] CS:  0010 DS: 002b ES: 002b CR0: 0000000080050033
[   62.657083] CR2: 0000000000000046 CR3: 000000002c9d2000 CR4: 00000000000006e0
[   62.657083] Stack:
[   62.657083]  ffff88002fd03a40 ffffffff81c8e2c0 ffff88002fd039e0 ffff88002d96b480
[   62.657083]  ffff88002fd03958 ffffffff816cac8b ffff880019277cc0 ffff8800192b5d00
[   62.657083]  ffff88002d5bc000 ffff880019277cc0 0000000000001821 0000000000000001
[   62.657083] Call Trace:
[   62.657083]  
[   62.657083]  [] ip6_dst_lookup_tail+0xdb/0xf0
[   62.657083]  [] ip6_dst_lookup+0x10/0x20
[   62.657083]  [] vxlan_xmit_one+0x193/0x9c0 [vxlan]
[   62.657083]  [] ? account+0xc7/0x1f0
[   62.657083]  [] vxlan_xmit+0xd3/0x400 [vxlan]
[   62.657083]  [] dev_hard_start_xmit+0x49d/0x5e0
[   62.657083]  [] dev_queue_xmit+0x2d9/0x480
[   62.657083]  [] ? _raw_write_unlock_bh+0x14/0x20
[   62.657083]  [] ? eth_header+0x35/0xe0
[   62.657083]  [] neigh_resolve_output+0x11e/0x1e0
[   62.657083]  [] ? ip6_fragment+0xad0/0xad0
[   62.657083]  [] ip6_finish_output2+0x2f5/0x470
[   62.657083]  [] ip6_finish_output+0x86/0xc0
[   62.657083]  [] ip6_output+0x78/0xb0
[   62.657083]  [] mld_sendpack+0x256/0x2a0
[   62.657083]  [] mld_ifc_timer_expire+0x17c/0x290
[   62.657083]  [] ? igmp6_timer_handler+0x80/0x80
[   62.657083]  [] ? igmp6_timer_handler+0x80/0x80
[   62.657083]  [] call_timer_fn+0x45/0x150
[   62.657083]  [] ? igmp6_timer_handler+0x80/0x80
[   62.657083]  [] run_timer_softirq+0x1f3/0x2a0
[   62.657083]  [] ? lapic_next_event+0x18/0x20
[   62.657083]  [] ? clockevents_program_event+0x6f/0x110
[   62.657083]  [] __do_softirq+0xd6/0x2b0
[   62.657083]  [] irq_exit+0x7e/0xa0
[   62.657083]  [] smp_apic_timer_interrupt+0x45/0x60
[   62.657083]  [] apic_timer_interrupt+0x6a/0x70
[   62.657083]  
[   62.657083]  [] ? sysenter_dispatch+0x7/0x1a
[   62.657083] Code: 4d 8b 85 a8 02 00 00 4c 89 e9 ba 03 04 00 00 48 c7 c6 c0 be 8d 81 48 c7 c7 48 35 a3 81 31 c0 e8 db 68 0e 00 49 8b 85 a8 02 00 00 <0f> b6 40 46 c0 e8 05 0f b6 c0 c1 e0 03 41 09 c4 e9 77 ff ff ff
[   62.657083] RIP  [] ip6_route_output+0xbd/0xe0
[   62.657083]  RSP 
[   62.657083] CR2: 0000000000000046
[   62.657083] ---[ end trace ba8a9583d7cd1934 ]---
[   62.657083] Kernel panic - not syncing: Fatal exception in interrupt

Signed-off-by: Fan Du 
Reported-by: Ryan Whelan 
Acked-by: Cong Wang 
Signed-off-by: David S. Miller

vxlan: release rt when found circular route

2013-12-11T03:01:54+00:00

Otherwise causing dst memory leakage.
Have Checked all other type tunnel device transmit implementation,
no such things happens anymore.

Signed-off-by: Fan Du 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-11-14T07:30:30+00:00

Pull core locking changes from Ingo Molnar:
 "The biggest changes:

   - add lockdep support for seqcount/seqlocks structures, this
     unearthed both bugs and required extra annotation.

   - move the various kernel locking primitives to the new
     kernel/locking/ directory"

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  block: Use u64_stats_init() to initialize seqcounts
  locking/lockdep: Mark __lockdep_count_forward_deps() as static
  lockdep/proc: Fix lock-time avg computation
  locking/doc: Update references to kernel/mutex.c
  ipv6: Fix possible ipv6 seqlock deadlock
  cpuset: Fix potential deadlock w/ set_mems_allowed
  seqcount: Add lockdep functionality to seqcount/seqlock structures
  net: Explicitly initialize u64_stats_sync structures for lockdep
  locking: Move the percpu-rwsem code to kernel/locking/
  locking: Move the lglocks code to kernel/locking/
  locking: Move the rwsem code to kernel/locking/
  locking: Move the rtmutex code to kernel/locking/
  locking: Move the semaphore core to kernel/locking/
  locking: Move the spinlock code to kernel/locking/
  locking: Move the lockdep code to kernel/locking/
  locking: Move the mutex code to kernel/locking/
  hung_task debugging: Add tracepoint to report the hang
  x86/locking/kconfig: Update paravirt spinlock Kconfig description
  lockstat: Report avg wait and hold times
  lockdep, x86/alternatives: Drop ancient lockdep fixup message
  ...

net: Explicitly initialize u64_stats_sync structures for lockdep

2013-11-06T11:40:25+00:00

In order to enable lockdep on seqcount/seqlock structures, we
must explicitly initialize any locks.

The u64_stats_sync structure, uses a seqcount, and thus we need
to introduce a u64_stats_init() function and use it to initialize
the structure.

This unfortunately adds a lot of fairly trivial initialization code
to a number of drivers. But the benefit of ensuring correctness makes
this worth while.

Because these changes are required for lockdep to be enabled, and the
changes are quite trivial, I've not yet split this patch out into 30-some
separate patches, as I figured it would be better to get the various
maintainers thoughts on how to best merge this change along with
the seqcount lockdep enablement.

Feedback would be appreciated!

Signed-off-by: John Stultz 
Acked-by: Julian Anastasov 
Signed-off-by: Peter Zijlstra 
Cc: Alexey Kuznetsov 
Cc: "David S. Miller" 
Cc: Eric Dumazet 
Cc: Hideaki YOSHIFUJI 
Cc: James Morris 
Cc: Jesse Gross 
Cc: Mathieu Desnoyers 
Cc: "Michael S. Tsirkin" 
Cc: Mirko Lindner 
Cc: Patrick McHardy 
Cc: Roger Luethi 
Cc: Rusty Russell 
Cc: Simon Horman 
Cc: Stephen Hemminger 
Cc: Steven Rostedt 
Cc: Thomas Petazzoni 
Cc: Wensong Zhang 
Cc: netdev@vger.kernel.org
Link: http://lkml.kernel.org/r/1381186321-4906-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar

vxlan: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))

2013-11-05T01:02:33+00:00

trivial patch converting ERR_PTR(PTR_ERR()) into ERR_CAST().
No functional changes.

Signed-off-by: Duan Jiong 
Signed-off-by: David S. Miller

vxlan: Have the NIC drivers do less work for offloads

2013-10-29T09:39:13+00:00

This patch removes the burden from the NIC drivers to check if the
vxlan driver is enabled in the kernel and also makes available
the vxlan headrooms to them.

Signed-off-by: Joseph Gasparakis 
Tested-by: Kavindya Deegala 
Signed-off-by: Jeff Kirsher

vxlan: silence one build warning

2013-10-29T04:19:04+00:00

drivers/net/vxlan.c: In function ‘vxlan_sock_add’:
drivers/net/vxlan.c:2298:11: warning: ‘sock’ may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/net/vxlan.c:2275:17: note: ‘sock’ was declared here
  LD      drivers/net/built-in.o

Signed-off-by: Zhi Yong Wu 
Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-10-01T21:06:14+00:00

Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller

net ipv4: Convert ipv4.ip_local_port_range to be per netns v3

2013-10-01T04:59:38+00:00

- Move sysctl_local_ports from a global variable into struct netns_ipv4.
- Modify inet_get_local_port_range to take a struct net, and update all
  of the callers.
- Move the initialization of sysctl_local_ports into
   sysctl_net_ipv4.c:ipv4_sysctl_init_net from inet_connection_sock.c

v2:
- Ensure indentation used tabs
- Fixed ip.h so it applies cleanly to todays net-next

v3:
- Compile fixes of strange callers of inet_get_local_port_range.
  This patch now successfully passes an allmodconfig build.
  Removed manual inlining of inet_get_local_port_range in ipv4_local_port_range

Originally-by: Samya 
Acked-by: Nicolas Dichtel 
Signed-off-by: "Eric W. Biederman" 
Signed-off-by: David S. Miller

vxlan: Use RCU apis to access sk_user_data.

2013-09-30T18:22:59+00:00

Use of RCU api makes vxlan code easier to understand.  It also
fixes bug due to missing ACCESS_ONCE() on sk_user_data dereference.
In rare case without ACCESS_ONCE() compiler might omit vs on
sk_user_data dereference.
Compiler can use vs as alias for sk->sk_user_data, resulting in
multiple sk_user_data dereference in rcu read context which
could change.

CC: Jesse Gross 
Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller