lkml.org 
[lkml]   [2020]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 045/129] bnxt_en: Fix possible crash in bnxt_fw_reset_task().
    Date
    From: Michael Chan <michael.chan@broadcom.com>

    [ Upstream commit b148bb238c02f0c7797efed026e9bba5892d2172 ]

    bnxt_fw_reset_task() is run from a delayed workqueue. The current
    code is not cancelling the workqueue in the driver's .remove()
    method and it can potentially crash if the device is removed with
    the workqueue still pending.

    The fix is to clear the BNXT_STATE_IN_FW_RESET flag and then cancel
    the delayed workqueue in bnxt_remove_one(). bnxt_queue_fw_reset_work()
    also needs to check that this flag is set before scheduling. This
    will guarantee that no rescheduling will be done after it is cancelled.

    Fixes: 230d1f0de754 ("bnxt_en: Handle firmware reset.")
    Reviewed-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
    Signed-off-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    index 7cb74d7a78e3c..16462d21fea38 100644
    --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    @@ -1143,6 +1143,9 @@ static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,

    static void bnxt_queue_fw_reset_work(struct bnxt *bp, unsigned long delay)
    {
    + if (!(test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)))
    + return;
    +
    if (BNXT_PF(bp))
    queue_delayed_work(bnxt_pf_wq, &bp->fw_reset_task, delay);
    else
    @@ -1159,10 +1162,12 @@ static void bnxt_queue_sp_work(struct bnxt *bp)

    static void bnxt_cancel_sp_work(struct bnxt *bp)
    {
    - if (BNXT_PF(bp))
    + if (BNXT_PF(bp)) {
    flush_workqueue(bnxt_pf_wq);
    - else
    + } 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)
    @@ -11386,6 +11391,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)
    unregister_netdev(dev);
    bnxt_dl_unregister(bp);
    bnxt_shutdown_tc(bp);
    + clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
    bnxt_cancel_sp_work(bp);
    bp->sp_event = 0;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-08 19:29    [W:4.243 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site