From: Keiichi KII <k-keiichi@bx.jp.nec.com>
To: mpm@selenic.com
Cc: davem@davemloft.net, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [RFC][PATCH -mm take4 4/6] using symlink for the net_device
Date: Wed, 18 Apr 2007 21:11:14 +0900 [thread overview]
Message-ID: <46260AE2.9080107@bx.jp.nec.com> (raw)
In-Reply-To: <462605DC.2080804@bx.jp.nec.com>
From: Keiichi KII <k-keiichi@bx.jp.nec.com>
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:<net_dev> [rw-r--r--] net_dev: eth0,eth1,...
| ...
|--- port2/
...
Signed-off-by: Keiichi KII <k-keiichi@bx.jp.nec.com>
Signed-off-by: Takayoshi Kochi <t-kochi@bq.jp.nec.com>
---
Index: mm/drivers/net/netconsole.c
===================================================================
--- mm.orig/drivers/net/netconsole.c
+++ mm/drivers/net/netconsole.c
@@ -81,6 +81,9 @@ static int add_target(char* target_confi
static void remove_target(struct netconsole_target *nt);
static void cleanup_netconsole(void);
static int setup_target_sysfs(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;
@@ -274,12 +277,77 @@ static struct miscdevice netconsole_misc
.name = "netconsole",
};
+static struct notifier_block netconsole_notifier = {
+ .notifier_call = netconsole_event,
+};
+
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 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 int add_target(char* target_config)
@@ -409,6 +477,7 @@ static int __init init_netconsole(void)
} else
miscdev_configured = 1;
+ register_netdevice_notifier(&netconsole_notifier);
register_console(&netconsole);
if(!strlen(config)) {
printk(KERN_ERR "netconsole: not configured\n");
@@ -443,6 +512,7 @@ static void cleanup_netconsole(void)
list_for_each_entry_safe(nt, tmp, &target_list, list) {
kobject_unregister(&nt->obj);
}
+ unregister_netdevice_notifier(&netconsole_notifier);
if (miscdev_configured)
misc_deregister(&netconsole_miscdev);
#else
--
next prev parent reply other threads:[~2007-04-18 12:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <462605DC.2080804@bx.jp.nec.com>
2007-04-18 12:05 ` [RFC][PATCH -mm take4 1/6] marking __init Keiichi KII
2007-04-18 12:06 ` [RFC][PATCH -mm take4 2/6] support multiple logging Keiichi KII
2007-04-18 14:40 ` Stephen Hemminger
2007-04-20 9:58 ` Keiichi KII
2007-04-20 4:08 ` Andrew Morton
2007-04-20 9:51 ` Keiichi KII
2007-04-20 18:15 ` Andrew Morton
2007-04-20 18:21 ` Matt Mackall
2007-04-20 19:00 ` Stephen Hemminger
2007-04-24 8:14 ` Keiichi KII
2007-04-24 8:14 ` Keiichi KII
2007-04-24 8:29 ` Andrew Morton
2007-04-24 15:21 ` Stephen Hemminger
2007-04-26 4:02 ` Keiichi KII
2007-04-26 4:45 ` David Miller
2007-04-18 12:08 ` [RFC][PATCH -mm take4 3/6] add interface for netconsole using sysfs Keiichi KII
2007-04-20 4:06 ` Andrew Morton
2007-04-18 12:11 ` Keiichi KII [this message]
2007-04-20 4:12 ` [RFC][PATCH -mm take4 4/6] using symlink for the net_device Andrew Morton
2007-04-18 12:12 ` [RFC][PATCH -mm take4 5/6] switch function of netpoll Keiichi KII
2007-04-18 12:14 ` [RFC][PATCH -mm take4 6/6] add ioctls for adding/removing target Keiichi KII
2007-04-20 4:16 ` Andrew Morton
2007-04-20 5:39 ` Stephen Hemminger
2007-04-20 6:59 ` David Miller
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=46260AE2.9080107@bx.jp.nec.com \
--to=k-keiichi@bx.jp.nec.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.