lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 217/260] net/mlx5: FWTrace, cancel work on alloc pd error flow
    Date
    From: Saeed Mahameed <saeedm@nvidia.com>

    commit dfe6fd72b5f1878b16aa2c8603e031bbcd66b96d upstream.

    Handle error flow on mlx5_core_alloc_pd() failure,
    read_fw_strings_work must be canceled.

    Fixes: c71ad41ccb0c ("net/mlx5: FW tracer, events handling")
    Reported-by: Pavel Machek (CIP) <pavel@denx.de>
    Suggested-by: Pavel Machek (CIP) <pavel@denx.de>
    Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
    Reviewed-by: Aya Levin <ayal@nvidia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
    @@ -1005,7 +1005,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_t
    err = mlx5_core_alloc_pd(dev, &tracer->buff.pdn);
    if (err) {
    mlx5_core_warn(dev, "FWTracer: Failed to allocate PD %d\n", err);
    - return err;
    + goto err_cancel_work;
    }

    err = mlx5_fw_tracer_create_mkey(tracer);
    @@ -1029,6 +1029,7 @@ err_notifier_unregister:
    mlx5_core_destroy_mkey(dev, &tracer->buff.mkey);
    err_dealloc_pd:
    mlx5_core_dealloc_pd(dev, tracer->buff.pdn);
    +err_cancel_work:
    cancel_work_sync(&tracer->read_fw_strings_work);
    return err;
    }

    \
     
     \ /
      Last update: 2021-09-20 20:24    [W:4.037 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site