[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1364916362.5113.167.camel@edumazet-glaptop>
Date: Tue, 02 Apr 2013 08:26:02 -0700
From: Eric Dumazet <eric.dumazet@...il.com>
To: Veaceslav Falico <vfalico@...hat.com>
Cc: netdev@...r.kernel.org, fubar@...ibm.com, andy@...yhouse.net,
edumazet@...gle.com
Subject: Re: [PATCH] bonding: get netdev_rx_handler_unregister out of locks
On Tue, 2013-04-02 at 17:15 +0200, Veaceslav Falico wrote:
> Now that netdev_rx_handler_unregister contains synchronize_net(), we need
> to call it outside of bond->lock, cause it might sleep. Also, remove the
> already unneded synchronize_net().
>
> Signed-off-by: Veaceslav Falico <vfalico@...hat.com>
> ---
> drivers/net/bonding/bond_main.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 11a8cb3..78c9e2d 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -1975,12 +1975,11 @@ static int __bond_release_one(struct net_device *bond_dev,
> return -EINVAL;
> }
>
> + write_unlock_bh(&bond->lock);
> /* unregister rx_handler early so bond_handle_frame wouldn't be called
> * for this slave anymore.
> */
> netdev_rx_handler_unregister(slave_dev);
> - write_unlock_bh(&bond->lock);
> - synchronize_net();
> write_lock_bh(&bond->lock);
>
> if (!all && !bond->params.fail_over_mac) {
Good catch, thanks !
Acked-by: Eric Dumazet <edumazet@...gle.com>
I'll send a net-next patch to remove the synchronize_net() from bridge
code as well.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists