From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Raag Jadav <raag.jadav@intel.com>
Cc: <intel-xe@lists.freedesktop.org>, <riana.tauro@intel.com>,
<michal.wajdeczko@intel.com>, <lukasz.laguna@intel.com>,
<matthew.d.roper@intel.com>, <matthew.brost@intel.com>,
<mallesh.koujalagi@intel.com>
Subject: Re: [PATCH v5 2/5] drm/xe: Drop xe_device_set_wedged_method()
Date: Tue, 13 Oct 2026 14:30:04 -0400 [thread overview]
Message-ID: <as54rBt2Av-CAYDW@intel.com> (raw)
In-Reply-To: <20261013110439.181447-3-raag.jadav@intel.com>
On Tue, Oct 13, 2026 at 04:33:54PM +0530, Raag Jadav wrote:
> Commit 60439ac3f235 ("drm/xe: Add a helper function to set recovery
> method") introduced xe_device_set_wedged_method() helper to allow setting
> preferred recovery method before wedging the device, but also introduced
> a flaw where the previously set method can be overwritten by concurrent
> racing wedge call. This can result in unintended recovery method to be
> sent to userspace and possibly failed recovery.
>
> Drop xe_device_set_wedged_method() entirely and pass the recovery method
> as part of xe_device_declare_wedged() argument, which places the preferred
> recovery method on stack and avoids this issue.
>
> Fixes: 60439ac3f235 ("drm/xe: Add a helper function to set recovery method")
> Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/xe/xe_amc.c | 3 ++-
> drivers/gpu/drm/xe/xe_device.c | 23 ++++------------------
> drivers/gpu/drm/xe/xe_device.h | 3 +--
> drivers/gpu/drm/xe/xe_device_types.h | 2 --
> drivers/gpu/drm/xe/xe_gsc.c | 3 ++-
> drivers/gpu/drm/xe/xe_gt.c | 3 ++-
> drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 2 +-
> drivers/gpu/drm/xe/xe_guc_submit.c | 5 +++--
> drivers/gpu/drm/xe/xe_mert.c | 6 ++++--
> drivers/gpu/drm/xe/xe_pci_error.c | 3 ++-
> drivers/gpu/drm/xe/xe_ras.c | 3 +--
> drivers/gpu/drm/xe/xe_survivability_mode.c | 3 +--
> 12 files changed, 23 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_amc.c b/drivers/gpu/drm/xe/xe_amc.c
> index 8ecadee6eea3..b7390a4ee3ce 100644
> --- a/drivers/gpu/drm/xe/xe_amc.c
> +++ b/drivers/gpu/drm/xe/xe_amc.c
> @@ -160,7 +160,8 @@ static void xe_amc_work(struct work_struct *work)
> case AMC_ALERT_OOB_RESET:
> case AMC_ALERT_CATERR:
> dev_warn(amc->i2c->drm_dev, "AMC Alert: %s\n", amc_alert[alert_reason]);
> - xe_device_declare_wedged(i2c_client_to_xe_device(client));
> + xe_device_declare_wedged(i2c_client_to_xe_device(client),
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> break;
> default:
> dev_warn(amc->i2c->drm_dev, "unknown AMC alert: %d\n", alert_reason);
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 22ae10958d7f..0d9ef4f1ab9a 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -1378,24 +1378,13 @@ u64 xe_device_uncanonicalize_addr(struct xe_device *xe, u64 address)
> * firmware and restore device to normal operation.
> */
>
> -/**
> - * xe_device_set_wedged_method - Set wedged recovery method
> - * @xe: xe device instance
> - * @method: recovery method to set
> - *
> - * Set wedged recovery method to be sent in drm wedged uevent.
> - */
> -void xe_device_set_wedged_method(struct xe_device *xe, unsigned long method)
> -{
> - xe->wedged.method = method;
> -}
> -
> #define WEDGED_URL "https://docs.kernel.org/gpu/drm-uapi.html#device-wedging"
> #define XE_BUG_URL "https://gitlab.freedesktop.org/drm/xe/kernel/issues/new"
>
> /**
> * xe_device_declare_wedged - Declare device wedged
> * @xe: xe device instance
> + * @method: method(s) to be used for recovery
> *
> * This is a final state that can only be cleared with the recovery method
> * specified in the drm wedged uevent. The method can be set using
> @@ -1411,7 +1400,7 @@ void xe_device_set_wedged_method(struct xe_device *xe, unsigned long method)
> * snapshot capture. In this mode, GT reset won't be attempted so the state of
> * the issue is preserved for further debugging.
> */
> -void xe_device_declare_wedged(struct xe_device *xe)
> +void xe_device_declare_wedged(struct xe_device *xe, unsigned long method)
> {
> struct xe_gt *gt;
> u8 id;
> @@ -1442,14 +1431,10 @@ void xe_device_declare_wedged(struct xe_device *xe)
> * it available to the user for debugging.
> */
> if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> - xe_device_set_wedged_method(xe, DRM_WEDGE_RECOVERY_NONE);
> - /* If no wedge recovery method is set, use default */
> - else if (!xe->wedged.method)
> - xe_device_set_wedged_method(xe, DRM_WEDGE_RECOVERY_REBIND |
> - DRM_WEDGE_RECOVERY_BUS_RESET);
> + method = DRM_WEDGE_RECOVERY_NONE;
>
> /* Notify userspace of wedged device */
> - drm_dev_wedged_event(&xe->drm, xe->wedged.method, NULL);
> + drm_dev_wedged_event(&xe->drm, method, NULL);
> }
> }
>
> diff --git a/drivers/gpu/drm/xe/xe_device.h b/drivers/gpu/drm/xe/xe_device.h
> index 80bda9b548d5..9f35370c0851 100644
> --- a/drivers/gpu/drm/xe/xe_device.h
> +++ b/drivers/gpu/drm/xe/xe_device.h
> @@ -264,8 +264,7 @@ static inline bool xe_debug_page_size_mode_is_mixed(struct xe_device *xe)
> }
> #endif
>
> -void xe_device_set_wedged_method(struct xe_device *xe, unsigned long method);
> -void xe_device_declare_wedged(struct xe_device *xe);
> +void xe_device_declare_wedged(struct xe_device *xe, unsigned long method);
> int xe_device_validate_wedged_mode(struct xe_device *xe, unsigned int mode);
> const char *xe_wedged_mode_to_string(enum xe_wedged_mode mode);
>
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index 4e0e1bc040c1..00ce8e9872ea 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -543,8 +543,6 @@ struct xe_device {
> atomic_t flag;
> /** @wedged.mode: Mode controlled by kernel parameter and debugfs */
> enum xe_wedged_mode mode;
> - /** @wedged.method: Recovery method to be sent in the drm device wedged uevent */
> - unsigned long method;
> /** @wedged.inconsistent_reset: Inconsistent reset policy state between GTs */
> bool inconsistent_reset;
> } wedged;
> diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c
> index 524ac56bdcc7..2bbe0f20ff8d 100644
> --- a/drivers/gpu/drm/xe/xe_gsc.c
> +++ b/drivers/gpu/drm/xe/xe_gsc.c
> @@ -340,7 +340,8 @@ static int gsc_er_complete(struct xe_gt *gt)
> * declare the device as wedged.
> */
> xe_gt_err(gt, "GSC ER timed out!\n");
> - xe_device_declare_wedged(gt_to_xe(gt));
> + xe_device_declare_wedged(gt_to_xe(gt),
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> return -EIO;
> }
>
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 4e047cfaf603..f35ae3a532ee 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -992,7 +992,8 @@ static void gt_reset_worker(struct work_struct *w)
>
> err_fail:
> xe_log_err_fatal(gt, GT, err, "reset failed\n");
> - xe_device_declare_wedged(gt_to_xe(gt));
> + xe_device_declare_wedged(gt_to_xe(gt),
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> err_pm_put:
> xe_pm_runtime_put(gt_to_xe(gt));
> }
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
> index 37899fcf5b22..28ec83bb8100 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
> @@ -1462,7 +1462,7 @@ static void vf_post_migration_recovery(struct xe_gt *gt)
> fail:
> vf_post_migration_abort(gt);
> xe_gt_sriov_err(gt, "migration recovery failed (%pe)\n", ERR_PTR(err));
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe, DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> return;
>
> queue:
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 7ce73489c35f..e2a0b989cfc8 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1453,7 +1453,7 @@ static bool guc_submit_hint_wedged(struct xe_guc *guc)
> if (xe_device_wedged(xe))
> return true;
>
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe, DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
>
> return true;
> }
> @@ -1780,7 +1780,8 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
> }
>
> if (wedge_device)
> - xe_device_declare_wedged(gt_to_xe(q->gt));
> + xe_device_declare_wedged(gt_to_xe(q->gt),
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
>
> /*
> * We want the job added back to the pending list so it gets freed; this
> diff --git a/drivers/gpu/drm/xe/xe_mert.c b/drivers/gpu/drm/xe/xe_mert.c
> index 32700c19a1df..934be933d57f 100644
> --- a/drivers/gpu/drm/xe/xe_mert.c
> +++ b/drivers/gpu/drm/xe/xe_mert.c
> @@ -74,7 +74,8 @@ static void mert_handle_cat_error(struct xe_device *xe)
> break;
> case CATERR_UNMAPPED_GGTT:
> xe_sriov_err(xe, "MERT: CAT_ERR: Access to an unmapped GGTT!\n");
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe,
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> break;
> case CATERR_LMTT_FAULT:
> xe_sriov_dbg_ratelimited(xe, "MERT: CAT_ERR: VF%u LMTT fault!\n", vfid);
> @@ -82,7 +83,8 @@ static void mert_handle_cat_error(struct xe_device *xe)
> break;
> default:
> xe_sriov_err(xe, "MERT: Unexpected CAT_ERR code=%#x!\n", code);
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe,
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> break;
> }
> }
> diff --git a/drivers/gpu/drm/xe/xe_pci_error.c b/drivers/gpu/drm/xe/xe_pci_error.c
> index 79ce0c671549..fdecd3e0b9a9 100644
> --- a/drivers/gpu/drm/xe/xe_pci_error.c
> +++ b/drivers/gpu/drm/xe/xe_pci_error.c
> @@ -86,7 +86,8 @@ static pci_ers_result_t xe_pci_error_mmio_enabled(struct pci_dev *pdev)
>
> /* User wants to debug the error, prevent reset */
> if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET) {
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe,
> + DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET);
> return PCI_ERS_RESULT_DISCONNECT;
> }
>
> diff --git a/drivers/gpu/drm/xe/xe_ras.c b/drivers/gpu/drm/xe/xe_ras.c
> index 7a85735c57d5..fe16a4106060 100644
> --- a/drivers/gpu/drm/xe/xe_ras.c
> +++ b/drivers/gpu/drm/xe/xe_ras.c
> @@ -321,8 +321,7 @@ static u8 handle_core_compute_errors(struct xe_ras_error_array *arr)
>
> static void punit_error_handler(struct xe_device *xe)
> {
> - xe_device_set_wedged_method(xe, DRM_WEDGE_RECOVERY_COLD_RESET);
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe, DRM_WEDGE_RECOVERY_COLD_RESET);
> }
>
> static u8 handle_soc_internal_errors(struct xe_device *xe, struct xe_ras_error_array *arr)
> diff --git a/drivers/gpu/drm/xe/xe_survivability_mode.c b/drivers/gpu/drm/xe/xe_survivability_mode.c
> index 45d44ebe288b..ca031576fecb 100644
> --- a/drivers/gpu/drm/xe/xe_survivability_mode.c
> +++ b/drivers/gpu/drm/xe/xe_survivability_mode.c
> @@ -446,8 +446,7 @@ void xe_survivability_mode_runtime_enable(struct xe_device *xe)
> survivability->type = XE_SURVIVABILITY_TYPE_RUNTIME;
> xe_log_err(xe, SURVIVABILITY, 0, "Runtime Mode enabled!\n");
>
> - xe_device_set_wedged_method(xe, DRM_WEDGE_RECOVERY_VENDOR);
> - xe_device_declare_wedged(xe);
> + xe_device_declare_wedged(xe, DRM_WEDGE_RECOVERY_VENDOR);
>
> xe_log_err(xe, SURVIVABILITY, 0, "Firmware flash required!\n");
> xe_info(xe, "Please refer to the userspace documentation for more details how to flash the firmware on %s!\n",
> --
> 2.43.0
>
next prev parent reply other threads:[~2026-10-13 18:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-13 11:03 [PATCH v5 0/5] Introduce xe_wedge Raag Jadav
2026-10-13 11:03 ` [PATCH v5 1/5] drm/xe/gt: Use GT ordered workqueue for wedging Raag Jadav
2026-10-13 11:19 ` sashiko-bot
2026-10-13 18:29 ` Rodrigo Vivi
2026-10-13 18:49 ` Matthew Brost
2026-10-13 11:03 ` [PATCH v5 2/5] drm/xe: Drop xe_device_set_wedged_method() Raag Jadav
2026-10-13 11:20 ` sashiko-bot
2026-10-13 18:30 ` Rodrigo Vivi [this message]
2026-10-13 11:03 ` [PATCH v5 3/5] drm/xe: Move xe_device_wedged_fini() registration to xe_device_probe_early() Raag Jadav
2026-10-13 11:03 ` [PATCH v5 4/5] drm/xe: Introduce xe_wedge Raag Jadav
2026-10-13 11:16 ` sashiko-bot
2026-10-13 18:32 ` Rodrigo Vivi
2026-10-13 11:03 ` [PATCH v5 5/5] drm/xe/ras: Move xe_ras_process_errors() to xe_ras Raag Jadav
2026-10-13 11:22 ` sashiko-bot
2026-10-13 11:12 ` ✗ CI.checkpatch: warning for Introduce xe_wedge (rev4) Patchwork
2026-10-13 11:14 ` ✓ CI.KUnit: success " Patchwork
2026-10-13 15:40 ` ✓ Xe.CI.BAT: " Patchwork
2026-10-13 23:38 ` ✗ Xe.CI.FULL: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=as54rBt2Av-CAYDW@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=lukasz.laguna@intel.com \
--cc=mallesh.koujalagi@intel.com \
--cc=matthew.brost@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=michal.wajdeczko@intel.com \
--cc=raag.jadav@intel.com \
--cc=riana.tauro@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox