All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] drm/xe/xe_guc_ct: Exit CT submission fence wait on GT reset
@ 2026-01-06 20:55 Jonathan Cavitt
  2026-01-06 21:09 ` ✗ CI.checkpatch: warning for drm/xe/xe_guc_ct: Exit CT submission fence wait on GT reset (rev3) Patchwork
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Jonathan Cavitt @ 2026-01-06 20:55 UTC (permalink / raw)
  To: intel-xe
  Cc: saurabhg.gupta, alex.zuo, jonathan.cavitt, stuart.summers,
	matthew.brost

It's possible if unlikely that the GuC could be reset in the time
between performing a guc_ct_send and the G2H fence completing in
guc_ct_send_recv.  Exit early if this is occurs.

v2: Rebase

v3: goto retry_same_fence if ct is not alive (Stuart)

Suggested-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_ct.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index dfbf76037b04..0bdcbe6503a7 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -1238,6 +1238,10 @@ int xe_guc_ct_send_g2h_handler(struct xe_guc_ct *ct, const u32 *action, u32 len)
 	return ret;
 }
 
+#define ct_alive(ct)    \
+	(xe_guc_ct_enabled(ct) && !ct->ctbs.h2g.info.broken && \
+	 !ct->ctbs.g2h.info.broken)
+
 /*
  * Check if a GT reset is in progress or will occur and if GT reset brought the
  * CT back up. Randomly picking 5 seconds for an upper limit to do a GT a reset.
@@ -1247,12 +1251,8 @@ static bool retry_failure(struct xe_guc_ct *ct, int ret)
 	if (!(ret == -EDEADLK || ret == -EPIPE || ret == -ENODEV))
 		return false;
 
-#define ct_alive(ct)	\
-	(xe_guc_ct_enabled(ct) && !ct->ctbs.h2g.info.broken && \
-	 !ct->ctbs.g2h.info.broken)
 	if (!wait_event_interruptible_timeout(ct->wq, ct_alive(ct), HZ * 5))
 		return false;
-#undef ct_alive
 
 	return true;
 }
@@ -1304,7 +1304,11 @@ static int guc_ct_send_recv(struct xe_guc_ct *ct, const u32 *action, u32 len,
 	/* READ_ONCEs pairs with WRITE_ONCEs in parse_g2h_response
 	 * and g2h_fence_cancel.
 	 */
-	ret = wait_event_timeout(ct->g2h_fence_wq, READ_ONCE(g2h_fence.done), HZ);
+	ret = wait_event_timeout(ct->g2h_fence_wq, !ct_alive(ct) ||
+				 READ_ONCE(g2h_fence.done), HZ);
+	if (!ct_alive(ct))
+		goto retry_same_fence;
+
 	if (!ret) {
 		LNL_FLUSH_WORK(&ct->g2h_worker);
 		if (READ_ONCE(g2h_fence.done)) {
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2026-01-07  0:49 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-06 20:55 [PATCH v3] drm/xe/xe_guc_ct: Exit CT submission fence wait on GT reset Jonathan Cavitt
2026-01-06 21:09 ` ✗ CI.checkpatch: warning for drm/xe/xe_guc_ct: Exit CT submission fence wait on GT reset (rev3) Patchwork
2026-01-06 21:10 ` ✓ CI.KUnit: success " Patchwork
2026-01-06 21:46 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-06 23:09 ` [PATCH v3] drm/xe/xe_guc_ct: Exit CT submission fence wait on GT reset Matthew Brost
2026-01-06 23:11   ` Summers, Stuart
2026-01-07  0:35     ` Matthew Brost
2026-01-07  0:49       ` Summers, Stuart
2026-01-07  0:40 ` ✗ Xe.CI.Full: failure for drm/xe/xe_guc_ct: Exit CT submission fence wait on GT reset (rev3) Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.