Commit d17f98bf authored by Przemek Kitszel's avatar Przemek Kitszel Committed by David S. Miller
Browse files

net/mlx5: devlink health: use retained error fmsg API 



Drop unneeded error checking.

devlink_fmsg_*() family of functions is now retaining errors,
so there is no need to check for them after each call.

Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d434b48

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+12 −37
Original line number Diff line number Diff line
@@ -889,36 +889,16 @@ int mlx5_fw_tracer_trigger_core_dump_general(struct mlx5_core_dev *dev) 
	return 0;

}



static int

static void

mlx5_devlink_fmsg_fill_trace(struct devlink_fmsg *fmsg,

			     struct mlx5_fw_trace_data *trace_data)

{

	int err;



	err = devlink_fmsg_obj_nest_start(fmsg);

	if (err)

		return err;



	err = devlink_fmsg_u64_pair_put(fmsg, "timestamp", trace_data->timestamp);

	if (err)

		return err;



	err = devlink_fmsg_bool_pair_put(fmsg, "lost", trace_data->lost);

	if (err)

		return err;



	err = devlink_fmsg_u8_pair_put(fmsg, "event_id", trace_data->event_id);

	if (err)

		return err;



	err = devlink_fmsg_string_pair_put(fmsg, "msg", trace_data->msg);

	if (err)

		return err;



	err = devlink_fmsg_obj_nest_end(fmsg);

	if (err)

		return err;

	return 0;

	devlink_fmsg_obj_nest_start(fmsg);

	devlink_fmsg_u64_pair_put(fmsg, "timestamp", trace_data->timestamp);

	devlink_fmsg_bool_pair_put(fmsg, "lost", trace_data->lost);

	devlink_fmsg_u8_pair_put(fmsg, "event_id", trace_data->event_id);

	devlink_fmsg_string_pair_put(fmsg, "msg", trace_data->msg);

	devlink_fmsg_obj_nest_end(fmsg);

}



