Commit b21aef7e authored by Joe Perches's avatar Joe Perches Committed by Saeed Mahameed
Browse files

mlx5: Use proper logging and tracing line terminations 



netdev_err should use newline termination but mlx5_health_report
is used in a trace output function devlink_health_report where
no newline should be used.

Remove the newlines from a couple formats and add a format string
of "%s\n" to the netdev_err call to not directly output the
logging string.

Also use snprintf to avoid any possible output string overrun.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 0f56d3c5

drivers/net/ethernet/mellanox/mlx5/core/en/health.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int mlx5e_health_report(struct mlx5e_priv *priv, 
			struct devlink_health_reporter *reporter, char *err_str,

			struct mlx5e_err_ctx *err_ctx)

{

	netdev_err(priv->netdev, err_str);

	netdev_err(priv->netdev, "%s\n", err_str);



	if (!reporter)

		return err_ctx->recover(&err_ctx->ctx);

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c

+5 −4
Original line number Diff line number Diff line
@@ -519,7 +519,8 @@ void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq) 
	err_ctx.ctx = rq;

	err_ctx.recover = mlx5e_rx_reporter_timeout_recover;

	err_ctx.dump = mlx5e_rx_reporter_dump_rq;

	sprintf(err_str, "RX timeout on channel: %d, ICOSQ: 0x%x RQ: 0x%x, CQ: 0x%x\n",

	snprintf(err_str, sizeof(err_str),

		 "RX timeout on channel: %d, ICOSQ: 0x%x RQ: 0x%x, CQ: 0x%x",

		 icosq->channel->ix, icosq->sqn, rq->rqn, rq->cq.mcq.cqn);



	mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
@@ -534,7 +535,7 @@ void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq) 
	err_ctx.ctx = rq;

	err_ctx.recover = mlx5e_rx_reporter_err_rq_cqe_recover;

	err_ctx.dump = mlx5e_rx_reporter_dump_rq;

	sprintf(err_str, "ERR CQE on RQ: 0x%x", rq->rqn);

	snprintf(err_str, sizeof(err_str), "ERR CQE on RQ: 0x%x", rq->rqn);



	mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);

}
@@ -548,7 +549,7 @@ void mlx5e_reporter_icosq_cqe_err(struct mlx5e_icosq *icosq) 
	err_ctx.ctx = icosq;

	err_ctx.recover = mlx5e_rx_reporter_err_icosq_cqe_recover;

	err_ctx.dump = mlx5e_rx_reporter_dump_icosq;

	sprintf(err_str, "ERR CQE on ICOSQ: 0x%x", icosq->sqn);

	snprintf(err_str, sizeof(err_str), "ERR CQE on ICOSQ: 0x%x", icosq->sqn);



	mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);

}

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+5 −5
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq) 
	err_ctx.ctx = sq;

	err_ctx.recover = mlx5e_tx_reporter_err_cqe_recover;

	err_ctx.dump = mlx5e_tx_reporter_dump_sq;

	sprintf(err_str, "ERR CQE on SQ: 0x%x", sq->sqn);

	snprintf(err_str, sizeof(err_str), "ERR CQE on SQ: 0x%x", sq->sqn);



	mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx);

}
@@ -389,8 +389,8 @@ int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq) 
	err_ctx.ctx = sq;

	err_ctx.recover = mlx5e_tx_reporter_timeout_recover;

	err_ctx.dump = mlx5e_tx_reporter_dump_sq;

	sprintf(err_str,

		"TX timeout on queue: %d, SQ: 0x%x, CQ: 0x%x, SQ Cons: 0x%x SQ Prod: 0x%x, usecs since last trans: %u\n",

	snprintf(err_str, sizeof(err_str),

		 "TX timeout on queue: %d, SQ: 0x%x, CQ: 0x%x, SQ Cons: 0x%x SQ Prod: 0x%x, usecs since last trans: %u",

		 sq->channel->ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc,

		 jiffies_to_usecs(jiffies - sq->txq->trans_start));

CRA Git | Maintained and supported by SUSTech CRA and CCSE