bridge: update sysfs link names if port device names have changed
Subsystems (4)
PATCH 1/1 bridge: update sysfs link names if port device names have changed
Links for each port are created in sysfs using the device name, but this could be changed after being added to the bridge.
As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link.
This fixes the problem by listening for NETDEV_CHANGENAME notifications and renaming the link.
https://bugzilla.kernel.org/show_bug.cgi?id=12743
--- fs/sysfs/symlink.c | 1 + net/bridge/br_if.c | 2 +- net/bridge/br_notify.c | 4 ++++ net/bridge/br_private.h | 5 +++++ net/bridge/br_sysfs_if.c | 19 +++++++++++++++++-- 5 files changed, 28 insertions(+), 3 deletions(-)
fs/sysfs/symlink.c +1 -0
@@ -261,3 +261,4 @@ const struct inode_operations sysfs_symlink_inode_operations = {EXPORT_SYMBOL_GPL (sysfs_create_link);EXPORT_SYMBOL_GPL (sysfs_remove_link); +EXPORT_SYMBOL_GPL (sysfs_rename_link);
net/bridge/br_if.c +1 -1
@@ -132,7 +132,7 @@ static void del_nbp(struct net_bridge_port *p)struct net_bridge *br = p->br;struct net_device *dev = p->dev; -sysfs_remove_link (br->ifobj, dev->name); +sysfs_remove_link (br->ifobj, p->sysfs_name);dev_set_promiscuity (dev,-1 );
net/bridge/br_notify.c +4 -0
@@ -82,6 +82,10 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, vcase NETDEV_UNREGISTER :br_del_if (br, dev);break ; + +case NETDEV_CHANGENAME : +br_sysfs_renameif (p); +break ; }/* Events that may cause spanning tree to refresh */
net/bridge/br_private.h +5 -0
@@ -96,6 +96,9 @@ struct net_bridge_port {struct net_bridge *br;struct net_device *dev; +#ifdef CONFIG_SYSFS +char sysfs_name[IFNAMSIZ ]; +#endif struct list_head list;/* STP */
@@ -433,6 +436,7 @@ extern void br_ifinfo_notify(int event, struct net_bridge_port *port);/* br_sysfs_if.c */ extern const struct sysfs_ops brport_sysfs_ops;extern int br_sysfs_addif (struct net_bridge_port *p); +extern void br_sysfs_renameif (struct net_bridge_port *p);/* br_sysfs_br.c */ extern int br_sysfs_addbr (struct net_device *dev);
@@ -441,6 +445,7 @@ extern void br_sysfs_delbr(struct net_device *dev);#else #define br_sysfs_addif (p) (0) +#define br_sysfs_renameif (p) do { } while(0)#define br_sysfs_addbr (dev) (0)#define br_sysfs_delbr (dev) do { } while(0)#endif /* CONFIG_SYSFS */
net/bridge/br_sysfs_if.c +17 -2
@@ -246,7 +246,7 @@ const struct sysfs_ops brport_sysfs_ops = {/* * Add sysfs entries to ethernet device added to a bridge. * Creates a brport subdirectory with bridge attributes. -* Puts symlink in bridge's brport subdirectory +* Puts symlink in bridge's brif subdirectory */ int br_sysfs_addif (struct net_bridge_port *p) {
@@ -265,7 +265,22 @@ int br_sysfs_addif(struct net_bridge_port *p) goto out2; } - err =sysfs_create_link (br->ifobj, &p->kobj, p->dev->name); +strncpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); + err =sysfs_create_link (br->ifobj, &p->kobj, p->sysfs_name); out2:return err; } + +/* Rename bridge's brif symlink */ +void br_sysfs_renameif (struct net_bridge_port *p) +{ +struct net_bridge *br = p->br; +int err; + + err =sysfs_rename_link (br->ifobj, &p->kobj, + p->sysfs_name, p->dev->name); +if (err) +printk (KERN_ERR "%s: unable to rename sysfs link %s to %s (%d)" , + br->dev->name, p->sysfs_name, p->dev->name, err); +strncpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); +}
Signature · 4 lines
1.7.0.4 -- Simon Arlott
Quoted 66 lines · On Thu, 06 May 2010 19:32:29 +0100 Simon Arlott <[email protected]> wrote:
Links for each port are created in sysfs using the device name, but this could be changed after being added to the bridge.
As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link.
This fixes the problem by listening for
NETDEV_CHANGENAMEnotifications and renaming the link.https://bugzilla.kernel.org/show_bug.cgi?id=12743
Signed-off-by Simon Arlott <[email protected]>--- fs/sysfs/symlink.c | 1 + net/bridge/br_if.c | 2 +- net/bridge/br_notify.c | 4 ++++ net/bridge/br_private.h | 5 +++++ net/bridge/br_sysfs_if.c | 19 +++++++++++++++++-- 5 files changed, 28 insertions(+), 3 deletions(-)fs/sysfs/symlink.c +1
-0@@ -261,3 +261,4 @@ const struct inode_operations sysfs_symlink_inode_operations = {EXPORT_SYMBOL_GPL (sysfs_create_link);EXPORT_SYMBOL_GPL (sysfs_remove_link); +EXPORT_SYMBOL_GPL (sysfs_rename_link);net/bridge/br_if.c +1
-1@@ -132,7 +132,7 @@ static void del_nbp(struct net_bridge_port *p)struct net_bridge *br = p->br;struct net_device *dev = p->dev; -sysfs_remove_link (br->ifobj, dev->name); +sysfs_remove_link (br->ifobj, p->sysfs_name);dev_set_promiscuity (dev,-1 );net/bridge/br_notify.c +4
-0@@ -82,6 +82,10 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, vcase NETDEV_UNREGISTER :br_del_if (br, dev);break ; + +case NETDEV_CHANGENAME : +br_sysfs_renameif (p); +break ; }/* Events that may cause spanning tree to refresh */ net/bridge/br_private.h +0
-0
net/bridge/br_private.h struct net_bridge_port · line 102
Quoted 7 lines
net/bridge/br_private.h +3
-0@@ -96,6 +96,9 @@ struct net_bridge_port {struct net_bridge *br;struct net_device *dev; +#ifdef CONFIG_SYSFS +char sysfs_name[IFNAMSIZ ]; +#endif struct list_head list;
Ok, but the sysfs_name should go at end of net_bridge_port structure since it is only used in special case code. And putting in middle of structure kills cache locality.
PATCH 1/1 bridge: update sysfs link names if port device names have changed
In reply to Simon ArlottLinks for each port are created in sysfs using the device name, but this could be changed after being added to the bridge.
As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link.
This fixes the problem by listening for NETDEV_CHANGENAME notifications and renaming the link.
https://bugzilla.kernel.org/show_bug.cgi?id=12743
---
Updated to force rename rollback if sysfs_rename_link fails.
fs/sysfs/symlink.c | 1 + net/bridge/br_if.c | 2 +- net/bridge/br_notify.c | 7 +++++++ net/bridge/br_private.h | 5 +++++ net/bridge/br_sysfs_if.c | 29 +++++++++++++++++++++++++++-- 5 files changed, 41 insertions(+), 3 deletions(-)
fs/sysfs/symlink.c +1 -0
@@ -261,3 +261,4 @@ const struct inode_operations sysfs_symlink_inode_operations = {EXPORT_SYMBOL_GPL (sysfs_create_link);EXPORT_SYMBOL_GPL (sysfs_remove_link); +EXPORT_SYMBOL_GPL (sysfs_rename_link);
net/bridge/br_if.c +1 -1
@@ -132,7 +132,7 @@ static void del_nbp(struct net_bridge_port *p)struct net_bridge *br = p->br;struct net_device *dev = p->dev; -sysfs_remove_link (br->ifobj, dev->name); +sysfs_remove_link (br->ifobj, p->sysfs_name);dev_set_promiscuity (dev,-1 );
net/bridge/br_notify.c +7 -0
@@ -34,6 +34,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, vstruct net_device *dev = ptr;struct net_bridge_port *p = dev->br_port;struct net_bridge *br; +int err;/* not a port of a bridge */ if (p ==NULL )
@@ -82,6 +83,12 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, vcase NETDEV_UNREGISTER :br_del_if (br, dev);break ; + +case NETDEV_CHANGENAME : + err =br_sysfs_renameif (p); +if (err) +return NOTIFY_BAD ; +break ; }/* Events that may cause spanning tree to refresh */
net/bridge/br_private.h +5 -0
@@ -96,6 +96,9 @@ struct net_bridge_port {struct net_bridge *br;struct net_device *dev; +#ifdef CONFIG_SYSFS +char sysfs_name[IFNAMSIZ ]; +#endif struct list_head list;/* STP */
@@ -433,6 +436,7 @@ extern void br_ifinfo_notify(int event, struct net_bridge_port *port);/* br_sysfs_if.c */ extern const struct sysfs_ops brport_sysfs_ops;extern int br_sysfs_addif (struct net_bridge_port *p); +extern int br_sysfs_renameif (struct net_bridge_port *p);/* br_sysfs_br.c */ extern int br_sysfs_addbr (struct net_device *dev);
@@ -441,6 +445,7 @@ extern void br_sysfs_delbr(struct net_device *dev);#else #define br_sysfs_addif (p) (0) +#define br_sysfs_renameif (p) (0)#define br_sysfs_addbr (dev) (0)#define br_sysfs_delbr (dev) do { } while(0)#endif /* CONFIG_SYSFS */
net/bridge/br_sysfs_if.c +27 -2
@@ -246,7 +246,7 @@ const struct sysfs_ops brport_sysfs_ops = {/* * Add sysfs entries to ethernet device added to a bridge. * Creates a brport subdirectory with bridge attributes. -* Puts symlink in bridge's brport subdirectory +* Puts symlink in bridge's brif subdirectory */ int br_sysfs_addif (struct net_bridge_port *p) {
@@ -265,7 +265,32 @@ int br_sysfs_addif(struct net_bridge_port *p) goto out2; } - err =sysfs_create_link (br->ifobj, &p->kobj, p->dev->name); +strncpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); + err =sysfs_create_link (br->ifobj, &p->kobj, p->sysfs_name); out2:return err; } + +/* Rename bridge's brif symlink */ +int br_sysfs_renameif (struct net_bridge_port *p) +{ +struct net_bridge *br = p->br; +int err; + +/* If a rename fails, the rollback will cause another +* rename call with the existing name. +*/ +if (!strncmp (p->sysfs_name, p->dev->name,IFNAMSIZ )) +return 0 ; + + err =sysfs_rename_link (br->ifobj, &p->kobj, + p->sysfs_name, p->dev->name); +if (err) { +printk (KERN_ERR "%s: unable to rename sysfs link %s to %s (%d)" , + br->dev->name, p->sysfs_name, p->dev->name, err); + }else { +strncpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); + } + +return err; +}
Signature · 4 lines
1.7.0.4 -- Simon Arlott
net/bridge/br_notify.c static int br_device_event(struct notifier_block *unused, unsigned long event, v · line 91
Quoted 6 lines · On Thu, 06 May 2010 20:01:44 +0100 Simon Arlott <[email protected]> wrote:
net/bridge/br_notify.c +6
-0+ +case NETDEV_CHANGENAME : + err =br_sysfs_renameif (p); +if (err) +return NOTIFY_BAD ; +break ;
I think you want:
if (err)
return notifier_from_errno(err);
+ err = sysfs_rename_link(br->ifobj, &p->kobj,
+ p->sysfs_name, p->dev->name);
+ if (err) {
+ printk(KERN_ERR "%s: unable to rename sysfs link %s to %s (%d)",
+ br->dev->name, p->sysfs_name, p->dev->name, err);
This should not be KERN_ERR but KERN_NOTICE, and use new wrapper macros.
if (err) netdev_notice(br->dev, "unable to rename sysfs link %s to %s". p->sysfs_name, p->dev->name, err)
PATCH 1/1 bridge: update sysfs link names if port device names have changed
Links for each port are created in sysfs using the device name, but this could be changed after being added to the bridge.
As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link.
This fixes the problem by listening for NETDEV_CHANGENAME notifications and renaming the link.
https://bugzilla.kernel.org/show_bug.cgi?id=12743
---
Updated notifier return value and error message logging. Changed to use strlcpy instead of strncpy.
fs/sysfs/symlink.c | 1 + net/bridge/br_if.c | 2 +- net/bridge/br_notify.c | 7 +++++++ net/bridge/br_private.h | 6 ++++++ net/bridge/br_sysfs_if.c | 29 +++++++++++++++++++++++++++-- 5 files changed, 42 insertions(+), 3 deletions(-)
fs/sysfs/symlink.c +1 -0
@@ -261,3 +261,4 @@ const struct inode_operations sysfs_symlink_inode_operations = {EXPORT_SYMBOL_GPL (sysfs_create_link);EXPORT_SYMBOL_GPL (sysfs_remove_link); +EXPORT_SYMBOL_GPL (sysfs_rename_link);
net/bridge/br_if.c +1 -1
@@ -132,7 +132,7 @@ static void del_nbp(struct net_bridge_port *p)struct net_bridge *br = p->br;struct net_device *dev = p->dev; -sysfs_remove_link (br->ifobj, dev->name); +sysfs_remove_link (br->ifobj, p->sysfs_name);dev_set_promiscuity (dev,-1 );
net/bridge/br_notify.c +7 -0
@@ -34,6 +34,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, vstruct net_device *dev = ptr;struct net_bridge_port *p = dev->br_port;struct net_bridge *br; +int err;/* not a port of a bridge */ if (p ==NULL )
@@ -82,6 +83,12 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, vcase NETDEV_UNREGISTER :br_del_if (br, dev);break ; + +case NETDEV_CHANGENAME : + err =br_sysfs_renameif (p); +if (err) +return notifier_from_errno (err); +break ; }/* Events that may cause spanning tree to refresh */
net/bridge/br_private.h +6 -0
@@ -128,6 +128,10 @@ struct net_bridge_portstruct hlist_head mglist;struct hlist_node rlist;#endif + +#ifdef CONFIG_SYSFS +char sysfs_name[IFNAMSIZ ]; +#endif };struct net_bridge
@@ -433,6 +437,7 @@ extern void br_ifinfo_notify(int event, struct net_bridge_port *port);/* br_sysfs_if.c */ extern const struct sysfs_ops brport_sysfs_ops;extern int br_sysfs_addif (struct net_bridge_port *p); +extern int br_sysfs_renameif (struct net_bridge_port *p);/* br_sysfs_br.c */ extern int br_sysfs_addbr (struct net_device *dev);
@@ -441,6 +446,7 @@ extern void br_sysfs_delbr(struct net_device *dev);#else #define br_sysfs_addif (p) (0) +#define br_sysfs_renameif (p) (0)#define br_sysfs_addbr (dev) (0)#define br_sysfs_delbr (dev) do { } while(0)#endif /* CONFIG_SYSFS */
net/bridge/br_sysfs_if.c +27 -2
@@ -246,7 +246,7 @@ const struct sysfs_ops brport_sysfs_ops = {/* * Add sysfs entries to ethernet device added to a bridge. * Creates a brport subdirectory with bridge attributes. -* Puts symlink in bridge's brport subdirectory +* Puts symlink in bridge's brif subdirectory */ int br_sysfs_addif (struct net_bridge_port *p) {
@@ -265,7 +265,32 @@ int br_sysfs_addif(struct net_bridge_port *p) goto out2; } - err =sysfs_create_link (br->ifobj, &p->kobj, p->dev->name); +strlcpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); + err =sysfs_create_link (br->ifobj, &p->kobj, p->sysfs_name); out2:return err; } + +/* Rename bridge's brif symlink */ +int br_sysfs_renameif (struct net_bridge_port *p) +{ +struct net_bridge *br = p->br; +int err; + +/* If a rename fails, the rollback will cause another +* rename call with the existing name. +*/ +if (!strncmp (p->sysfs_name, p->dev->name,IFNAMSIZ )) +return 0 ; + + err =sysfs_rename_link (br->ifobj, &p->kobj, + p->sysfs_name, p->dev->name); +if (err) { +netdev_notice (br->dev,"unable to rename sysfs link %s to %s (%d)" , + p->sysfs_name, p->dev->name, err); + }else { +strlcpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); + } + +return err; +}
Signature · 4 lines
1.7.0.4 -- Simon Arlott
Quoted 10 lines · On Thu, 06 May 2010 20:37:11 +0100 Simon Arlott <[email protected]> wrote:
Links for each port are created in sysfs using the device name, but this could be changed after being added to the bridge.
As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link.
Quoted 6 lines
This fixes the problem by listening for
NETDEV_CHANGENAMEnotifications and renaming the link.https://bugzilla.kernel.org/show_bug.cgi?id=12743
Signed-off-by Simon Arlott <[email protected]>
Looks good
PATCH 1/1 bridge: update sysfs link names if port device names have changed
In reply to Simon ArlottFrom: Simon Arlott <[email protected]>
Links for each port are created in sysfs using the device name, but this could be changed after being added to the bridge.
As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link.
This fixes the problem by listening for NETDEV_CHANGENAME notifications and renaming the link.
https://bugzilla.kernel.org/show_bug.cgi?id=12743
---
Modified to apply to net-next and fix checkpatch warnings -- Stephen
fs/sysfs/symlink.c | 1 + net/bridge/br_if.c | 2 +- net/bridge/br_notify.c | 7 +++++++ net/bridge/br_private.h | 6 ++++++ net/bridge/br_sysfs_if.c | 32 +++++++++++++++++++++++++++----- 5 files changed, 42 insertions(+), 6 deletions(-)
fs/sysfs/symlink.c +1 -0
@@ -261,3 +261,4 @@ const struct inode_operations sysfs_symlEXPORT_SYMBOL_GPL (sysfs_create_link);EXPORT_SYMBOL_GPL (sysfs_remove_link); +EXPORT_SYMBOL_GPL (sysfs_rename_link);
net/bridge/br_if.c +1 -1
@@ -133,7 +133,7 @@ static void del_nbp(struct net_bridge_postruct net_bridge *br = p->br;struct net_device *dev = p->dev; -sysfs_remove_link (br->ifobj, dev->name); +sysfs_remove_link (br->ifobj, p->sysfs_name);dev_set_promiscuity (dev,-1 );
net/bridge/br_notify.c +7 -0
@@ -34,6 +34,7 @@ static int br_device_event(struct notifistruct net_device *dev = ptr;struct net_bridge_port *p = dev->br_port;struct net_bridge *br; +int err;/* not a port of a bridge */ if (p ==NULL )
@@ -83,6 +84,12 @@ static int br_device_event(struct notifibr_del_if (br, dev);break ; +case NETDEV_CHANGENAME : + err =br_sysfs_renameif (p); +if (err) +return notifier_from_errno (err); +break ; +case NETDEV_PRE_TYPE_CHANGE :/* Forbid underlaying device to change its type. */ return NOTIFY_BAD ;
net/bridge/br_private.h +6 -0
@@ -139,6 +139,10 @@ struct net_bridge_portstruct hlist_head mglist;struct hlist_node rlist;#endif + +#ifdef CONFIG_SYSFS +char sysfs_name[IFNAMSIZ ]; +#endif };struct br_cpu_netstats {
@@ -455,6 +459,7 @@ extern void br_ifinfo_notify(int event,/* br_sysfs_if.c */ extern const struct sysfs_ops brport_sysfs_ops;extern int br_sysfs_addif (struct net_bridge_port *p); +extern int br_sysfs_renameif (struct net_bridge_port *p);/* br_sysfs_br.c */ extern int br_sysfs_addbr (struct net_device *dev);
@@ -463,6 +468,7 @@ extern void br_sysfs_delbr(struct net_de#else #define br_sysfs_addif (p) (0) +#define br_sysfs_renameif (p) (0)#define br_sysfs_addbr (dev) (0)#define br_sysfs_delbr (dev) do { } while(0)#endif /* CONFIG_SYSFS */
net/bridge/br_sysfs_if.c +27 -5
@@ -246,7 +246,7 @@ const struct sysfs_ops brport_sysfs_ops/* * Add sysfs entries to ethernet device added to a bridge. * Creates a brport subdirectory with bridge attributes. -* Puts symlink in bridge's brport subdirectory +* Puts symlink in bridge's brif subdirectory */ int br_sysfs_addif (struct net_bridge_port *p) {
@@ -257,15 +257,37 @@ int br_sysfs_addif(struct net_bridge_por err =sysfs_create_link (&p->kobj, &br->dev->dev.kobj,SYSFS_BRIDGE_PORT_LINK );if (err) - goto out2; +return err;for (a = brport_attrs; *a; ++a) { err =sysfs_create_file (&p->kobj, &((*a)->attr));if (err) - goto out2; +return err; } - err =sysfs_create_link (br->ifobj, &p->kobj, p->dev->name); -out2: +strlcpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); +return sysfs_create_link (br->ifobj, &p->kobj, p->sysfs_name); +} + +/* Rename bridge's brif symlink */ +int br_sysfs_renameif (struct net_bridge_port *p) +{ +struct net_bridge *br = p->br; +int err; + +/* If a rename fails, the rollback will cause another +* rename call with the existing name. +*/ +if (!strncmp (p->sysfs_name, p->dev->name,IFNAMSIZ )) +return 0 ; + + err =sysfs_rename_link (br->ifobj, &p->kobj, + p->sysfs_name, p->dev->name); +if (err) +netdev_notice (br->dev,"unable to rename link %s to %s" , + p->sysfs_name, p->dev->name); +else +strlcpy (p->sysfs_name, p->dev->name,IFNAMSIZ ); +return err; }