Commit 9f818c8a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by David S. Miller
Browse files

mlx5: no need to check return value of debugfs_create functions 



When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

This cleans up a lot of unneeded code and logic around the debugfs
files, making all of this much simpler and easier to understand as we
don't need to keep the dentries saved anymore.

Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fedcc6da

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

+7 −44
Original line number Diff line number Diff line
@@ -1368,49 +1368,19 @@ static void clean_debug_files(struct mlx5_core_dev *dev) 
	debugfs_remove_recursive(dbg->dbg_root);

}



static int create_debugfs_files(struct mlx5_core_dev *dev)

static void create_debugfs_files(struct mlx5_core_dev *dev)

{

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

	int err = -ENOMEM;



	if (!mlx5_debugfs_root)

		return 0;



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

	if (!dbg->dbg_root)

		return err;



	dbg->dbg_in = debugfs_create_file("in", 0400, dbg->dbg_root,

					  dev, &dfops);

	if (!dbg->dbg_in)

		goto err_dbg;



	dbg->dbg_out = debugfs_create_file("out", 0200, dbg->dbg_root,

					   dev, &dfops);

	if (!dbg->dbg_out)

		goto err_dbg;



	dbg->dbg_outlen = debugfs_create_file("out_len", 0600, dbg->dbg_root,

					      dev, &olfops);

	if (!dbg->dbg_outlen)

		goto err_dbg;



	dbg->dbg_status = debugfs_create_u8("status", 0600, dbg->dbg_root,

					    &dbg->status);

	if (!dbg->dbg_status)

		goto err_dbg;



	dbg->dbg_run = debugfs_create_file("run", 0200, dbg->dbg_root, dev, &fops);

	if (!dbg->dbg_run)

		goto err_dbg;

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

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

	debugfs_create_file("out_len", 0600, dbg->dbg_root, dev, &olfops);

	debugfs_create_u8("status", 0600, dbg->dbg_root, &dbg->status);

	debugfs_create_file("run", 0200, dbg->dbg_root, dev, &fops);



	mlx5_cmdif_debugfs_init(dev);



	return 0;



err_dbg:

	clean_debug_files(dev);

	return err;

}



static void mlx5_cmd_change_mod(struct mlx5_core_dev *dev, int mode)
@@ -2007,17 +1977,10 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
		goto err_cache;

	}



	err = create_debugfs_files(dev);

	if (err) {

		err = -ENOMEM;

		goto err_wq;

	}

	create_debugfs_files(dev);



	return 0;



err_wq:

	destroy_workqueue(cmd->wq);



err_cache:

	destroy_msg_cache(dev);

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

+10 −92
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ EXPORT_SYMBOL(mlx5_debugfs_root); 
void mlx5_register_debugfs(void)

{

	mlx5_debugfs_root = debugfs_create_dir("mlx5", NULL);

	if (IS_ERR_OR_NULL(mlx5_debugfs_root))

		mlx5_debugfs_root = NULL;

}



void mlx5_unregister_debugfs(void)
@@ -101,45 +99,25 @@ void mlx5_unregister_debugfs(void) 
	debugfs_remove(mlx5_debugfs_root);

}



int mlx5_qp_debugfs_init(struct mlx5_core_dev *dev)

void mlx5_qp_debugfs_init(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return 0;



	atomic_set(&dev->num_qps, 0);



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

	if (!dev->priv.qp_debugfs)

		return -ENOMEM;



	return 0;

}



void mlx5_qp_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return;



	debugfs_remove_recursive(dev->priv.qp_debugfs);

}



int mlx5_eq_debugfs_init(struct mlx5_core_dev *dev)

void mlx5_eq_debugfs_init(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return 0;



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

	if (!dev->priv.eq_debugfs)

		return -ENOMEM;



	return 0;

}



void mlx5_eq_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return;



	debugfs_remove_recursive(dev->priv.eq_debugfs);

}
@@ -183,85 +161,41 @@ static const struct file_operations stats_fops = { 
	.write	= average_write,

};



int mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)

void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd_stats *stats;

	struct dentry **cmd;

	const char *namep;

	int err;

	int i;



	if (!mlx5_debugfs_root)

		return 0;



	cmd = &dev->priv.cmdif_debugfs;

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

	if (!*cmd)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(dev->cmd.stats); i++) {

		stats = &dev->cmd.stats[i];

		namep = mlx5_command_str(i);

		if (strcmp(namep, "unknown command opcode")) {

			stats->root = debugfs_create_dir(namep, *cmd);

			if (!stats->root) {

				mlx5_core_warn(dev, "failed adding command %d\n",

					       i);

				err = -ENOMEM;

				goto out;

			}



			stats->avg = debugfs_create_file("average", 0400,

							 stats->root, stats,

			debugfs_create_file("average", 0400, stats->root, stats,

					    &stats_fops);

			if (!stats->avg) {

				mlx5_core_warn(dev, "failed creating debugfs file\n");

				err = -ENOMEM;

				goto out;

			}



			stats->count = debugfs_create_u64("n", 0400,

							  stats->root,

							  &stats->n);

			if (!stats->count) {

				mlx5_core_warn(dev, "failed creating debugfs file\n");

				err = -ENOMEM;

				goto out;

			debugfs_create_u64("n", 0400, stats->root, &stats->n);

		}

	}

}



	return 0;

out:

	debugfs_remove_recursive(dev->priv.cmdif_debugfs);

	return err;

}



