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

bonding: Don't hold lock when calling rtnl_unlock

2008-01-18T19:38:39+00:00

Change bond_mii_monitor to not hold any locks when calling rtnl_unlock,
as rtnl_unlock can sleep (when acquring another mutex in netdev_run_todo).

Bug reported by Makito SHIOKAWA , who
included a different patch.

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: fix lock ordering for rtnl and bonding_rwsem

2008-01-18T19:38:39+00:00

Fix the handling of rtnl and the bonding_rwsem to always be acquired
in a consistent order (rtnl, then bonding_rwsem).

The existing code sometimes acquired them in this order, and sometimes
in the opposite order, which opens a window for deadlock between ifenslave
and sysfs.

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: Fix up parameter parsing

2008-01-18T19:38:38+00:00

	A recent change to add an additional hash policy modified
bond_parse_parm, but it now does not correctly match parameters passed in
via sysfs.

	Rewrote bond_parse_parm to handle (a) parameter matches that
are substrings of one another and (b) user input with whitespace (e.g.,
sysfs input often has a trailing newline).

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: release slaves when master removed via sysfs

2008-01-18T19:38:38+00:00

	Add a call to bond_release_all in the bonding netdev event
handler for the master.  This releases the slaves for the case of, e.g.,
"echo -bond0 > /sys/class/net/bonding_masters", which otherwise will spin
forever waiting for references to be released.

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: fix locking during alb failover and slave removal

2008-01-18T19:38:38+00:00

	alb_fasten_mac_swap (actually rlb_teach_disabled_mac_on_primary)
requries RTNL and no other locks.  This could cause dev_set_promiscuity
and/or dev_set_mac_address to be called with improper locking.

	Changed callers to hold only RTNL during calls to alb_fasten_mac_swap
or functions calling it.  Updated header comments in affected functions to
reflect proper reality of locking requirements.

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: fix ASSERT_RTNL that produces spurious warnings

2008-01-18T19:38:38+00:00

	Move an ASSERT_RTNL down to where we should hold only RTNL;
the existing check produces spurious warnings because we hold additional
locks at _bh, tripping a debug warning in spin_lock_mutex().

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: fix locking in sysfs primary/active selection

2008-01-18T19:38:38+00:00

	Fix the functions that store the primary and active slave
options via sysfs to hold the correct locks in the correct order.

	The bond_change_active_slave and bond_select_active_slave
functions both require rtnl, bond->lock for read and curr_slave_lock for
write_bh, and no other locks.  This is so that the lower level
mode-specific functions (notably for balance-alb mode) can release locks
down to just rtnl in order to call, e.g., dev_set_mac_address with the
locks it expects (rtnl only).

Signed-off-by: Jay Vosburgh 
Signed-off-by: Andy Gospodarek 
Signed-off-by: Jeff Garzik

bonding: Fix race at module unload

2007-12-07T20:00:34+00:00

	Fixes a race condition in module unload.  Without this change,
workqueue events may fire while bonding data structures are partially
freed but before bond_close() is invoked by unregister_netdevice().

	Update version to 3.2.3.

Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: Add new layer2+3 hash for xor/802.3ad modes

2007-12-07T20:00:32+00:00

 	Add new hash for balance-xor and 802.3ad modes.  Originally
 submitted by "Glenn Griffin" ; modified by
 Jay Vosburgh to move setting of hash policy out of line, tweak the
 documentation update and add version update to 3.2.2.

	Glenn's original comment follows:

Included is a patch for a new xmit_hash_policy for the bonding driver
that selects slaves based on MAC and IP information.  This is a middle
ground between what currently exists in the layer2 only policy and the
layer3+4 policy.  This policy strives to be fully 802.3ad compliant by
transmitting every packet of any particular flow over the same link.
As documented the layer3+4 policy is not fully compliant for extreme
cases such as ip fragmentation, so this policy is a nice compromise
for environments that require full compliance but desire more than the
layer2 only policy.

Signed-off-by: "Glenn Griffin" 
Signed-off-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik

bonding: Fix time comparison

2007-12-07T20:00:30+00:00

From: David Sterba 

Use macros for comparing jiffies. Jiffies' wrap caused missed events and hangs.
Module reinsert was needed to make bonding work again.

Signed-off-by: David Sterba 
Acked-by: Jay Vosburgh 
Signed-off-by: Jeff Garzik