From patchwork Wed Jun 1 16:31:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 98226 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 AADB4B6F95 for ; Thu, 2 Jun 2011 03:23:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759014Ab1FARXN (ORCPT ); Wed, 1 Jun 2011 13:23:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33751 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753628Ab1FARXM (ORCPT ); Wed, 1 Jun 2011 13:23:12 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p51HMq7X003167 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 1 Jun 2011 13:23:00 -0400 Received: from localhost (vpn1-5-71.ams2.redhat.com [10.36.5.71]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p51GVs4f024774; Wed, 1 Jun 2011 12:31:55 -0400 Date: Wed, 1 Jun 2011 18:31:54 +0200 From: Jiri Pirko To: Jay Vosburgh Cc: Flavio Leitner , netdev@vger.kernel.org, davem@davemloft.net, andy@greyhouse.net Subject: [patch net-next-2.6 v2] bonding: allow resetting slave failure counters Message-ID: <20110601163153.GB2784@psychotron.redhat.com> References: <1306921249-3623-1-git-send-email-jpirko@redhat.com> <4DE63E85.7020508@redhat.com> <20110601135321.GA2909@psychotron.brq.redhat.com> <16056.1306944819@death> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <16056.1306944819@death> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch allows to reset failure counters for all enslaved devices. Signed-off-by: Jiri Pirko v1->v2: added version bump added version note to doc moved and adjusted printk Reviewed-by: Nicolas de Pesloüan --- Documentation/networking/bonding.txt | 9 +++++++++ drivers/net/bonding/bond_sysfs.c | 28 ++++++++++++++++++++++++++++ drivers/net/bonding/bonding.h | 4 ++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index 675612f..7a8da01 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt @@ -782,6 +782,15 @@ resend_igmp This option was added for bonding version 3.7.0. +reset_failure_counters + + This write-only control file will zero failure counters for + all slaves. Note there is no appropriate module parameter for this + since it would not make much sense. + Write any value to perform reset. + + This option was added for bonding version 3.7.2. + 3. Configuring Bonding Devices ============================== diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 88fcb25..342b4ed 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1572,6 +1572,33 @@ out: static DEVICE_ATTR(resend_igmp, S_IRUGO | S_IWUSR, bonding_show_resend_igmp, bonding_store_resend_igmp); +static ssize_t +bonding_store_reset_failure_counters(struct device *d, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct slave *slave; + int i; + struct bonding *bond = to_bond(d); + + if (!rtnl_trylock()) + return restart_syscall(); + + pr_info("%s: Resetting failure counters.\n", bond->dev->name); + + read_lock(&bond->lock); + bond_for_each_slave(bond, slave, i) + slave->link_failure_count = 0; + read_unlock(&bond->lock); + + rtnl_unlock(); + + return count; +} + +static DEVICE_ATTR(reset_failure_counters, S_IWUSR, NULL, + bonding_store_reset_failure_counters); + static struct attribute *per_bond_attrs[] = { &dev_attr_slaves.attr, &dev_attr_mode.attr, @@ -1600,6 +1627,7 @@ static struct attribute *per_bond_attrs[] = { &dev_attr_queue_id.attr, &dev_attr_all_slaves_active.attr, &dev_attr_resend_igmp.attr, + &dev_attr_reset_failure_counters.attr, NULL, }; diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index ea1d005..62528f8 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -24,8 +24,8 @@ #include "bond_3ad.h" #include "bond_alb.h" -#define DRV_VERSION "3.7.1" -#define DRV_RELDATE "April 27, 2011" +#define DRV_VERSION "3.7.2" +#define DRV_RELDATE "Jun 1, 2011" #define DRV_NAME "bonding" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"