From: David Vrabel <david.vrabel@citrix.com>
To: <netdev@vger.kernel.org>
Cc: Nithin Nayak Sujir <nsujir@broadcom.com>,
Michael Chan <mchan@broadcom.com>,
David Vrabel <david.vrabel@citrix.com>
Subject: [PATCHv1 net] tg3: fix deadlock in tg3_change_mtu()
Date: Tue, 4 Feb 2014 19:01:27 +0000 [thread overview]
Message-ID: <1391540487-31207-1-git-send-email-david.vrabel@citrix.com> (raw)
5780 cards cannot have jumbo frames and TSO enabled together. When
jumbo frames are enabled by setting the MTU, the TSO feature must be
cleared. This is done indirectly by calling netdev_update_features()
which will call tg3_fix_features() to actually clear the flags.
netdev_update_features() will also trigger a new netlink message for
the feature change event which will result in a call to
tg3_get_stats64() which deadlocks on the tg3 lock.
Fix this by dropping the tg3 lock while calling
netdev_update_features(). This is safe as the device is down and the
hardware is stopped.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---
drivers/net/ethernet/broadcom/tg3.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index e2ca03e..0b344c0 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14077,17 +14077,13 @@ static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,
dev->mtu = new_mtu;
if (new_mtu > ETH_DATA_LEN) {
- if (tg3_flag(tp, 5780_CLASS)) {
- netdev_update_features(dev);
+ if (tg3_flag(tp, 5780_CLASS))
tg3_flag_clear(tp, TSO_CAPABLE);
- } else {
+ else
tg3_flag_set(tp, JUMBO_RING_ENABLE);
- }
} else {
- if (tg3_flag(tp, 5780_CLASS)) {
+ if (tg3_flag(tp, 5780_CLASS))
tg3_flag_set(tp, TSO_CAPABLE);
- netdev_update_features(dev);
- }
tg3_flag_clear(tp, JUMBO_RING_ENABLE);
}
}
@@ -14119,6 +14115,14 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
tg3_set_mtu(dev, tp, new_mtu);
+ tg3_full_unlock(tp);
+
+ /* Adjusting MTU may add/remove TSO feature. */
+ if (tg3_flag(tp, 5780_CLASS))
+ netdev_update_features(dev);
+
+ tg3_full_lock(tp, 0);
+
/* Reset PHY, otherwise the read DMA engine will be in a mode that
* breaks all requests to 256 bytes.
*/
--
1.7.2.5
next reply other threads:[~2014-02-04 19:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 19:01 David Vrabel [this message]
2014-02-05 22:09 ` [PATCHv1 net] tg3: fix deadlock in tg3_change_mtu() Nithin Nayak Sujir
2014-02-06 10:43 ` David Vrabel
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=1391540487-31207-1-git-send-email-david.vrabel@citrix.com \
--to=david.vrabel@citrix.com \
--cc=mchan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=nsujir@broadcom.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).