Skip to contentSkip to conversation

drm/ttm: Check ttm_debugfs_root before creating files under it

PATCH In review Ma Jun 3 participants 8 messages Jan 13, 2023 – Jan 16, 2023

Subsystems (3)
lore
Share & tools
lore

Ma Jun

author
#0 lore raw

PATCH 1/2 drm/ttm: Check ttm_debugfs_root before creating files under it

Check the ttm_debugfs_root before creating files under it. If the ttm_debugfs_root is NULL, all the files created for ttm/ will be placed in the /sys/kerne/debug/ but not /sys/kernel/debug/ttm/

---
 drivers/gpu/drm/ttm/ttm_device.c |  3 ++-
 drivers/gpu/drm/ttm/ttm_pool.c   | 10 ++++++----
 drivers/gpu/drm/ttm/ttm_tt.c     |  5 +++--
 3 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_device.c +2 -1
index e7147e304637..967bc2244df3 100644
@@ -105,7 +105,8 @@ static int ttm_global_init(void)
 	INIT_LIST_HEAD(&glob->device_list);
 	atomic_set(&glob->bo_count, 0);
 
-	debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
+	if(ttm_debugfs_root)
+		debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
 				&glob->bo_count);
 out:
 	if (ret && ttm_debugfs_root)
drivers/gpu/drm/ttm/ttm_pool.c +6 -4
index 21b61631f73a..d95a65f759df 100644
@@ -713,10 +713,12 @@ int ttm_pool_mgr_init(unsigned long num_pages)
 	}
 
 #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_globals_fops);
-	debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_shrink_fops);
+	if(ttm_debugfs_root) {
+		debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_globals_fops);
+		debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_shrink_fops);
+	}
 #endif
 
 	mm_shrinker.count_objects = ttm_pool_shrinker_count;
drivers/gpu/drm/ttm/ttm_tt.c +3 -2
index d505603930a7..fec443494ef0 100644
@@ -394,8 +394,9 @@ DEFINE_SHOW_ATTRIBUTE(ttm_tt_debugfs_shrink);
 void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages)
 {
 #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_tt_debugfs_shrink_fops);
+	if(ttm_debugfs_root)
+		debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_tt_debugfs_shrink_fops);
 #endif
 
 	if (!ttm_pages_limit)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 drm/ttm: Use debugfs_remove_recursive to remove ttm directory

Use debugfs_remove_recursive to remove the /sys/kernel/debug/ttm directory for better compatibility. Becuase debugfs_remove fails on older kernel.

---
 drivers/gpu/drm/ttm/ttm_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_device.c +1 -1
index 967bc2244df3..590297123bb2 100644
@@ -55,7 +55,7 @@ static void ttm_global_release(void)
 		goto out;
 
 	ttm_pool_mgr_fini();
-	debugfs_remove(ttm_debugfs_root);
+	debugfs_remove_recursive(ttm_debugfs_root);
 
 	__free_page(glob->dummy_read_page);
 	memset(glob, 0, sizeof(*glob));
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 2/2] drm/ttm: Use debugfs_remove_recursive to remove ttm directory

Am 13.01.23 um 06:34 schrieb Ma Jun:

Quoted 3 lines

Use debugfs_remove_recursive to remove the /sys/kernel/debug/ttm directory for better compatibility. Becuase debugfs_remove fails on older kernel.

Again NAK for upstreaming.

The upstream kernel is made for the newest kernel version and should not contain any compatibility handling for older kernels.

Christian.

Quoted 19 lines
---
  drivers/gpu/drm/ttm/ttm_device.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_device.c +1 -1
index 967bc2244df3..590297123bb2 100644
@@ -55,7 +55,7 @@ static void ttm_global_release(void)
  		goto out;
 
  	ttm_pool_mgr_fini();
-	debugfs_remove(ttm_debugfs_root);
+	debugfs_remove_recursive(ttm_debugfs_root);
 
  	__free_page(glob->dummy_read_page);
  	memset(glob, 0, sizeof(*glob));
#3 lore raw

Re: [PATCH 2/2] drm/ttm: Use debugfs_remove_recursive to remove ttm directory

Quoted 10 lines · Christian König

Am 13.01.23 um 06:34 schrieb Ma Jun:

Quoted 3 lines

Use debugfs_remove_recursive to remove the /sys/kernel/debug/ttm directory for better compatibility. Becuase debugfs_remove fails on older kernel.

Again NAK for upstreaming.

The upstream kernel is made for the newest kernel version and should not contain any compatibility handling for older kernels.

Yes, generally so.

But the debugfs_remove_recursive() and debugfs_remove() are same function now. The debugfs_remove_recursive is used here so that we don't need to make kcl patch for it.

Regards,
Ma Jun

Quoted 22 lines

Christian.

Quoted 19 lines
---
  drivers/gpu/drm/ttm/ttm_device.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_device.c +1 -1
index 967bc2244df3..590297123bb2 100644
@@ -55,7 +55,7 @@ static void ttm_global_release(void)
  		goto out;
 
  	ttm_pool_mgr_fini();
-	debugfs_remove(ttm_debugfs_root);
+	debugfs_remove_recursive(ttm_debugfs_root);
 
  	__free_page(glob->dummy_read_page);
  	memset(glob, 0, sizeof(*glob));
#4 lore raw

Re: [PATCH 2/2] drm/ttm: Use debugfs_remove_recursive to remove ttm directory

Am 16.01.23 um 03:44 schrieb Ma, Jun:

Quoted 7 lines · Christian König
Quoted 6 lines

Am 13.01.23 um 06:34 schrieb Ma Jun:

Quoted 3 lines

Use debugfs_remove_recursive to remove the /sys/kernel/debug/ttm directory for better compatibility. Becuase debugfs_remove fails on older kernel.

Again NAK for upstreaming.

Quoted 8 lines
Quoted 3 lines

The upstream kernel is made for the newest kernel version and should not contain any compatibility handling for older kernels.

Yes, generally so.

But the debugfs_remove_recursive() and debugfs_remove() are same function now. The debugfs_remove_recursive is used here so that we don't need to make kcl patch for it.

Well making our internal kcl simpler is not a valid justification for upstreaming code.

My educated guess is that either debugfs_remove or debugfs_remove_recursive will go away in the near future, so it can happen that we will revert this again then.

What you could do is double checking with Greg what his preferences regarding debugfs_remove/debugfs_remove_recursive is.

You could then write something like "Replace debugfs_remove with debugfs_remove_recursive to better document what actually happens here. Also makes our internal KCL code simpler to maintain since debugfs_remove might go away in the future.".

Regards,
Christian.

Quoted 24 lines

Regards,
Ma Jun

Quoted 20 lines

Christian.

Quoted 18 lines
---
   drivers/gpu/drm/ttm/ttm_device.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_device.c +1 -1
index 967bc2244df3..590297123bb2 100644
@@ -55,7 +55,7 @@ static void ttm_global_release(void)
   		goto out;
 
   	ttm_pool_mgr_fini();
-	debugfs_remove(ttm_debugfs_root);
+	debugfs_remove_recursive(ttm_debugfs_root);
 
   	__free_page(glob->dummy_read_page);
   	memset(glob, 0, sizeof(*glob));
#5 lore raw
In reply to Ma Jun

Am 13.01.23 um 06:34 schrieb Ma Jun:

Quoted 4 lines

Check the ttm_debugfs_root before creating files under it. If the ttm_debugfs_root is NULL, all the files created for ttm/ will be placed in the /sys/kerne/debug/ but not /sys/kernel/debug/ttm/

Well NAK for upstreaming. Why should ttm_debugfs_root be NULL here?

Regards,
Christian.

Quoted 59 lines
---
  drivers/gpu/drm/ttm/ttm_device.c |  3 ++-
  drivers/gpu/drm/ttm/ttm_pool.c   | 10 ++++++----
  drivers/gpu/drm/ttm/ttm_tt.c     |  5 +++--
  3 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_device.c +2 -1
index e7147e304637..967bc2244df3 100644
@@ -105,7 +105,8 @@ static int ttm_global_init(void)
  	INIT_LIST_HEAD(&glob->device_list);
  	atomic_set(&glob->bo_count, 0);
 
-	debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
+	if(ttm_debugfs_root)
+		debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
  				&glob->bo_count);
  out:
  	if (ret && ttm_debugfs_root)
drivers/gpu/drm/ttm/ttm_pool.c +6 -4
index 21b61631f73a..d95a65f759df 100644
@@ -713,10 +713,12 @@ int ttm_pool_mgr_init(unsigned long num_pages)
  	}
 
  #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_globals_fops);
-	debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_shrink_fops);
+	if(ttm_debugfs_root) {
+		debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_globals_fops);
+		debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_shrink_fops);
+	}
  #endif
 
  	mm_shrinker.count_objects = ttm_pool_shrinker_count;
drivers/gpu/drm/ttm/ttm_tt.c +3 -2
index d505603930a7..fec443494ef0 100644
@@ -394,8 +394,9 @@ DEFINE_SHOW_ATTRIBUTE(ttm_tt_debugfs_shrink);
  void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages)
  {
  #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_tt_debugfs_shrink_fops);
+	if(ttm_debugfs_root)
+		debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_tt_debugfs_shrink_fops);
  #endif
 
  	if (!ttm_pages_limit)
#6 lore raw
Quoted 8 lines · Christian König

Am 13.01.23 um 06:34 schrieb Ma Jun:

Quoted 4 lines

Check the ttm_debugfs_root before creating files under it. If the ttm_debugfs_root is NULL, all the files created for ttm/ will be placed in the /sys/kerne/debug/ but not /sys/kernel/debug/ttm/

Well NAK for upstreaming. Why should ttm_debugfs_root be NULL here?

In my case, when the ttm/ removal fails during amdgpu uninstall and then we try to modprobe the amdgpu again, the ttm_debugfs_root will be NULL because the ttm/ already exists.

Regards,
Ma Jun

Quoted 63 lines

Regards,
Christian.

Quoted 59 lines
---
  drivers/gpu/drm/ttm/ttm_device.c |  3 ++-
  drivers/gpu/drm/ttm/ttm_pool.c   | 10 ++++++----
  drivers/gpu/drm/ttm/ttm_tt.c     |  5 +++--
  3 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_device.c +2 -1
index e7147e304637..967bc2244df3 100644
@@ -105,7 +105,8 @@ static int ttm_global_init(void)
  	INIT_LIST_HEAD(&glob->device_list);
  	atomic_set(&glob->bo_count, 0);
 
-	debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
+	if(ttm_debugfs_root)
+		debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
  				&glob->bo_count);
  out:
  	if (ret && ttm_debugfs_root)
drivers/gpu/drm/ttm/ttm_pool.c +6 -4
index 21b61631f73a..d95a65f759df 100644
@@ -713,10 +713,12 @@ int ttm_pool_mgr_init(unsigned long num_pages)
  	}
 
  #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_globals_fops);
-	debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_shrink_fops);
+	if(ttm_debugfs_root) {
+		debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_globals_fops);
+		debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_shrink_fops);
+	}
  #endif
 
  	mm_shrinker.count_objects = ttm_pool_shrinker_count;
drivers/gpu/drm/ttm/ttm_tt.c +3 -2
index d505603930a7..fec443494ef0 100644
@@ -394,8 +394,9 @@ DEFINE_SHOW_ATTRIBUTE(ttm_tt_debugfs_shrink);
  void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages)
  {
  #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_tt_debugfs_shrink_fops);
+	if(ttm_debugfs_root)
+		debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_tt_debugfs_shrink_fops);
  #endif
 
  	if (!ttm_pages_limit)
#7 lore raw

Am 16.01.23 um 03:44 schrieb Ma, Jun:

Quoted 11 lines · Christian König
Quoted 7 lines

Am 13.01.23 um 06:34 schrieb Ma Jun:

Quoted 4 lines

Check the ttm_debugfs_root before creating files under it. If the ttm_debugfs_root is NULL, all the files created for ttm/ will be placed in the /sys/kerne/debug/ but not /sys/kernel/debug/ttm/

Well NAK for upstreaming. Why should ttm_debugfs_root be NULL here?

In my case, when the ttm/ removal fails during amdgpu uninstall and then we try to modprobe the amdgpu again, the ttm_debugfs_root will be NULL because the ttm/ already exists.

Yeah, but this is just papering over a previous bug which in turn is not a valid argument for a code change.

What should happen instead is that the original bug needs to get fixed.

Regards,
Christian.

Quoted 65 lines

Regards,
Ma Jun

Quoted 61 lines

Regards,
Christian.

Quoted 58 lines
---
   drivers/gpu/drm/ttm/ttm_device.c |  3 ++-
   drivers/gpu/drm/ttm/ttm_pool.c   | 10 ++++++----
   drivers/gpu/drm/ttm/ttm_tt.c     |  5 +++--
   3 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_device.c +2 -1
index e7147e304637..967bc2244df3 100644
@@ -105,7 +105,8 @@ static int ttm_global_init(void)
   	INIT_LIST_HEAD(&glob->device_list);
   	atomic_set(&glob->bo_count, 0);
 
-	debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
+	if(ttm_debugfs_root)
+		debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
   				&glob->bo_count);
   out:
   	if (ret && ttm_debugfs_root)
drivers/gpu/drm/ttm/ttm_pool.c +6 -4
index 21b61631f73a..d95a65f759df 100644
@@ -713,10 +713,12 @@ int ttm_pool_mgr_init(unsigned long num_pages)
   	}
 
   #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_globals_fops);
-	debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_pool_debugfs_shrink_fops);
+	if(ttm_debugfs_root) {
+		debugfs_create_file("page_pool", 0444, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_globals_fops);
+		debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_pool_debugfs_shrink_fops);
+	}
   #endif
 
   	mm_shrinker.count_objects = ttm_pool_shrinker_count;
drivers/gpu/drm/ttm/ttm_tt.c +3 -2
index d505603930a7..fec443494ef0 100644
@@ -394,8 +394,9 @@ DEFINE_SHOW_ATTRIBUTE(ttm_tt_debugfs_shrink);
   void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages)
   {
   #ifdef CONFIG_DEBUG_FS
-	debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
-			    &ttm_tt_debugfs_shrink_fops);
+	if(ttm_debugfs_root)
+		debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL,
+				    &ttm_tt_debugfs_shrink_fops);
   #endif
 
   	if (!ttm_pages_limit)