Skip to content

Commit a952f1a

Browse files
jason--liuPhilipp Stanner
authored andcommitted
drm/sched: Fix fence reference count leak
The last_scheduled fence leaks when an entity is being killed and adding the cleanup callback fails. Decrement the reference count of prev when dma_fence_add_callback() fails, ensuring proper balance. Cc: stable@vger.kernel.org # v6.2+ [phasta: add git tag info for stable kernel] Fixes: 2fdb8a8 ("drm/scheduler: rework entity flush, kill and fini") Signed-off-by: qianyi liu <liuqianyi125@gmail.com> Signed-off-by: Philipp Stanner <phasta@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20250311060251.4041101-1-liuqianyi125@gmail.com
1 parent 12d8f31 commit a952f1a

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,16 @@ static void drm_sched_entity_kill(struct drm_sched_entity *entity)
259259
struct drm_sched_fence *s_fence = job->s_fence;
260260

261261
dma_fence_get(&s_fence->finished);
262-
if (!prev || dma_fence_add_callback(prev, &job->finish_cb,
263-
drm_sched_entity_kill_jobs_cb))
262+
if (!prev ||
263+
dma_fence_add_callback(prev, &job->finish_cb,
264+
drm_sched_entity_kill_jobs_cb)) {
265+
/*
266+
* Adding callback above failed.
267+
* dma_fence_put() checks for NULL.
268+
*/
269+
dma_fence_put(prev);
264270
drm_sched_entity_kill_jobs_cb(NULL, &job->finish_cb);
271+
}
265272

266273
prev = &s_fence->finished;
267274
}

0 commit comments

Comments
 (0)