Skip to contentSkip to conversation

drm/amdgpu: don't add files at control minor debugfs directory

PATCH In review Alex Deucher 4 participants 4 messages Dec 5, 2016 – Dec 8, 2016 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: don't add files at control minor debugfs directory

Since commit 8a357d10043c ("drm: Nerf DRM_CONTROL nodes"), a struct drm_device's ->control member is always NULL.

In the case of CONFIG_DEBUG_FS=y, amdgpu_debugfs_add_files() accesses ->control->debugfs_root though. This results in the following Oops:

[    9.627636] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
[    9.628274] IP: amdgpu_debugfs_add_files+0x8d/0x100 [amdgpu]
[    9.628867] PGD 2514c7067
[    9.628876] PUD 2514c8067
[    9.629448] PMD 0
[    9.630026] Oops: 0000 [#1] PREEMPT SMP
[...]
[    9.639906] Call Trace:
[    9.640538]  amdgpu_fence_driver_init+0x1e/0x40 [amdgpu]
[    9.641186]  amdgpu_device_init+0xa6d/0x1410 [amdgpu]
[    9.641900]  ? kmalloc_order_trace+0x2e/0x100
[    9.642587]  amdgpu_driver_load_kms+0x5b/0x200 [amdgpu]
[    9.643355]  drm_dev_register+0xa7/0xd0
[    9.644016]  drm_get_pci_dev+0xde/0x1d0
[    9.644659]  amdgpu_pci_probe+0xbe/0xf0 [amdgpu]

[...]

Fix this by omitting the drm_debugfs_create_files() call for the control minor debugfs directory which is now non-existent anyway.

Port of Nicolai Stange's radeon patch to amdgpu.

Fixes 8a357d10043c ("drm: Nerf DRM_CONTROL nodes")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -6
index 4701d94..a578540 100644
@@ -2512,9 +2512,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
 	adev->debugfs_count = i;
 #if defined(CONFIG_DEBUG_FS)
 	drm_debugfs_create_files(files, nfiles,
-				 adev->ddev->control->debugfs_root,
-				 adev->ddev->control);
-	drm_debugfs_create_files(files, nfiles,
 				 adev->ddev->primary->debugfs_root,
 				 adev->ddev->primary);
 #endif
@@ -2529,9 +2526,6 @@ static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev)
 	for (i = 0; i < adev->debugfs_count; i++) {
 		drm_debugfs_remove_files(adev->debugfs[i].files,
 					 adev->debugfs[i].num_files,
-					 adev->ddev->control);
-		drm_debugfs_remove_files(adev->debugfs[i].files,
-					 adev->debugfs[i].num_files,
 					 adev->ddev->primary);
 	}
 #endif
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1480968458-2270-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 21 lines · Alex Deucher

Since commit 8a357d10043c ("drm: Nerf DRM_CONTROL nodes"), a struct drm_device's ->control member is always NULL.

In the case of CONFIG_DEBUG_FS=y, amdgpu_debugfs_add_files() accesses ->control->debugfs_root though. This results in the following Oops:

