Skip to content

Commit 7491cdf

Browse files
committed
cpufreq: Avoid using inconsistent policy->min and policy->max
Since cpufreq_driver_resolve_freq() can run in parallel with cpufreq_set_policy() and there is no synchronization between them, the former may access policy->min and policy->max while the latter is updating them and it may see intermediate values of them due to the way the update is carried out. Also the compiler is free to apply any optimizations it wants both to the stores in cpufreq_set_policy() and to the loads in cpufreq_driver_resolve_freq() which may result in additional inconsistencies. To address this, use WRITE_ONCE() when updating policy->min and policy->max in cpufreq_set_policy() and use READ_ONCE() for reading them in cpufreq_driver_resolve_freq(). Moreover, rearrange the update in cpufreq_set_policy() to avoid storing intermediate values in policy->min and policy->max with the help of the observation that their new values are expected to be properly ordered upfront. Also modify cpufreq_driver_resolve_freq() to take the possible reverse ordering of policy->min and policy->max, which may happen depending on the ordering of operations when this function and cpufreq_set_policy() run concurrently, into account by always honoring the max when it turns out to be less than the min (in case it comes from thermal throttling or similar). Fixes: 1517176 ("cpufreq: Make policy min/max hard requirements") Cc: 5.16+ <stable@vger.kernel.org> # 5.16+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Christian Loehle <christian.loehle@arm.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Link: https://patch.msgid.link/5907080.DvuYhMxLoT@rjwysocki.net
1 parent 75da043 commit 7491cdf

File tree

1 file changed

+25
-7
lines changed

1 file changed

+25
-7
lines changed

drivers/cpufreq/cpufreq.c

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,6 @@ static unsigned int __resolve_freq(struct cpufreq_policy *policy,
540540
{
541541
unsigned int idx;
542542

543-
target_freq = clamp_val(target_freq, policy->min, policy->max);
544-
545543
if (!policy->freq_table)
546544
return target_freq;
547545

@@ -565,7 +563,22 @@ static unsigned int __resolve_freq(struct cpufreq_policy *policy,
565563
unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy,
566564
unsigned int target_freq)
567565
{
568-
return __resolve_freq(policy, target_freq, CPUFREQ_RELATION_LE);
566+
unsigned int min = READ_ONCE(policy->min);
567+
unsigned int max = READ_ONCE(policy->max);
568+
569+
/*
570+
* If this function runs in parallel with cpufreq_set_policy(), it may
571+
* read policy->min before the update and policy->max after the update
572+
* or the other way around, so there is no ordering guarantee.
573+
*
574+
* Resolve this by always honoring the max (in case it comes from
575+
* thermal throttling or similar).
576+
*/
577+
if (unlikely(min > max))
578+
min = max;
579+
580+
return __resolve_freq(policy, clamp_val(target_freq, min, max),
581+
CPUFREQ_RELATION_LE);
569582
}
570583
EXPORT_SYMBOL_GPL(cpufreq_driver_resolve_freq);
571584

@@ -2384,6 +2397,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
23842397
if (cpufreq_disabled())
23852398
return -ENODEV;
23862399

2400+
target_freq = clamp_val(target_freq, policy->min, policy->max);
23872401
target_freq = __resolve_freq(policy, target_freq, relation);
23882402

23892403
pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n",
@@ -2708,11 +2722,15 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,
27082722
* Resolve policy min/max to available frequencies. It ensures
27092723
* no frequency resolution will neither overshoot the requested maximum
27102724
* nor undershoot the requested minimum.
2725+
*
2726+
* Avoid storing intermediate values in policy->max or policy->min and
2727+
* compiler optimizations around them because they may be accessed
2728+
* concurrently by cpufreq_driver_resolve_freq() during the update.
27112729
*/
2712-
policy->min = new_data.min;
2713-
policy->max = new_data.max;
2714-
policy->min = __resolve_freq(policy, policy->min, CPUFREQ_RELATION_L);
2715-
policy->max = __resolve_freq(policy, policy->max, CPUFREQ_RELATION_H);
2730+
WRITE_ONCE(policy->max, __resolve_freq(policy, new_data.max, CPUFREQ_RELATION_H));
2731+
new_data.min = __resolve_freq(policy, new_data.min, CPUFREQ_RELATION_L);
2732+
WRITE_ONCE(policy->min, new_data.min > policy->max ? policy->max : new_data.min);
2733+
27162734
trace_cpu_frequency_limits(policy);
27172735

27182736
cpufreq_update_pressure(policy);

0 commit comments

Comments
 (0)