drm/i915/gt: Use poll_timeout_us in place of sliding sleep window
Subsystems (2)
PATCH 1/1 drm/i915/gt: Use poll_timeout_us in place of sliding sleep window
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.
--- 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(-)
drivers/gpu/drm/i915/gt/uc/intel_guc.h +16 -16
@@ -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_SEC , +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_SEC , +600 *USEC_PER_SEC , false); +return timedout ?: err; }/* Only call this from the interrupt handler code */
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +7 -12
@@ -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 (err =0 , + !h2g_has_room (ct, len +GUC_CTB_HDR_LEN ) || + !g2h_has_room (ct,GUC_CTB_HXG_MSG_MAX_LEN ), +USEC_PER_SEC ,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 ;
Signature · 1 line
2.53.0
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/i915/gt: Use poll_timeout_us in place of sliding sleep window
== Series Details ==
== Series Details ==
Series: drm/i915/gt: Use poll_timeout_us in place of sliding sleep window
URL : https://patchwork.freedesktop.org/series/169454/
State : failure
== Summary ==
Error: make failed
DESCEND objtool
HDRTEST drivers/gpu/drm/xe/generated/xe_wa_oob.h
HDRTEST drivers/gpu/drm/xe/generated/xe_device_wa_oob.h MODPOST Module.symvers
ERROR: modpost: "__bad_udelay" [drivers/gpu/drm/i915/i915.ko] undefined! make[2]: *** [scripts/Makefile.modpost:147: Module.symvers] Error 1 make[1]: *** [/home/kbuild/kernel/Makefile:2134: modpost] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Build failed, no error log produced