From mboxrd@z Thu Jan 1 00:00:00 1970 From: mk.singh@oracle.com Subject: [PATCH] bonding:avoid repeated display of same link status change Date: Wed, 31 Oct 2018 16:27:28 +0530 Message-ID: <20181031105729.7442-1-mk.singh@oracle.com> Cc: eric.dumazet@gmail.com, mkubecek@suse.cz, Manish Kumar Singh , Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , "David S. Miller" , linux-kernel@vger.kernel.org To: netdev@vger.kernel.org Return-path: Received: from aserp2120.oracle.com ([141.146.126.78]:38338 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728918AbeJaTzo (ORCPT ); Wed, 31 Oct 2018 15:55:44 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: Manish Kumar Singh 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: Manish Kumar Singh --- drivers/net/bonding/bond_main.c | 8 ++++++-- include/net/bonding.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 2b01180be834..b3d95c7040ac 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2096,7 +2096,8 @@ 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 && + !atomic64_read(&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) ? @@ -2136,7 +2137,8 @@ static int bond_miimon_inspect(struct bonding *bond) commit++; slave->delay = bond->params.updelay; - if (slave->delay) { + if (slave->delay && + !atomic64_read(&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 : @@ -2310,9 +2312,11 @@ static void bond_mii_monitor(struct work_struct *work) if (!rtnl_trylock()) { delay = 1; should_notify_peers = false; + atomic64_set(&bond->rtnl_needed, 1); goto re_arm; } + atomic64_set(&bond->rtnl_needed, 0); 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 a4f116f06c50..20c3c875266f 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -229,6 +229,7 @@ struct bonding { struct dentry *debug_dir; #endif /* CONFIG_DEBUG_FS */ struct rtnl_link_stats64 bond_stats; + atomic64_t rtnl_needed; }; #define bond_slave_get_rcu(dev) \ -- 2.14.1