Re: [PATCH v4 13/18] drm/xe/multi_queue: Teardown group upon job timeout

[Matthew Brost <matthew.brost@intel.com>]

On Mon, Dec 08, 2025 at 07:21:03PM -0800, Niranjana Vishwanathapura wrote:
> Upon a job timeout, teardown the multi-queue group by
> triggering TDR on all queues of the multi-queue group
> and by skipping timeout checks in them.
> 
> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>

Same comment as patch #9. With that:

Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_exec_queue_types.h | 2 ++
>  drivers/gpu/drm/xe/xe_guc_submit.c       | 9 ++++++++-
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_exec_queue_types.h b/drivers/gpu/drm/xe/xe_exec_queue_types.h
> index 8a954ee62505..5fc516b0bb77 100644
> --- a/drivers/gpu/drm/xe/xe_exec_queue_types.h
> +++ b/drivers/gpu/drm/xe/xe_exec_queue_types.h
> @@ -64,6 +64,8 @@ struct xe_exec_queue_group {
>  	struct mutex list_lock;
>  	/** @sync_pending: CGP_SYNC_DONE g2h response pending */
>  	bool sync_pending;
> +	/** @banned: Group banned */
> +	bool banned;
>  };
>  
>  /**
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 509433f132d0..3d6eda29a819 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -602,6 +602,8 @@ static void xe_guc_exec_queue_group_trigger_cleanup(struct xe_exec_queue *q)
>  	xe_gt_assert(guc_to_gt(exec_queue_to_guc(q)),
>  		     xe_exec_queue_is_multi_queue(q));
>  
> +	/* Group banned, skip timeout check in TDR */
> +	WRITE_ONCE(group->banned, true);
>  	xe_guc_exec_queue_trigger_cleanup(primary);
>  
>  	mutex_lock(&group->list_lock);
> @@ -1485,6 +1487,11 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
>  		exec_queue_killed_or_banned_or_wedged(q) ||
>  		exec_queue_destroyed(q);
>  
> +	/* Skip timeout check if multi-queue group is banned */
> +	if (xe_exec_queue_is_multi_queue(q) &&
> +	    READ_ONCE(q->multi_queue.group->banned))
> +		skip_timeout_check = true;
> +
>  	/*
>  	 * If devcoredump not captured and GuC capture for the job is not ready
>  	 * do manual capture first and decide later if we need to use it
> @@ -1637,7 +1644,7 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
>  	xe_sched_add_pending_job(sched, job);
>  	xe_sched_submission_start(sched);
>  
> -	xe_guc_exec_queue_trigger_cleanup(q);
> +	xe_guc_exec_queue_group_trigger_cleanup(q);
>  
>  	/* Mark all outstanding jobs as bad, thus completing them */
>  	spin_lock(&sched->base.job_list_lock);
> -- 
> 2.43.0
>