bnxt_en: Fix race between firmware reset and driver remove.
The driver's error recovery reset sequence can take many seconds to
complete and only the critical sections are protected by rtnl_lock.
A recent change has introduced a regression in this sequence.
bnxt_remove_one() may be called while the recovery is in progress.
Normally, unregister_netdev() would cause bnxt_close_nic() to be
called and this would cause the error recovery to safely abort
with the BNXT_STATE_ABORT_ERR flag set in bnxt_close_nic().
Recently, we added bnxt_reinit_after_abort() to allow the user to
reopen the device after an aborted recovery. This causes the
regression in the scenario described above because we would
attempt to re-open even after the netdev has been unregistered.
Fix it by checking the netdev reg_state in
bnxt_reinit_after_abort() and abort if it is unregistered.
Fixes: 6882c36cf8
("bnxt_en: attempt to reinitialize after aborted reset")
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
82adc457ac
commit
d20cd74521
|
@ -9890,6 +9890,9 @@ static int bnxt_reinit_after_abort(struct bnxt *bp)
|
|||
if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
|
||||
return -EBUSY;
|
||||
|
||||
if (bp->dev->reg_state == NETREG_UNREGISTERED)
|
||||
return -ENODEV;
|
||||
|
||||
rc = bnxt_fw_init_one(bp);
|
||||
if (!rc) {
|
||||
bnxt_clear_int_mode(bp);
|
||||
|
|
Loading…
Reference in New Issue