From: Mahesh Bandewar <maheshb@google.com>
To: Jay Vosburgh <j.vosburgh@gmail.com>,
Andy Gospodarek <andy@greyhouse.net>,
Veaceslav Falico <vfalico@gmail.com>,
Nikolay Aleksandrov <nikolay@redhat.com>,
David Miller <davem@davemloft.net>
Cc: Mahesh Bandewar <maheshb@google.com>,
Maciej Zenczykowski <maze@google.com>,
netdev <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH net-next v2 2/4] bonding: Do not ignore notifications for miimon-work-queue
Date: Fri, 20 Mar 2015 22:39:23 -0700 [thread overview]
Message-ID: <1426916363-18368-1-git-send-email-maheshb@google.com> (raw)
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@google.com>
---
drivers/net/bonding/bond_main.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 19eabea2d7d9..6da311509a2e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2143,8 +2143,11 @@ static void bond_mii_monitor(struct work_struct *work)
if (!bond_has_slaves(bond))
goto re_arm;
+ if (bond_get_notif_pending(bond, BOND_MII_NOTIF)) {
+ should_notify_peers = true;
+ goto re_arm;
+ }
rcu_read_lock();
-
should_notify_peers = bond_should_notify_peers(bond);
if (bond_miimon_inspect(bond)) {
@@ -2164,15 +2167,17 @@ 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);
+ } else {
+ call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond->dev);
+ rtnl_unlock();
+ }
}
+ 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
reply other threads:[~2015-03-21 5:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426916363-18368-1-git-send-email-maheshb@google.com \
--to=maheshb@google.com \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=j.vosburgh@gmail.com \
--cc=maze@google.com \
--cc=netdev@vger.kernel.org \
--cc=nikolay@redhat.com \
--cc=vfalico@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).