netdev - [PATCH net-next 2/4] bonding: Do not ignore notifications for miimon-work-queue

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1426139677-27167-1-git-send-email-maheshb@google.com>
Date:	Wed, 11 Mar 2015 22:54:37 -0700
From:	Mahesh Bandewar <maheshb@...gle.com>
To:	Jay Vosburgh <j.vosburgh@...il.com>,
	Andy Gospodarek <andy@...yhouse.net>,
	Veaceslav Falico <vfalico@...il.com>,
	Nikolay Aleksandrov <nikolay@...hat.com>,
	David Miller <davem@...emloft.net>
Cc:	Mahesh Bandewar <maheshb@...gle.com>,
	Maciej Zenczykowski <maze@...gle.com>,
	netdev <netdev@...r.kernel.org>,
	Eric Dumazet <edumazet@...gle.com>
Subject: [PATCH net-next 2/4] bonding: Do not ignore notifications for miimon-work-queue

This patch adds code to reschedule the mii-work (aggressively)
just to handle the notification before resuming the regular
cycle.

Signed-off-by: Mahesh Bandewar <maheshb@...gle.com>
---
 drivers/net/bonding/bond_main.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 19eabea2d7d9..54ecb7a22bae 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2143,10 +2143,13 @@ static void bond_mii_monitor(struct work_struct *work)
 	if (!bond_has_slaves(bond))
 		goto re_arm;
 
-	rcu_read_lock();
-
+	if (bond_get_notif_pending(bond, BOND_MII_NOTIF)) {
+		should_notify_peers = true;
+		goto re_arm;
+	}
 	should_notify_peers = bond_should_notify_peers(bond);
 
+	rcu_read_lock();
 	if (bond_miimon_inspect(bond)) {
 		rcu_read_unlock();
 
@@ -2164,15 +2167,18 @@ static void bond_mii_monitor(struct work_struct *work)
 		rcu_read_unlock();
 
 re_arm:
-	if (bond->params.miimon)
-		queue_delayed_work(bond->wq, &bond->mii_work, delay);
-
 	if (should_notify_peers) {
-		if (!rtnl_trylock())
-			return;
-		call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond->dev);
-		rtnl_unlock();
+		if (!rtnl_trylock()) {
+			delay = 1;
+			bond_set_notif_pending(bond, BOND_MII_NOTIF, 1);
+		} else {
+			call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond->dev);
+			rtnl_unlock();
+			bond_set_notif_pending(bond, BOND_MII_NOTIF, 0);
+		}
 	}
+	if (bond->params.miimon)
+		queue_delayed_work(bond->wq, &bond->mii_work, delay);
 }
 
 static bool bond_has_this_ip(struct bonding *bond, __be32 ip)
-- 
2.2.0.rc0.207.ga3a616c

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html