Commit 66247fbb authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Remove Q counter low level helper APIs 



mlx5 core users are encouraged to use low level API (mlx5_cmd_exec)
without the need of helper functions, do this for q counters, remove
helper functions and call mlx5_cmd_exec directly from users.

This will help reduce the total amount of code and reduction of the
mlx5_core symbol table.

Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 57a6c5e9

drivers/infiniband/hw/mlx5/main.c

+32 −23
Original line number Diff line number Diff line
@@ -5439,15 +5439,21 @@ static bool is_mdev_switchdev_mode(const struct mlx5_core_dev *mdev) 


static void mlx5_ib_dealloc_counters(struct mlx5_ib_dev *dev)

{

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

	int num_cnt_ports;

	int i;



	num_cnt_ports = is_mdev_switchdev_mode(dev->mdev) ? 1 : dev->num_ports;



	MLX5_SET(dealloc_q_counter_in, in, opcode,

		 MLX5_CMD_OP_DEALLOC_Q_COUNTER);



	for (i = 0; i < num_cnt_ports; i++) {

		if (dev->port[i].cnts.set_id_valid)

			mlx5_core_dealloc_q_counter(dev->mdev,

		if (dev->port[i].cnts.set_id_valid) {

			MLX5_SET(dealloc_q_counter_in, in, counter_set_id,

				 dev->port[i].cnts.set_id);

			mlx5_cmd_exec_in(dev->mdev, dealloc_q_counter, in);

		}

		kfree(dev->port[i].cnts.names);

		kfree(dev->port[i].cnts.offsets);

	}
@@ -5638,27 +5644,23 @@ static int mlx5_ib_query_q_counters(struct mlx5_core_dev *mdev, 
				    struct rdma_hw_stats *stats,

				    u16 set_id)

{

	int outlen = MLX5_ST_SZ_BYTES(query_q_counter_out);

	void *out;

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

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

	__be32 val;

	int ret, i;



	out = kvzalloc(outlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;



	ret = mlx5_core_query_q_counter(mdev, set_id, 0, out, outlen);

	MLX5_SET(query_q_counter_in, in, opcode, MLX5_CMD_OP_QUERY_Q_COUNTER);

	MLX5_SET(query_q_counter_in, in, counter_set_id, set_id);

	ret = mlx5_cmd_exec_inout(mdev, query_q_counter, in, out);

	if (ret)

		goto free;

		return ret;



	for (i = 0; i < cnts->num_q_counters; i++) {

		val = *(__be32 *)(out + cnts->offsets[i]);

		val = *(__be32 *)((void *)out + cnts->offsets[i]);

		stats->value[i] = (u64)be32_to_cpu(val);

	}



free:

	kvfree(out);

	return ret;

	return 0;

}



static int mlx5_ib_query_ext_ppcnt_counters(struct mlx5_ib_dev *dev,
@@ -5765,6 +5767,20 @@ static int mlx5_ib_counter_update_stats(struct rdma_counter *counter) 
					counter->stats, counter->id);

}



static int mlx5_ib_counter_dealloc(struct rdma_counter *counter)

{

	struct mlx5_ib_dev *dev = to_mdev(counter->device);

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



	if (!counter->id)

		return 0;



	MLX5_SET(dealloc_q_counter_in, in, opcode,

		 MLX5_CMD_OP_DEALLOC_Q_COUNTER);

	MLX5_SET(dealloc_q_counter_in, in, counter_set_id, counter->id);

	return mlx5_cmd_exec_in(dev->mdev, dealloc_q_counter, in);

}



static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter,

				   struct ib_qp *qp)

{
@@ -5788,7 +5804,7 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter, 
	return 0;



fail_set_counter:

	mlx5_core_dealloc_q_counter(dev->mdev, cnt_set_id);

	mlx5_ib_counter_dealloc(counter);

	counter->id = 0;



	return err;
@@ -5799,13 +5815,6 @@ static int mlx5_ib_counter_unbind_qp(struct ib_qp *qp) 
	return mlx5_ib_qp_set_counter(qp, NULL);

}



static int mlx5_ib_counter_dealloc(struct rdma_counter *counter)

{

	struct mlx5_ib_dev *dev = to_mdev(counter->device);



	return mlx5_core_dealloc_q_counter(dev->mdev, counter->id);

}



static int mlx5_ib_rn_get_params(struct ib_device *device, u8 port_num,

				 enum rdma_netdev_t type,

				 struct rdma_netdev_alloc_params *params)

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+25 −14
Original line number Diff line number Diff line
@@ -4997,29 +4997,40 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 


void mlx5e_create_q_counters(struct mlx5e_priv *priv)

{

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

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

	struct mlx5_core_dev *mdev = priv->mdev;

	int err;



	err = mlx5_core_alloc_q_counter(mdev, &priv->q_counter);

	if (err) {

		mlx5_core_warn(mdev, "alloc queue counter failed, %d\n", err);

		priv->q_counter = 0;

	}

	MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER);

	err = mlx5_cmd_exec_inout(mdev, alloc_q_counter, in, out);

	if (!err)

		priv->q_counter =

			MLX5_GET(alloc_q_counter_out, out, counter_set_id);



	err = mlx5_core_alloc_q_counter(mdev, &priv->drop_rq_q_counter);

	if (err) {

		mlx5_core_warn(mdev, "alloc drop RQ counter failed, %d\n", err);

		priv->drop_rq_q_counter = 0;

	}

	err = mlx5_cmd_exec_inout(mdev, alloc_q_counter, in, out);

	if (!err)

		priv->drop_rq_q_counter =

			MLX5_GET(alloc_q_counter_out, out, counter_set_id);

}



void mlx5e_destroy_q_counters(struct mlx5e_priv *priv)

