Re: [PATCH v2 3/3] drm/xe: Trigger queue cleanup if not in wedged mode 2

["Summers, Stuart" <stuart.summers@intel.com>]

On Thu, 2025-12-18 at 13:44 -0800, Matthew Brost wrote:
> The intent of wedging a device is to allow queues to continue running
> only in wedged mode 2. In other modes, queues should initiate cleanup
> and signal all remaining fences. Fix xe_guc_submit_wedge to correctly
> clean up queues when wedge mode != 2.

Yeah this makes sense. Should we use this for the fixes instead though?

commit 8ed9aaae39f39130b7a3eb2726be05d7f64b344c
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date:   Tue Apr 23 18:18:16 2024 -0400

    drm/xe: Force wedged state and block GT reset upon any GPU hang

Thanks,
Stuart

> 
> Fixes: 7dbe8af13c18 ("drm/xe: Wedge the entire device")
> Cc: stable@vger.kernel.org
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> 
> ---
> 
> This fix will not apply outright to any stable kernel as it depeneds
> on
> functions which have added in the KMD since the original commit.
> Likely
> will have to manually send out patches to stable for kernel which
> we'd
> like to fix.
> ---
>  drivers/gpu/drm/xe/xe_guc_submit.c | 31 ++++++++++++++++++----------
> --
>  1 file changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c
> b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 58ec94439df1..63b984f6d78d 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1313,6 +1313,7 @@ static void
> disable_scheduling_deregister(struct xe_guc *guc,
>   */
>  void xe_guc_submit_wedge(struct xe_guc *guc)
>  {
> +       struct xe_device *xe = guc_to_xe(guc);
>         struct xe_gt *gt = guc_to_gt(guc);
>         struct xe_exec_queue *q;
>         unsigned long index;
> @@ -1327,19 +1328,25 @@ void xe_guc_submit_wedge(struct xe_guc *guc)
>         if (!guc->submission_state.initialized)
>                 return;
>  
> -       err = devm_add_action_or_reset(guc_to_xe(guc)->drm.dev,
> -                                      guc_submit_wedged_fini, guc);
> -       if (err) {
> -               xe_gt_err(gt, "Failed to register clean-up on
> wedged.mode=2; "
> -                         "Although device is wedged.\n");
> -               return;
> -       }
> +       if (xe->wedged.mode == 2) {
> +               err = devm_add_action_or_reset(guc_to_xe(guc)-
> >drm.dev,
> +                                             
> guc_submit_wedged_fini, guc);
> +               if (err) {
> +                       xe_gt_err(gt, "Failed to register clean-up on
> wedged.mode=2; "
> +                                 "Although device is wedged.\n");
> +                       return;
> +               }
>  
> -       mutex_lock(&guc->submission_state.lock);
> -       xa_for_each(&guc->submission_state.exec_queue_lookup, index,
> q)
> -               if (xe_exec_queue_get_unless_zero(q))
> -                       set_exec_queue_wedged(q);
> -       mutex_unlock(&guc->submission_state.lock);
> +               mutex_lock(&guc->submission_state.lock);
> +               xa_for_each(&guc->submission_state.exec_queue_lookup,
> index, q)
> +                       if (xe_exec_queue_get_unless_zero(q))
> +                               set_exec_queue_wedged(q);
> +               mutex_unlock(&guc->submission_state.lock);
> +       } else {
> +               /* Forcefully kill any remaining exec queues, signal
> fences */
> +               xe_guc_submit_stop(guc);
> +               xe_guc_submit_pause_abort(guc);
> +       }
>  }
>  
>  static bool guc_submit_hint_wedged(struct xe_guc *guc)