Skip to content

Commit

Permalink
cpufreq: Lock CPU online/offline in cpufreq_register_driver()
Browse files Browse the repository at this point in the history
To protect against races with concurrent CPU online/offline, call
get_online_cpus() before registering a cpufreq driver.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
  • Loading branch information
Rafael J. Wysocki committed Jul 31, 2015
1 parent 194d99c commit fdd320d
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions drivers/cpufreq/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -2471,10 +2471,14 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)

pr_debug("trying to register driver %s\n", driver_data->name);

/* Protect against concurrent CPU online/offline. */
get_online_cpus();

write_lock_irqsave(&cpufreq_driver_lock, flags);
if (cpufreq_driver) {
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
return -EEXIST;
ret = -EEXIST;
goto out;
}
cpufreq_driver = driver_data;
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
Expand Down Expand Up @@ -2513,7 +2517,10 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
register_hotcpu_notifier(&cpufreq_cpu_notifier);
pr_debug("driver %s up and running\n", driver_data->name);

return 0;
out:
put_online_cpus();
return ret;

err_if_unreg:
subsys_interface_unregister(&cpufreq_interface);
err_boost_unreg:
Expand All @@ -2523,7 +2530,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
write_lock_irqsave(&cpufreq_driver_lock, flags);
cpufreq_driver = NULL;
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
return ret;
goto out;
}
EXPORT_SYMBOL_GPL(cpufreq_register_driver);

Expand Down

0 comments on commit fdd320d

Please sign in to comment.