]> www.infradead.org Git - linux.git/commitdiff
drm/xe: Take job list lock in xe_sched_add_pending_job
authorMatthew Brost <matthew.brost@intel.com>
Thu, 3 Oct 2024 00:16:56 +0000 (17:16 -0700)
committerMatthew Brost <matthew.brost@intel.com>
Fri, 11 Oct 2024 22:48:29 +0000 (15:48 -0700)
A fragile micro optimization in xe_sched_add_pending_job relied on both
the GPU scheduler being stopped and fence signaling stopped to safely
add a job to the pending list without the job list lock in
xe_sched_add_pending_job. Remove this optimization and just take the job
list lock.

Fixes: 7ddb9403dd74 ("drm/xe: Sample ctx timestamp to determine if jobs have timed out")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241003001657.3517883-2-matthew.brost@intel.com
drivers/gpu/drm/xe/xe_gpu_scheduler.h

index 5ad5629a6c604348a82a4ce76fed4d2e0b3a410f..64b2ae6839db26f2c72c311744649cc21fb9878a 100644 (file)
@@ -63,7 +63,9 @@ xe_sched_invalidate_job(struct xe_sched_job *job, int threshold)
 static inline void xe_sched_add_pending_job(struct xe_gpu_scheduler *sched,
                                            struct xe_sched_job *job)
 {
+       spin_lock(&sched->base.job_list_lock);
        list_add(&job->drm.list, &sched->base.pending_list);
+       spin_unlock(&sched->base.job_list_lock);
 }
 
 static inline