From patchwork Thu Aug 9 21:12:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rama Nichanamatlu X-Patchwork-Id: 955789 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="sn7tpziM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41mgvl6G3Fz9ryt for ; Fri, 10 Aug 2018 07:13:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727294AbeHIXjo (ORCPT ); Thu, 9 Aug 2018 19:39:44 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:40480 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727156AbeHIXjo (ORCPT ); Thu, 9 Aug 2018 19:39:44 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w79L9I8b183469 for ; Thu, 9 Aug 2018 21:13:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : subject : to : message-id : date : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=1j39jaz3imkxKMtl6Lk11IY/MrJ08Q2imYcR2ysD6HQ=; b=sn7tpziMAiPhDJLx1rtQ7ia5uN6fjcvD+stssE9QjXBI5j1qxAmmSLvzvvgnxGg/7TxP 6eRO9bAkt6tBxduLWvrCnSENiAchWyFSKAcxNafO+b/RGJwiCNvKpbprIG+o3AlCWqDV iEMhbXg5bLicbCcG4gvLne/b4EOWvrQI7CVn6itGBvbbh19mPpETiabuo2R6fVurM2pg NLLg+uYrvUoFqg1yFtxpvWQi0MAZhAHAvcxOu1qWSHNsNv4tqEB/aLApCyW9ScjqmnRJ 6EWeY6FfthQbczUtD6mtJL0c17h8KjRTdHXalOdzrPp6ttWBBY9xksS8DhNMCorJXfRk ww== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2kn3jtd0a7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 09 Aug 2018 21:13:04 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w79LD3IO018858 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 9 Aug 2018 21:13:03 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w79LD3sN017972 for ; Thu, 9 Aug 2018 21:13:03 GMT Received: from [10.159.232.124] (/10.159.232.124) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 09 Aug 2018 14:13:03 -0700 From: rama nichanamatlu Subject: [PATCH] bonding: avoid repeated display of same link status change To: netdev@vger.kernel.org Message-ID: <4d0ff757-ea60-2dae-cc66-45d3fe2dcca0@oracle.com> Date: Thu, 9 Aug 2018 14:12:57 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: en-US X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8980 signatures=668707 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808090210 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From 9927a1c2a632d9479a80c63b7d9fda59ea8374bc Mon Sep 17 00:00:00 2001 From: Rama Nichanamatlu Date: Tue, 31 Jul 2018 07:09:52 -0700 Subject: [PATCH] bonding: avoid repeated display of same link status change When link status change needs to be committed and rtnl lock couldn't be taken, avoid redisplay of same link status change message. Signed-off-by: Rama Nichanamatlu ---  drivers/net/bonding/bond_main.c |    6 ++++--  include/net/bonding.h           |    1 +  2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 63e3844..3dd1091 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2086,7 +2086,7 @@ static int bond_miimon_inspect(struct bonding *bond)                         bond_propose_link_state(slave, BOND_LINK_FAIL);                         commit++;                         slave->delay = bond->params.downdelay; -                       if (slave->delay) { +                       if (slave->delay && !bond->rtnl_needed) {                                 netdev_info(bond->dev, "link status down for %sinterface %s, disabling it in %d ms\n",                                             (BOND_MODE(bond) ==                                              BOND_MODE_ACTIVEBACKUP) ? @@ -2126,7 +2126,7 @@ static int bond_miimon_inspect(struct bonding *bond)                         commit++;                         slave->delay = bond->params.updelay; -                       if (slave->delay) { +                       if (slave->delay && !bond->rtnl_needed) {                                 netdev_info(bond->dev, "link status up for interface %s, enabling it in %d ms\n",                                             slave->dev->name,                                             ignore_updelay ? 0 : @@ -2300,9 +2300,11 @@ static void bond_mii_monitor(struct work_struct *work)                 if (!rtnl_trylock()) {                         delay = 1;                         should_notify_peers = false; +                       bond->rtnl_needed = true;                         goto re_arm;                 } +               bond->rtnl_needed = false;                 bond_for_each_slave(bond, slave, iter) {                         bond_commit_link_state(slave, BOND_SLAVE_NOTIFY_LATER);                 } diff --git a/include/net/bonding.h b/include/net/bonding.h index 808f1d1..4e76e5d 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -234,6 +234,7 @@ struct bonding {         struct   dentry *debug_dir;  #endif /* CONFIG_DEBUG_FS */         struct rtnl_link_stats64 bond_stats; +       u8 rtnl_needed;  };  #define bond_slave_get_rcu(dev) \