void mlx5_cmdif_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return;



	debugfs_remove_recursive(dev->priv.cmdif_debugfs);

}



int mlx5_cq_debugfs_init(struct mlx5_core_dev *dev)

void mlx5_cq_debugfs_init(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return 0;



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

	if (!dev->priv.cq_debugfs)

		return -ENOMEM;



	return 0;

}



void mlx5_cq_debugfs_cleanup(struct mlx5_core_dev *dev)

{

	if (!mlx5_debugfs_root)

		return;



	debugfs_remove_recursive(dev->priv.cq_debugfs);

}
@@ -484,7 +418,6 @@ static int add_res_tree(struct mlx5_core_dev *dev, enum dbg_rsc_type type, 
{

	struct mlx5_rsc_debug *d;

	char resn[32];

	int err;

	int i;



	d = kzalloc(struct_size(d, fields, nfile), GFP_KERNEL);
@@ -496,30 +429,15 @@ static int add_res_tree(struct mlx5_core_dev *dev, enum dbg_rsc_type type, 
	d->type = type;

	sprintf(resn, "0x%x", rsn);

	d->root = debugfs_create_dir(resn,  root);

	if (!d->root) {

		err = -ENOMEM;

		goto out_free;

	}



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

		d->fields[i].i = i;

		d->fields[i].dent = debugfs_create_file(field[i], 0400,

							d->root, &d->fields[i],

		debugfs_create_file(field[i], 0400, d->root, &d->fields[i],

				    &fops);

		if (!d->fields[i].dent) {

			err = -ENOMEM;

			goto out_rem;

		}

	}

	*dbg = d;



	return 0;

out_rem:

	debugfs_remove_recursive(d->root);



out_free:

	kfree(d);

	return err;

}



static void rem_res_tree(struct mlx5_rsc_debug *d)

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

+2 −9
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ void mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq) 
int mlx5_eq_table_init(struct mlx5_core_dev *dev)

{

	struct mlx5_eq_table *eq_table;

	int i, err;

	int i;



	eq_table = kvzalloc(sizeof(*eq_table), GFP_KERNEL);

	if (!eq_table)
@@ -419,9 +419,7 @@ int mlx5_eq_table_init(struct mlx5_core_dev *dev) 


	dev->priv.eq_table = eq_table;



	err = mlx5_eq_debugfs_init(dev);

	if (err)

		goto kvfree_eq_table;

	mlx5_eq_debugfs_init(dev);



	mutex_init(&eq_table->lock);

	for (i = 0; i < MLX5_EVENT_TYPE_MAX; i++)
@@ -429,11 +427,6 @@ int mlx5_eq_table_init(struct mlx5_core_dev *dev) 


	eq_table->irq_table = dev->priv.irq_table;

	return 0;



kvfree_eq_table:

	kvfree(eq_table);

	dev->priv.eq_table = NULL;

	return err;

}



void mlx5_eq_table_cleanup(struct mlx5_core_dev *dev)

drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void mlx5_eq_synchronize_cmd_irq(struct mlx5_core_dev *dev); 


int mlx5_debug_eq_add(struct mlx5_core_dev *dev, struct mlx5_eq *eq);

void mlx5_debug_eq_remove(struct mlx5_core_dev *dev, struct mlx5_eq *eq);

int mlx5_eq_debugfs_init(struct mlx5_core_dev *dev);

void mlx5_eq_debugfs_init(struct mlx5_core_dev *dev);

void mlx5_eq_debugfs_cleanup(struct mlx5_core_dev *dev);



/* This function should only be called after mlx5_cmd_force_teardown_hca */

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

+1 −6
Original line number Diff line number Diff line
@@ -826,11 +826,7 @@ static int mlx5_init_once(struct mlx5_core_dev *dev) 
		goto err_eq_cleanup;

	}



	err = mlx5_cq_debugfs_init(dev);

	if (err) {

		mlx5_core_err(dev, "failed to initialize cq debugfs\n");

		goto err_events_cleanup;

	}

	mlx5_cq_debugfs_init(dev);



	mlx5_init_qp_table(dev);
@@ -891,7 +887,6 @@ err_tables_cleanup: 
	mlx5_cleanup_mkey_table(dev);

	mlx5_cleanup_qp_table(dev);

	mlx5_cq_debugfs_cleanup(dev);

err_events_cleanup:

	mlx5_events_cleanup(dev);

err_eq_cleanup:

	mlx5_eq_table_cleanup(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE