Commit 1564d411 authored by Jonathan Cavitt's avatar Jonathan Cavitt Committed by Matthew Brost
Browse files

drm/xe/xe_guc_submit: Fix exec queue stop race condition 



Reorder the xe_sched_tdr_queue_imm and set_exec_queue_banned calls in
guc_exec_queue_stop.  This prevents a possible race condition between
the two events in which it's possible for xe_sched_tdr_queue_imm to
wake the ufence waiter before the exec queue is banned, causing the
ufence waiter to miss the banned state.

Suggested-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarStuart Summers <stuart.summers@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510194540.3246991-1-jonathan.cavitt@intel.com
parent 4071e087

drivers/gpu/drm/xe/xe_guc_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -1491,8 +1491,8 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q) 
			    !xe_sched_job_completed(job)) ||

			    xe_sched_invalidate_job(job, 2)) {

				trace_xe_sched_job_ban(job);

				xe_sched_tdr_queue_imm(&q->guc->sched);

				set_exec_queue_banned(q);

				xe_sched_tdr_queue_imm(&q->guc->sched);

			}

		}

	}