From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jonathan.cavitt@intel.com, saurabhg.gupta@intel.com
Subject: [PATCH v7 2/3] drm/xe/xe_guc_submit: Allow lr exec queues to be banned
Date: Fri, 10 May 2024 12:45:39 -0700 [thread overview]
Message-ID: <20240510194540.3246991-2-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20240510194540.3246991-1-jonathan.cavitt@intel.com>
LR queues currently don't get banned during a GT/GuC reset because they
lack a job. Though they don't have a job to detect the reset status of,
it's still possible to tell when they should be banned by looking at the
LRC: if the LRC head and tail don't match, then the exec queue should be
banned and cleaned up.
This also requires swapping the usage of xe_sched_tdr_queue_imm with
xe_guc_exec_queue_trigger_cleanup, as the former is specific to non-lr
exec queues.
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Stuart Summers <stuart.summers@intel.com>
---
drivers/gpu/drm/xe/xe_guc_submit.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 3a8e501f2bc25..bd507a916c1cf 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1485,15 +1485,23 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)
*/
if (!(q->flags & (EXEC_QUEUE_FLAG_KERNEL | EXEC_QUEUE_FLAG_VM))) {
struct xe_sched_job *job = xe_sched_first_pending_job(sched);
+ bool ban = false;
if (job) {
if ((xe_sched_job_started(job) &&
!xe_sched_job_completed(job)) ||
xe_sched_invalidate_job(job, 2)) {
trace_xe_sched_job_ban(job);
- set_exec_queue_banned(q);
- xe_sched_tdr_queue_imm(&q->guc->sched);
+ ban = true;
}
+ } else if (xe_exec_queue_is_lr(q) &&
+ (xe_lrc_ring_head(q->lrc) != xe_lrc_ring_tail(q->lrc))) {
+ ban = true;
+ }
+
+ if (ban) {
+ set_exec_queue_banned(q);
+ xe_guc_exec_queue_trigger_cleanup(q);
}
}
}
--
2.25.1
next prev parent reply other threads:[~2024-05-10 20:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 19:45 [PATCH v7 1/3] drm/xe/xe_guc_submit: Fix exec queue stop race condition Jonathan Cavitt
2024-05-10 19:45 ` Jonathan Cavitt [this message]
2024-05-10 19:45 ` [PATCH v7 3/3] drm/xe/xe_guc_submit: Declare reset if banned or killed or wedged Jonathan Cavitt
2024-05-10 20:05 ` ✓ CI.Patch_applied: success for series starting with [v7,1/3] drm/xe/xe_guc_submit: Fix exec queue stop race condition Patchwork
2024-05-10 20:05 ` ✓ CI.checkpatch: " Patchwork
2024-05-10 20:06 ` ✓ CI.KUnit: " Patchwork
2024-05-10 20:18 ` ✓ CI.Build: " Patchwork
2024-05-10 20:21 ` ✓ CI.Hooks: " Patchwork
2024-05-10 20:22 ` ✓ CI.checksparse: " Patchwork
2024-05-10 20:59 ` ✓ CI.BAT: " Patchwork
2024-05-11 0:09 ` ✗ 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=20240510194540.3246991-2-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=saurabhg.gupta@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).