From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jonathan.cavitt@intel.com, saurabhg.gupta@intel.com,
niranjana.vishwanathapura@intel.com, brian.welty@intel.com,
matthew.d.roper@intel.com, matthew.brost@intel.com,
john.c.harrison@intel.com
Subject: [PATCH v6 2/4] drm/xe/xe_guc_submit: Fix exec queue stop race condition
Date: Mon, 15 Apr 2024 14:50:10 -0700 [thread overview]
Message-ID: <20240415215012.2978778-2-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20240415215012.2978778-1-jonathan.cavitt@intel.com>
Reorder the xe_sched_tdr_queue_imm and set_exec_queue_banned calls in
guc_exec_queue_stop. This prevents a possible race condition between
the two events in which it's possible for xe_sched_tdr_queue_imm to
wake the ufence waiter before the exec queue is banned, causing the
ufence waiter to miss the banned state.
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>
---
v2: Expand on cause of race condition
drivers/gpu/drm/xe/xe_guc_submit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index ecd1085619b30..09331dc41ebdb 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1428,8 +1428,8 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)
!xe_sched_job_completed(job)) ||
xe_sched_invalidate_job(job, 2)) {
trace_xe_sched_job_ban(job);
- xe_sched_tdr_queue_imm(&q->guc->sched);
set_exec_queue_banned(q);
+ xe_sched_tdr_queue_imm(&q->guc->sched);
}
}
}
--
2.25.1
next prev parent reply other threads:[~2024-04-15 22:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-15 21:50 [PATCH v6 1/4] drm/xe/lrc: Add xe lrc ring tail function definitions Jonathan Cavitt
2024-04-15 21:50 ` Jonathan Cavitt [this message]
2024-04-15 21:50 ` [PATCH v6 3/4] drm/xe/xe_guc_submit: Allow lr exec queues to be banned Jonathan Cavitt
2024-04-15 21:50 ` [PATCH v6 4/4] drm/xe/xe_guc_submit: Declare reset if banned or killed Jonathan Cavitt
2024-05-09 19:12 ` Cavitt, Jonathan
2024-04-16 0:58 ` ✓ CI.Patch_applied: success for series starting with [v6,1/4] drm/xe/lrc: Add xe lrc ring tail function definitions Patchwork
2024-04-16 0:58 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-16 0:59 ` ✓ CI.KUnit: success " Patchwork
2024-04-16 1:11 ` ✓ CI.Build: " Patchwork
2024-04-16 1:13 ` ✓ CI.Hooks: " Patchwork
2024-04-16 1:15 ` ✓ CI.checksparse: " Patchwork
2024-04-16 1:38 ` ✓ CI.BAT: " Patchwork
2024-04-16 18:14 ` ✓ CI.FULL: " Patchwork
2024-05-09 19:11 ` [PATCH v6 1/4] " Cavitt, Jonathan
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=20240415215012.2978778-2-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=brian.welty@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=john.c.harrison@intel.com \
--cc=matthew.brost@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=niranjana.vishwanathapura@intel.com \
--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