* [PATCH 0/2] bonding: add the debugfs interface to see RLB hash table @ 2010-12-03 2:51 Taku Izumi 2010-12-03 2:54 ` [PATCH 1/2] bonding: add the debugfs facility to the bonding driver Taku Izumi 2010-12-03 2:55 ` [PATCH 2/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi 0 siblings, 2 replies; 5+ messages in thread From: Taku Izumi @ 2010-12-03 2:51 UTC (permalink / raw) To: netdev@vger.kernel.org, Jay Vosburgh; +Cc: eric.dumazet, shemminger This patchset provides the debugfs facility to the bonding driver and the interface to see RLB hashtable in it. *[PATCH 1/2] bonding: add the debugfs facility to the bonding driver *[PATCH 2/2] bonding: add the debugfs interface to see RLB hash table Best regards, Taku Izumi ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] bonding: add the debugfs facility to the bonding driver 2010-12-03 2:51 [PATCH 0/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi @ 2010-12-03 2:54 ` Taku Izumi 2010-12-03 3:37 ` Jay Vosburgh 2010-12-03 2:55 ` [PATCH 2/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi 1 sibling, 1 reply; 5+ messages in thread From: Taku Izumi @ 2010-12-03 2:54 UTC (permalink / raw) To: netdev@vger.kernel.org, Jay Vosburgh; +Cc: eric.dumazet, shemminger This patch provides the debugfs facility to the bonding driver. The "bonding" directory is created in the debugfs root and directories of each bonding interface (like bond0, bond1...) are created in that. # mount -t debugfs none /sys/kernel/debug # ls /sys/kernel/debug/bonding bond0 bond1 Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com> --- drivers/net/bonding/Makefile | 2 drivers/net/bonding/bond_debugfs.c | 90 +++++++++++++++++++++++++++++++++++++ drivers/net/bonding/bond_main.c | 10 +++- drivers/net/bonding/bonding.h | 7 ++ 4 files changed, 107 insertions(+), 2 deletions(-) Index: net-next/drivers/net/bonding/bond_main.c =================================================================== --- net-next.orig/drivers/net/bonding/bond_main.c +++ net-next/drivers/net/bonding/bond_main.c @@ -3507,6 +3507,8 @@ static int bond_event_changename(struct bond_remove_proc_entry(bond); bond_create_proc_entry(bond); + bond_debug_reregister(bond); + return NOTIFY_DONE; } @@ -4789,6 +4791,8 @@ static void bond_uninit(struct net_devic bond_remove_proc_entry(bond); + bond_debug_unregister(bond); + __hw_addr_flush(&bond->mc_list); list_for_each_entry_safe(vlan, tmp, &bond->vlan_list, vlan_list) { @@ -5191,6 +5195,8 @@ static int bond_init(struct net_device * bond_prepare_sysfs_group(bond); + bond_debug_register(bond); + __hw_addr_init(&bond->mc_list); return 0; } @@ -5312,6 +5318,8 @@ static int __init bonding_init(void) if (res) goto err_link; + bond_create_debugfs(); + for (i = 0; i < max_bonds; i++) { res = bond_create(&init_net, NULL); if (res) @@ -5322,7 +5330,6 @@ static int __init bonding_init(void) if (res) goto err; - register_netdevice_notifier(&bond_netdev_notifier); register_inetaddr_notifier(&bond_inetaddr_notifier); bond_register_ipv6_notifier(); @@ -5346,6 +5353,7 @@ static void __exit bonding_exit(void) bond_unregister_ipv6_notifier(); bond_destroy_sysfs(); + bond_destroy_debugfs(); rtnl_link_unregister(&bond_link_ops); unregister_pernet_subsys(&bond_net_ops); Index: net-next/drivers/net/bonding/Makefile =================================================================== --- net-next.orig/drivers/net/bonding/Makefile +++ net-next/drivers/net/bonding/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_BONDING) += bonding.o -bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o +bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o bond_debugfs.o ipv6-$(subst m,y,$(CONFIG_IPV6)) += bond_ipv6.o bonding-objs += $(ipv6-y) Index: net-next/drivers/net/bonding/bond_debugfs.c =================================================================== --- /dev/null +++ net-next/drivers/net/bonding/bond_debugfs.c @@ -0,0 +1,90 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/netdevice.h> + +#include "bonding.h" + +#ifdef CONFIG_DEBUG_FS + +#include <linux/debugfs.h> +#include <linux/seq_file.h> + +static struct dentry *bonding_debug_root; + +void bond_debug_register(struct bonding *bond) +{ + if (!bonding_debug_root) + return; + + bond->debug_dir = + debugfs_create_dir(bond->dev->name, bonding_debug_root); + + if (!bond->debug_dir) { + pr_warning("%s: Warning: failed to regist to debugfs\n", + bond->dev->name); + return; + } +} + +void bond_debug_unregister(struct bonding *bond) +{ + debugfs_remove_recursive(bond->debug_dir); +} + +void bond_debug_reregister(struct bonding *bond) +{ + struct dentry *d; + + if (!bonding_debug_root) + return; + + d = debugfs_rename(bonding_debug_root, bond->debug_dir, + bonding_debug_root, bond->dev->name); + if (d) { + bond->debug_dir = d; + } else { + pr_warning("Warning: failed to re-regist, so unregist this\n"); + bond_debug_unregister(bond); + } +} + +void bond_create_debugfs(void) +{ + bonding_debug_root = debugfs_create_dir("bonding", NULL); + + if (!bonding_debug_root) { + pr_warning("Warning: Cannot create bonding directory" + " in debugfs\n"); + } +} + +void bond_destroy_debugfs(void) +{ + debugfs_remove_recursive(bonding_debug_root); +} + + +#else /* !CONFIG_DEBUG_FS */ + +void bond_debug_register(struct bonding *bond) +{ +} + +void bond_debug_unregister(struct bonding *bond) +{ +} + +void bond_debug_reregister(struct bonding *bond) +{ +} + +void bond_create_debugfs(void) +{ +} + +void bond_destroy_debugfs(void) +{ +} + +#endif /* CONFIG_DEBUG_FS */ Index: net-next/drivers/net/bonding/bonding.h =================================================================== --- net-next.orig/drivers/net/bonding/bonding.h +++ net-next/drivers/net/bonding/bonding.h @@ -259,6 +259,8 @@ struct bonding { #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) struct in6_addr master_ipv6; #endif + /* debugging suport via debugfs */ + struct dentry *debug_dir; }; /** @@ -380,6 +382,11 @@ void bond_select_active_slave(struct bon void bond_change_active_slave(struct bonding *bond, struct slave *new_active); void bond_register_arp(struct bonding *); void bond_unregister_arp(struct bonding *); +void bond_create_debugfs(void); +void bond_destroy_debugfs(void); +void bond_debug_register(struct bonding *bond); +void bond_debug_unregister(struct bonding *bond); +void bond_debug_reregister(struct bonding *bond); struct bond_net { struct net * net; /* Associated network namespace */ ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] bonding: add the debugfs facility to the bonding driver 2010-12-03 2:54 ` [PATCH 1/2] bonding: add the debugfs facility to the bonding driver Taku Izumi @ 2010-12-03 3:37 ` Jay Vosburgh 0 siblings, 0 replies; 5+ messages in thread From: Jay Vosburgh @ 2010-12-03 3:37 UTC (permalink / raw) To: Taku Izumi; +Cc: netdev@vger.kernel.org, eric.dumazet, shemminger Taku Izumi <izumi.taku@jp.fujitsu.com> wrote: > >This patch provides the debugfs facility to the bonding driver. >The "bonding" directory is created in the debugfs root and directories of >each bonding interface (like bond0, bond1...) are created in that. > > # mount -t debugfs none /sys/kernel/debug > > # ls /sys/kernel/debug/bonding > bond0 bond1 > >Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com> > >--- > drivers/net/bonding/Makefile | 2 > drivers/net/bonding/bond_debugfs.c | 90 +++++++++++++++++++++++++++++++++++++ > drivers/net/bonding/bond_main.c | 10 +++- > drivers/net/bonding/bonding.h | 7 ++ > 4 files changed, 107 insertions(+), 2 deletions(-) > >Index: net-next/drivers/net/bonding/bond_main.c >=================================================================== >--- net-next.orig/drivers/net/bonding/bond_main.c >+++ net-next/drivers/net/bonding/bond_main.c >@@ -3507,6 +3507,8 @@ static int bond_event_changename(struct > bond_remove_proc_entry(bond); > bond_create_proc_entry(bond); > >+ bond_debug_reregister(bond); >+ > return NOTIFY_DONE; > } > >@@ -4789,6 +4791,8 @@ static void bond_uninit(struct net_devic > > bond_remove_proc_entry(bond); > >+ bond_debug_unregister(bond); >+ > __hw_addr_flush(&bond->mc_list); > > list_for_each_entry_safe(vlan, tmp, &bond->vlan_list, vlan_list) { >@@ -5191,6 +5195,8 @@ static int bond_init(struct net_device * > > bond_prepare_sysfs_group(bond); > >+ bond_debug_register(bond); >+ > __hw_addr_init(&bond->mc_list); > return 0; > } >@@ -5312,6 +5318,8 @@ static int __init bonding_init(void) > if (res) > goto err_link; > >+ bond_create_debugfs(); >+ > for (i = 0; i < max_bonds; i++) { > res = bond_create(&init_net, NULL); > if (res) >@@ -5322,7 +5330,6 @@ static int __init bonding_init(void) > if (res) > goto err; > >- > register_netdevice_notifier(&bond_netdev_notifier); > register_inetaddr_notifier(&bond_inetaddr_notifier); > bond_register_ipv6_notifier(); >@@ -5346,6 +5353,7 @@ static void __exit bonding_exit(void) > bond_unregister_ipv6_notifier(); > > bond_destroy_sysfs(); >+ bond_destroy_debugfs(); > > rtnl_link_unregister(&bond_link_ops); > unregister_pernet_subsys(&bond_net_ops); >Index: net-next/drivers/net/bonding/Makefile >=================================================================== >--- net-next.orig/drivers/net/bonding/Makefile >+++ net-next/drivers/net/bonding/Makefile >@@ -4,7 +4,7 @@ > > obj-$(CONFIG_BONDING) += bonding.o > >-bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o >+bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o bond_debugfs.o > > ipv6-$(subst m,y,$(CONFIG_IPV6)) += bond_ipv6.o > bonding-objs += $(ipv6-y) >Index: net-next/drivers/net/bonding/bond_debugfs.c >=================================================================== >--- /dev/null >+++ net-next/drivers/net/bonding/bond_debugfs.c >@@ -0,0 +1,90 @@ >+#include <linux/kernel.h> >+#include <linux/module.h> >+#include <linux/device.h> >+#include <linux/netdevice.h> >+ >+#include "bonding.h" >+ >+#ifdef CONFIG_DEBUG_FS >+ >+#include <linux/debugfs.h> >+#include <linux/seq_file.h> >+ >+static struct dentry *bonding_debug_root; >+ >+void bond_debug_register(struct bonding *bond) >+{ >+ if (!bonding_debug_root) >+ return; >+ >+ bond->debug_dir = >+ debugfs_create_dir(bond->dev->name, bonding_debug_root); >+ >+ if (!bond->debug_dir) { >+ pr_warning("%s: Warning: failed to regist to debugfs\n", Please spell out "register." >+ bond->dev->name); >+ return; >+ } >+} >+ >+void bond_debug_unregister(struct bonding *bond) >+{ >+ debugfs_remove_recursive(bond->debug_dir); >+} >+ >+void bond_debug_reregister(struct bonding *bond) >+{ >+ struct dentry *d; >+ >+ if (!bonding_debug_root) >+ return; >+ >+ d = debugfs_rename(bonding_debug_root, bond->debug_dir, >+ bonding_debug_root, bond->dev->name); >+ if (d) { >+ bond->debug_dir = d; >+ } else { >+ pr_warning("Warning: failed to re-regist, so unregist this\n"); Again, please use the entire word. >+ bond_debug_unregister(bond); >+ } >+} >+ >+void bond_create_debugfs(void) >+{ >+ bonding_debug_root = debugfs_create_dir("bonding", NULL); >+ >+ if (!bonding_debug_root) { >+ pr_warning("Warning: Cannot create bonding directory" >+ " in debugfs\n"); >+ } >+} >+ >+void bond_destroy_debugfs(void) >+{ >+ debugfs_remove_recursive(bonding_debug_root); >+} >+ >+ >+#else /* !CONFIG_DEBUG_FS */ >+ >+void bond_debug_register(struct bonding *bond) >+{ >+} >+ >+void bond_debug_unregister(struct bonding *bond) >+{ >+} >+ >+void bond_debug_reregister(struct bonding *bond) >+{ >+} >+ >+void bond_create_debugfs(void) >+{ >+} >+ >+void bond_destroy_debugfs(void) >+{ >+} >+ >+#endif /* CONFIG_DEBUG_FS */ >Index: net-next/drivers/net/bonding/bonding.h >=================================================================== >--- net-next.orig/drivers/net/bonding/bonding.h >+++ net-next/drivers/net/bonding/bonding.h >@@ -259,6 +259,8 @@ struct bonding { > #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) > struct in6_addr master_ipv6; > #endif >+ /* debugging suport via debugfs */ >+ struct dentry *debug_dir; Should this entry be behind #ifdef CONFIG_DEBUG_FS? > }; > > /** >@@ -380,6 +382,11 @@ void bond_select_active_slave(struct bon > void bond_change_active_slave(struct bonding *bond, struct slave *new_active); > void bond_register_arp(struct bonding *); > void bond_unregister_arp(struct bonding *); >+void bond_create_debugfs(void); >+void bond_destroy_debugfs(void); >+void bond_debug_register(struct bonding *bond); >+void bond_debug_unregister(struct bonding *bond); >+void bond_debug_reregister(struct bonding *bond); > > struct bond_net { > struct net * net; /* Associated network namespace */ > -J --- -Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] bonding: add the debugfs interface to see RLB hash table 2010-12-03 2:51 [PATCH 0/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi 2010-12-03 2:54 ` [PATCH 1/2] bonding: add the debugfs facility to the bonding driver Taku Izumi @ 2010-12-03 2:55 ` Taku Izumi 2010-12-03 3:50 ` Jay Vosburgh 1 sibling, 1 reply; 5+ messages in thread From: Taku Izumi @ 2010-12-03 2:55 UTC (permalink / raw) To: netdev@vger.kernel.org, Jay Vosburgh; +Cc: eric.dumazet, shemminger This patch provices the debugfs interface to see RLB hash table like the following: # cat /sys/kernel/debug/bonding/bond0/rlb_hash_table SourceIP DestinationIP Destination MAC DEV 10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4 10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3 10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0 This is helpful to check if the receive load balancing works as expected. Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com> --- drivers/net/bonding/bond_debugfs.c | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) Index: net-next/drivers/net/bonding/bond_debugfs.c =================================================================== --- net-next.orig/drivers/net/bonding/bond_debugfs.c +++ net-next/drivers/net/bonding/bond_debugfs.c @@ -4,6 +4,7 @@ #include <linux/netdevice.h> #include "bonding.h" +#include "bond_alb.h" #ifdef CONFIG_DEBUG_FS @@ -12,6 +13,53 @@ static struct dentry *bonding_debug_root; +/* + * Show RLB hash table + */ +#define RLB_NULL_INDEX 0xffffffff +static int bond_debug_rlb_hash_show(struct seq_file *m, void *v) +{ + struct bonding *bond = m->private; + struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); + struct rlb_client_info *client_info; + u32 hash_index; + + if (bond->params.mode != BOND_MODE_ALB) + return 0; + + seq_printf(m, "SourceIP DestinationIP " + "Destination MAC DEV\n"); + + spin_lock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock)); + + hash_index = bond_info->rx_hashtbl_head; + for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) { + client_info = &(bond_info->rx_hashtbl[hash_index]); + seq_printf(m, "%-15pI4 %-15pI4 %-17pM %s\n", + &client_info->ip_src, + &client_info->ip_dst, + &client_info->mac_dst, + client_info->slave->dev->name); + } + + spin_unlock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock)); + + return 0; +} + +static int bond_debug_rlb_hash_open(struct inode *inode, struct file *file) +{ + return single_open(file, bond_debug_rlb_hash_show, inode->i_private); +} + +static const struct file_operations bond_debug_rlb_hash_fops = { + .owner = THIS_MODULE, + .open = bond_debug_rlb_hash_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + void bond_debug_register(struct bonding *bond) { if (!bonding_debug_root) @@ -25,6 +73,9 @@ void bond_debug_register(struct bonding bond->dev->name); return; } + + debugfs_create_file("rlb_hash_table", 0400, bond->debug_dir, + bond, &bond_debug_rlb_hash_fops); } void bond_debug_unregister(struct bonding *bond) ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] bonding: add the debugfs interface to see RLB hash table 2010-12-03 2:55 ` [PATCH 2/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi @ 2010-12-03 3:50 ` Jay Vosburgh 0 siblings, 0 replies; 5+ messages in thread From: Jay Vosburgh @ 2010-12-03 3:50 UTC (permalink / raw) To: Taku Izumi; +Cc: netdev@vger.kernel.org, eric.dumazet, shemminger Taku Izumi <izumi.taku@jp.fujitsu.com> wrote: > >This patch provices the debugfs interface to see RLB hash table >like the following: > ># cat /sys/kernel/debug/bonding/bond0/rlb_hash_table >SourceIP DestinationIP Destination MAC DEV >10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4 >10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3 >10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0 > >This is helpful to check if the receive load balancing works as expected. > >Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com> > >--- > drivers/net/bonding/bond_debugfs.c | 51 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > >Index: net-next/drivers/net/bonding/bond_debugfs.c >=================================================================== >--- net-next.orig/drivers/net/bonding/bond_debugfs.c >+++ net-next/drivers/net/bonding/bond_debugfs.c >@@ -4,6 +4,7 @@ > #include <linux/netdevice.h> > > #include "bonding.h" >+#include "bond_alb.h" > > #ifdef CONFIG_DEBUG_FS > >@@ -12,6 +13,53 @@ > > static struct dentry *bonding_debug_root; > >+/* >+ * Show RLB hash table >+ */ >+#define RLB_NULL_INDEX 0xffffffff Instead of copying this constant from bond_alb.c, move it into bond_alb.h. >+static int bond_debug_rlb_hash_show(struct seq_file *m, void *v) >+{ >+ struct bonding *bond = m->private; >+ struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); >+ struct rlb_client_info *client_info; >+ u32 hash_index; >+ >+ if (bond->params.mode != BOND_MODE_ALB) >+ return 0; >+ >+ seq_printf(m, "SourceIP DestinationIP " >+ "Destination MAC DEV\n"); >+ >+ spin_lock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock)); >+ >+ hash_index = bond_info->rx_hashtbl_head; >+ for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) { >+ client_info = &(bond_info->rx_hashtbl[hash_index]); >+ seq_printf(m, "%-15pI4 %-15pI4 %-17pM %s\n", >+ &client_info->ip_src, >+ &client_info->ip_dst, >+ &client_info->mac_dst, >+ client_info->slave->dev->name); >+ } I think this is going to run up against the PAGE_SIZE limit for writing to the seq_file if the rlb table is sufficiently populated (for systems with a 4K PAGE_SIZE). It looks like seq_printf won't do anything bad (other than not print any more) when it runs out of space, and the above won't use up 4K until there are around 65 or 70 entries in the table, so this may not be worth worrying about now. -J >+ >+ spin_unlock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock)); >+ >+ return 0; >+} >+ >+static int bond_debug_rlb_hash_open(struct inode *inode, struct file *file) >+{ >+ return single_open(file, bond_debug_rlb_hash_show, inode->i_private); >+} >+ >+static const struct file_operations bond_debug_rlb_hash_fops = { >+ .owner = THIS_MODULE, >+ .open = bond_debug_rlb_hash_open, >+ .read = seq_read, >+ .llseek = seq_lseek, >+ .release = single_release, >+}; >+ > void bond_debug_register(struct bonding *bond) > { > if (!bonding_debug_root) >@@ -25,6 +73,9 @@ void bond_debug_register(struct bonding > bond->dev->name); > return; > } >+ >+ debugfs_create_file("rlb_hash_table", 0400, bond->debug_dir, >+ bond, &bond_debug_rlb_hash_fops); > } > > void bond_debug_unregister(struct bonding *bond) > > --- -Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-03 3:50 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-12-03 2:51 [PATCH 0/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi 2010-12-03 2:54 ` [PATCH 1/2] bonding: add the debugfs facility to the bonding driver Taku Izumi 2010-12-03 3:37 ` Jay Vosburgh 2010-12-03 2:55 ` [PATCH 2/2] bonding: add the debugfs interface to see RLB hash table Taku Izumi 2010-12-03 3:50 ` Jay Vosburgh
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).