{

	if (priv->q_counter)

		mlx5_core_dealloc_q_counter(priv->mdev, priv->q_counter);

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



	MLX5_SET(dealloc_q_counter_in, in, opcode,

		 MLX5_CMD_OP_DEALLOC_Q_COUNTER);

	if (priv->q_counter) {

		MLX5_SET(dealloc_q_counter_in, in, counter_set_id,

			 priv->q_counter);

		mlx5_cmd_exec_in(priv->mdev, dealloc_q_counter, in);

	}



	if (priv->drop_rq_q_counter)

		mlx5_core_dealloc_q_counter(priv->mdev, priv->drop_rq_q_counter);

	if (priv->drop_rq_q_counter) {

		MLX5_SET(dealloc_q_counter_in, in, counter_set_id,

			 priv->drop_rq_q_counter);

		mlx5_cmd_exec_in(priv->mdev, dealloc_q_counter, in);

	}

}



static int mlx5e_nic_init(struct mlx5_core_dev *mdev,

drivers/net/ethernet/mellanox/mlx5/core/en_stats.c

+23 −12
Original line number Diff line number Diff line
@@ -411,18 +411,29 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(qcnt) 
static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(qcnt)

{

	struct mlx5e_qcounter_stats *qcnt = &priv->stats.qcnt;

	u32 out[MLX5_ST_SZ_DW(query_q_counter_out)];

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

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

	int ret;



	if (priv->q_counter &&

	    !mlx5_core_query_q_counter(priv->mdev, priv->q_counter, 0, out,

				       sizeof(out)))

	MLX5_SET(query_q_counter_in, in, opcode, MLX5_CMD_OP_QUERY_Q_COUNTER);



	if (priv->q_counter) {

		MLX5_SET(query_q_counter_in, in, counter_set_id,

			 priv->q_counter);

		ret = mlx5_cmd_exec_inout(priv->mdev, query_q_counter, in, out);

		if (!ret)

			qcnt->rx_out_of_buffer = MLX5_GET(query_q_counter_out,

							  out, out_of_buffer);

	if (priv->drop_rq_q_counter &&

	    !mlx5_core_query_q_counter(priv->mdev, priv->drop_rq_q_counter, 0,

				       out, sizeof(out)))

		qcnt->rx_if_down_packets = MLX5_GET(query_q_counter_out, out,

						    out_of_buffer);

	}



	if (priv->drop_rq_q_counter) {

		MLX5_SET(query_q_counter_in, in, counter_set_id,

			 priv->drop_rq_q_counter);

		ret = mlx5_cmd_exec_inout(priv->mdev, query_q_counter, in, out);

		if (!ret)

			qcnt->rx_if_down_packets = MLX5_GET(query_q_counter_out,

							    out, out_of_buffer);

	}

}



#define VNIC_ENV_OFF(c) MLX5_BYTE_OFF(query_vnic_env_out, c)

drivers/net/ethernet/mellanox/mlx5/core/qp.c

+0 −39
Original line number Diff line number Diff line
@@ -680,45 +680,6 @@ void mlx5_core_destroy_sq_tracked(struct mlx5_core_dev *dev, 
}

EXPORT_SYMBOL(mlx5_core_destroy_sq_tracked);



int mlx5_core_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id)

{

	u32 in[MLX5_ST_SZ_DW(alloc_q_counter_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {0};

	int err;



	MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*counter_id = MLX5_GET(alloc_q_counter_out, out,

				       counter_set_id);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_core_alloc_q_counter);



int mlx5_core_dealloc_q_counter(struct mlx5_core_dev *dev, u16 counter_id)

{

	u32 in[MLX5_ST_SZ_DW(dealloc_q_counter_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(dealloc_q_counter_out)] = {0};



	MLX5_SET(dealloc_q_counter_in, in, opcode,

		 MLX5_CMD_OP_DEALLOC_Q_COUNTER);

	MLX5_SET(dealloc_q_counter_in, in, counter_set_id, counter_id);

	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

}

EXPORT_SYMBOL_GPL(mlx5_core_dealloc_q_counter);



int mlx5_core_query_q_counter(struct mlx5_core_dev *dev, u16 counter_id,

			      int reset, void *out, int out_size)

{

	u32 in[MLX5_ST_SZ_DW(query_q_counter_in)] = {0};



	MLX5_SET(query_q_counter_in, in, opcode, MLX5_CMD_OP_QUERY_Q_COUNTER);

	MLX5_SET(query_q_counter_in, in, clear, reset);

	MLX5_SET(query_q_counter_in, in, counter_set_id, counter_id);

	return mlx5_cmd_exec(dev, in, sizeof(in), out, out_size);

}

EXPORT_SYMBOL_GPL(mlx5_core_query_q_counter);



struct mlx5_core_rsc_common *mlx5_core_res_hold(struct mlx5_core_dev *dev,

						int res_num,

						enum mlx5_res_type res_type)

include/linux/mlx5/qp.h

+0 −4
Original line number Diff line number Diff line
@@ -595,10 +595,6 @@ int mlx5_core_create_sq_tracked(struct mlx5_core_dev *dev, u32 *in, int inlen, 
				struct mlx5_core_qp *sq);

void mlx5_core_destroy_sq_tracked(struct mlx5_core_dev *dev,

				  struct mlx5_core_qp *sq);

int mlx5_core_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id);

int mlx5_core_dealloc_q_counter(struct mlx5_core_dev *dev, u16 counter_id);

int mlx5_core_query_q_counter(struct mlx5_core_dev *dev, u16 counter_id,

			      int reset, void *out, int out_size);



struct mlx5_core_rsc_common *mlx5_core_res_hold(struct mlx5_core_dev *dev,

						int res_num,

CRA Git | Maintained and supported by SUSTech CRA and CCSE