Skip to content

Commit

Permalink
cpufreq: Make cpufreq_online() call driver->offline() on errors
Browse files Browse the repository at this point in the history
[ Upstream commit 3b71805 ]

In the CPU removal path the ->offline() callback provided by the
driver is always invoked before ->exit(), but in the cpufreq_online()
error path it is not, so ->exit() is expected to somehow know the
context in which it has been called and act accordingly.

That is less than straightforward, so make cpufreq_online() invoke
the driver's ->offline() callback, if present, on errors before
->exit() too.

This only potentially affects intel_pstate.

Fixes: 91a12e9 ("cpufreq: Allow light-weight tear down and bring up of CPUs")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
rafaeljw authored and gregkh committed Jul 14, 2021
1 parent 435f74c commit ba9e414
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion drivers/cpufreq/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1370,9 +1370,14 @@ static int cpufreq_online(unsigned int cpu)
goto out_free_policy;
}

/*
* The initialization has succeeded and the policy is online.
* If there is a problem with its frequency table, take it
* offline and drop it.
*/
ret = cpufreq_table_validate_and_sort(policy);
if (ret)
goto out_exit_policy;
goto out_offline_policy;

/* related_cpus should at least include policy->cpus. */
cpumask_copy(policy->related_cpus, policy->cpus);
Expand Down Expand Up @@ -1518,6 +1523,10 @@ static int cpufreq_online(unsigned int cpu)

up_write(&policy->rwsem);

out_offline_policy:
if (cpufreq_driver->offline)
cpufreq_driver->offline(policy);

out_exit_policy:
if (cpufreq_driver->exit)
cpufreq_driver->exit(policy);
Expand Down

0 comments on commit ba9e414

Please sign in to comment.