Commit 19cfa36b authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Refactor RX reporter diagnostics 



Break RX diagnostics function into smaller helpers. This enables easier
enhancement in the next patch in the set.

Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 3adb60b6

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

+66 −38
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ static int mlx5e_reporter_icosq_diagnose(struct mlx5e_icosq *icosq, u8 hw_state, 
	return mlx5e_health_fmsg_named_obj_nest_end(fmsg);

}



static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,

static int

mlx5e_rx_reporter_build_diagnose_output_rq_common(struct mlx5e_rq *rq,

						  struct devlink_fmsg *fmsg)

{

	u16 wqe_counter;
@@ -247,14 +248,6 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, 
	wq_head = mlx5e_rqwq_get_head(rq);

	wqe_counter = mlx5e_rqwq_get_wqe_counter(rq);



	err = devlink_fmsg_obj_nest_start(fmsg);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "channel ix", rq->ix);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "rqn", rq->rqn);

	if (err)

		return err;
@@ -300,61 +293,96 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, 
			return err;

	}



	err = devlink_fmsg_obj_nest_end(fmsg);

	return 0;

}



static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,

						   struct devlink_fmsg *fmsg)

{

	int err;



	err = devlink_fmsg_obj_nest_start(fmsg);

	if (err)

		return err;



	return 0;

	err = devlink_fmsg_u32_pair_put(fmsg, "channel ix", rq->ix);

	if (err)

		return err;



	err = mlx5e_rx_reporter_build_diagnose_output_rq_common(rq, fmsg);

	if (err)

		return err;



	return devlink_fmsg_obj_nest_end(fmsg);

}



static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,

				      struct devlink_fmsg *fmsg,

				      struct netlink_ext_ack *extack)

static int mlx5e_rx_reporter_diagnose_generic_rq(struct mlx5e_rq *rq,

						 struct devlink_fmsg *fmsg)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	struct mlx5e_params *params = &priv->channels.params;

	struct mlx5e_rq *generic_rq;

	struct mlx5e_priv *priv = rq->priv;

	struct mlx5e_params *params;

	u32 rq_stride, rq_sz;

	int i, err = 0;



	mutex_lock(&priv->state_lock);



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state))

		goto unlock;

	int err;



	generic_rq = &priv->channels.c[0]->rq;

	rq_sz = mlx5e_rqwq_get_size(generic_rq);

	params = &priv->channels.params;

	rq_sz = mlx5e_rqwq_get_size(rq);

	rq_stride = BIT(mlx5e_mpwqe_get_log_stride_size(priv->mdev, params, NULL));



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "Common config");

	if (err)

		goto unlock;



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RQ");

	if (err)

		goto unlock;

		return err;



	err = devlink_fmsg_u8_pair_put(fmsg, "type", params->rq_wq_type);

	if (err)

		goto unlock;

		return err;



	err = devlink_fmsg_u64_pair_put(fmsg, "stride size", rq_stride);

	if (err)

		goto unlock;

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "size", rq_sz);

	if (err)

		goto unlock;

		return err;



	err = mlx5e_health_cq_common_diag_fmsg(&generic_rq->cq, fmsg);

	err = mlx5e_health_cq_common_diag_fmsg(&rq->cq, fmsg);

	if (err)

		goto unlock;

		return err;



	err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	return mlx5e_health_fmsg_named_obj_nest_end(fmsg);

}



static int

mlx5e_rx_reporter_diagnose_common_config(struct devlink_health_reporter *reporter,

					 struct devlink_fmsg *fmsg)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	struct mlx5e_rq *generic_rq = &priv->channels.c[0]->rq;

	int err;



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "Common config");

	if (err)

		return err;



	err = mlx5e_rx_reporter_diagnose_generic_rq(generic_rq, fmsg);

	if (err)

		return err;



	return mlx5e_health_fmsg_named_obj_nest_end(fmsg);

}



static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,

				      struct devlink_fmsg *fmsg,

				      struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	int i, err = 0;



	mutex_lock(&priv->state_lock);



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state))

		goto unlock;



	err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	err = mlx5e_rx_reporter_diagnose_common_config(reporter, fmsg);

	if (err)

		goto unlock;