int mlx5_fw_tracer_get_saved_traces_objects(struct mlx5_fw_tracer *tracer,
@@ -927,7 +907,6 @@ int mlx5_fw_tracer_get_saved_traces_objects(struct mlx5_fw_tracer *tracer, 
	struct mlx5_fw_trace_data *straces = tracer->st_arr.straces;

	u32 index, start_index, end_index;

	u32 saved_traces_index;

	int err;



	if (!straces[0].timestamp)

		return -ENOMSG;
@@ -940,22 +919,18 @@ int mlx5_fw_tracer_get_saved_traces_objects(struct mlx5_fw_tracer *tracer, 
		start_index = 0;

	end_index = (saved_traces_index - 1) & (SAVED_TRACES_NUM - 1);



	err = devlink_fmsg_arr_pair_nest_start(fmsg, "dump fw traces");

	if (err)

		goto unlock;

	devlink_fmsg_arr_pair_nest_start(fmsg, "dump fw traces");

	index = start_index;

	while (index != end_index) {

		err = mlx5_devlink_fmsg_fill_trace(fmsg, &straces[index]);

		if (err)

			goto unlock;

		mlx5_devlink_fmsg_fill_trace(fmsg, &straces[index]);



		index = (index + 1) & (SAVED_TRACES_NUM - 1);

	}



	err = devlink_fmsg_arr_pair_nest_end(fmsg);

unlock:

	devlink_fmsg_arr_pair_nest_end(fmsg);

	mutex_unlock(&tracer->st_arr.lock);

	return err;



	return 0;

}



static void mlx5_fw_tracer_update_db(struct work_struct *work)

drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c

+34 −84
Original line number Diff line number Diff line
@@ -13,106 +13,55 @@ struct mlx5_vnic_diag_stats { 
	__be64 query_vnic_env_out[MLX5_ST_SZ_QW(query_vnic_env_out)];

};



int mlx5_reporter_vnic_diagnose_counters(struct mlx5_core_dev *dev,

void mlx5_reporter_vnic_diagnose_counters(struct mlx5_core_dev *dev,

					  struct devlink_fmsg *fmsg,

					  u16 vport_num, bool other_vport)

{

	u32 in[MLX5_ST_SZ_DW(query_vnic_env_in)] = {};

	struct mlx5_vnic_diag_stats vnic;

	int err;



	MLX5_SET(query_vnic_env_in, in, opcode, MLX5_CMD_OP_QUERY_VNIC_ENV);

	MLX5_SET(query_vnic_env_in, in, vport_number, vport_num);

	MLX5_SET(query_vnic_env_in, in, other_vport, !!other_vport);



	err = mlx5_cmd_exec_inout(dev, query_vnic_env, in, &vnic.query_vnic_env_out);

	if (err)

		return err;

	mlx5_cmd_exec_inout(dev, query_vnic_env, in, &vnic.query_vnic_env_out);



	err = devlink_fmsg_pair_nest_start(fmsg, "vNIC env counters");

	if (err)

		return err;



	err = devlink_fmsg_obj_nest_start(fmsg);

	if (err)

		return err;

	devlink_fmsg_pair_nest_start(fmsg, "vNIC env counters");

	devlink_fmsg_obj_nest_start(fmsg);



	if (MLX5_CAP_GEN(dev, vnic_env_queue_counters)) {

		err = devlink_fmsg_u32_pair_put(fmsg, "total_error_queues",

		devlink_fmsg_u32_pair_put(fmsg, "total_error_queues",

					  VNIC_ENV_GET(&vnic, total_error_queues));

		if (err)

			return err;



		err = devlink_fmsg_u32_pair_put(fmsg, "send_queue_priority_update_flow",

						VNIC_ENV_GET(&vnic,

							     send_queue_priority_update_flow));

		if (err)

			return err;

		devlink_fmsg_u32_pair_put(fmsg, "send_queue_priority_update_flow",

					  VNIC_ENV_GET(&vnic, send_queue_priority_update_flow));

	}



	if (MLX5_CAP_GEN(dev, eq_overrun_count)) {

		err = devlink_fmsg_u32_pair_put(fmsg, "comp_eq_overrun",

		devlink_fmsg_u32_pair_put(fmsg, "comp_eq_overrun",

					  VNIC_ENV_GET(&vnic, comp_eq_overrun));

		if (err)

			return err;



		err = devlink_fmsg_u32_pair_put(fmsg, "async_eq_overrun",

		devlink_fmsg_u32_pair_put(fmsg, "async_eq_overrun",

					  VNIC_ENV_GET(&vnic, async_eq_overrun));

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, vnic_env_cq_overrun)) {

		err = devlink_fmsg_u32_pair_put(fmsg, "cq_overrun",

	if (MLX5_CAP_GEN(dev, vnic_env_cq_overrun))

		devlink_fmsg_u32_pair_put(fmsg, "cq_overrun",

					  VNIC_ENV_GET(&vnic, cq_overrun));

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, invalid_command_count)) {

		err = devlink_fmsg_u32_pair_put(fmsg, "invalid_command",

	if (MLX5_CAP_GEN(dev, invalid_command_count))

		devlink_fmsg_u32_pair_put(fmsg, "invalid_command",

					  VNIC_ENV_GET(&vnic, invalid_command));

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, quota_exceeded_count)) {

		err = devlink_fmsg_u32_pair_put(fmsg, "quota_exceeded_command",

	if (MLX5_CAP_GEN(dev, quota_exceeded_count))

		devlink_fmsg_u32_pair_put(fmsg, "quota_exceeded_command",

					  VNIC_ENV_GET(&vnic, quota_exceeded_command));

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, nic_receive_steering_discard)) {

		err = devlink_fmsg_u64_pair_put(fmsg, "nic_receive_steering_discard",

						VNIC_ENV_GET64(&vnic,

							       nic_receive_steering_discard));

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, nic_receive_steering_discard))

		devlink_fmsg_u64_pair_put(fmsg, "nic_receive_steering_discard",

					  VNIC_ENV_GET64(&vnic, nic_receive_steering_discard));

	if (MLX5_CAP_GEN(dev, vnic_env_cnt_steering_fail)) {

		err = devlink_fmsg_u64_pair_put(fmsg, "generated_pkt_steering_fail",

						VNIC_ENV_GET64(&vnic,

							       generated_pkt_steering_fail));

		if (err)

			return err;



		err = devlink_fmsg_u64_pair_put(fmsg, "handled_pkt_steering_fail",

		devlink_fmsg_u64_pair_put(fmsg, "generated_pkt_steering_fail",

					  VNIC_ENV_GET64(&vnic, generated_pkt_steering_fail));

		devlink_fmsg_u64_pair_put(fmsg, "handled_pkt_steering_fail",

					  VNIC_ENV_GET64(&vnic, handled_pkt_steering_fail));

		if (err)

			return err;

	}



	err = devlink_fmsg_obj_nest_end(fmsg);

	if (err)

		return err;



	err = devlink_fmsg_pair_nest_end(fmsg);

	if (err)

		return err;



	return 0;

	devlink_fmsg_obj_nest_end(fmsg);

	devlink_fmsg_pair_nest_end(fmsg);

}



static int mlx5_reporter_vnic_diagnose(struct devlink_health_reporter *reporter,
@@ -121,7 +70,8 @@ static int mlx5_reporter_vnic_diagnose(struct devlink_health_reporter *reporter, 
{

	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);



	return mlx5_reporter_vnic_diagnose_counters(dev, fmsg, 0, false);

	mlx5_reporter_vnic_diagnose_counters(dev, fmsg, 0, false);

	return 0;

}



static const struct devlink_health_reporter_ops mlx5_reporter_vnic_ops = {

drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
void mlx5_reporter_vnic_create(struct mlx5_core_dev *dev);

void mlx5_reporter_vnic_destroy(struct mlx5_core_dev *dev);



int mlx5_reporter_vnic_diagnose_counters(struct mlx5_core_dev *dev,

void mlx5_reporter_vnic_diagnose_counters(struct mlx5_core_dev *dev,

					  struct devlink_fmsg *fmsg,

					  u16 vport_num, bool other_vport);

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

+42 −145
Original line number Diff line number Diff line
@@ -5,134 +5,59 @@ 
#include "lib/eq.h"

#include "lib/mlx5.h"



int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name)

void mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name)

{

	int err;



	err = devlink_fmsg_pair_nest_start(fmsg, name);

	if (err)

		return err;



	err = devlink_fmsg_obj_nest_start(fmsg);

	if (err)

		return err;



	return 0;

	devlink_fmsg_pair_nest_start(fmsg, name);

	devlink_fmsg_obj_nest_start(fmsg);

}



int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg)

void mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg)

{

	int err;



	err = devlink_fmsg_obj_nest_end(fmsg);

	if (err)

		return err;



	err = devlink_fmsg_pair_nest_end(fmsg);

	if (err)

		return err;



	return 0;

	devlink_fmsg_obj_nest_end(fmsg);

	devlink_fmsg_pair_nest_end(fmsg);

}



int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)

void mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)

{

	u32 out[MLX5_ST_SZ_DW(query_cq_out)] = {};

	u8 hw_status;

	void *cqc;

	int err;



	err = mlx5_core_query_cq(cq->mdev, &cq->mcq, out);

	if (err)

		return err;



	mlx5_core_query_cq(cq->mdev, &cq->mcq, out);

	cqc = MLX5_ADDR_OF(query_cq_out, out, cq_context);

	hw_status = MLX5_GET(cqc, cqc, status);



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ");

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "cqn", cq->mcq.cqn);

	if (err)

		return err;



	err = devlink_fmsg_u8_pair_put(fmsg, "HW status", hw_status);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "ci", mlx5_cqwq_get_ci(&cq->wq));

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "size", mlx5_cqwq_get_size(&cq->wq));

	if (err)

		return err;



	err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	if (err)

		return err;



	return 0;

	mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ");

	devlink_fmsg_u32_pair_put(fmsg, "cqn", cq->mcq.cqn);

	devlink_fmsg_u8_pair_put(fmsg, "HW status", hw_status);

	devlink_fmsg_u32_pair_put(fmsg, "ci", mlx5_cqwq_get_ci(&cq->wq));

	devlink_fmsg_u32_pair_put(fmsg, "size", mlx5_cqwq_get_size(&cq->wq));

	mlx5e_health_fmsg_named_obj_nest_end(fmsg);

}



