Skip to contentSkip to conversation

tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one()

PATCH Applied Junichi Nomura 3 participants 3 messages Feb 12, 2015

Subsystems (3)
Networking Network drivers Broadcom TG3 gigabit Ethernet driver
lore
Share & tools
lore

Junichi Nomura

author
#0 lore raw

PATCH 1/1 tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one()

tg3_init_one() calls tg3_halt() without tp->lock despite its assumption and causes deadlock.
If lockdep is enabled, a warning like this shows up before the stall:

[ BUG: bad unlock balance detected! ]
3.19.0test #3 Tainted: G E
-------------------------------------
insmod/369 is trying to release lock (&(&tp->lock)->rlock) at:

  [<ffffffffa02d5a1d>] tg3_chip_reset+0x14d/0x780 [tg3]
  but there are no more locks to release!

tg3_init_one() doesn't call tg3_halt() under normal situation but during kexec kdump I hit this problem.

Fixes 932f19de ("tg3: Release tp->lock before invoking synchronize_irq()")
Signed-off-by Jun'ichi Nomura <[email protected]>
---
 drivers/net/ethernet/broadcom/tg3.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/broadcom/tg3.c +2 -0
index 615a6db..23a019c 100644
@@ -17855,8 +17855,10 @@ static int tg3_init_one(struct pci_dev *pdev,
 	 */
 	if ((tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE) ||
 	    (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
+		tg3_full_lock(tp, 0);
 		tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
 		tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
+		tg3_full_unlock(tp);
 	}
 
 	err = tg3_test_dma(tp);
Signature · 4 lines
1.9.3

-- 
Jun'ichi Nomura, NEC Corporation
Acked-by on v1 1/1
#1 lore raw
Quoted 37 lines · Junichi Nomura

tg3_init_one() calls tg3_halt() without tp->lock despite its assumption and causes deadlock.
If lockdep is enabled, a warning like this shows up before the stall:

[ BUG: bad unlock balance detected! ]
3.19.0test #3 Tainted: G E
-------------------------------------
insmod/369 is trying to release lock (&(&tp->lock)->rlock) at:

  [<ffffffffa02d5a1d>] tg3_chip_reset+0x14d/0x780 [tg3]
  but there are no more locks to release!

tg3_init_one() doesn't call tg3_halt() under normal situation but during kexec kdump I hit this problem.

Fixes 932f19de ("tg3: Release tp->lock before invoking synchronize_irq()")
Signed-off-by Jun'ichi Nomura <[email protected]>
---
 drivers/net/ethernet/broadcom/tg3.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/broadcom/tg3.c +2 -0
index 615a6db..23a019c 100644
@@ -17855,8 +17855,10 @@ static int tg3_init_one(struct pci_dev *pdev,
 	 */
 	if ((tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE) ||
 	    (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
+		tg3_full_lock(tp, 0);
 		tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
 		tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
+		tg3_full_unlock(tp);
 	}
 
 	err = tg3_test_dma(tp);
Signature · 1 line
1.9.3
Acked-by Prashant Sreedharan <[email protected]>
maintainer Applied
#2 lore raw
In reply to Junichi Nomura

From: Junichi Nomura <[email protected]>
Date: Thu, 12 Feb 2015 01:26:24 +0000

Quoted 8 lines

tg3_init_one() calls tg3_halt() without tp->lock despite its assumption and causes deadlock.
If lockdep is enabled, a warning like this shows up before the stall:

[ BUG: bad unlock balance detected! ]
3.19.0test #3 Tainted: G E
-------------------------------------
insmod/369 is trying to release lock (&(&tp->lock)->rlock) at:

Quoted 8 lines
  [<ffffffffa02d5a1d>] tg3_chip_reset+0x14d/0x780 [tg3]
  but there are no more locks to release!

tg3_init_one() doesn't call tg3_halt() under normal situation but during kexec kdump I hit this problem.

Fixes 932f19de ("tg3: Release tp->lock before invoking synchronize_irq()")
Signed-off-by Jun'ichi Nomura <[email protected]>

Applied.