From: Raag Jadav <raag.jadav@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: 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,
rodrigo.vivi@intel.com, Raag Jadav <raag.jadav@intel.com>
Subject: [PATCH v4 1/5] drm/xe/gt: Use GT ordered workqueue for wedging
Date: Sat, 10 Oct 2026 14:36:18 +0530 [thread overview]
Message-ID: <20261010090718.68308-2-raag.jadav@intel.com> (raw)
In-Reply-To: <20261010090718.68308-1-raag.jadav@intel.com>
Currently, xe_gt_declare_wedged() stops GuC CT and initiates exec queue
teardown synchronously. This can result in tdr timeout in cases where
the device is declared wedged while jobs are still in-flight.
Introduce a worker for GT specific wedge handling and queue the teardown
on GT ordered workqueue, so we don't disrupt the scheduler while jobs
are still in-flight.
While at it, introduce for_each_initialized_gt() macro and use it for
wedging GT. This helps avoid races in case the device is declared wedged
in probe sequence before GT is initialized.
Fixes: c9474b726b93 ("drm/xe: Wedge the entire device")
Signed-off-by: Raag Jadav <raag.jadav@intel.com>
---
v2: Split fixes into separate patches (Rodrigo, Michal)
v4: Introduce for_each_initialized_gt() (Michal)
---
drivers/gpu/drm/xe/xe_device.c | 2 +-
drivers/gpu/drm/xe/xe_device.h | 4 ++++
drivers/gpu/drm/xe/xe_gt.c | 17 +++++++++++++++--
drivers/gpu/drm/xe/xe_gt_types.h | 9 +++++++++
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 8392c9fad3c4..22ae10958d7f 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -1432,7 +1432,7 @@ void xe_device_declare_wedged(struct xe_device *xe)
WEDGED_URL, XE_BUG_URL);
}
- for_each_gt(gt, xe, id)
+ for_each_initialized_gt(gt, xe, id)
xe_gt_declare_wedged(gt);
if (xe_device_wedged(xe)) {
diff --git a/drivers/gpu/drm/xe/xe_device.h b/drivers/gpu/drm/xe/xe_device.h
index 83d6dafab53c..9b09e627af8c 100644
--- a/drivers/gpu/drm/xe/xe_device.h
+++ b/drivers/gpu/drm/xe/xe_device.h
@@ -139,6 +139,10 @@ static inline bool xe_device_uc_enabled(struct xe_device *xe)
for_each_gt((gt__), (tile__)->xe, (id__)) \
for_each_if((gt__)->tile == (tile__))
+#define for_each_initialized_gt(gt__, xe__, id__) \
+ for_each_gt((gt__), (xe__), (id__)) \
+ for_each_if((gt__)->initialized)
+
static inline struct xe_force_wake *gt_to_fw(struct xe_gt *gt)
{
return >->pm.fw;
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 775c826b68b4..d762158c0777 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -175,6 +175,7 @@ static void xe_gt_enable_comp_1wcoh(struct xe_gt *gt)
}
static void gt_reset_worker(struct work_struct *w);
+static void gt_wedge_worker(struct work_struct *w);
static int emit_job_sync(struct xe_exec_queue *q, struct xe_bb *bb,
long timeout_jiffies, bool force_reset)
@@ -706,6 +707,8 @@ static void xe_gt_fini(void *arg)
struct xe_gt *gt = arg;
int i;
+ disable_work_sync(>->wedge.worker);
+
if (disable_work_sync(>->reset.worker))
/*
* If gt_reset_worker was halted from executing, take care of
@@ -725,6 +728,7 @@ int xe_gt_init(struct xe_gt *gt)
int i;
INIT_WORK(>->reset.worker, gt_reset_worker);
+ INIT_WORK(>->wedge.worker, gt_wedge_worker);
for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i) {
gt->ring_ops[i] = xe_ring_ops_get(gt, i);
@@ -769,6 +773,8 @@ int xe_gt_init(struct xe_gt *gt)
return err;
}
+ /* Must be last */
+ gt->initialized = true;
return 0;
}
@@ -1010,6 +1016,14 @@ void xe_gt_reset_async(struct xe_gt *gt)
xe_pm_runtime_put(xe);
}
+static void gt_wedge_worker(struct work_struct *w)
+{
+ struct xe_gt *gt = container_of(w, typeof(*gt), wedge.worker);
+
+ xe_uc_declare_wedged(>->uc);
+ xe_tlb_inval_reset(>->tlb_inval);
+}
+
void xe_gt_suspend_prepare(struct xe_gt *gt)
{
xe_uc_suspend_prepare(>->uc);
@@ -1200,6 +1214,5 @@ void xe_gt_declare_wedged(struct xe_gt *gt)
{
xe_gt_assert(gt, gt_to_xe(gt)->wedged.mode);
- xe_uc_declare_wedged(>->uc);
- xe_tlb_inval_reset(>->tlb_inval);
+ queue_work(gt->ordered_wq, >->wedge.worker);
}
diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
index 628911346455..c00a7c171f80 100644
--- a/drivers/gpu/drm/xe/xe_gt_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_types.h
@@ -233,6 +233,12 @@ struct xe_gt {
struct work_struct worker;
} reset;
+ /** @wedge: state for GT wedge */
+ struct {
+ /** @wedge.worker: worker for GT wedge to be done async */
+ struct work_struct worker;
+ } wedge;
+
/** @tlb_inval: TLB invalidation state */
struct xe_tlb_inval tlb_inval;
@@ -419,6 +425,9 @@ struct xe_gt {
/** @eu_stall: EU stall counters subsystem per gt info */
struct xe_eu_stall_gt *eu_stall;
+
+ /** @initialized: GT is initialized */
+ bool initialized;
};
#endif
--
2.43.0
next prev parent reply other threads:[~2026-10-10 9:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-10 9:06 [PATCH v4 0/5] Introduce xe_wedge Raag Jadav
2026-10-10 9:06 ` Raag Jadav [this message]
2026-10-10 9:17 ` [PATCH v4 1/5] drm/xe/gt: Use GT ordered workqueue for wedging sashiko-bot
2026-10-12 20:43 ` Matthew Brost
2026-10-10 9:06 ` [PATCH v4 2/5] drm/xe: Move xe_device_wedged_fini() registration to xe_device_probe_early() Raag Jadav
2026-10-10 9:06 ` [PATCH v4 3/5] drm/xe: Make xe_device_declare_wedged() IRQ safe Raag Jadav
2026-10-10 9:19 ` sashiko-bot
2026-10-12 15:09 ` Raag Jadav
2026-10-10 9:06 ` [PATCH v4 4/5] drm/xe: Introduce xe_wedge Raag Jadav
2026-10-12 20:46 ` Matthew Brost
2026-10-10 9:06 ` [PATCH v4 5/5] drm/xe/ras: Move xe_ras_process_errors() to xe_ras Raag Jadav
2026-10-10 9:28 ` sashiko-bot
2026-10-10 9:15 ` ✗ CI.checkpatch: warning for Introduce xe_wedge (rev3) Patchwork
2026-10-10 9:17 ` ✓ CI.KUnit: success " Patchwork
2026-10-10 10:06 ` ✓ Xe.CI.BAT: " Patchwork
2026-10-10 11:29 ` ✓ Xe.CI.FULL: " 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=20261010090718.68308-2-raag.jadav@intel.com \
--to=raag.jadav@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=riana.tauro@intel.com \
--cc=rodrigo.vivi@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