int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)

void mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)

{

	u8 cq_log_stride;

	u32 cq_sz;

	int err;



	cq_sz = mlx5_cqwq_get_size(&cq->wq);

	cq_log_stride = mlx5_cqwq_get_log_stride_size(&cq->wq);



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ");

	if (err)

		return err;



	err = devlink_fmsg_u64_pair_put(fmsg, "stride size", BIT(cq_log_stride));

	if (err)

		return err;



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

	if (err)

		return err;



	err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	if (err)

		return err;



	return 0;

	mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ");

	devlink_fmsg_u64_pair_put(fmsg, "stride size", BIT(cq_log_stride));

	devlink_fmsg_u32_pair_put(fmsg, "size", cq_sz);

	mlx5e_health_fmsg_named_obj_nest_end(fmsg);

}



int mlx5e_health_eq_diag_fmsg(struct mlx5_eq_comp *eq, struct devlink_fmsg *fmsg)

void mlx5e_health_eq_diag_fmsg(struct mlx5_eq_comp *eq, struct devlink_fmsg *fmsg)

{

	int err;



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "EQ");

	if (err)

		return err;



	err = devlink_fmsg_u8_pair_put(fmsg, "eqn", eq->core.eqn);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "irqn", eq->core.irqn);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "vecidx", eq->core.vecidx);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "ci", eq->core.cons_index);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "size", eq_get_size(&eq->core));

	if (err)

		return err;



	return mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	mlx5e_health_fmsg_named_obj_nest_start(fmsg, "EQ");

	devlink_fmsg_u8_pair_put(fmsg, "eqn", eq->core.eqn);

	devlink_fmsg_u32_pair_put(fmsg, "irqn", eq->core.irqn);

	devlink_fmsg_u32_pair_put(fmsg, "vecidx", eq->core.vecidx);

	devlink_fmsg_u32_pair_put(fmsg, "ci", eq->core.cons_index);

	devlink_fmsg_u32_pair_put(fmsg, "size", eq_get_size(&eq->core));

	mlx5e_health_fmsg_named_obj_nest_end(fmsg);

}



