Re: [PATCH] intel-pstate: Update frequencies of policy->cpus only from ->set_policy()

[Joonas Lahtinen]

Hi,

This fixes the issue for my machine, we'll try in our CI system, too.

CC'd Daniel for that. By R-b and T-b below.

On ma, 2016-02-22 at 10:27 +0530, Viresh Kumar wrote:
> The intel-pstate driver is using intel_pstate_hwp_set() from two
> separate paths, i.e. ->set_policy() callback and sysfs update path for
> the files present in /sys/devices/system/cpu/intel_pstate/ directory.
> 
> While an update to the sysfs path applies to all the CPUs being managed
> by the driver (which essentially means all the online CPUs), the update
> via the ->set_policy() callback applies to a smaller group of CPUs
> managed by the policy for which ->set_policy() is called.
> 
> And so, intel_pstate_hwp_set() should update frequencies of only the
> CPUs that are part of policy->cpus mask, while it is called from
> ->set_policy() callback.
> 
> In order to do that, add a parameter (cpumask) to intel_pstate_hwp_set()
> and apply the frequency changes only to the concerned CPUs.
> 
> For ->set_policy() path, we are only concerned about policy->cpus, and
> so policy->rwsem lock taken by the core prior to calling ->set_policy()
> is enough to take care of any races. The larger lock acquired by
> get_online_cpus() is required only for the updates to sysfs files.
> 
> Add another routine, intel_pstate_hwp_set_online_cpus(), and call it
> from the sysfs update paths.
> 
> This also fixes a lockdep reported recently, where policy->rwsem and
> get_online_cpus() could have been acquired in any order causing an ABBA
> deadlock. The sequence of events leading to that was:
> 
> intel_pstate_init(...)
> 	...cpufreq_online(...)
> 		down_write(&policy->rwsem); // Locks policy->rwsem
> 		...
> 		cpufreq_init_policy(policy);
> 			...intel_pstate_hwp_set();
> 				get_online_cpus(); // Temporarily locks cpu_hotplug.lock
> 		...
> 		up_write(&policy->rwsem);
> 
> pm_suspend(...)
> 	...disable_nonboot_cpus()
> 		_cpu_down()
> 			cpu_hotplug_begin(); // Locks cpu_hotplug.lock
> 			__cpu_notify(CPU_DOWN_PREPARE, ...);
> 				...cpufreq_offline_prepare();
> 					down_write(&policy->rwsem); // Locks policy->rwsem
> 
> Reported-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>

Tested-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>

> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> ---
> Âdrivers/cpufreq/intel_pstate.c | 21 ++++++++++++---------
> Â1 file changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index f4d85c2ae7b1..2e7058a2479d 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -287,7 +287,7 @@ static inline void update_turbo_state(void)
> Â		Âcpu->pstate.max_pstate == cpu->pstate.turbo_pstate);
> Â}
> Â
> -static void intel_pstate_hwp_set(void)
> +static void intel_pstate_hwp_set(const struct cpumask *cpumask)
> Â{
> Â	int min, hw_min, max, hw_max, cpu, range, adj_range;
> Â	u64 value, cap;
> @@ -297,9 +297,7 @@ static void intel_pstate_hwp_set(void)
> Â	hw_max = HWP_HIGHEST_PERF(cap);
> Â	range = hw_max - hw_min;
> Â
> -	get_online_cpus();
> -
> -	for_each_online_cpu(cpu) {
> +	for_each_cpu(cpu, cpumask) {
> Â		rdmsrl_on_cpu(cpu, MSR_HWP_REQUEST, &value);
> Â		adj_range = limits->min_perf_pct * range / 100;
> Â		min = hw_min + adj_range;
> @@ -318,7 +316,12 @@ static void intel_pstate_hwp_set(void)
> Â		value |= HWP_MAX_PERF(max);
> Â		wrmsrl_on_cpu(cpu, MSR_HWP_REQUEST, value);
> Â	}
> +}
> Â
> +static void intel_pstate_hwp_set_online_cpus(void)
> +{
> +	get_online_cpus();
> +	intel_pstate_hwp_set(cpu_online_mask);
> Â	put_online_cpus();
> Â}
> Â
> @@ -440,7 +443,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
> Â	limits->no_turbo = clamp_t(int, input, 0, 1);
> Â
> Â	if (hwp_active)
> -		intel_pstate_hwp_set();
> +		intel_pstate_hwp_set_online_cpus();
> Â
> Â	return count;
> Â}
> @@ -466,7 +469,7 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
> Â				ÂÂint_tofp(100));
> Â
> Â	if (hwp_active)
> -		intel_pstate_hwp_set();
> +		intel_pstate_hwp_set_online_cpus();
> Â	return count;
> Â}
> Â
> @@ -491,7 +494,7 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
> Â				ÂÂint_tofp(100));
> Â
> Â	if (hwp_active)
> -		intel_pstate_hwp_set();
> +		intel_pstate_hwp_set_online_cpus();
> Â	return count;
> Â}
> Â
> @@ -1112,7 +1115,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
> Â		pr_debug("intel_pstate: set performance\n");
> Â		limits = &performance_limits;
> Â		if (hwp_active)
> -			intel_pstate_hwp_set();
> +			intel_pstate_hwp_set(policy->cpus);
> Â		return 0;
> Â	}
> Â
> @@ -1144,7 +1147,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
> Â				ÂÂint_tofp(100));
> Â
> Â	if (hwp_active)
> -		intel_pstate_hwp_set();
> +		intel_pstate_hwp_set(policy->cpus);
> Â
> Â	return 0;
> Â}
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation