From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: alex.zuo@intel.com, jonathan.cavitt@intel.com,
jani.nikula@linux.intel.com, andi.shyti@intel.com
Subject: [PATCH v3] drm/i915/gt: Use poll_timeout_us in place of sliding sleep window
Date: Tue, 30 Jun 2026 23:25:11 +0800 [thread overview]
Message-ID: <20260630152511.1401029-1-jonathan.cavitt@intel.com> (raw)
The functions intel_guc_send_busy_loop and ct_send can theoretically
loop forever. In the former case, intel_guc_send_busy_loop can iterate
forever if intel_guc_send_nb repeatedly returns -EBUSY. In the latter
case, ct_send can loop forever if the guc-to-host or host-to-guc buffers
get stuck in a full state.
Rework the functions to use the poll_timeout_us family of functions
instead of calculating sleep_period_ms repeatedly. In both cases now,
if the loop condition is not met after 10 minutes, the function will
report it as a failure.
This also resolves a static analysis issue involving sleep_period_ms
overflowing after several shift-left-logical calls.
v2:
- Reduce default sleep/udelay duration (jcavitt)
v3:
- Use atomic in ct_send (jcavitt)
Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc.h | 32 +++++++++++------------
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 19 +++++---------
2 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
index 053780f562c1..13be4f7e7ab7 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
@@ -7,6 +7,7 @@
#define _INTEL_GUC_H_
#include <linux/delay.h>
+#include <linux/iopoll.h>
#include <linux/iosys-map.h>
#include <linux/xarray.h>
@@ -360,8 +361,7 @@ static inline int intel_guc_send_busy_loop(struct intel_guc *guc,
u32 g2h_len_dw,
bool loop)
{
- int err;
- unsigned int sleep_period_ms = 1;
+ int err, timedout;
bool not_atomic = !in_atomic() && !irqs_disabled();
/*
@@ -374,20 +374,20 @@ static inline int intel_guc_send_busy_loop(struct intel_guc *guc,
/* No sleeping with spin locks, just busy loop */
might_sleep_if(loop && not_atomic);
-retry:
- err = intel_guc_send_nb(guc, action, len, g2h_len_dw);
- if (unlikely(err == -EBUSY && loop)) {
- if (likely(not_atomic)) {
- if (msleep_interruptible(sleep_period_ms))
- return -EINTR;
- sleep_period_ms = sleep_period_ms << 1;
- } else {
- cpu_relax();
- }
- goto retry;
- }
-
- return err;
+ if (!loop)
+ return intel_guc_send_nb(guc, action, len, g2h_len_dw);
+
+ if (not_atomic)
+ timedout = poll_timeout_us(err = intel_guc_send_nb(guc, action,
+ len, g2h_len_dw),
+ err != -EBUSY, USEC_PER_MSEC,
+ 600 * USEC_PER_SEC, false);
+ else
+ timedout = poll_timeout_us_atomic(err = intel_guc_send_nb(guc, action,
+ len, g2h_len_dw),
+ err != -EBUSY, USEC_PER_MSEC,
+ 600 * USEC_PER_SEC, false);
+ return timedout ?: err;
}
/* Only call this from the interrupt handler code */
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
index 1c455d84bf9d..dc4a5486b42c 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -716,7 +716,6 @@ static int ct_send(struct intel_guc_ct *ct,
struct intel_guc_ct_buffer *ctb = &ct->ctbs.send;
struct ct_request request;
unsigned long flags;
- unsigned int sleep_period_ms = 1;
bool send_again;
u32 fence;
int err;
@@ -736,22 +735,18 @@ static int ct_send(struct intel_guc_ct *ct,
* rare. Reserving the maximum size in the G2H credits as we don't know
* how big the response is going to be.
*/
-retry:
spin_lock_irqsave(&ctb->lock, flags);
- if (unlikely(!h2g_has_room(ct, len + GUC_CTB_HDR_LEN) ||
- !g2h_has_room(ct, GUC_CTB_HXG_MSG_MAX_LEN))) {
+ err = poll_timeout_us_atomic(err = 0,
+ !h2g_has_room(ct, len + GUC_CTB_HDR_LEN) ||
+ !g2h_has_room(ct, GUC_CTB_HXG_MSG_MAX_LEN),
+ USEC_PER_MSEC, 600 * USEC_PER_SEC, false);
+
+ if (err) {
if (ct->stall_time == KTIME_MAX)
ct->stall_time = ktime_get();
spin_unlock_irqrestore(&ctb->lock, flags);
- if (unlikely(ct_deadlocked(ct)))
- return -EPIPE;
-
- if (msleep_interruptible(sleep_period_ms))
- return -EINTR;
- sleep_period_ms = sleep_period_ms << 1;
-
- goto retry;
+ return unlikely(ct_deadlocked(ct)) ? -EPIPE : err;
}
ct->stall_time = KTIME_MAX;
--
2.53.0
next reply other threads:[~2026-06-30 15:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-30 15:25 Jonathan Cavitt [this message]
2026-06-30 20:02 ` ✗ i915.CI.BAT: failure for drm/i915/gt: Use poll_timeout_us in place of sliding sleep window (rev3) Patchwork
2026-07-01 8:36 ` [PATCH v3] drm/i915/gt: Use poll_timeout_us in place of sliding sleep window Krzysztof Karas
2026-07-01 14:10 ` Cavitt, Jonathan
2026-07-02 6:26 ` Krzysztof Karas
2026-07-03 15:12 ` Andi Shyti
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=20260630152511.1401029-1-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=alex.zuo@intel.com \
--cc=andi.shyti@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.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