[    9.627636] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
[    9.628274] IP: amdgpu_debugfs_add_files+0x8d/0x100 [amdgpu]
[    9.628867] PGD 2514c7067
[    9.628876] PUD 2514c8067
[    9.629448] PMD 0
[    9.630026] Oops: 0000 [#1] PREEMPT SMP
[...]
[    9.639906] Call Trace:
[    9.640538]  amdgpu_fence_driver_init+0x1e/0x40 [amdgpu]
[    9.641186]  amdgpu_device_init+0xa6d/0x1410 [amdgpu]
[    9.641900]  ? kmalloc_order_trace+0x2e/0x100
[    9.642587]  amdgpu_driver_load_kms+0x5b/0x200 [amdgpu]
[    9.643355]  drm_dev_register+0xa7/0xd0
[    9.644016]  drm_get_pci_dev+0xde/0x1d0
[    9.644659]  amdgpu_pci_probe+0xbe/0xf0 [amdgpu]
Quoted 8 lines

[...]

Fix this by omitting the drm_debugfs_create_files() call for the control minor debugfs directory which is now non-existent anyway.

Port of Nicolai Stange's radeon patch to amdgpu.

Not sure about the kernel, but in other projects the convention is

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98915

Quoted 2 lines
Fixes 8a357d10043c ("drm: Nerf DRM_CONTROL nodes")

Regardless of the above,

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 8a8380a1-fb41-e4e9-8c30-7ea075a241ac-otUistvHUpPR7s880joybQ@public.gmane.org

Reviewed-by
#4 lore raw

Am 06.12.2016 um 02:00 schrieb Michel Dänzer:

Quoted 32 lines · Alex Deucher
Quoted 21 lines

Since commit 8a357d10043c ("drm: Nerf DRM_CONTROL nodes"), a struct drm_device's ->control member is always NULL.

In the case of CONFIG_DEBUG_FS=y, amdgpu_debugfs_add_files() accesses ->control->debugfs_root though. This results in the following Oops:

[    9.627636] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
[    9.628274] IP: amdgpu_debugfs_add_files+0x8d/0x100 [amdgpu]
[    9.628867] PGD 2514c7067
[    9.628876] PUD 2514c8067
[    9.629448] PMD 0
[    9.630026] Oops: 0000 [#1] PREEMPT SMP
[...]
[    9.639906] Call Trace:
[    9.640538]  amdgpu_fence_driver_init+0x1e/0x40 [amdgpu]
[    9.641186]  amdgpu_device_init+0xa6d/0x1410 [amdgpu]
[    9.641900]  ? kmalloc_order_trace+0x2e/0x100
[    9.642587]  amdgpu_driver_load_kms+0x5b/0x200 [amdgpu]
[    9.643355]  drm_dev_register+0xa7/0xd0
[    9.644016]  drm_get_pci_dev+0xde/0x1d0
[    9.644659]  amdgpu_pci_probe+0xbe/0xf0 [amdgpu]
Quoted 8 lines

[...]

Fix this by omitting the drm_debugfs_create_files() call for the control minor debugfs directory which is now non-existent anyway.

Port of Nicolai Stange's radeon patch to amdgpu.

Not sure about the kernel, but in other projects the convention is

Quoted 8 lines

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98915

Quoted 2 lines
Fixes 8a357d10043c ("drm: Nerf DRM_CONTROL nodes")

Regardless of the above,

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 65ba1d07-7c50-c0d8-4d1b-bcdc7d447a63-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

Tested-by
#6 lore raw
Quoted 37 lines · EST Christian König

Am 06.12.2016 um 02:00 schrieb Michel Dänzer:

Quoted 36 lines · Alex Deucher
Quoted 22 lines

Since commit 8a357d10043c ("drm: Nerf DRM_CONTROL nodes"), a struct drm_device's ->control member is always NULL.

In the case of CONFIG_DEBUG_FS=y, amdgpu_debugfs_add_files() accesses ->control->debugfs_root though. This results in the following Oops:

[    9.627636] BUG: unable to handle kernel NULL pointer dereference at
0000000000000018 [    9.628274] IP: amdgpu_debugfs_add_files+0x8d/0x100
[amdgpu]
[    9.628867] PGD 2514c7067
[    9.628876] PUD 2514c8067
[    9.629448] PMD 0
[    9.630026] Oops: 0000 [#1] PREEMPT SMP
[...]
[    9.639906] Call Trace:
[    9.640538]  amdgpu_fence_driver_init+0x1e/0x40 [amdgpu]
[    9.641186]  amdgpu_device_init+0xa6d/0x1410 [amdgpu]
[    9.641900]  ? kmalloc_order_trace+0x2e/0x100
[    9.642587]  amdgpu_driver_load_kms+0x5b/0x200 [amdgpu]
[    9.643355]  drm_dev_register+0xa7/0xd0
[    9.644016]  drm_get_pci_dev+0xde/0x1d0
[    9.644659]  amdgpu_pci_probe+0xbe/0xf0 [amdgpu]
Quoted 8 lines

[...]

Fix this by omitting the drm_debugfs_create_files() call for the control minor debugfs directory which is now non-existent anyway.

Port of Nicolai Stange's radeon patch to amdgpu.

Not sure about the kernel, but in other projects the convention is

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98915

Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
Fixes 8a357d10043c ("drm: Nerf DRM_CONTROL nodes")

Regardless of the above,

Worked fine, fixed the issue for me.

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx