* [PATCH V2] drm/sched: fix fence reference count leak
@ 2025-02-25 9:41 Qianyi Liu
2025-02-25 14:17 ` Markus Elfring
0 siblings, 1 reply; 3+ messages in thread
From: Qianyi Liu @ 2025-02-25 9:41 UTC (permalink / raw)
To: matthew.brost, airlied, ckoenig.leichtzumerken, dakr, daniel,
maarten.lankhorst, mripard, phasta, tzimmermann
Cc: dri-devel, linux-kernel, liuqianyi125, stable
From: qianyi liu <liuqianyi125@gmail.com>
We leaked last_scheduled fences when the entity was being killed and the
fence callback add fails.
To fix this, we should decrement the reference count of prev when
dma_fence_add_callback() fails, ensuring proper balance.
v2:
* Make commit message more clearly. (Philipp and Matt)
* Add "Fixes: " tag and put the stable kernel on Cc. (Philipp)
* Correct subject line from "drm/scheduler" to "drm/sched". (Philipp)
Cc: stable@vger.kernel.org
Fixes: 2fdb8a8f07c2 ("drm/scheduler: rework entity flush, kill and fini")
Signed-off-by: qianyi liu <liuqianyi125@gmail.com>
---
drivers/gpu/drm/scheduler/sched_entity.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
index 69bcf0e99d57..1c0c14bcf726 100644
--- a/drivers/gpu/drm/scheduler/sched_entity.c
+++ b/drivers/gpu/drm/scheduler/sched_entity.c
@@ -259,9 +259,12 @@ static void drm_sched_entity_kill(struct drm_sched_entity *entity)
struct drm_sched_fence *s_fence = job->s_fence;
dma_fence_get(&s_fence->finished);
- if (!prev || dma_fence_add_callback(prev, &job->finish_cb,
- drm_sched_entity_kill_jobs_cb))
+ if (!prev ||
+ dma_fence_add_callback(prev, &job->finish_cb,
+ drm_sched_entity_kill_jobs_cb)) {
+ dma_fence_put(prev);
drm_sched_entity_kill_jobs_cb(NULL, &job->finish_cb);
+ }
prev = &s_fence->finished;
}
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V2] drm/sched: fix fence reference count leak
2025-02-25 9:41 [PATCH V2] drm/sched: fix fence reference count leak Qianyi Liu
@ 2025-02-25 14:17 ` Markus Elfring
2025-02-26 0:10 ` Qianyi Liu
0 siblings, 1 reply; 3+ messages in thread
From: Markus Elfring @ 2025-02-25 14:17 UTC (permalink / raw)
To: Qianyi Liu, dri-devel
Cc: stable, LKML, Christian König, Daniel Vetter,
Danilo Krummrich, David Airlie, Maarten Lankhorst, Matthew Brost,
Maxime Ripard, Philipp Stanner, Thomas Zimmermann
…
> fence callback add fails.
failed?
> To fix this, we should decrement the reference count of prev when
…
See also:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14-rc4#n94
> v2:
Patch version descriptions may be specified behind the marker line.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14-rc4#n763
Regards,
Markus
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V2] drm/sched: fix fence reference count leak
2025-02-25 14:17 ` Markus Elfring
@ 2025-02-26 0:10 ` Qianyi Liu
0 siblings, 0 replies; 3+ messages in thread
From: Qianyi Liu @ 2025-02-26 0:10 UTC (permalink / raw)
To: markus.elfring
Cc: airlied, ckoenig.leichtzumerken, dakr, daniel, dri-devel,
linux-kernel, liuqianyi125, maarten.lankhorst, matthew.brost,
mripard, phasta, stable, tzimmermann
Hello Markus,
>…
>> fence callback add fails.
> failed?
>> To fix this, we should decrement the reference count of prev when
>…
> See also:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14-rc4#n94
>> v2:
> Patch version descriptions may be specified behind the marker line.
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14-rc4#n763
Thanks for your comments, I will update these in V3.
> Regards,
> Markus
Best Regards
Qianyi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-26 0:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-25 9:41 [PATCH V2] drm/sched: fix fence reference count leak Qianyi Liu
2025-02-25 14:17 ` Markus Elfring
2025-02-26 0:10 ` Qianyi Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®