leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: fix ras ctrl debugfs node leak

Browse Source 
Use debugfs_remove_recursive to remove the whole debugfs
directory instead of removing the node one by one.

Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Guchun Chen
2019-09-16 13:42:46 +08:00
committed by Alex Deucher
parent 1313dacfad
commit 012dd14d1d
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
View File

@@ -980,9 +980,9 @@ static void amdgpu_ras_debugfs_create_ctrl_node(struct amdgpu_device *adev)
struct drm_minor *minor = adev->ddev->primary; struct drm_minor *minor = adev->ddev->primary;
con->dir = debugfs_create_dir("ras", minor->debugfs_root); con->dir = debugfs_create_dir("ras", minor->debugfs_root);
con->ent = debugfs_create_file("ras_ctrl", S_IWUGO | S_IRUGO, con->dir, debugfs_create_file("ras_ctrl", S_IWUGO | S_IRUGO, con->dir,
adev, &amdgpu_ras_debugfs_ctrl_ops); adev, &amdgpu_ras_debugfs_ctrl_ops);
con->ent = debugfs_create_file("ras_eeprom_reset", S_IWUGO | S_IRUGO, con->dir, debugfs_create_file("ras_eeprom_reset", S_IWUGO | S_IRUGO, con->dir,
adev, &amdgpu_ras_debugfs_eeprom_ops); adev, &amdgpu_ras_debugfs_eeprom_ops);
} }
@@ -1028,10 +1028,8 @@ static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev)
amdgpu_ras_debugfs_remove(adev, &obj->head); amdgpu_ras_debugfs_remove(adev, &obj->head);
} }
debugfs_remove(con->ent); debugfs_remove_recursive(con->dir);
debugfs_remove(con->dir);
con->dir = NULL; con->dir = NULL;
con->ent = NULL;
} }
/* debugfs end */ /* debugfs end */

2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
View File

@@ -317,8 +317,6 @@ struct amdgpu_ras {
struct list_head head; struct list_head head;
/* debugfs */ /* debugfs */
struct dentry *dir; struct dentry *dir;
/* debugfs ctrl */
struct dentry *ent;
/* sysfs */ /* sysfs */
struct device_attribute features_attr; struct device_attribute features_attr;
struct bin_attribute badpages_attr; struct bin_attribute badpages_attr;