Fix cpufreq locking dependency
cover Fix cpufreq locking dependency
Hi,
Here is a patchset applying on 2.6.30 which should fix the cpufreq locking dependency. Sadly, my two main test machines does not seem to support cpufreq, so I have only been able to perform very light testing. (I can't afford to lock down my laptop right now).
I went for the most straightforward fix I could think of and kept the current locking structure. As you will see, the second patch cleans up the error handling paths of cpufreq add dev, which were a total mess.
As a general recommendation, creating scripts which does, concurrently :
cpu hotplug up/down
cpufreq sysfs actions
change between cpufreq governors
add governors on random CPU numbers
will likely help stress-testing cpufreq locking. I really did not like what I've seen there. It looked _very_ fragile.
Hopefully this will be better with this patches, but again, testing is welcome.
Thanks,
Mathieu
Signature · 2 lines
Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 1/4 remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)
commit 42a06f2166f2f6f7bf04f32b4e823eacdceafdc9
Missed a call site for CPUFREQ_GOV_STOP to remove the rwlock taken around the teardown. To make a long story short, the rwlock write-lock causes a circular dependency with cancel_delayed_work_sync(), because the timer handler takes the read lock.
Note that all callers to __cpufreq_set_policy are taking the rwsem. All sysfs callers (writers) hold the write rwsem at the earliest sysfs calling stage.
However, the rwlock write-lock is not needed upon governor stop.
Change :
- Added comment from Venkyi at lock definition site.
--- drivers/cpufreq/cpufreq.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +12 -1
@@ -61,6 +61,8 @@ static DEFINE_SPINLOCK(cpufreq_driver_lo* are concerned with are online after they get the lock. * - Governor routines that can be called in cpufreq hotplug path should not * take this sem as top level hotplug notifier handler takes this. +* - Lock should not be held across +* __cpufreq_governor(data, CPUFREQ_GOV_STOP); */ static DEFINE_PER_CPU(int, policy_cpu); static DEFINE_PER_CPU(struct rw_semaphore, cpu_policy_rwsem);
@@ -1697,8 +1699,17 @@ static int __cpufreq_set_policy(struct cdprintk ("governor switch\n" );/* end old governor */ -if (data->governor) +if (data->governor) { +/* +* Need to release the rwsem around governor +* stop due to lock dependency between +* cancel_delayed_work_sync and the read lock +* taken in the delayed work handler. +*/ +unlock_policy_rwsem_write (data->cpu);__cpufreq_governor (data,CPUFREQ_GOV_STOP ); +lock_policy_rwsem_write (data->cpu); + }/* start new governor */ data->governor = policy->governor;
Signature · 2 lines
Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68