linux-stable.git/drivers/net/vxlan.c, branch v4.2.7

vxlan: re-ignore EADDRINUSE from igmp_join

2015-08-25T23:24:35+00:00

Before 56ef9c909b40[1] it used to ignore all errors from igmp_join().
That commit enhanced that and made it error out whatever error happened
with igmp_join(), but that's not good because when using multicast
groups vxlan will try to join it multiple times if the socket is reused
and then the 2nd and further attempts will fail with EADDRINUSE.

As we don't track to which groups the socket is already subscribed, it's
okay to just ignore that error.

Fixes: 56ef9c909b40 ("vxlan: Move socket initialization to within rtnl scope")
Reported-by: John Nielsen 
Signed-off-by: Marcelo Ricardo Leitner 
Signed-off-by: David S. Miller

vxlan: release lock after each bucket in vxlan_cleanup

2015-05-27T17:33:21+00:00

We're seeing some softlockups from this function when there
are a lot fdb entries on a vxlan device. Taking the lock for
each bucket instead of the whole table is enough to fix that.

Signed-off-by: Sorin Dumitru 
Signed-off-by: David S. Miller

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

2015-05-23T05:22:35+00:00

Conflicts:
	drivers/net/ethernet/cadence/macb.c
	drivers/net/phy/phy.c
	include/linux/skbuff.h
	net/ipv4/tcp.c
	net/switchdev/switchdev.c

Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.

phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.

tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.

macb.c involved the addition of two zyncq device entries.

skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.

Signed-off-by: David S. Miller

vxlan: correct typo in call to unregister_netdevice_queue

2015-05-18T20:57:09+00:00

By inspection, this appears to be a typo.  The gating comparison
involves vxlan->dev rather than dev.  In fact, dev is the iterator in
the preceding loop above but it is actually constant in the 2nd loop.

Use of dev seems to be a bad cut-n-paste from the prior call to
unregister_netdevice_queue.  Change dev to vxlan->dev, since that is
what is actually being checked.

Signed-off-by: John W. Linville 
Signed-off-by: David S. Miller

netns: rename peernet2id() to peernet2id_alloc()

2015-05-10T02:15:30+00:00

In a following commit, a new function will be introduced to only lookup for
a nsid (no allocation if the nsid doesn't exist). To avoid confusion, the
existing function is renamed.

Signed-off-by: Nicolas Dichtel 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

vxlan: Correctly set flow*i_mark and flow4i_proto in route lookups

2015-05-05T23:37:54+00:00

VXLAN must provide the skb mark and specifiy IPPROTO_UDP when doing
the FIB lookup for the remote ip. Otherwise an invalid route might
be returned.

Signed-off-by: Thomas Graf 
Signed-off-by: David S. Miller

vxlan: remove the unnecessary codes

2015-04-22T22:45:49+00:00

The return value of vxlan_fdb_replace always is greater than or equal to 0

Signed-off-by: Li RongQing 
Signed-off-by: David S. Miller

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

2015-04-14T19:44:14+00:00

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller

udptunnels: Call handle_offloads after inserting vlan tag.

2015-04-09T18:56:32+00:00

handle_offloads() calls skb_reset_inner_headers() to store
the layer pointers to the encapsulated packet. However, we
currently push the vlag tag (if there is one) onto the packet
afterwards. This changes the MAC header for the encapsulated
packet but it is not reflected in skb->inner_mac_header, which
breaks GSO and drivers which attempt to use this for encapsulation
offloads.

Fixes: 1eaa8178 ("vxlan: Add tx-vlan offload support.")
Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller

vxlan: do not exit on error in vxlan_stop()

2015-04-09T02:48:08+00:00

We need to clean up vxlan despite vxlan_igmp_leave() fails.

This fixes the following kernel warning:

 WARNING: CPU: 0 PID: 6 at lib/debugobjects.c:263 debug_print_object+0x7c/0x8d()
 ODEBUG: free active (active state 0) object type: timer_list hint: vxlan_cleanup+0x0/0xd0
 CPU: 0 PID: 6 Comm: kworker/u8:0 Not tainted 4.0.0-rc7+ #953
 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
 Workqueue: netns cleanup_net
  0000000000000009 ffff88011955f948 ffffffff81a25f5a 00000000253f253e
  ffff88011955f998 ffff88011955f988 ffffffff8107608e 0000000000000000
  ffffffff814deba2 ffff8800d4e94000 ffffffff82254c30 ffffffff81fbe455
 Call Trace:
  [] dump_stack+0x4c/0x65
  [] warn_slowpath_common+0x9c/0xb6
  [] ? debug_print_object+0x7c/0x8d
  [] warn_slowpath_fmt+0x46/0x48
  [] debug_print_object+0x7c/0x8d
  [] ? vxlan_fdb_destroy+0x5b/0x5b
  [] __debug_check_no_obj_freed+0xc3/0x15f
  [] debug_check_no_obj_freed+0x12/0x16
  [] slab_free_hook+0x64/0x6c
  [] ? kvfree+0x31/0x33
  [] kfree+0x101/0x1ac
  [] kvfree+0x31/0x33
  [] netdev_freemem+0x18/0x1a
  [] netdev_release+0x2e/0x32
  [] device_release+0x5a/0x92
  [] kobject_cleanup+0x49/0x5e
  [] kobject_put+0x45/0x49
  [] netdev_run_todo+0x26f/0x283
  [] ? rollback_registered_many+0x20f/0x23b
  [] rtnl_unlock+0xe/0x10
  [] default_device_exit_batch+0x12a/0x139
  [] ? wait_woken+0x8f/0x8f
  [] ops_exit_list+0x2b/0x57
  [] cleanup_net+0x154/0x1e7
  [] process_one_work+0x255/0x4ad
  [] ? process_one_work+0x161/0x4ad
  [] worker_thread+0x1cd/0x2ab
  [] ? process_scheduled_works+0x2f/0x2f
  [] kthread+0xd4/0xdc
  [] ? local_clock+0x19/0x22
  [] ? __kthread_parkme+0x83/0x83
  [] ret_from_fork+0x58/0x90
  [] ? __kthread_parkme+0x83/0x83

For the long-term, we should handle NETDEV_{UP,DOWN} event
from the lower device of a tunnel device.

Fixes: 56ef9c909b40 ("vxlan: Move socket initialization to within rtnl scope")
Cc: Marcelo Ricardo Leitner 
Signed-off-by: Cong Wang 
Acked-by: Marcelo Ricardo Leitner 
Signed-off-by: David S. Miller