linux.git/drivers/net/bonding, branch v2.6.37

bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion

2010-12-16T20:43:22+00:00

bond_na_send() attempts to insert a VLAN tag in between building and
sending packets of the respective formats.  If the slave does not
implement hardware VLAN tag insertion then vlan_put_tag() will mangle
the network-layer header because the Ethernet header is not present at
this point (unlike in bond_arp_send()).

Fix this by adding the tag out-of-line and relying on
dev_hard_start_xmit() to insert it inline if necessary.

Signed-off-by: Ben Hutchings 
Signed-off-by: Jay Vosburgh 
Reviewed-by: Jesse Gross 
Signed-off-by: David S. Miller

bonding: Change active slave quietly when bond is down

2010-12-16T20:43:22+00:00

bond_change_active_slave() may be called when a slave is added, even
if the bond has not been brought up yet.  It may then attempt to send
packets, and further it may use mcast_work which is uninitialised
before the bond is brought up.  Add the necessary checks for
netif_running(bond->dev).

Signed-off-by: Ben Hutchings 
Signed-off-by: Jay Vosburgh 
Signed-off-by: David S. Miller

bonding/vlan: Remove redundant VLAN tag insertion logic

2010-12-16T20:43:21+00:00

A bond may have a mixture of slave devices with and without hardware
VLAN tag insertion capability.  Therefore it always claims this
capability and performs software VLAN tag insertion if the slave does
not.

Since commit 7b9c60903714bf0a19d746b228864bad3497284e, this has
also been done by dev_hard_start_xmit().  The result is that VLAN-
tagged skbs are now double-tagged when transmitted through slave
devices without hardware VLAN tag insertion!

Remove the now-redundant logic from bond_dev_queue_xmit().

Signed-off-by: Ben Hutchings 
Signed-off-by: Jay Vosburgh 
Reviewed-by: Jesse Gross 
Signed-off-by: David S. Miller

bonding: Fix slave selection bug.

2010-12-16T20:24:02+00:00

The returned slave is incorrect, if the net device under check is not
charged yet by the master.

Signed-off-by: Hillf Danton 
Signed-off-by: David S. Miller

net: Convert netpoll blocking api in bonding driver to be a counter

2010-12-10T04:33:46+00:00

A while back I made some changes to enable netpoll in the bonding driver.  Among
them was a per-cpu flag that indicated we were in a path that held locks which
could cause the netpoll path to block in during tx, and as such the tx path
should queue the frame for later use.  This appears to have given rise to a
regression.  If one of those paths on which we hold the per-cpu flag yields the
cpu, its possible for us to come back on a different cpu, leading to us clearing
a different flag than we set.  This results in odd netpoll drops, and BUG
backtraces appearing in the log, as we check to make sure that we only clear set
bits, and only set clear bits.  I had though briefly about changing the
offending paths so that they wouldn't sleep, but looking at my origional work
more closely, it doesn't appear that a per-cpu flag is warranted.  We alrady
gate the checking of this flag on IFF_IN_NETPOLL, so we don't hit this in the
normal tx case anyway.  And practically speaking, the normal use case for
netpoll is to only have one client anyway, so we're not going to erroneously
queue netpoll frames when its actually safe to do so.  As such, lets just
convert that per-cpu flag to an atomic counter.  It fixes the rescheduling bugs,
is equivalent from a performance perspective and actually eliminates some code
in the process.

Tested by the reporter and myself, successfully

Reported-by: Liang Zheng 
CC: Jay Vosburgh 
CC: Andy Gospodarek 
CC: David S. Miller 
Signed-off-by: Neil Horman 
Signed-off-by: David S. Miller

bonding: check for assigned mac before adopting the slaves mac address

2010-12-01T19:43:08+00:00

Restore the check for an unassigned mac address before adopting the
first slaves as it's own. The change in behavior was introduced by:

commit c20811a79e671a6a1fe86a8c1afe04aca8a7f085
Author: Jiri Pirko 

    bonding: move dev_addr cpy to bond_enslave


Signed-off-by: David Strand 
Signed-off-by: Jay Vosburgh 
Signed-off-by: David S. Miller

bonding: fix a race in IGMP handling

2010-11-18T17:30:42+00:00

RCU conversion in IGMP code done in net-next-2.6 raised a race in
__bond_resend_igmp_join_requests().

