From: Maarten Lankhorst <dev@lankhorst.se>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Tvrtko Ursulin <tursulin@ursulin.net>,
intel-gfx@lists.freedesktop.org
Cc: Maarten Lankhorst <dev@lankhorst.se>
Subject: [PATCH v5 4/6] drm/i915/gt: Fix selftests on PREEMPT_RT
Date: Wed, 23 Sep 2026 13:15:23 +0200 [thread overview]
Message-ID: <20260923111518.310430-12-dev@lankhorst.se> (raw)
In-Reply-To: <20260923111518.310430-8-dev@lankhorst.se>
The engine->busyness() callbacks called from the selftests are on PREEMPT_RT
not safe with preemption disabled, because all spinlock_t locks
becomes sleeping locks on PREEMPT_RT and must not be acquired with disabled
preemption.
This is also a problem for perf events, where we disable the busyness events
on PREEMPT_RT, as they're run from hardirq context.
Previous attempts to fix this failed, so convert the selftest code to read
engine->busyness() with migrate_disable() instead of preempt_disable() to
prevent selftest failures on PREEMPT_RT.
By disabling migration, we prevent moving the selftests between cores,
and should decrease the jitter in both the idle cases and busy cases,
compared to no prevention at all.
Since interrupts were not disabled, some jitter may still occur, but it
should hopefully be less with migration disabled.
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---
drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_pm.c b/drivers/gpu/drm/i915/gt/selftest_engine_pm.c
index 10e556a7eac45..c1eff9edd8a5e 100644
--- a/drivers/gpu/drm/i915/gt/selftest_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/selftest_engine_pm.c
@@ -277,11 +277,11 @@ static int live_engine_busy_stats(void *arg)
st_engine_heartbeat_disable(engine);
ENGINE_TRACE(engine, "measuring idle time\n");
- preempt_disable();
+ migrate_disable();
de = intel_engine_get_busy_time(engine, &t[0]);
udelay(100);
de = ktime_sub(intel_engine_get_busy_time(engine, &t[1]), de);
- preempt_enable();
+ migrate_enable();
dt = ktime_sub(t[1], t[0]);
if (de < 0 || de > 10) {
pr_err("%s: reported %lldns [%d%%] busyness while sleeping [for %lldns]\n",
@@ -316,11 +316,11 @@ static int live_engine_busy_stats(void *arg)
}
ENGINE_TRACE(engine, "measuring busy time\n");
- preempt_disable();
+ migrate_disable();
de = intel_engine_get_busy_time(engine, &t[0]);
mdelay(100);
de = ktime_sub(intel_engine_get_busy_time(engine, &t[1]), de);
- preempt_enable();
+ migrate_enable();
dt = ktime_sub(t[1], t[0]);
if (100 * de < 95 * dt || 95 * de > 100 * dt) {
pr_err("%s: reported %lldns [%d%%] busyness while spinning [for %lldns]\n",
--
2.55.0
next prev parent reply other threads:[~2026-09-23 11:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 11:15 [PATCH v5 0/6] drm/i915: Most fixes to make i915 work well with PREEMPT_RT Maarten Lankhorst
2026-09-23 11:15 ` [PATCH v5 1/6] drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock() Maarten Lankhorst
2026-09-23 11:15 ` [PATCH v5 2/6] drm/i915: Drop the irqs_disabled() check Maarten Lankhorst
2026-09-23 11:15 ` [PATCH v5 3/6] drm/i915/guc: Consider also RCU depth in busy loop Maarten Lankhorst
2026-09-23 11:15 ` Maarten Lankhorst [this message]
2026-09-23 14:26 ` [PATCH v5 4/6] drm/i915/gt: Fix selftests on PREEMPT_RT Sebastian Andrzej Siewior
2026-09-23 11:15 ` [PATCH v5 5/6] drm/i915/gt: Set stop_timeout() correctly on PREEMPT-RT Maarten Lankhorst
2026-09-23 14:27 ` Sebastian Andrzej Siewior
2026-09-23 11:15 ` [PATCH v5 6/6] drm/i915: Use sleeping selftests for igt_atomic on PREEMPT_RT Maarten Lankhorst
2026-09-23 11:28 ` sashiko-bot
2026-09-23 14:27 ` Sebastian Andrzej Siewior
2026-09-23 12:55 ` ✓ i915.CI.BAT: success for drm/i915: Most fixes to make i915 work well with PREEMPT_RT Patchwork
2026-09-23 14:27 ` [PATCH v5 0/6] " Sebastian Andrzej Siewior
2026-09-24 6:30 ` ✓ i915.CI.Full: success for " Patchwork
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=20260923111518.310430-12-dev@lankhorst.se \
--to=dev@lankhorst.se \
--cc=bigeasy@linutronix.de \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.intel.com \
--cc=tursulin@ursulin.net \
/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