Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH] drm/xe/guc_submit: prevent repeated unregister
@ 2023-08-02 14:03 Matthew Auld
  2023-08-02 14:46 ` [Intel-xe] ✗ CI.Patch_applied: failure for " Patchwork
  2023-08-02 15:56 ` [Intel-xe] [PATCH] " Matthew Brost
  0 siblings, 2 replies; 3+ messages in thread
From: Matthew Auld @ 2023-08-02 14:03 UTC (permalink / raw)
  To: intel-xe

It seems that various things can trigger the lr cleanup worker,
including CAT error, engine reset and destroying the actual engine, so
seems plausible to end up triggering the worker more than once in some
cases. If that does happen we can race with an ongoing engine deregister
before it has completed, thus triggering it again and also changing the
state back into pending_disable. Checking if the engine has been marked
as destroyed looks like it should prevent this.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_submit.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 8d2b50e03ed2..2459e9dd95e8 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -802,8 +802,18 @@ static void xe_guc_engine_lr_cleanup(struct work_struct *w)
 	/* Kill the run_job / process_msg entry points */
 	drm_sched_run_wq_stop(sched);
 
-	/* Engine state now stable, disable scheduling / deregister if needed */
-	if (engine_registered(e)) {
+	/*
+	 * Engine state now mostly stable, disable scheduling / deregister if
+	 * needed. This cleanup routine might be called multiple times, where
+	 * the actual async engine deregister drops the final engine ref.
+	 * Calling disable_scheduling_deregister will mark the engine as
+	 * destroyed and fire off the CT requests to disable scheduling /
+	 * deregister, which we only want to do once. We also don't want to mark
+	 * the engine as pending_disable again as this may race with the
+	 * xe_guc_deregister_done_handler() which treats it as an unexpected
+	 * state.
+	 */
+	if (engine_registered(e) && !engine_destroyed(e)) {
 		struct xe_guc *guc = engine_to_guc(e);
 		int ret;
 
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-08-02 15:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-02 14:03 [Intel-xe] [PATCH] drm/xe/guc_submit: prevent repeated unregister Matthew Auld
2023-08-02 14:46 ` [Intel-xe] ✗ CI.Patch_applied: failure for " Patchwork
2023-08-02 15:56 ` [Intel-xe] [PATCH] " Matthew Brost

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox