| From foo@baz Sat 11 Jan 2020 09:13:20 AM CET |
| From: Eran Ben Elisha <eranbe@mellanox.com> |
| Date: Wed, 4 Dec 2019 14:34:18 +0200 |
| Subject: net/mlx5e: Always print health reporter message to dmesg |
| |
| From: Eran Ben Elisha <eranbe@mellanox.com> |
| |
| [ Upstream commit 99cda45426c9a2c59bb2f7cb886a405440282455 ] |
| |
| In case a reporter exists, error message is logged only to the devlink |
| tracer. The devlink tracer is a visibility utility only, which user can |
| choose not to monitor. |
| After cited patch, 3rd party monitoring tools that tracks these error |
| message will no longer find them in dmesg, causing a regression. |
| |
| With this patch, error messages are also logged into the dmesg. |
| |
| Fixes: c50de4af1d63 ("net/mlx5e: Generalize tx reporter's functionality") |
| Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com> |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/en/health.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c |
| @@ -197,9 +197,10 @@ int mlx5e_health_report(struct mlx5e_pri |
| struct devlink_health_reporter *reporter, char *err_str, |
| struct mlx5e_err_ctx *err_ctx) |
| { |
| - if (!reporter) { |
| - netdev_err(priv->netdev, err_str); |
| + netdev_err(priv->netdev, err_str); |
| + |
| + if (!reporter) |
| return err_ctx->recover(&err_ctx->ctx); |
| - } |
| + |
| return devlink_health_report(reporter, err_str, err_ctx); |
| } |
