Skip to content

Commit 03dec92

Browse files
committed
drm/scheduler: Fix lockup in drm_sched_entity_kill()
The drm_sched_entity_kill() is invoked twice by drm_sched_entity_destroy() while userspace process is exiting or being killed. First time it's invoked when sched entity is flushed and second time when entity is released. This causes a lockup within wait_for_completion(entity_idle) due to how completion API works. Calling wait_for_completion() more times than complete() was invoked is a error condition that causes lockup because completion internally uses counter for complete/wait calls. The complete_all() must be used instead in such cases. This patch fixes lockup of Panfrost driver that is reproducible by killing any application in a middle of 3d drawing operation. Fixes: 2fdb8a8 ("drm/scheduler: rework entity flush, kill and fini") Signed-off-by: Dmitry Osipenko <[email protected]> Reviewed-by: Christian König <[email protected]> Tested-by: Guilherme G. Piccoli <[email protected]> # Steam Deck Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 523dfa9 commit 03dec92

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity,
8181
init_completion(&entity->entity_idle);
8282

8383
/* We start in an idle state. */
84-
complete(&entity->entity_idle);
84+
complete_all(&entity->entity_idle);
8585

8686
spin_lock_init(&entity->rq_lock);
8787
spsc_queue_init(&entity->job_queue);

drivers/gpu/drm/scheduler/sched_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ static int drm_sched_main(void *param)
987987
sched_job = drm_sched_entity_pop_job(entity);
988988

989989
if (!sched_job) {
990-
complete(&entity->entity_idle);
990+
complete_all(&entity->entity_idle);
991991
continue;
992992
}
993993

@@ -998,7 +998,7 @@ static int drm_sched_main(void *param)
998998

999999
trace_drm_run_job(sched_job, entity);
10001000
fence = sched->ops->run_job(sched_job);
1001-
complete(&entity->entity_idle);
1001+
complete_all(&entity->entity_idle);
10021002
drm_sched_fence_scheduled(s_fence);
10031003

10041004
if (!IS_ERR_OR_NULL(fence)) {

0 commit comments

Comments
 (0)