drm/amd: fix scheduler fence teardown order
Subsystems (2)
PATCH 1/1 drm/amd: fix scheduler fence teardown order
From: Christian König <[email protected]>
Some fences might be alive even after we have stopped the scheduler leading to warnings about leaked objects from the SLUB allocator.
Fix this by allocating/freeing the SLUB allocator from the module init/finfi functions just like we do it for hw fences.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 ++ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 13 ------------- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 3 +++ drivers/gpu/drm/amd/scheduler/sched_fence.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -0
@@ -748,6 +748,7 @@ static int __init amdgpu_init(void) {amdgpu_sync_init ();amdgpu_fence_slab_init (); +amd_sched_fence_slab_init ();if (vgacon_text_force ()) {DRM_ERROR ("VGACON disables amdgpu kernel modesetting.\n" );return -EINVAL ;
@@ -767,6 +768,7 @@ static void __exit amdgpu_exit(void)drm_pci_exit (driver, pdriver);amdgpu_unregister_atpx_handler ();amdgpu_sync_fini (); +amd_sched_fence_slab_fini ();amdgpu_fence_slab_fini (); }
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +0 -13
@@ -34,9 +34,6 @@ static bool amd_sched_entity_is_ready(struct amd_sched_entity *entity);static void amd_sched_wakeup (struct amd_gpu_scheduler *sched);static void amd_sched_process_job (struct fence *f,struct fence_cb *cb); -struct kmem_cache *sched_fence_slab; -atomic_t sched_fence_slab_ref =ATOMIC_INIT (0 ); -/* Initialize a given run queue struct */ static void amd_sched_rq_init (struct amd_sched_rq *rq) {
@@ -618,13 +615,6 @@ int amd_sched_init(struct amd_gpu_scheduler *sched,INIT_LIST_HEAD (&sched->ring_mirror_list);spin_lock_init (&sched->job_list_lock);atomic_set (&sched->hw_rq_count,0 ); -if (atomic_inc_return (&sched_fence_slab_ref) ==1 ) { - sched_fence_slab =kmem_cache_create ( -"amd_sched_fence" ,sizeof (struct amd_sched_fence ),0 , -SLAB_HWCACHE_ALIGN ,NULL ); -if (!sched_fence_slab) -return -ENOMEM ; - }/* Each scheduler will run on a seperate kernel thread */ sched->thread =kthread_run (amd_sched_main, sched, sched->name);
@@ -645,7 +635,4 @@ void amd_sched_fini(struct amd_gpu_scheduler *sched) {if (sched->thread)kthread_stop (sched->thread); -rcu_barrier (); -if (atomic_dec_and_test (&sched_fence_slab_ref)) -kmem_cache_destroy (sched_fence_slab); }
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +3 -0
@@ -145,6 +145,9 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched, struct amd_sched_entity *entity);void amd_sched_entity_push_job (struct amd_sched_job *sched_job); +int amd_sched_fence_slab_init (void ); +void amd_sched_fence_slab_fini (void ); +struct amd_sched_fence *amd_sched_fence_create (struct amd_sched_entity *s_entity,void *owner);void amd_sched_fence_scheduled (struct amd_sched_fence *fence);
drivers/gpu/drm/amd/scheduler/sched_fence.c +19 -0
@@ -27,6 +27,25 @@#include <drm/drmP.h> #include "gpu_scheduler.h" +struct kmem_cache *sched_fence_slab; + +int amd_sched_fence_slab_init (void ) +{ + sched_fence_slab =kmem_cache_create ( +"amd_sched_fence" ,sizeof (struct amd_sched_fence ),0 , +SLAB_HWCACHE_ALIGN ,NULL ); +if (!sched_fence_slab) +return -ENOMEM ; + +return 0 ; +} + +void amd_sched_fence_slab_fini (void ) +{ +rcu_barrier (); +kmem_cache_destroy (sched_fence_slab); +} +struct amd_sched_fence *amd_sched_fence_create (struct amd_sched_entity *entity,void *owner) {
Signature · 6 lines
2.5.0 _______________________________________________ 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): 1477667333-2423-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Quoted 11 lines · Christian König
From: Christian König <[email protected]>
Some fences might be alive even after we have stopped the scheduler leading to warnings about leaked objects from the SLUB allocator.
Fix this by allocating/freeing the SLUB allocator from the module init/finfi functions just like we do it for hw fences.
Reported-by Grazvydas Ignotas <[email protected]>Signed-off-by Christian König <[email protected]>---
...
Quoted 19 lines
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +3
-0@@ -145,6 +145,9 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched, struct amd_sched_entity *entity);void amd_sched_entity_push_job (struct amd_sched_job *sched_job); +int amd_sched_fence_slab_init (void ); +void amd_sched_fence_slab_fini (void ); +struct amd_sched_fence *amd_sched_fence_create (struct amd_sched_entity *s_entity,void *owner);void amd_sched_fence_scheduled (struct amd_sched_fence *fence);drivers/gpu/drm/amd/scheduler/sched_fence.c +0
-0
drivers/gpu/drm/amd/scheduler/sched_fence.c line 30
Quoted 4 lines
drivers/gpu/drm/amd/scheduler/sched_fence.c +1
-0@@ -27,6 +27,25 @@#include <drm/drmP.h> #include "gpu_scheduler.h" +struct kmem_cache *sched_fence_slab;
Can become static now I guess?
Gražvydas
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 13 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, October 28, 2016 11:09 AM
To: [email protected]
Subject: [PATCH] drm/amd: fix scheduler fence teardown orderFrom: Christian König <[email protected]>
Some fences might be alive even after we have stopped the scheduler leading
to warnings about leaked objects from the SLUB allocator.
Quoted 5 lines
Fix this by allocating/freeing the SLUB allocator from the module init/finfi functions just like we do it for hw fences.
Reported-by Grazvydas Ignotas <[email protected]>Signed-off-by Christian König <[email protected]>
Good catch!
Quoted 123 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 ++ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 13 ------------- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 3 +++ drivers/gpu/drm/amd/scheduler/sched_fence.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0@@ -748,6 +748,7 @@ static int __init amdgpu_init(void) {amdgpu_sync_init ();amdgpu_fence_slab_init (); +amd_sched_fence_slab_init ();if (vgacon_text_force ()) { DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0return -EINVAL ;@@ -767,6 +768,7 @@ static void __exit amdgpu_exit(void)drm_pci_exit (driver, pdriver);amdgpu_unregister_atpx_handler ();amdgpu_sync_fini (); +amd_sched_fence_slab_fini ();amdgpu_fence_slab_fini (); }drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +0
-3@@ -34,9 +34,6 @@ static bool amd_sched_entity_is_ready(struct amd_sched_entity *entity);static void amd_sched_wakeup (struct amd_gpu_scheduler *sched);static void amd_sched_process_job (struct fence *f,struct fence_cb *cb); -struct kmem_cache *sched_fence_slab; -atomic_t sched_fence_slab_ref =ATOMIC_INIT (0 ); -/* Initialize a given run queue struct */ static void amd_sched_rq_init (struct amd_sched_rq *rq){
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +0
-7@@ -618,13 +615,6 @@ int amd_sched_init(struct amd_gpu_scheduler *sched,INIT_LIST_HEAD (&sched->ring_mirror_list);spin_lock_init (&sched->job_list_lock);atomic_set (&sched->hw_rq_count,0 ); -if (atomic_inc_return (&sched_fence_slab_ref) ==1 ) { - sched_fence_slab =kmem_cache_create ( -"amd_sched_fence" ,sizeof (struct amd_sched_fence), 0, -SLAB_HWCACHE_ALIGN ,NULL ); -if (!sched_fence_slab) -return -ENOMEM ; - }drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +0
-0/* Each scheduler will run on a seperate kernel thread */ sched->thread = kthread_run(amd_sched_main, sched, sched-Quoted 1 line
name);
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +0
-3@@ -645,7 +635,4 @@ void amd_sched_fini(struct amd_gpu_scheduler *sched) {if (sched->thread)kthread_stop (sched->thread); -rcu_barrier (); -if (atomic_dec_and_test (&sched_fence_slab_ref)) -kmem_cache_destroy (sched_fence_slab);}
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +3
-0@@ -145,6 +145,9 @@ void amd_sched_entity_fini(structamd_gpu_scheduler *sched, struct amd_sched_entity *entity);void amd_sched_entity_push_job (struct amd_sched_job *sched_job); +int amd_sched_fence_slab_init (void ); +void amd_sched_fence_slab_fini (void ); +struct amd_sched_fence *amd_sched_fence_create (struct amd_sched_entity *s_entity,void *owner);void
amd_sched_fence_scheduled(struct amd_sched_fence *fence);drivers/gpu/drm/amd/scheduler/sched_fence.c +19
-0@@ -27,6 +27,25 @@#include <drm/drmP.h> #include "gpu_scheduler.h" +struct kmem_cache *sched_fence_slab; + +int amd_sched_fence_slab_init (void ) +{ + sched_fence_slab =kmem_cache_create ( +"amd_sched_fence" ,sizeof (struct amd_sched_fence ),0 , +SLAB_HWCACHE_ALIGN ,NULL ); +if (!sched_fence_slab) +return -ENOMEM ; + +return 0 ; +} + +void amd_sched_fence_slab_fini (void ) +{ +rcu_barrier (); +kmem_cache_destroy (sched_fence_slab); +} +struct amd_sched_fence *amd_sched_fence_create (struct amd_sched_entity *entity,void *owner){
--
2.5.0
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