* [PATCH net-next] net/mlx5: fix uninit value use
@ 2023-10-25 14:50 Przemek Kitszel
2023-10-26 8:41 ` Michal Swiatkowski
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Przemek Kitszel @ 2023-10-25 14:50 UTC (permalink / raw)
To: netdev, Saeed Mahameed, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Jiri Pirko
Cc: linux-kernel, Leon Romanovsky, Tariq Toukan, Danielle Ratson,
Ido Schimmel, Petr Machata, Moshe Shemesh, Eran Ben Elisha,
Aya Levin, Simon Horman, Przemek Kitszel, Dan Carpenter
Avoid use of uninitialized state variable.
In case of mlx5e_tx_reporter_build_diagnose_output_sq_common() it's better
to still collect other data than bail out entirely.
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/netdev/8bd30131-c9f2-4075-a575-7fa2793a1760@moroto.mountain
Fixes: d17f98bf7cc9 ("net/mlx5: devlink health: use retained error fmsg API")
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 +++++-
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 8 ++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index fc5a9fdd06db..fea8c0a5fe89 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -263,8 +263,12 @@ mlx5e_rx_reporter_build_diagnose_output_rq_common(struct mlx5e_rq *rq,
if (rq->icosq) {
struct mlx5e_icosq *icosq = rq->icosq;
u8 icosq_hw_state;
+ int err;
+
+ err = mlx5_core_query_sq_state(rq->mdev, icosq->sqn, &icosq_hw_state);
+ if (err)
+ return err;
- mlx5_core_query_sq_state(rq->mdev, icosq->sqn, &icosq_hw_state);
mlx5e_reporter_icosq_diagnose(icosq, icosq_hw_state, fmsg);
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index ccff7c26d6ac..6b44ddce14e9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -221,12 +221,16 @@ mlx5e_tx_reporter_build_diagnose_output_sq_common(struct devlink_fmsg *fmsg,
bool stopped = netif_xmit_stopped(sq->txq);
struct mlx5e_priv *priv = sq->priv;
u8 state;
+ int err;
- mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);
devlink_fmsg_u32_pair_put(fmsg, "tc", tc);
devlink_fmsg_u32_pair_put(fmsg, "txq ix", sq->txq_ix);
devlink_fmsg_u32_pair_put(fmsg, "sqn", sq->sqn);
- devlink_fmsg_u8_pair_put(fmsg, "HW state", state);
+
+ err = mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);
+ if (!err)
+ devlink_fmsg_u8_pair_put(fmsg, "HW state", state);
+
devlink_fmsg_bool_pair_put(fmsg, "stopped", stopped);
devlink_fmsg_u32_pair_put(fmsg, "cc", sq->cc);
devlink_fmsg_u32_pair_put(fmsg, "pc", sq->pc);
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net/mlx5: fix uninit value use
2023-10-25 14:50 [PATCH net-next] net/mlx5: fix uninit value use Przemek Kitszel
@ 2023-10-26 8:41 ` Michal Swiatkowski
2023-10-26 22:14 ` Saeed Mahameed
2023-10-26 22:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: Michal Swiatkowski @ 2023-10-26 8:41 UTC (permalink / raw)
To: Przemek Kitszel
Cc: netdev, Saeed Mahameed, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Jiri Pirko, linux-kernel,
Leon Romanovsky, Tariq Toukan, Danielle Ratson, Ido Schimmel,
Petr Machata, Moshe Shemesh, Eran Ben Elisha, Aya Levin,
Simon Horman, Dan Carpenter
On Wed, Oct 25, 2023 at 04:50:50PM +0200, Przemek Kitszel wrote:
> Avoid use of uninitialized state variable.
>
> In case of mlx5e_tx_reporter_build_diagnose_output_sq_common() it's better
> to still collect other data than bail out entirely.
>
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Link: https://lore.kernel.org/netdev/8bd30131-c9f2-4075-a575-7fa2793a1760@moroto.mountain
> Fixes: d17f98bf7cc9 ("net/mlx5: devlink health: use retained error fmsg API")
> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 +++++-
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 8 ++++++--
> 2 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> index fc5a9fdd06db..fea8c0a5fe89 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> @@ -263,8 +263,12 @@ mlx5e_rx_reporter_build_diagnose_output_rq_common(struct mlx5e_rq *rq,
> if (rq->icosq) {
> struct mlx5e_icosq *icosq = rq->icosq;
> u8 icosq_hw_state;
> + int err;
> +
> + err = mlx5_core_query_sq_state(rq->mdev, icosq->sqn, &icosq_hw_state);
> + if (err)
> + return err;
>
> - mlx5_core_query_sq_state(rq->mdev, icosq->sqn, &icosq_hw_state);
> mlx5e_reporter_icosq_diagnose(icosq, icosq_hw_state, fmsg);
> }
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> index ccff7c26d6ac..6b44ddce14e9 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> @@ -221,12 +221,16 @@ mlx5e_tx_reporter_build_diagnose_output_sq_common(struct devlink_fmsg *fmsg,
> bool stopped = netif_xmit_stopped(sq->txq);
> struct mlx5e_priv *priv = sq->priv;
> u8 state;
> + int err;
>
> - mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);
> devlink_fmsg_u32_pair_put(fmsg, "tc", tc);
> devlink_fmsg_u32_pair_put(fmsg, "txq ix", sq->txq_ix);
> devlink_fmsg_u32_pair_put(fmsg, "sqn", sq->sqn);
> - devlink_fmsg_u8_pair_put(fmsg, "HW state", state);
> +
> + err = mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);
> + if (!err)
> + devlink_fmsg_u8_pair_put(fmsg, "HW state", state);
> +
> devlink_fmsg_bool_pair_put(fmsg, "stopped", stopped);
> devlink_fmsg_u32_pair_put(fmsg, "cc", sq->cc);
> devlink_fmsg_u32_pair_put(fmsg, "pc", sq->pc);
> --
LGTM
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> 2.38.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net/mlx5: fix uninit value use
2023-10-25 14:50 [PATCH net-next] net/mlx5: fix uninit value use Przemek Kitszel
2023-10-26 8:41 ` Michal Swiatkowski
@ 2023-10-26 22:14 ` Saeed Mahameed
2023-10-26 22:48 ` Jakub Kicinski
2023-10-26 22:50 ` patchwork-bot+netdevbpf
2 siblings, 1 reply; 5+ messages in thread
From: Saeed Mahameed @ 2023-10-26 22:14 UTC (permalink / raw)
To: Przemek Kitszel
Cc: netdev, Saeed Mahameed, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Jiri Pirko, linux-kernel,
Leon Romanovsky, Tariq Toukan, Danielle Ratson, Ido Schimmel,
Petr Machata, Moshe Shemesh, Eran Ben Elisha, Aya Levin,
Simon Horman, Dan Carpenter
On 25 Oct 16:50, Przemek Kitszel wrote:
>Avoid use of uninitialized state variable.
>
>In case of mlx5e_tx_reporter_build_diagnose_output_sq_common() it's better
>to still collect other data than bail out entirely.
>
>Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
>Link: https://lore.kernel.org/netdev/8bd30131-c9f2-4075-a575-7fa2793a1760@moroto.mountain
>Fixes: d17f98bf7cc9 ("net/mlx5: devlink health: use retained error fmsg API")
>Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Applied to net-next-mlx5
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net/mlx5: fix uninit value use
2023-10-26 22:14 ` Saeed Mahameed
@ 2023-10-26 22:48 ` Jakub Kicinski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2023-10-26 22:48 UTC (permalink / raw)
To: Saeed Mahameed
Cc: Przemek Kitszel, netdev, Saeed Mahameed, David S. Miller,
Eric Dumazet, Paolo Abeni, Jiri Pirko, linux-kernel,
Leon Romanovsky, Tariq Toukan, Danielle Ratson, Ido Schimmel,
Petr Machata, Moshe Shemesh, Eran Ben Elisha, Aya Levin,
Simon Horman, Dan Carpenter
On Thu, 26 Oct 2023 15:14:37 -0700 Saeed Mahameed wrote:
> >Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> >Link: https://lore.kernel.org/netdev/8bd30131-c9f2-4075-a575-7fa2793a1760@moroto.mountain
> >Fixes: d17f98bf7cc9 ("net/mlx5: devlink health: use retained error fmsg API")
> >Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
>
> Applied to net-next-mlx5
Given the hold up with your PR I prefer to take this directly, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] net/mlx5: fix uninit value use
2023-10-25 14:50 [PATCH net-next] net/mlx5: fix uninit value use Przemek Kitszel
2023-10-26 8:41 ` Michal Swiatkowski
2023-10-26 22:14 ` Saeed Mahameed
@ 2023-10-26 22:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-26 22:50 UTC (permalink / raw)
To: Przemek Kitszel
Cc: netdev, saeedm, davem, edumazet, kuba, pabeni, jiri, linux-kernel,
leon, tariqt, danieller, idosch, petrm, moshe, eranbe, ayal,
horms, dan.carpenter
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 25 Oct 2023 16:50:50 +0200 you wrote:
> Avoid use of uninitialized state variable.
>
> In case of mlx5e_tx_reporter_build_diagnose_output_sq_common() it's better
> to still collect other data than bail out entirely.
>
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Link: https://lore.kernel.org/netdev/8bd30131-c9f2-4075-a575-7fa2793a1760@moroto.mountain
> Fixes: d17f98bf7cc9 ("net/mlx5: devlink health: use retained error fmsg API")
> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
>
> [...]
Here is the summary with links:
- [net-next] net/mlx5: fix uninit value use
https://git.kernel.org/netdev/net-next/c/5af8d8ce6434
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-26 22:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-25 14:50 [PATCH net-next] net/mlx5: fix uninit value use Przemek Kitszel
2023-10-26 8:41 ` Michal Swiatkowski
2023-10-26 22:14 ` Saeed Mahameed
2023-10-26 22:48 ` Jakub Kicinski
2023-10-26 22:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).