Skip to contentSkip to conversation

drm/amdkfd: Destroy KFD debugfs after destroy KFD wq

PATCH In review Amber Lin 2 participants 2 messages Aug 1, 2025

Subsystems (3)
lore
Share & tools
lore

Amber Lin

author
#0 lore raw

PATCH 1/1 drm/amdkfd: Destroy KFD debugfs after destroy KFD wq

Since KFD proc content was moved to kernel debugfs, we can't destroy KFD debugfs before kfd_process_destroy_wq. Move kfd_process_destroy_wq prior to kfd_debugfs_fini to fix a kernel NULL pointer problem. It happens when /sys/kernel/debug/kfd was already destroyed in kfd_debugfs_fini but kfd_process_destroy_wq calls kfd_debugfs_remove_process. This line

    debugfs_remove_recursive(entry->proc_dentry);

tries to remove /sys/kernel/debug/kfd/proc/<pid> while /sys/kernel/debug/kfd is already gone. It hangs the kernel by kernel NULL pointer.

---
 drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_module.c +1 -1
index aee2212e52f6..33aa23450b3f 100644
@@ -78,8 +78,8 @@ static int kfd_init(void)
 static void kfd_exit(void)
 {
 	kfd_cleanup_processes();
-	kfd_debugfs_fini();
 	kfd_process_destroy_wq();
+	kfd_debugfs_fini();
 	kfd_procfs_shutdown();
 	kfd_topology_shutdown();
 	kfd_chardev_exit();
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw

[AMD Official Use Only - AMD Internal Distribution Only]

________________________________
From: Lin, Amber <[email protected]>
Sent: August 1, 2025 10:18 AM
To: [email protected] <[email protected]>; Huang, JinHuiEric <[email protected]>
Cc: Lin, Amber <[email protected]>
Subject: [PATCH] drm/amdkfd: Destroy KFD debugfs after destroy KFD wq

Since KFD proc content was moved to kernel debugfs, we can't destroy KFD debugfs before kfd_process_destroy_wq. Move kfd_process_destroy_wq prior to kfd_debugfs_fini to fix a kernel NULL pointer problem. It happens when /sys/kernel/debug/kfd was already destroyed in kfd_debugfs_fini but kfd_process_destroy_wq calls kfd_debugfs_remove_process. This line

    debugfs_remove_recursive(entry->proc_dentry);

tries to remove /sys/kernel/debug/kfd/proc/<pid> while /sys/kernel/debug/kfd is already gone. It hangs the kernel by kernel NULL pointer.

---
 drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_module.c +1 -1
index aee2212e52f6..33aa23450b3f 100644
@@ -78,8 +78,8 @@ static int kfd_init(void)
 static void kfd_exit(void)
 {
         kfd_cleanup_processes();
-       kfd_debugfs_fini();
         kfd_process_destroy_wq();
+       kfd_debugfs_fini();
         kfd_procfs_shutdown();
         kfd_topology_shutdown();
         kfd_chardev_exit();

--
2.34.1