It iterates in_dev->mc_list without appropriate protection (RTNL, or
read_lock on in_dev->mc_list_lock).

Another cpu might delete an entry while we use it and trigger a fault.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

bonding: Fix lockdep warning after bond_vlan_rx_register()

2010-10-27T21:24:07+00:00

Fix lockdep warning:
[   52.991402] ======================================================
[   52.991511] [ INFO: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected ]
[   52.991569] 2.6.36-04573-g4b60626-dirty #65
[   52.991622] ------------------------------------------------------
[   52.991696] ip/4842 [HC0[0]:SC0[4]:HE1:SE0] is trying to acquire:
[   52.991758]  (&bond->lock){++++..}, at: [] bond_set_multicast_list+0x60/0x2c0 [bonding]
[   52.991966]
[   52.991967] and this task is already holding:
[   52.992008]  (&bonding_netdev_addr_lock_key){+.....}, at: [] dev_mc_sync+0x50/0xa0
[   52.992008] which would create a new lock dependency:
[   52.992008]  (&bonding_netdev_addr_lock_key){+.....} -> (&bond->lock){++++..}
[   52.992008]
[   52.992008] but this new dependency connects a SOFTIRQ-irq-safe lock:
[   52.992008]  (&(&mc->mca_lock)->rlock){+.-...}
[   52.992008] ... which became SOFTIRQ-irq-safe at:
[   52.992008]   [] __lock_acquire+0x96b/0x1960
[   52.992008]   [] lock_acquire+0x7e/0xf0
[   52.992008]   [] _raw_spin_lock_bh+0x3d/0x50
[   52.992008]   [] mld_ifc_timer_expire+0xf0/0x280
[   52.992008]   [] run_timer_softirq+0x146/0x310
[   52.992008]   [] __do_softirq+0xad/0x1c0
[   52.992008]
[   52.992008] to a SOFTIRQ-irq-unsafe lock:
[   52.992008]  (&bond->lock){++++..}
[   52.992008] ... which became SOFTIRQ-irq-unsafe at:
[   52.992008] ...  [] __lock_acquire+0x9bb/0x1960
[   52.992008]   [] lock_acquire+0x7e/0xf0
[   52.992008]   [] _raw_write_lock+0x38/0x50
[   52.992008]   [] bond_vlan_rx_register+0x24/0x70 [bonding]
[   52.992008]   [] register_vlan_dev+0xc0/0x280
[   52.992008]   [] vlan_newlink+0xaa/0xd0
[   52.992008]   [] rtnl_newlink+0x404/0x490
[   52.992008]   [] rtnetlink_rcv_msg+0x1e5/0x220
[   52.992008]   [] netlink_rcv_skb+0x8e/0xb0
[   52.992008]   [] rtnetlink_rcv+0x1c/0x30
[   52.992008]   [] netlink_unicast+0x24b/0x290
[   52.992008]   [] netlink_sendmsg+0x1f7/0x310
[   52.992008]   [] sock_sendmsg+0xac/0xe0
[   52.992008]   [] sys_sendmsg+0x130/0x230
[   52.992008]   [] sys_socketcall+0xde/0x280
[   52.992008]   [] sysenter_do_call+0x12/0x36
[   52.992008]
[   52.992008] other info that might help us debug this:
...
[ Full info at netdev: Wed, 27 Oct 2010 12:24:30 +0200
  Subject: [BUG net-2.6 vlan/bonding] lockdep splats ]

Use BH variant of write_lock(&bond->lock) (as elsewhere in bond_main)
to prevent this dependency.

Fixes commit f35188faa0fbabefac476536994f4b6f3677380f [v2.6.36]

Reported-by: Eric Dumazet 
Tested-by: Eric Dumazet 
Signed-off-by: Jarek Poplawski 
Acked-by: Eric Dumazet 
Cc: Jay Vosburgh

bonding: cleanup: remove braces from single block statements

2010-10-21T10:09:49+00:00

checkpatch.pl cleanup : Remove braces from single statement
blocks.

Signed-off-by: Bandan Das 
Signed-off-by: David S. Miller

bonding: cleanup : add space around operators

2010-10-21T10:09:49+00:00

checkpatch.pl cleanup: Added spaces around operators at various places.
Also fixed some c99 style comments that I came across.

Signed-off-by: Bandan Das 
Signed-off-by: David S. Miller