net/mlx5e: Gather reporters APIs together

Assemble all the API's to ease insertion of dump callbacks in the
following patches in the set.

Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

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 6c72b592315bccb284039895b17060155137e42e..cfa6941fca6b97b7668c1e5874cfce7b06818321 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -102,19 +102,6 @@ out:
        return err;
 }
 
-void mlx5e_reporter_icosq_cqe_err(struct mlx5e_icosq *icosq)
-{
-       struct mlx5e_priv *priv = icosq->channel->priv;
-       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
-       struct mlx5e_err_ctx err_ctx = {};
-
-       err_ctx.ctx = icosq;
-       err_ctx.recover = mlx5e_rx_reporter_err_icosq_cqe_recover;
-       sprintf(err_str, "ERR CQE on ICOSQ: 0x%x", icosq->sqn);
-
-       mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
-}
-
 static int mlx5e_rq_to_ready(struct mlx5e_rq *rq, int curr_state)
 {
        struct net_device *dev = rq->netdev;
@@ -171,19 +158,6 @@ out:
        return err;
 }
 
-void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq)
-{
-       struct mlx5e_priv *priv = rq->channel->priv;
-       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
-       struct mlx5e_err_ctx err_ctx = {};
-
-       err_ctx.ctx = rq;
-       err_ctx.recover = mlx5e_rx_reporter_err_rq_cqe_recover;
-       sprintf(err_str, "ERR CQE on RQ: 0x%x", rq->rqn);
-
-       mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
-}
-
 static int mlx5e_rx_reporter_timeout_recover(void *ctx)
 {
        struct mlx5e_icosq *icosq;
@@ -201,21 +175,6 @@ static int mlx5e_rx_reporter_timeout_recover(void *ctx)
        return err;
 }
 
-void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq)
-{
-       struct mlx5e_icosq *icosq = &rq->channel->icosq;
-       struct mlx5e_priv *priv = rq->channel->priv;
-       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
-       struct mlx5e_err_ctx err_ctx = {};
-
-       err_ctx.ctx = rq;
-       err_ctx.recover = mlx5e_rx_reporter_timeout_recover;
-       sprintf(err_str, "RX timeout on channel: %d, ICOSQ: 0x%x RQ: 0x%x, CQ: 0x%x\n",
-               icosq->channel->ix, icosq->sqn, rq->rqn, rq->cq.mcq.cqn);
-
-       mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
-}
-
 static int mlx5e_rx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx)
 {
        return err_ctx->recover(err_ctx->ctx);
@@ -371,6 +330,47 @@ unlock:
        return err;
 }
 
+void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq)
+{
+       struct mlx5e_icosq *icosq = &rq->channel->icosq;
+       struct mlx5e_priv *priv = rq->channel->priv;
+       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
+       struct mlx5e_err_ctx err_ctx = {};
+
+       err_ctx.ctx = rq;
+       err_ctx.recover = mlx5e_rx_reporter_timeout_recover;
+       sprintf(err_str, "RX timeout on channel: %d, ICOSQ: 0x%x RQ: 0x%x, CQ: 0x%x\n",
+               icosq->channel->ix, icosq->sqn, rq->rqn, rq->cq.mcq.cqn);
+
+       mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
+}
+
+void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq)
+{
+       struct mlx5e_priv *priv = rq->channel->priv;
+       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
+       struct mlx5e_err_ctx err_ctx = {};
+
+       err_ctx.ctx = rq;
+       err_ctx.recover = mlx5e_rx_reporter_err_rq_cqe_recover;
+       sprintf(err_str, "ERR CQE on RQ: 0x%x", rq->rqn);
+
+       mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
+}
+
+void mlx5e_reporter_icosq_cqe_err(struct mlx5e_icosq *icosq)
+{
+       struct mlx5e_priv *priv = icosq->channel->priv;
+       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
+       struct mlx5e_err_ctx err_ctx = {};
+
+       err_ctx.ctx = icosq;
+       err_ctx.recover = mlx5e_rx_reporter_err_icosq_cqe_recover;
+       sprintf(err_str, "ERR CQE on ICOSQ: 0x%x", icosq->sqn);
+
+       mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx);
+}
+
 static const struct devlink_health_reporter_ops mlx5_rx_reporter_ops = {
        .name = "rx",
        .recover = mlx5e_rx_reporter_recover,

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 b468549e96ffd5e87bed705d6eda6abe77b43962..623c949db54c0e38482c11f8a811d35d338a8b67 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -82,19 +82,6 @@ out:
        return err;
 }
 
-void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq)
-{
-       struct mlx5e_priv *priv = sq->channel->priv;
-       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
-       struct mlx5e_err_ctx err_ctx = {0};
-
-       err_ctx.ctx = sq;
-       err_ctx.recover = mlx5e_tx_reporter_err_cqe_recover;
-       sprintf(err_str, "ERR CQE on SQ: 0x%x", sq->sqn);
-
-       mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx);
-}
-
 static int mlx5e_tx_reporter_timeout_recover(void *ctx)
 {
        struct mlx5_eq_comp *eq;
@@ -110,22 +97,6 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx)
        return err;
 }
 
-int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq)
-{
-       struct mlx5e_priv *priv = sq->channel->priv;
-       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
-       struct mlx5e_err_ctx err_ctx;
-
-       err_ctx.ctx = sq;
-       err_ctx.recover = mlx5e_tx_reporter_timeout_recover;
-       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",
-               sq->channel->ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc,
-               jiffies_to_usecs(jiffies - sq->txq->trans_start));
-
-       return mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx);
-}
-
 /* state lock cannot be grabbed within this function.
  * It can cause a dead lock or a read-after-free.
  */
@@ -275,6 +246,35 @@ unlock:
        return err;
 }
 
+void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq)
+{
+       struct mlx5e_priv *priv = sq->channel->priv;
+       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
+       struct mlx5e_err_ctx err_ctx = {};
+
+       err_ctx.ctx = sq;
+       err_ctx.recover = mlx5e_tx_reporter_err_cqe_recover;
+       sprintf(err_str, "ERR CQE on SQ: 0x%x", sq->sqn);
+
+       mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx);
+}
+
+int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq)
+{
+       struct mlx5e_priv *priv = sq->channel->priv;
+       char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];
+       struct mlx5e_err_ctx err_ctx = {};
+
+       err_ctx.ctx = sq;
+       err_ctx.recover = mlx5e_tx_reporter_timeout_recover;
+       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",
+               sq->channel->ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc,
+               jiffies_to_usecs(jiffies - sq->txq->trans_start));
+
+       return mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx);
+}
+
 static const struct devlink_health_reporter_ops mlx5_tx_reporter_ops = {
                .name = "tx",
                .recover = mlx5e_tx_reporter_recover,