aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2007-07-11 22:47:19 -0400
committerDavid S. Miller <davem@davemloft.net>2007-07-11 22:47:19 -0400
commit469665459d26da8d0b46c70d070da1e192e48e46 (patch)
treee64f86c93ad9350c7e042672de12fda26592249a /drivers/net/tg3.c
parentdb3d99c090e0cdb34b1274767e062bfddbb384bc (diff)
[TG3]: Fix irq_sync race condition.
Gagan Arneja <gaagaan@gmail.com> pointed out that tg3_reset_task() could potentially race with another thread calling tg3_full_lock() such as the ethtool_set_xxx() functions. This may trigger the BUG_ON() in tg3_irq_quiesce() or cause the irq_sync flag to be out- of-sync. I think the easiest way to fix this is to get the tp->lock first before setting the irq_sync flag. This is safe to do because the tp->lock is never grabbed by the irq handler. This change will guarantee that the irq_sync flag updates will be serialized. We also have to change one spot to call tg3_netif_start() (which clears the irq_sync flag) before releasing the tp->lock. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3a43426ced32..314f5cfe7246 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3512,9 +3512,9 @@ static inline int tg3_irq_sync(struct tg3 *tp)
3512 */ 3512 */
3513static inline void tg3_full_lock(struct tg3 *tp, int irq_sync) 3513static inline void tg3_full_lock(struct tg3 *tp, int irq_sync)
3514{ 3514{
3515 spin_lock_bh(&tp->lock);
3515 if (irq_sync) 3516 if (irq_sync)
3516 tg3_irq_quiesce(tp); 3517 tg3_irq_quiesce(tp);
3517 spin_lock_bh(&tp->lock);
3518} 3518}
3519 3519
3520static inline void tg3_full_unlock(struct tg3 *tp) 3520static inline void tg3_full_unlock(struct tg3 *tp)
@@ -9116,10 +9116,10 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
9116 /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */ 9116 /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
9117 __tg3_set_rx_mode(dev); 9117 __tg3_set_rx_mode(dev);
9118 9118
9119 tg3_full_unlock(tp);
9120
9121 if (netif_running(dev)) 9119 if (netif_running(dev))
9122 tg3_netif_start(tp); 9120 tg3_netif_start(tp);
9121
9122 tg3_full_unlock(tp);
9123} 9123}
9124#endif 9124#endif
9125 9125