Commit b8321829 authored Oct 26, 2020 by Vasundhara Volam Committed by Greg Kroah-Hartman Nov 01, 2020

bnxt_en: Invoke cancel_delayed_work_sync() for PFs also.



[ Upstream commit 631ce27a3006fc0b732bfd589c6df505f62eadd9 ]

As part of the commit b148bb238c02
("bnxt_en: Fix possible crash in bnxt_fw_reset_task()."),
cancel_delayed_work_sync() is called only for VFs to fix a possible
crash by cancelling any pending delayed work items. It was assumed
by mistake that the flush_workqueue() call on the PF would flush
delayed work items as well.

As flush_workqueue() does not cancel the delayed workqueue, extend
the fix for PFs. This fix will avoid the system crash, if there are
any pending delayed work items in fw_reset_task() during driver's
.remove() call.

Unify the workqueue cleanup logic for both PF and VF by calling
cancel_work_sync() and cancel_delayed_work_sync() directly in
bnxt_remove_one().

Fixes: b148bb238c02 ("bnxt_en: Fix possible crash in bnxt_fw_reset_task().")
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: Andy Gospodarek <gospo@broadcom.com>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b1b5efe5

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -1160,16 +1160,6 @@ static void bnxt_queue_sp_work(struct bnxt *bp)
		schedule_work(&bp->sp_task);
		}

		static void bnxt_cancel_sp_work(struct bnxt *bp)
		{
		if (BNXT_PF(bp)) {
		flush_workqueue(bnxt_pf_wq);
		} else {
		cancel_work_sync(&bp->sp_task);
		cancel_delayed_work_sync(&bp->fw_reset_task);
		}
		}

		static void bnxt_sched_reset(struct bnxt bp, struct bnxt_rx_ring_info rxr)
		{
		if (!rxr->bnapi->in_reset) {
		@@ -11400,7 +11390,8 @@ static void bnxt_remove_one(struct pci_dev *pdev)
		unregister_netdev(dev);
		clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
		/* Flush any pending tasks */
		bnxt_cancel_sp_work(bp);
		cancel_work_sync(&bp->sp_task);
		cancel_delayed_work_sync(&bp->fw_reset_task);
		bp->sp_event = 0;

		bnxt_dl_fw_reporters_destroy(bp, true);