From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: Re: [PATCH] bonding: get netdev_rx_handler_unregister out of locks Date: Tue, 02 Apr 2013 08:26:02 -0700 Message-ID: <1364916362.5113.167.camel@edumazet-glaptop> References: <1364915716-4857-1-git-send-email-vfalico@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, fubar@us.ibm.com, andy@greyhouse.net, edumazet@google.com To: Veaceslav Falico Return-path: Received: from mail-pa0-f54.google.com ([209.85.220.54]:63715 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932437Ab3DBP0J (ORCPT ); Tue, 2 Apr 2013 11:26:09 -0400 Received: by mail-pa0-f54.google.com with SMTP id fa11so346167pad.13 for ; Tue, 02 Apr 2013 08:26:08 -0700 (PDT) In-Reply-To: <1364915716-4857-1-git-send-email-vfalico@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 > --- > 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 I'll send a net-next patch to remove the synchronize_net() from bridge code as well.