Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932287AbZD3Qt1 (ORCPT ); Thu, 30 Apr 2009 12:49:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762699AbZD3QtO (ORCPT ); Thu, 30 Apr 2009 12:49:14 -0400 Received: from waste.org ([66.93.16.53]:45216 "EHLO waste.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757809AbZD3QtN (ORCPT ); Thu, 30 Apr 2009 12:49:13 -0400 Subject: Re: [PATCH, resend] netconsole: take care of NETDEV_UNREGISTER event From: Matt Mackall To: Bruno =?ISO-8859-1?Q?Pr=E9mont?= Cc: David Miller , netdev@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20090430084517.6de15689@pluto.restena.lu> References: <20090429223722.62da9dcd@neptune.home> <20090429225625.75a016ff@neptune.home> <20090429.144420.262432582.davem@davemloft.net> <20090430084517.6de15689@pluto.restena.lu> Content-Type: text/plain; charset="UTF-8" Date: Thu, 30 Apr 2009 11:48:35 -0500 Message-Id: <1241110115.938.1603.camel@calx> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2372 Lines: 62 On Thu, 2009-04-30 at 08:45 +0200, Bruno Prémont wrote: > When netconsole is loaded and a network interface fades away (e.g. on > rmmod $interface_driver_module) the rmmod remains stuck and some locks > are taken that prevent any additional module loading/unloading as well > as interface up/down changes. > In addition kernel logs (and console) get flooded at 10s interval with > > [ 122.464065] unregister_netdevice: waiting for eth0 to become free. Usage count = 1 > [ 132.704059] unregister_netdevice: waiting for eth0 to become free. Usage count = 1 > > This patch lets netconsole take NETDEV_UNREGISTER event into account > and release the affected interface if it was in use. > > Signed-off-by: Bruno Prémont Acked-by: Matt Mackall > --- > diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c > index eceadf7..bf4af52 100644 > --- a/drivers/net/netconsole.c > +++ b/drivers/net/netconsole.c > @@ -664,7 +664,7 @@ static int netconsole_netdev_event(struct notifier_block *this, > struct netconsole_target *nt; > struct net_device *dev = ptr; > > - if (!(event == NETDEV_CHANGENAME)) > + if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER)) > goto done; > > spin_lock_irqsave(&target_list_lock, flags); > @@ -675,6 +675,15 @@ static int netconsole_netdev_event(struct notifier_block *this, > case NETDEV_CHANGENAME: > strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); > break; > + case NETDEV_UNREGISTER: > + if (!nt->enabled) > + break; > + netpoll_cleanup(&nt->np); > + nt->enabled = 0; > + printk(KERN_INFO "netconsole: network logging stopped" > + ", interface %s unregistered\n", > + dev->name); > + break; > } > } > netconsole_target_put(nt); > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- http://selenic.com : development and support for Mercurial and Linux -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/