kernel/git/stable/linux-stable.git/drivers/net/bonding, branch linux-3.6.y

bonding: fix race condition in bonding_store_slaves_active

2012-12-17T17:27:19+00:00

[ Upstream commit e196c0e579902f42cf72414461fb034e5a1ffbf7 ] Race between bonding_store_slaves_active() and slave manipulation functions. The bond_for_each_slave use in bonding_store_slaves_active() is not protected by any synchronization mechanism. NULL pointer dereference is easy to reach. Fixed by acquiring the bond->lock for the slave walk. v2: Make description text < 75 columns Signed-off-by: Nikolay Aleksandrov Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman

bonding: Bonding driver does not consider the gso_max_size/gso_max_segs setting of slave devices.

2012-12-17T17:27:19+00:00

[ Upstream commit 0e376bd0b791ac6ac6bdb051492df0769c840848 ] Patch sets the lowest gso_max_size and gso_max_segs values of the slave devices during enslave and detach. Signed-off-by: Sarveshwar Bandi Acked-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman

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

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

net: rename bond_queue_mapping to slave_dev_queue_mapping

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

As this is going to be used not only by bonding. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller

rtnl: allow to specify different num for rx and tx queue count

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

Also cut out unused function parameters and possible err in return value. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller

bonding: refine IFF_XMIT_DST_RELEASE capability

2012-07-18T16:31:25+00:00

Some workloads greatly benefit of IFF_XMIT_DST_RELEASE capability on output net device, avoiding dirtying dst refcount. bonding currently disables IFF_XMIT_DST_RELEASE unconditionally. If all slaves have the IFF_XMIT_DST_RELEASE bit set, then bonding master can also have it in its priv_flags Signed-off-by: Eric Dumazet Cc: Jay Vosburgh Cc: Andy Gospodarek Cc: Tom Herbert Signed-off-by: David S. Miller

netpoll: move np->dev and np->dev_name init into __netpoll_setup()

2012-07-17T16:02:36+00:00

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