Thread (1 message) 1 message, 1 author, 2018-08-20

Re: [PATCH] bonding: avoid repeated display of same link status change

From: rama nichanamatlu <hidden>
Date: 2018-08-20 22:19:46

gentle request. may i have review comments pls ?

-Rama
On 08/13/2018 01:10 PM, Rama Nichanamatlu wrote:
quoted hunk
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 <redacted>
---
  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..50d61cf 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;
+	bool rtnl_needed;
  };
  
  #define bond_slave_get_rcu(dev) \
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help