From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
To: intel-gfx@lists.freedesktop.org, vinay.belgaumkar@intel.com
Cc: dev@lankhorst.se
Subject: [PATCH 3/3] drm/i915/pmu: Use a delayed wakeref put in get_rc6()
Date: Tue, 29 Sep 2026 12:01:51 -0700 [thread overview]
Message-ID: <20260929190147.2886670-8-umesh.nerlige.ramappa@intel.com> (raw)
In-Reply-To: <20260929190147.2886670-5-umesh.nerlige.ramappa@intel.com>
get_rc6() has the same runqueue lock deadlock as guc_engine_busyness():
it is called from the PMU callbacks, which perf can invoke from the
scheduler with the runqueue lock held, and intel_gt_pm_put_async() there
can wake a workqueue worker via try_to_wake_up().
Use intel_gt_pm_put_delay() so the deferred put arms a timer instead.
The remaining async puts in atomic contexts (hrtimer, tasklet, irq_work,
G2H handlers) cannot run with the runqueue lock held and are left alone.
Fixes: 07779a76ee1f ("drm/i915: Mark up the calling context for intel_wakeref_put()")
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Assisted-by: Claude:claude-opus-5
---
v2: Reword comment in code (Vinay)
---
drivers/gpu/drm/i915/i915_pmu.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 9ea5626399e5..0ebf1620519b 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -229,7 +229,16 @@ static u64 get_rc6(struct intel_gt *gt)
wakeref = intel_gt_pm_get_if_awake(gt);
if (wakeref) {
val = __get_rc6(gt);
- intel_gt_pm_put_async(gt, wakeref);
+ /*
+ * Perf framework may invoke this from the scheduler with the
+ * runqueue lock held. If we are the last to drop the reference
+ * here, then we cannot use intel_gt_pm_put_async since that can
+ * result in waking up a task from this context which would try
+ * to re-acquire the runqueue lock. To avoid such a deadlock,
+ * defer the put on a timer so that waking the task can happen
+ * from a timer context.
+ */
+ intel_gt_pm_put_delay(gt, wakeref, 1);
}
spin_lock_irqsave(&pmu->lock, flags);
--
2.55.0
next prev parent reply other threads:[~2026-09-29 19:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-29 19:01 [PATCH 0/3] Fixup deadlock scenarios in the PMU path Umesh Nerlige Ramappa
2026-09-29 19:01 ` [PATCH 1/3] drm/i915/pmu: Disable on PREEMPT_RT Umesh Nerlige Ramappa
2026-09-30 5:42 ` Maarten Lankhorst
2026-09-30 8:02 ` Tvrtko Ursulin
2026-09-30 13:25 ` Maarten Lankhorst
2026-10-01 12:15 ` Tvrtko Ursulin
2026-09-29 19:01 ` [PATCH 2/3] drm/i915/guc: Use a delayed wakeref put in guc_engine_busyness() Umesh Nerlige Ramappa
2026-09-29 19:01 ` Umesh Nerlige Ramappa [this message]
2026-09-29 21:35 ` ✓ i915.CI.BAT: success for Fixup deadlock scenarios in the PMU path (rev2) Patchwork
2026-09-30 7:26 ` ✗ i915.CI.Full: failure " 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=20260929190147.2886670-8-umesh.nerlige.ramappa@intel.com \
--to=umesh.nerlige.ramappa@intel.com \
--cc=dev@lankhorst.se \
--cc=intel-gfx@lists.freedesktop.org \
--cc=vinay.belgaumkar@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