Commit 66771a1c authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Saeed Mahameed
Browse files

net/mlx5: Move debugfs entries to separate struct 



Move the debugfs entry pointers under priv to their own struct.
Add get function for device debugfs root.

Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent d2cb8dda

drivers/infiniband/hw/mlx5/cong.c

+1 −2
Original line number Diff line number Diff line
@@ -433,8 +433,7 @@ void mlx5_ib_init_cong_debugfs(struct mlx5_ib_dev *dev, u32 port_num) 


	dev->port[port_num].dbg_cc_params = dbg_cc_params;



	dbg_cc_params->root = debugfs_create_dir("cc_params",

						 mdev->priv.dbg_root);

	dbg_cc_params->root = debugfs_create_dir("cc_params", mlx5_debugfs_get_dev_root(mdev));



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

		dbg_cc_params->params[i].offset = i;

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4178,7 +4178,7 @@ static int mlx5_ib_stage_delay_drop_init(struct mlx5_ib_dev *dev) 
	if (!mlx5_debugfs_root)

		return 0;



	root = debugfs_create_dir("delay_drop", dev->mdev->priv.dbg_root);

	root = debugfs_create_dir("delay_drop", mlx5_debugfs_get_dev_root(dev->mdev));

	dev->delay_drop.dir_debugfs = root;



	debugfs_create_atomic_t("num_timeout_events", 0400, root,

drivers/infiniband/hw/mlx5/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static void mlx5_mr_cache_debugfs_init(struct mlx5_ib_dev *dev) 
	if (!mlx5_debugfs_root || dev->is_rep)

		return;



	cache->root = debugfs_create_dir("mr_cache", dev->mdev->priv.dbg_root);

	cache->root = debugfs_create_dir("mr_cache", mlx5_debugfs_get_dev_root(dev->mdev));



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

		ent = &cache->ent[i];

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

+1 −1
Original line number Diff line number Diff line
@@ -1543,7 +1543,7 @@ static void create_debugfs_files(struct mlx5_core_dev *dev) 
{

	struct mlx5_cmd_debug *dbg = &dev->cmd.dbg;



	dbg->dbg_root = debugfs_create_dir("cmd", dev->priv.dbg_root);

	dbg->dbg_root = debugfs_create_dir("cmd", mlx5_debugfs_get_dev_root(dev));



	debugfs_create_file("in", 0400, dbg->dbg_root, dev, &dfops);

	debugfs_create_file("out", 0200, dbg->dbg_root, dev, &dfops);

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

+18 −12
Original line number Diff line number Diff line
@@ -99,26 +99,32 @@ void mlx5_unregister_debugfs(void) 
	debugfs_remove(mlx5_debugfs_root);

}



struct dentry *mlx5_debugfs_get_dev_root(struct mlx5_core_dev *dev)

{

	return dev->priv.dbg.dbg_root;

}

EXPORT_SYMBOL(mlx5_debugfs_get_dev_root);



void mlx5_qp_debugfs_init(struct mlx5_core_dev *dev)

{

	dev->priv.qp_debugfs = debugfs_create_dir("QPs",  dev->priv.dbg_root);

	dev->priv.dbg.qp_debugfs = debugfs_create_dir("QPs", dev->priv.dbg.dbg_root);

}

EXPORT_SYMBOL(mlx5_qp_debugfs_init);



void mlx5_qp_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	debugfs_remove_recursive(dev->priv.qp_debugfs);

	debugfs_remove_recursive(dev->priv.dbg.qp_debugfs);

}

EXPORT_SYMBOL(mlx5_qp_debugfs_cleanup);



void mlx5_eq_debugfs_init(struct mlx5_core_dev *dev)

{

	dev->priv.eq_debugfs = debugfs_create_dir("EQs",  dev->priv.dbg_root);

	dev->priv.dbg.eq_debugfs = debugfs_create_dir("EQs", dev->priv.dbg.dbg_root);

}



void mlx5_eq_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	debugfs_remove_recursive(dev->priv.eq_debugfs);

	debugfs_remove_recursive(dev->priv.dbg.eq_debugfs);

}



static ssize_t average_read(struct file *filp, char __user *buf, size_t count,
@@ -168,8 +174,8 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev) 
	const char *namep;

	int i;



	cmd = &dev->priv.cmdif_debugfs;

	*cmd = debugfs_create_dir("commands", dev->priv.dbg_root);

	cmd = &dev->priv.dbg.cmdif_debugfs;

	*cmd = debugfs_create_dir("commands", dev->priv.dbg.dbg_root);



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

		stats = &dev->cmd.stats[i];
@@ -193,17 +199,17 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev) 


void mlx5_cmdif_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	debugfs_remove_recursive(dev->priv.cmdif_debugfs);

	debugfs_remove_recursive(dev->priv.dbg.cmdif_debugfs);

}



void mlx5_cq_debugfs_init(struct mlx5_core_dev *dev)

{

	dev->priv.cq_debugfs = debugfs_create_dir("CQs",  dev->priv.dbg_root);

	dev->priv.dbg.cq_debugfs = debugfs_create_dir("CQs", dev->priv.dbg.dbg_root);

}



void mlx5_cq_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	debugfs_remove_recursive(dev->priv.cq_debugfs);

	debugfs_remove_recursive(dev->priv.dbg.cq_debugfs);

}



static u64 qp_read_field(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp,
@@ -448,7 +454,7 @@ int mlx5_debug_qp_add(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp) 
	if (!mlx5_debugfs_root)

		return 0;



	err = add_res_tree(dev, MLX5_DBG_RSC_QP, dev->priv.qp_debugfs,

	err = add_res_tree(dev, MLX5_DBG_RSC_QP, dev->priv.dbg.qp_debugfs,

			   &qp->dbg, qp->qpn, qp_fields,

			   ARRAY_SIZE(qp_fields), qp);

	if (err)
@@ -475,7 +481,7 @@ int mlx5_debug_eq_add(struct mlx5_core_dev *dev, struct mlx5_eq *eq) 
	if (!mlx5_debugfs_root)

		return 0;



	err = add_res_tree(dev, MLX5_DBG_RSC_EQ, dev->priv.eq_debugfs,

	err = add_res_tree(dev, MLX5_DBG_RSC_EQ, dev->priv.dbg.eq_debugfs,

			   &eq->dbg, eq->eqn, eq_fields,

			   ARRAY_SIZE(eq_fields), eq);

	if (err)
@@ -500,7 +506,7 @@ int mlx5_debug_cq_add(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq) 
	if (!mlx5_debugfs_root)

		return 0;



	err = add_res_tree(dev, MLX5_DBG_RSC_CQ, dev->priv.cq_debugfs,

	err = add_res_tree(dev, MLX5_DBG_RSC_CQ, dev->priv.dbg.cq_debugfs,

			   &cq->dbg, cq->cqn, cq_fields,

			   ARRAY_SIZE(cq_fields), cq);

	if (err)