From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Saeed Mahameed <saeedm@nvidia.com>,
Pavel Machek <pavel@denx.de>, Aya Levin <ayal@nvidia.com>
Subject: [net 4/7] net/mlx5: FWTrace, cancel work on alloc pd error flow
Date: Tue, 7 Sep 2021 14:24:17 -0700 [thread overview]
Message-ID: <20210907212420.28529-5-saeed@kernel.org> (raw)
In-Reply-To: <20210907212420.28529-1-saeed@kernel.org>
From: Saeed Mahameed <saeedm@nvidia.com>
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>
---
drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
index 3f8a98093f8c..f9cf9fb31547 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
@@ -1007,7 +1007,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer)
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);
@@ -1031,6 +1031,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer)
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;
}
--
2.31.1
next prev parent reply other threads:[~2021-09-07 21:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 21:24 [pull request][net 0/7] mlx5 fixes 2021-09-07 Saeed Mahameed
2021-09-07 21:24 ` [net 1/7] net/mlx5: Bridge, fix uninitialized variable usage Saeed Mahameed
2021-09-08 10:50 ` patchwork-bot+netdevbpf
2021-09-07 21:24 ` [net 2/7] net/mlx5: Fix rdma aux device on devlink reload Saeed Mahameed
2021-09-07 21:24 ` [net 3/7] net/mlx5: Lag, don't update lag if lag isn't supported Saeed Mahameed
2021-09-07 21:24 ` Saeed Mahameed [this message]
2021-09-11 7:43 ` [net 4/7] net/mlx5: FWTrace, cancel work on alloc pd error flow Pavel Machek
2021-09-07 21:24 ` [net 5/7] net/mlx5: Fix potential sleeping in atomic context Saeed Mahameed
2021-09-07 21:24 ` [net 6/7] net/mlx5e: Fix mutual exclusion between CQE compression and HW TS Saeed Mahameed
2021-09-07 21:24 ` [net 7/7] net/mlx5e: Fix condition when retrieving PTP-rqn Saeed Mahameed
2021-09-08 16:39 ` Jakub Kicinski
2021-09-08 17:34 ` Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210907212420.28529-5-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=ayal@nvidia.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pavel@denx.de \
--cc=saeedm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.