From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keiichi KII Subject: [RFC][PATCH -mm take3 4/6][resend] using symlink for the net_device Date: Tue, 20 Mar 2007 21:30:07 +0900 Message-ID: <45FFD3CF.2010409@bx.jp.nec.com> References: <45FFCF31.3040000@bx.jp.nec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org To: mpm@selenic.com Return-path: Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:39860 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932750AbXCTMaN (ORCPT ); Tue, 20 Mar 2007 08:30:13 -0400 In-Reply-To: <45FFCF31.3040000@bx.jp.nec.com> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Keiichi KII We use symbolic link for net_device. The link in sysfs represents the corresponding network etherdevice. -+- /sys/class/misc/ |-+- netconsole/ |-+- port1/ | |--- id [r--r--r--] id | |--- net: [rw-r--r--] net_dev: eth0,eth1,... | ... |--- port2/ ... Signed-off-by: Keiichi KII Signed-off-by: Takayoshi Kochi --- Index: linux-mm/drivers/net/netconsole.c =================================================================== --- linux-mm.orig/drivers/net/netconsole.c +++ linux-mm/drivers/net/netconsole.c @@ -77,6 +77,9 @@ static int add_target(char* target_confi static int setup_target_sysfs(struct netconsole_target *nt); static void cleanup_netconsole(void); static void delete_target(struct netconsole_target *nt); +static char* make_netdev_class_name(char *netdev_name); +static int netconsole_event(struct notifier_block *this, unsigned long event, + void *ptr); static int miscdev_configured; @@ -275,6 +278,10 @@ static struct netpoll np = { .remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, }; +static struct notifier_block netconsole_notifier = { + .notifier_call = netconsole_event, +}; + static int add_target(char* target_config) { int retval = 0; @@ -322,10 +329,20 @@ static int add_target(char* target_confi static int setup_target_sysfs(struct netconsole_target *nt) { + int retval = 0; + char *name; + kobject_set_name(&nt->obj, "port%d", nt->id); nt->obj.parent = &netconsole_miscdev.this_device->kobj; nt->obj.ktype = &target_ktype; - return kobject_register(&nt->obj); + retval = kobject_register(&nt->obj); + name = make_netdev_class_name(nt->np.dev_name); + if (IS_ERR(name)) + return PTR_ERR(name); + retval = sysfs_create_link(&nt->obj, &nt->np.dev->dev.kobj, name); + kfree(name); + + return retval; } static void delete_target(struct netconsole_target *nt) @@ -337,6 +354,57 @@ static void delete_target(struct netcons kfree(nt); } +static char* make_netdev_class_name(char *netdev_name) +{ + int size; + char *name; + char *netdev_class_prefix = "net:"; + + size = strlen(netdev_class_prefix) + strlen(netdev_name) + 1; + name = kmalloc(size, GFP_KERNEL); + if (!name) { + printk(KERN_ERR "netconsole: kmalloc() failed!\n"); + return ERR_PTR(-ENOMEM); + } + strcpy(name, netdev_class_prefix); + strcat(name, netdev_name); + + return name; +} + +static int netconsole_event(struct notifier_block *this, unsigned long event, + void *ptr) +{ + int error = 0; + char *old_link_name = NULL, *new_link_name = NULL; + struct netconsole_target *nt; + struct net_device *dev = ptr; + + if (event == NETDEV_CHANGENAME) { + spin_lock(&target_list_lock); + list_for_each_entry(nt, &target_list, list) { + if (nt->np.dev != dev) + continue; + new_link_name = make_netdev_class_name(dev->name); + old_link_name = + make_netdev_class_name(nt->np.dev_name); + sysfs_remove_link(&nt->obj, old_link_name); + error = sysfs_create_link(&nt->obj, + &nt->np.dev->dev.kobj, + new_link_name); + if (error) + printk(KERN_ERR "can't create link: %s\n", + new_link_name); + strcpy(nt->np.dev_name, dev->name); + kfree(new_link_name); + kfree(old_link_name); + } + spin_unlock(&target_list_lock); + } + + return NOTIFY_DONE; +} + static void write_msg(struct console *con, const char *msg, unsigned int len) { int frag, left; @@ -393,6 +461,7 @@ static int __init init_netconsole(void) miscdev_configured = 1; register_console(&netconsole); + register_netdevice_notifier(&netconsole_notifier); if(!strlen(config)) { printk(KERN_ERR "netconsole: not configured\n"); @@ -416,6 +485,7 @@ static void cleanup_netconsole(void) struct netconsole_target *nt, *tmp; unregister_console(&netconsole); + unregister_netdevice_notifier(&netconsole_notifier); list_for_each_entry_safe(nt, tmp, &target_list, list) { kobject_unregister(&nt->obj); } --