From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
To: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Cc: netdev@vger.kernel.org, Saeed Mahameed <saeedm@nvidia.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jiri Pirko <jiri@resnulli.us>,
linux-kernel@vger.kernel.org, Leon Romanovsky <leon@kernel.org>,
Tariq Toukan <tariqt@nvidia.com>,
Danielle Ratson <danieller@nvidia.com>,
Ido Schimmel <idosch@nvidia.com>, Petr Machata <petrm@nvidia.com>,
Moshe Shemesh <moshe@nvidia.com>,
Eran Ben Elisha <eranbe@nvidia.com>,
Aya Levin <ayal@mellanox.com>, Simon Horman <horms@kernel.org>,
Dan Carpenter <dan.carpenter@linaro.org>
Subject: Re: [PATCH net-next] net/mlx5: fix uninit value use
Date: Thu, 26 Oct 2023 10:41:34 +0200 [thread overview]
Message-ID: <ZTomPuMY/cWwdB8S@wasp> (raw)
In-Reply-To: <20231025145050.36114-1-przemyslaw.kitszel@intel.com>
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
next prev parent reply other threads:[~2023-10-26 9:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 14:50 [PATCH net-next] net/mlx5: fix uninit value use Przemek Kitszel
2023-10-26 8:41 ` Michal Swiatkowski [this message]
2023-10-26 22:14 ` Saeed Mahameed
2023-10-26 22:48 ` Jakub Kicinski
2023-10-26 22:50 ` patchwork-bot+netdevbpf
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=ZTomPuMY/cWwdB8S@wasp \
--to=michal.swiatkowski@linux.intel.com \
--cc=ayal@mellanox.com \
--cc=dan.carpenter@linaro.org \
--cc=danieller@nvidia.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eranbe@nvidia.com \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=moshe@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=saeedm@nvidia.com \
--cc=tariqt@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.