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

Commit 90c694bb authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Fix RTNL lock usage on bnxt_get_port_module_status(). 



bnxt_get_port_module_status() calls bnxt_update_link() which expects
RTNL to be held.  In bnxt_sp_task() that does not hold RTNL, we need to
call it with a prior call to bnxt_rtnl_lock_sp() and the call needs to
be moved to the end of bnxt_sp_task().

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0eaa24b9

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -6259,9 +6259,6 @@ static void bnxt_sp_task(struct work_struct *work) 
		bnxt_hwrm_tunnel_dst_port_free(

		bnxt_hwrm_tunnel_dst_port_free(

			bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE);

			bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE);

	}

	}

	if (test_and_clear_bit(BNXT_HWRM_PORT_MODULE_SP_EVENT, &bp->sp_event))

		bnxt_get_port_module_status(bp);



	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event))

	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event))

		bnxt_hwrm_port_qstats(bp);

		bnxt_hwrm_port_qstats(bp);
@@ -6283,6 +6280,12 @@ static void bnxt_sp_task(struct work_struct *work) 
			netdev_err(bp->dev, "SP task can't update link (rc: %x)\n",

			netdev_err(bp->dev, "SP task can't update link (rc: %x)\n",

				   rc);

				   rc);

	}

	}

	if (test_and_clear_bit(BNXT_HWRM_PORT_MODULE_SP_EVENT, &bp->sp_event)) {

		bnxt_rtnl_lock_sp(bp);

		if (test_bit(BNXT_STATE_OPEN, &bp->state))

			bnxt_get_port_module_status(bp);

		bnxt_rtnl_unlock_sp(bp);

	}

	if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event))

	if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event))

		bnxt_reset(bp, false);

		bnxt_reset(bp, false);