From: Neil Horman <nhorman@tuxdriver.com>
To: Amerigo Wang <amwang@redhat.com>
Cc: linux-kernel@vger.kernel.org, Neil Horman <nhorman@redhat.com>,
Jay Vosburgh <fubar@us.ibm.com>,
Andy Gospodarek <andy@greyhouse.net>,
"David S. Miller" <davem@davemloft.net>,
Alexey Dobriyan <adobriyan@gmail.com>,
Ferenc Wagner <wferi@niif.hu>,
Andrew Morton <akpm@linux-foundation.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Josh Triplett <josh@joshtriplett.org>,
Ian Campbell <ian.campbell@citrix.com>,
netdev@vger.kernel.org
Subject: Re: [Patch net-next-2.6] netpoll: disable netpoll when enslave a device
Date: Wed, 18 May 2011 06:56:48 -0400 [thread overview]
Message-ID: <20110518105558.GA3203@hmsreliant.think-freely.org> (raw)
In-Reply-To: <1305712845-11762-1-git-send-email-amwang@redhat.com>
On Wed, May 18, 2011 at 06:00:35PM +0800, Amerigo Wang wrote:
> Currently we do nothing when we enslave a net device which is running netconsole.
> Neil pointed out that we may get weird results in such case, so let's disable
> netpoll on the device being enslaved. I think it is too harsh to prevent
> the device being ensalved if it is running netconsole.
>
> By the way, this patch also removes the NETDEV_GOING_DOWN from netconsole
> netdev notifier, because netpoll will check if the device is running or not
> and we don't handle NETDEV_PRE_UP neither.
>
> Signed-off-by: WANG Cong <amwang@redhat.com>
> Cc: Neil Horman <nhorman@redhat.com>
>
> ---
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 088fd84..b9c70c5 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -1640,6 +1640,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
> }
> }
>
> + netdev_bonding_change(slave_dev, NETDEV_ENSLAVE);
> +
> /* If this is the first slave, then we need to set the master's hardware
> * address to be the same as the slave's. */
> if (is_zero_ether_addr(bond->dev->dev_addr))
> diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
> index a83e101..0c3e8de 100644
> --- a/drivers/net/netconsole.c
> +++ b/drivers/net/netconsole.c
> @@ -621,7 +621,8 @@ static int netconsole_netdev_event(struct notifier_block *this,
> bool stopped = false;
>
> if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER ||
> - event == NETDEV_BONDING_DESLAVE || event == NETDEV_GOING_DOWN))
> + event == NETDEV_BONDING_DESLAVE || event == NETDEV_GOING_DOWN ||
> + event == NETDEV_ENSLAVE))
> goto done;
>
> spin_lock_irqsave(&target_list_lock, flags);
> @@ -650,8 +651,8 @@ restart:
> goto restart;
> }
> /* Fall through */
> - case NETDEV_GOING_DOWN:
> case NETDEV_BONDING_DESLAVE:
> + case NETDEV_ENSLAVE:
> nt->enabled = 0;
> stopped = true;
> break;
This wasn't introduced by this patch, but looking at it made me realize that
nt->enabled, if it passes through this code path, doesn't properly track weather
or not netpoll_setup has been called on this interface. If you look at
drop_netconsole_target, you'll see we only call netpoll_cleanup_target if
nt->enabled is set. We should probably change the nt->enabled check there, and
in store_enabled to be if (nt->np.dev), like we do in the NETDEV_UNREGISTER case
in netconsole_netdev_event.
> @@ -660,10 +661,21 @@ restart:
> netconsole_target_put(nt);
> }
> spin_unlock_irqrestore(&target_list_lock, flags);
> - if (stopped && (event == NETDEV_UNREGISTER || event == NETDEV_BONDING_DESLAVE))
> + if (stopped) {
> printk(KERN_INFO "netconsole: network logging stopped on "
> - "interface %s as it %s\n", dev->name,
> - event == NETDEV_UNREGISTER ? "unregistered" : "released slaves");
> + "interface %s as it ", dev->name);
> + switch (event) {
> + case NETDEV_UNREGISTER:
> + printk(KERN_CONT "unregistered\n");
> + break;
> + case NETDEV_BONDING_DESLAVE:
> + printk(KERN_CONT "released slaves\n");
> + break;
> + case NETDEV_ENSLAVE:
> + printk(KERN_CONT "is enslaved\n");
> + break;
> + }
> + }
>
> done:
> return NOTIFY_DONE;
> diff --git a/include/linux/notifier.h b/include/linux/notifier.h
> index 621dfa1..3d82867 100644
> --- a/include/linux/notifier.h
> +++ b/include/linux/notifier.h
> @@ -211,6 +211,7 @@ static inline int notifier_to_errno(int ret)
> #define NETDEV_UNREGISTER_BATCH 0x0011
> #define NETDEV_BONDING_DESLAVE 0x0012
> #define NETDEV_NOTIFY_PEERS 0x0013
> +#define NETDEV_ENSLAVE 0x0014
>
Nit:
Shouldn't this be NETDEV_BONDING_ENSLAVE, to keep it in line with
NETDEV_BONDING_DESLAVE above?
> #define SYS_DOWN 0x0001 /* Notify of system down */
> #define SYS_RESTART SYS_DOWN
>
Other than those two points, this looks good to me
Thanks!
Neil
next prev parent reply other threads:[~2011-05-18 10:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 10:00 Amerigo Wang
2011-05-18 10:56 ` Neil Horman [this message]
2011-05-19 5:13 ` Cong Wang
2011-05-19 11:03 ` Neil Horman
2011-05-19 8:39 ` [V2 Patch " Amerigo Wang
2011-05-19 10:24 ` [Patch] bridge: call NETDEV_ENSLAVE notifiers when adding a slave Amerigo Wang
2011-05-19 15:12 ` Stephen Hemminger
2011-05-19 16:04 ` [Bridge] " Stephen Hemminger
2011-05-20 3:06 ` Cong Wang
2011-05-19 11:31 ` [V2 Patch net-next-2.6] netpoll: disable netpoll when enslave a device Andy Gospodarek
2011-05-19 13:25 ` Neil Horman
2011-05-20 3:10 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110518105558.GA3203@hmsreliant.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=amwang@redhat.com \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=fubar@us.ibm.com \
--cc=ian.campbell@citrix.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=wferi@niif.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®