From patchwork Fri Dec 10 01:17:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taku Izumi X-Patchwork-Id: 75023 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 13643B6EED for ; Fri, 10 Dec 2010 12:18:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757651Ab0LJBSF (ORCPT ); Thu, 9 Dec 2010 20:18:05 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:45499 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757451Ab0LJBSD (ORCPT ); Thu, 9 Dec 2010 20:18:03 -0500 Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id oBA1I2sH014886 for (envelope-from izumi.taku@jp.fujitsu.com); Fri, 10 Dec 2010 10:18:02 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 6E32645DE53 for ; Fri, 10 Dec 2010 10:18:02 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 2D50F45DE5B for ; Fri, 10 Dec 2010 10:18:02 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 216DEE08003 for ; Fri, 10 Dec 2010 10:18:02 +0900 (JST) Received: from ml14.s.css.fujitsu.com (ml14.s.css.fujitsu.com [10.249.87.104]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id D7A6B1DB8044 for ; Fri, 10 Dec 2010 10:18:01 +0900 (JST) Received: from ml14.css.fujitsu.com (ml14 [127.0.0.1]) by ml14.s.css.fujitsu.com (Postfix) with ESMTP id A8F809F6C25; Fri, 10 Dec 2010 10:18:01 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.101.102]) by ml14.s.css.fujitsu.com (Postfix) with ESMTP id 44A679F6C3B; Fri, 10 Dec 2010 10:18:01 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Received: from DEUCALION2[10.124.101.102] by DEUCALION2 (FujitsuOutboundMailChecker v1.3.1/9992[10.124.101.102]); Fri, 10 Dec 2010 10:17:52 +0900 (JST) Message-ID: <4D017F99.2040706@jp.fujitsu.com> Date: Fri, 10 Dec 2010 10:17:13 +0900 From: Taku Izumi User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 MIME-Version: 1.0 To: "netdev@vger.kernel.org" , Jay Vosburgh CC: eric.dumazet@gmail.com, shemminger@vyatta.com Subject: Re: [PATCH 1/3] bonding: add the debugfs facility to the bonding driver References: <4CF89A00.8030902@jp.fujitsu.com> <4CF89A6E.4090303@jp.fujitsu.com> In-Reply-To: <4CF89A6E.4090303@jp.fujitsu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Jay Vosburgh --- drivers/net/bonding/Makefile | 2 drivers/net/bonding/bond_debugfs.c | 96 +++++++++++++++++++++++++++++++++++++ drivers/net/bonding/bond_main.c | 10 +++ drivers/net/bonding/bonding.h | 9 +++ 4 files changed, 115 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,96 @@ +#include +#include +#include +#include + +#include "bonding.h" + +#ifdef CONFIG_DEBUG_FS + +#include +#include + +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 register to debugfs\n", + bond->dev->name); + return; + } +} + +void bond_debug_unregister(struct bonding *bond) +{ + if (!bonding_debug_root) + return; + + 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("%s: Warning: failed to reregister, " + "so just unregister old one\n", + bond->dev->name); + 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); + bonding_debug_root = NULL; +} + + +#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,10 @@ struct bonding { #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) struct in6_addr master_ipv6; #endif +#ifdef CONFIG_DEBUG_FS + /* debugging suport via debugfs */ + struct dentry *debug_dir; +#endif /* CONFIG_DEBUG_FS */ }; /** @@ -380,6 +384,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 */