void mlx5e_health_create_reporters(struct mlx5e_priv *priv)
@@ -235,23 +160,19 @@ int mlx5e_health_report(struct mlx5e_priv *priv, 
}



#define MLX5_HEALTH_DEVLINK_MAX_SIZE 1024

static int mlx5e_health_rsc_fmsg_binary(struct devlink_fmsg *fmsg,

static void mlx5e_health_rsc_fmsg_binary(struct devlink_fmsg *fmsg,

					 const void *value, u32 value_len)



{

	u32 data_size;

	int err = 0;

	u32 offset;



	for (offset = 0; offset < value_len; offset += data_size) {

		data_size = value_len - offset;

		if (data_size > MLX5_HEALTH_DEVLINK_MAX_SIZE)

			data_size = MLX5_HEALTH_DEVLINK_MAX_SIZE;

		err = devlink_fmsg_binary_put(fmsg, value + offset, data_size);

		if (err)

			break;

		devlink_fmsg_binary_put(fmsg, value + offset, data_size);

	}

	return err;

}



int mlx5e_health_rsc_fmsg_dump(struct mlx5e_priv *priv, struct mlx5_rsc_key *key,
@@ -259,9 +180,8 @@ int mlx5e_health_rsc_fmsg_dump(struct mlx5e_priv *priv, struct mlx5_rsc_key *key 
{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5_rsc_dump_cmd *cmd;

	int cmd_err, err = 0;

	struct page *page;

	int cmd_err, err;

	int end_err;

	int size;



	if (IS_ERR_OR_NULL(mdev->rsc_dump))
@@ -271,9 +191,7 @@ int mlx5e_health_rsc_fmsg_dump(struct mlx5e_priv *priv, struct mlx5_rsc_key *key 
	if (!page)

		return -ENOMEM;



	err = devlink_fmsg_binary_pair_nest_start(fmsg, "data");

	if (err)

		goto free_page;

	devlink_fmsg_binary_pair_nest_start(fmsg, "data");



	cmd = mlx5_rsc_dump_cmd_create(mdev, key);

	if (IS_ERR(cmd)) {
@@ -288,52 +206,31 @@ int mlx5e_health_rsc_fmsg_dump(struct mlx5e_priv *priv, struct mlx5_rsc_key *key 
			goto destroy_cmd;

		}



		err = mlx5e_health_rsc_fmsg_binary(fmsg, page_address(page), size);

		if (err)

			goto destroy_cmd;



		mlx5e_health_rsc_fmsg_binary(fmsg, page_address(page), size);

	} while (cmd_err > 0);



destroy_cmd:

	mlx5_rsc_dump_cmd_destroy(cmd);

	end_err = devlink_fmsg_binary_pair_nest_end(fmsg);

	if (end_err)

		err = end_err;

	devlink_fmsg_binary_pair_nest_end(fmsg);

free_page:

	__free_page(page);

	return err;

}



int mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,

void mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,

			     int queue_idx, char *lbl)

{

	struct mlx5_rsc_key key = {};

	int err;



	key.rsc = MLX5_SGMT_TYPE_FULL_QPC;

	key.index1 = queue_idx;

	key.size = PAGE_SIZE;

	key.num_of_obj1 = 1;



	err = devlink_fmsg_obj_nest_start(fmsg);

	if (err)

		return err;



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, lbl);

	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "index", queue_idx);

	if (err)

		return err;



	err = mlx5e_health_rsc_fmsg_dump(priv, &key, fmsg);

	if (err)

		return err;



	err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	if (err)

		return err;



	return devlink_fmsg_obj_nest_end(fmsg);

	devlink_fmsg_obj_nest_start(fmsg);

	mlx5e_health_fmsg_named_obj_nest_start(fmsg, lbl);

	devlink_fmsg_u32_pair_put(fmsg, "index", queue_idx);

	mlx5e_health_rsc_fmsg_dump(priv, &key, fmsg);

	mlx5e_health_fmsg_named_obj_nest_end(fmsg);

	devlink_fmsg_obj_nest_end(fmsg);

}

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

+7 −7
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq); 
int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq);

void mlx5e_reporter_tx_ptpsq_unhealthy(struct mlx5e_ptpsq *ptpsq);



int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);

int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);

int mlx5e_health_eq_diag_fmsg(struct mlx5_eq_comp *eq, struct devlink_fmsg *fmsg);

int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name);

int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg);

void mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);

void mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);

void mlx5e_health_eq_diag_fmsg(struct mlx5_eq_comp *eq, struct devlink_fmsg *fmsg);

void mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name);

void mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg);



void mlx5e_reporter_rx_create(struct mlx5e_priv *priv);

void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv);
@@ -54,6 +54,6 @@ void mlx5e_health_destroy_reporters(struct mlx5e_priv *priv); 
void mlx5e_health_channels_update(struct mlx5e_priv *priv);

int mlx5e_health_rsc_fmsg_dump(struct mlx5e_priv *priv, struct mlx5_rsc_key *key,

			       struct devlink_fmsg *fmsg);

int mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,

void mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,

			     int queue_idx, char *lbl);

#endif