OSDN Git Service

drm/scheduler: Fix job cleanup without timeout handler
authorErico Nunes <nunes.erico@gmail.com>
Mon, 20 May 2019 23:16:49 +0000 (01:16 +0200)
committerChristian König <christian.koenig@amd.com>
Wed, 22 May 2019 06:42:50 +0000 (08:42 +0200)
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.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/306025/?series=60878&rev=2
drivers/gpu/drm/scheduler/sched_main.c

index f8f0e1c..10d1d37 100644 (file)
@@ -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;