Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761162AbZD2UrY (ORCPT ); Wed, 29 Apr 2009 16:47:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757674AbZD2UrI (ORCPT ); Wed, 29 Apr 2009 16:47:08 -0400 Received: from ppp-111-233.adsl.restena.lu ([158.64.111.233]:54480 "EHLO bonbons.gotdns.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754549AbZD2UrF convert rfc822-to-8bit (ORCPT ); Wed, 29 Apr 2009 16:47:05 -0400 X-Greylist: delayed 579 seconds by postgrey-1.27 at vger.kernel.org; Wed, 29 Apr 2009 16:47:04 EDT Date: Wed, 29 Apr 2009 22:37:22 +0200 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= To: David Miller Cc: linux-netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netconsole: take care of NETDEV_UNREGISTER event Message-ID: <20090429223722.62da9dcd@neptune.home> X-Mailer: Claws Mail 3.7.0 (GTK+ 2.14.7; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1855 Lines: 48 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 --- 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/