linux.git/drivers/net/bonding, branch v3.7-rc2

vlan: fix bond/team enslave of vlan challenged slave/port

2012-10-16T18:41:46+00:00

In vlan_uses_dev() check for number of vlan devs rather than existence
of vlan_info. The reason is that vlan id 0 is there without appropriate
vlan dev on it by default which prevented from enslaving vlan challenged
dev.

Reported-by: Jon Stanley 
Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bonding: set qdisc_tx_busylock to avoid LOCKDEP splat

2012-10-04T19:53:48+00:00

If a qdisc is installed on a bonding device, its possible to get
following lockdep splat under stress :

 =============================================
 [ INFO: possible recursive locking detected ]
 3.6.0+ #211 Not tainted
 ---------------------------------------------
 ping/4876 is trying to acquire lock:
  (dev->qdisc_tx_busylock ?: &qdisc_tx_busylock){+.-...}, at: [] dev_queue_xmit+0xe1/0x830

 but task is already holding lock:
  (dev->qdisc_tx_busylock ?: &qdisc_tx_busylock){+.-...}, at: [] dev_queue_xmit+0xe1/0x830

 other info that might help us debug this:
  Possible unsafe locking scenario:

        CPU0
        ----
   lock(dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
   lock(dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);

  *** DEADLOCK ***

  May be due to missing lock nesting notation

 6 locks held by ping/4876:
  #0:  (sk_lock-AF_INET){+.+.+.}, at: [] raw_sendmsg+0x600/0xc30
  #1:  (rcu_read_lock_bh){.+....}, at: [] ip_finish_output+0x12d/0x870
  #2:  (rcu_read_lock_bh){.+....}, at: [] dev_queue_xmit+0x0/0x830
  #3:  (dev->qdisc_tx_busylock ?: &qdisc_tx_busylock){+.-...}, at: [] dev_queue_xmit+0xe1/0x830
  #4:  (&bond->lock){++.?..}, at: [] bond_start_xmit+0x31/0x4b0 [bonding]
  #5:  (rcu_read_lock_bh){.+....}, at: [] dev_queue_xmit+0x0/0x830

 stack backtrace:
 Pid: 4876, comm: ping Not tainted 3.6.0+ #211
 Call Trace:
  [] __lock_acquire+0x715/0x1b80
  [] ? mark_held_locks+0x9b/0x100
  [] lock_acquire+0x92/0x1d0
  [] ? dev_queue_xmit+0xe1/0x830
  [] _raw_spin_lock+0x3c/0x50
  [] ? dev_queue_xmit+0xe1/0x830
  [] ? rcu_read_lock_bh_held+0x5d/0x90
  [] dev_queue_xmit+0xe1/0x830
  [] ? netdev_pick_tx+0x570/0x570
  [] bond_start_xmit+0x1da/0x4b0 [bonding]
  [] dev_hard_start_xmit+0x240/0x6b0
  [] sch_direct_xmit+0xfe/0x2a0
  [] dev_queue_xmit+0x199/0x830
  [] ? netdev_pick_tx+0x570/0x570
  [] ip_finish_output+0x5df/0x870
  [] ? ip_finish_output+0x12d/0x870
  [] ip_output+0x54/0xf0
  [] ip_local_out+0x28/0x90
  [] ip_send_skb+0x14/0x50
  [] ip_push_pending_frames+0x32/0x40
  [] raw_sendmsg+0x93a/0xc30
  [] ? selinux_file_send_sigiotask+0x1f0/0x1f0
  [] ? __lock_is_held+0x54/0x80
  [] ? inet_recvmsg+0x220/0x220
  [] ? __lock_is_held+0x54/0x80
  [] inet_sendmsg+0x125/0x240
  [] ? inet_recvmsg+0x220/0x220
  [] sock_sendmsg+0xab/0xe0
  [] ? lock_release_non_nested+0xa0/0x2e0
  [] ? lock_release_non_nested+0xa0/0x2e0
  [] __sys_sendmsg+0x37c/0x390
  [] ? fsnotify+0x2ca/0x7e0
  [] ? fsnotify+0x88/0x7e0
  [] ? put_ldisc+0x56/0xd0
  [] ? fget_light+0x3da/0x510
  [] sys_sendmsg+0x44/0x80
  [] system_call_fastpath+0x16/0x1b

Avoid this problem using a distinct lock_class_key for bonding
devices.

Signed-off-by: Eric Dumazet 
Cc: Jay Vosburgh 
Cc: Andy Gospodarek 
Signed-off-by: David S. Miller

bonding: add some slack to arp monitoring time limits

2012-08-31T20:37:12+00:00

Currently, all the time limits in the bonding ARP monitor are in
multiples of arp_interval -- the time interval at which the ARP
monitor is periodically scheduled.

With a fast network round-trip and a little scheduling latency
of the ARP monitor work, a limit of n*delta_in_ticks may
effectively mean (n-1)*delta_in_ticks.

This is fatal in case of n==1  (the link will stay down
forever) and makes the behaviour non-deterministic in all the
other cases.

Add a delta_in_ticks/2 time slack to all the time limits.

Signed-off-by: Jiri Bohac 
Signed-off-by: David S. Miller

bonding: support for IPv6 transmit hashing

2012-08-23T05:49:30+00:00

Currently the "bonding" driver does not support load balancing outgoing
traffic in LACP mode for IPv6 traffic. IPv4 (and TCP or UDP over IPv4)
are currently supported; this patch adds transmit hashing for IPv6 (and
TCP or UDP over IPv6), bringing IPv6 up to par with IPv4 support in the
bonding driver. In addition, bounds checking has been added to all
transmit hashing functions.

The algorithm chosen (xor'ing the bottom three quads of the source and
destination addresses together, then xor'ing each byte of that result into
the bottom byte, finally xor'ing with the last bytes of the MAC addresses)
was selected after testing almost 400,000 unique IPv6 addresses harvested
from server logs. This algorithm had the most even distribution for both
big- and little-endian architectures while still using few instructions. Its
behavior also attempts to closely match that of the IPv4 algorithm.

The IPv6 flow label was intentionally not included in the hash as it appears
to be unset in the vast majority of IPv6 traffic sampled, and the current
algorithm not using the flow label already offers a very even distribution.

Fragmented IPv6 packets are handled the same way as fragmented IPv4 packets,
ie, they are not balanced based on layer 4 information. Additionally,
IPv6 packets with intermediate headers are not balanced based on layer
4 information. In practice these intermediate headers are not common and
this should not cause any problems, and the alternative (a packet-parsing
loop and look-up table) seemed slow and complicated for little gain.

Tested-by: John Eaglesham 
Signed-off-by: John Eaglesham 
Signed-off-by: David S. Miller

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

2012-08-22T21:21:38+00:00

netpoll: check netpoll tx status on the right device

2012-08-14T21:33:32+00:00

Although this doesn't matter actually, because netpoll_tx_running()
doesn't use the parameter, the code will be more readable.

For team_dev_queue_xmit() we have to move it down to avoid
compile errors.

Cc: David Miller 
Signed-off-by: Jiri Pirko 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: make __netpoll_cleanup non-block

2012-08-14T21:33:30+00:00

Like the previous patch, slave_disable_netpoll() and __netpoll_cleanup()
may be called with read_lock() held too, so we should make them
non-block, by moving the cleanup and kfree() to call_rcu_bh() callbacks.

Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()

2012-08-14T21:33:30+00:00

slave_enable_netpoll() and __netpoll_setup() may be called
with read_lock() held, so should use GFP_ATOMIC to allocate
memory. Eric suggested to pass gfp flags to __netpoll_setup().

Cc: Eric Dumazet 
Cc: "David S. Miller" 
Reported-by: Dan Carpenter 
Signed-off-by: Eric Dumazet 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

net: remove netdev_bonding_change()

2012-08-14T21:28:24+00:00

I don't see any benifits to use netdev_bonding_change() than
using call_netdevice_notifiers() directly.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

bond_sysfs: use real_num_tx_queues rather than params.tx_queue

2012-07-20T18:07:00+00:00

Since now number of tx queues can be specified during bond instance
creation and therefore it may differ from params.tx_queues, use rather
real_num_tx_queues for boundary check.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller