From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Aya Levin <ayal@mellanox.com>, Tariq Toukan <tariqt@mellanox.com>,
Jiri Pirko <jiri@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [net 5/6] net/mlx5e: Fix error flow in tx reporter diagnose
Date: Thu, 11 Jul 2019 18:54:18 +0000 [thread overview]
Message-ID: <20190711185353.5715-6-saeedm@mellanox.com> (raw)
In-Reply-To: <20190711185353.5715-1-saeedm@mellanox.com>
From: Aya Levin <ayal@mellanox.com>
Fix tx reporter's diagnose callback. Propagate error when failing to
gather diagnostics information or failing to print diagnostic data per
queue.
Fixes: de8650a82071 ("net/mlx5e: Add tx reporter support")
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 a778c15e5324..f3d98748b211 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -262,13 +262,13 @@ static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,
err = mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);
if (err)
- break;
+ goto unlock;
err = mlx5e_tx_reporter_build_diagnose_output(fmsg, sq->sqn,
state,
netif_xmit_stopped(sq->txq));
if (err)
- break;
+ goto unlock;
}
err = devlink_fmsg_arr_pair_nest_end(fmsg);
if (err)
--
2.21.0
next prev parent reply other threads:[~2019-07-11 18:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 18:54 [pull request][net 0/6] Mellanox, mlx5 fixes 2019-07-11 Saeed Mahameed
2019-07-11 18:54 ` [net 1/6] net/mlx5: E-Switch, Fix default encap mode Saeed Mahameed
2019-07-11 18:54 ` [net 2/6] net/mlx5e: Fix port tunnel GRE entropy control Saeed Mahameed
2019-07-11 18:54 ` [net 3/6] net/mlx5e: Rx, Fix checksum calculation for new hardware Saeed Mahameed
2019-07-11 18:54 ` [net 4/6] net/mlx5e: Fix return value from timeout recover function Saeed Mahameed
2019-07-11 18:54 ` Saeed Mahameed [this message]
2019-07-11 18:54 ` [net 6/6] net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn Saeed Mahameed
2019-07-11 22:08 ` [pull request][net 0/6] Mellanox, mlx5 fixes 2019-07-11 David Miller
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=20190711185353.5715-6-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=ayal@mellanox.com \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=tariqt@mellanox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox