]> git.baikalelectronics.ru Git - kernel.git/commit
tg3: Fix soft lockup when tg3_reset_task() fails.
authorMichael Chan <michael.chan@broadcom.com>
Thu, 3 Sep 2020 18:28:54 +0000 (14:28 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Sep 2020 19:16:54 +0000 (12:16 -0700)
commitc1842f8cc997c4cd2291d32fa6914ec54ee9c707
tree1049f810bd303c532ddd4cfb196787f3d382e69d
parentf75ca80c95347e208e3b61c5e90d5b028aab1e60
tg3: Fix soft lockup when tg3_reset_task() fails.

If tg3_reset_task() fails, the device state is left in an inconsistent
state with IFF_RUNNING still set but NAPI state not enabled.  A
subsequent operation, such as ifdown or AER error can cause it to
soft lock up when it tries to disable NAPI state.

Fix it by bringing down the device to !IFF_RUNNING state when
tg3_reset_task() fails.  tg3_reset_task() running from workqueue
will now call tg3_close() when the reset fails.  We need to
modify tg3_reset_task_cancel() slightly to avoid tg3_close()
calling cancel_work_sync() to cancel tg3_reset_task().  Otherwise
cancel_work_sync() will wait forever for tg3_reset_task() to
finish.

Reported-by: David Christensen <drc@linux.vnet.ibm.com>
Reported-by: Baptiste Covolato <baptiste@arista.com>
Fixes: 82fb86543651 ("tg3: Schedule at most one tg3_reset_task run")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/tg3.c