]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
cpufreq: Initialize cpufreq-based invariance before subsys
authorChristian Loehle <christian.loehle@arm.com>
Thu, 18 Sep 2025 10:15:52 +0000 (11:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 20 Sep 2025 11:00:20 +0000 (13:00 +0200)
commit8ffe28b4e8d8b18cb2f2933410322c24f039d5d6
treed3fc2f4e80c7bf432a7f98caa0d8e2a4adb025fb
parentf83ec76bf285bea5727f478a68b894f5543ca76e
cpufreq: Initialize cpufreq-based invariance before subsys

commit 2a6c72738706 ("cpufreq: Initialize cpufreq-based
frequency-invariance later") postponed the frequency invariance
initialization to avoid disabling it in the error case.
This isn't locking safe, instead move the initialization up before
the subsys interface is registered (which will rebuild the
sched_domains) and add the corresponding disable on the error path.

Observed lockdep without this patch:
[    0.989686] ======================================================
[    0.989688] WARNING: possible circular locking dependency detected
[    0.989690] 6.17.0-rc4-cix-build+ #31 Tainted: G S
[    0.989691] ------------------------------------------------------
[    0.989692] swapper/0/1 is trying to acquire lock:
[    0.989693] ffff800082ada7f8 (sched_energy_mutex){+.+.}-{4:4}, at: rebuild_sched_domains_energy+0x30/0x58
[    0.989705]
               but task is already holding lock:
[    0.989706] ffff000088c89bc8 (&policy->rwsem){+.+.}-{4:4}, at: cpufreq_online+0x7f8/0xbe0
[    0.989713]
               which lock already depends on the new lock.

Fixes: 2a6c72738706 ("cpufreq: Initialize cpufreq-based frequency-invariance later")
Signed-off-by: Christian Loehle <christian.loehle@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/cpufreq.c