From: Veaceslav Falico <vfalico@redhat.com>
To: netdev@vger.kernel.org
Cc: Veaceslav Falico <vfalico@redhat.com>,
Jay Vosburgh <fubar@us.ibm.com>,
Andy Gospodarek <andy@greyhouse.net>
Subject: [PATCH net-next] bonding: fix send_peer_notif leekage on rtnl lock congestion
Date: Mon, 5 Aug 2013 21:47:33 +0200 [thread overview]
Message-ID: <1375732053-829-1-git-send-email-vfalico@redhat.com> (raw)
In bond_mii_monitor()/bond_activebackup_arp_mon(), we verify if we have any
notifications to be sent before trying to get the rtnl_trylock(), and if
we have - we set should_notify_peers and withdraw a notification. However,
if we fail the get the rtnl_trylock(), we don't send out any notification
and don't put the notification back to bond->send_peer_notif.
Fix it by putting back the notification to send_peer_notif in case of
rtnl_trylock() failure.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
drivers/net/bonding/bond_main.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5697043..fd92738 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2383,7 +2383,10 @@ void bond_mii_monitor(struct work_struct *work)
if (!rtnl_trylock()) {
read_lock(&bond->lock);
delay = 1;
- should_notify_peers = false;
+ if (should_notify_peers) {
+ bond->send_peer_notif++;
+ should_notify_peers = false;
+ }
goto re_arm;
}
@@ -2999,7 +3002,10 @@ void bond_activebackup_arp_mon(struct work_struct *work)
if (!rtnl_trylock()) {
read_lock(&bond->lock);
delta_in_ticks = 1;
- should_notify_peers = false;
+ if (should_notify_peers) {
+ bond->send_peer_notif++;
+ should_notify_peers = false;
+ }
goto re_arm;
}
--
1.8.1.4
next reply other threads:[~2013-08-05 19:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-05 19:47 Veaceslav Falico [this message]
2013-08-05 23:12 ` [PATCH net-next] bonding: fix send_peer_notif leekage on rtnl lock congestion David Miller
2013-08-06 12:17 ` Veaceslav Falico
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=1375732053-829-1-git-send-email-vfalico@redhat.com \
--to=vfalico@redhat.com \
--cc=andy@greyhouse.net \
--cc=fubar@us.ibm.com \
--cc=netdev@vger.kernel.org \
/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).