Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b190624 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Eliminate timer race with reset_task 



During shutdown, it is impossible to reliably disable the timer and
reset_task threads.  Each thread can schedule the other, which leads to
shutdown code that chases its tail.

To fix the problem, this patch removes the ability of tg3_reset_task to
schedule a new timer thread.  To support this change, tg3_timer no
longer terminates itself, but rather goes into a polling mode.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db219973

drivers/net/ethernet/broadcom/tg3.c

+2 −12
Original line number Diff line number Diff line
@@ -6352,7 +6352,6 @@ static void tg3_reset_task(struct work_struct *work) 
{

	struct tg3 *tp = container_of(work, struct tg3, reset_task);

	int err;

	unsigned int restart_timer;



	tg3_full_lock(tp, 0);
@@ -6370,9 +6369,6 @@ static void tg3_reset_task(struct work_struct *work) 


	tg3_full_lock(tp, 1);



	restart_timer = tg3_flag(tp, RESTART_TIMER);

	tg3_flag_clear(tp, RESTART_TIMER);



	if (tg3_flag(tp, TX_RECOVERY_PENDING)) {

		tp->write32_tx_mbox = tg3_write32_tx_mbox;

		tp->write32_rx_mbox = tg3_write_flush_reg32;
@@ -6387,9 +6383,6 @@ static void tg3_reset_task(struct work_struct *work) 


	tg3_netif_start(tp);



	if (restart_timer)

		mod_timer(&tp->timer, jiffies + 1);



out:

	tg3_full_unlock(tp);
@@ -9218,7 +9211,7 @@ static void tg3_timer(unsigned long __opaque) 
{

	struct tg3 *tp = (struct tg3 *) __opaque;



	if (tp->irq_sync)

	if (tp->irq_sync || tg3_flag(tp, RESET_TASK_PENDING))

		goto restart_timer;



	spin_lock(&tp->lock);
@@ -9241,10 +9234,9 @@ static void tg3_timer(unsigned long __opaque) 
		}



		if (!(tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {

			tg3_flag_set(tp, RESTART_TIMER);

			spin_unlock(&tp->lock);

			tg3_reset_task_schedule(tp);

			return;

			goto restart_timer;

		}

	}
@@ -15847,12 +15839,10 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, 
	tg3_netif_stop(tp);



	del_timer_sync(&tp->timer);

	tg3_flag_clear(tp, RESTART_TIMER);



	/* Want to make sure that the reset task doesn't run */

	tg3_reset_task_cancel(tp);

	tg3_flag_clear(tp, TX_RECOVERY_PENDING);

	tg3_flag_clear(tp, RESTART_TIMER);



	netif_device_detach(netdev);

drivers/net/ethernet/broadcom/tg3.h

+0 −1
Original line number Diff line number Diff line
@@ -2879,7 +2879,6 @@ enum TG3_FLAGS { 
	TG3_FLAG_JUMBO_CAPABLE,

	TG3_FLAG_CHIP_RESETTING,

	TG3_FLAG_INIT_COMPLETE,

	TG3_FLAG_RESTART_TIMER,

	TG3_FLAG_TSO_BUG,

	TG3_FLAG_IS_5788,

	TG3_FLAG_MAX_RXPEND_64,