drm/scheduler: Fix job cleanup without timeout handler
Subsystems (3)
PATCH 1/1 drm/scheduler: Fix job cleanup without timeout handler
After "5918045c4ed4 drm/scheduler: rework job destruction", jobs are only deleted when the timeout handler is able to be cancelled successfully.
In case no timeout handler is running (timeout == MAX_SCHEDULE_TIMEOUT), job cleanup would be skipped which may result in memory leaks.
Add the handling for the (timeout == MAX_SCHEDULE_TIMEOUT) case in drm_sched_cleanup_jobs.
--- drivers/gpu/drm/scheduler/sched_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/scheduler/sched_main.c +2 -1
@@ -630,7 +630,8 @@ static void drm_sched_cleanup_jobs(struct drm_gpu_scheduler *sched)unsigned long flags;/* Don't destroy jobs while the timeout worker is running */ -if (!cancel_delayed_work (&sched->work_tdr)) +if (sched->timeout !=MAX_SCHEDULE_TIMEOUT && +cancel_delayed_work (&sched->work_tdr))return ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 22 lines · Erico Nunes
After "
5918045c4ed4drm/scheduler: rework job destruction", jobs are only deleted when the timeout handler is able to be cancelled successfully.In case no timeout handler is running (timeout ==
MAX_SCHEDULE_TIMEOUT), job cleanup would be skipped which may result in memory leaks.Add the handling for the (timeout ==
MAX_SCHEDULE_TIMEOUT) case indrm_sched_cleanup_jobs.Signed-off-by Erico Nunes <[email protected]>Cc Christian König <[email protected]>--- drivers/gpu/drm/scheduler/sched_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/scheduler/sched_main.c +0
-0
drivers/gpu/drm/scheduler/sched_main.c static void drm_sched_cleanup_jobs(struct drm_gpu_scheduler *sched) · line 635
Quoted 7 lines
drivers/gpu/drm/scheduler/sched_main.c +2
-1@@ -630,7 +630,8 @@ static void drm_sched_cleanup_jobs(struct drm_gpu_scheduler *sched)unsigned long flags;/* Don't destroy jobs while the timeout worker is running */ -if (!cancel_delayed_work (&sched->work_tdr)) +if (sched->timeout !=MAX_SCHEDULE_TIMEOUT && +cancel_delayed_work (&sched->work_tdr))return ;
Nevermind this one, there is a typo. I'll resend.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel