Commit 05217e4f authored by Shay Drory's avatar Shay Drory Committed by Jakub Kicinski
Browse files

net/mlx5: SD, Keep multi-pf debugfs entries on primary 



mlx5_sd_init() creates the "multi-pf" debugfs directory under the
primary device debugfs root, but stored the dentry in the calling
device's sd struct. When sd_cleanup() run on a different PF,
this leads to using the wrong sd->dfs for removing entries, which
results in memory leak and an error in when re-creating the SD.[1]

Fix it by explicitly storing the debugfs dentry in the primary
device sd struct and use it for all per-group files.

[1]
debugfs: 'multi-pf' already exists in '0000:08:00.1'

Fixes: 4375130b ("net/mlx5: SD, Add debugfs")
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260504180206.268568-3-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3abcedfd

drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c

+13 −6
Original line number Diff line number Diff line
@@ -463,9 +463,13 @@ int mlx5_sd_init(struct mlx5_core_dev *dev) 
	if (err)

		goto err_sd_unregister;



	sd->dfs = debugfs_create_dir("multi-pf", mlx5_debugfs_get_dev_root(primary));

	debugfs_create_x32("group_id", 0400, sd->dfs, &sd->group_id);

	debugfs_create_file("primary", 0400, sd->dfs, primary, &dev_fops);

	primary_sd->dfs =

		debugfs_create_dir("multi-pf",

				   mlx5_debugfs_get_dev_root(primary));

	debugfs_create_x32("group_id", 0400, primary_sd->dfs,

			   &primary_sd->group_id);

	debugfs_create_file("primary", 0400, primary_sd->dfs, primary,

			    &dev_fops);



	mlx5_sd_for_each_secondary(i, primary, pos) {

		char name[32];
@@ -475,7 +479,8 @@ int mlx5_sd_init(struct mlx5_core_dev *dev) 
			goto err_unset_secondaries;



		snprintf(name, sizeof(name), "secondary_%d", i - 1);

		debugfs_create_file(name, 0400, sd->dfs, pos, &dev_fops);

		debugfs_create_file(name, 0400, primary_sd->dfs, pos,

				    &dev_fops);



	}
@@ -493,7 +498,8 @@ int mlx5_sd_init(struct mlx5_core_dev *dev) 
	mlx5_sd_for_each_secondary_to(i, primary, to, pos)

		sd_cmd_unset_secondary(pos);

	sd_cmd_unset_primary(primary);

	debugfs_remove_recursive(sd->dfs);

	debugfs_remove_recursive(primary_sd->dfs);

	primary_sd->dfs = NULL;

err_sd_unregister:

	mlx5_sd_for_each_secondary(i, primary, pos) {

		struct mlx5_sd *peer_sd = mlx5_get_sd(pos);
@@ -535,7 +541,8 @@ void mlx5_sd_cleanup(struct mlx5_core_dev *dev) 
	mlx5_sd_for_each_secondary(i, primary, pos)

		sd_cmd_unset_secondary(pos);

	sd_cmd_unset_primary(primary);

	debugfs_remove_recursive(sd->dfs);

	debugfs_remove_recursive(primary_sd->dfs);

	primary_sd->dfs = NULL;



	sd_info(primary, "group id %#x, uncombined\n", sd->group_id);

	primary_sd->state = MLX5_SD_STATE_DOWN;