Commit b4a11fa3 authored by Wyes Karny's avatar Wyes Karny Committed by Rafael J. Wysocki
Browse files

cpufreq: Fail driver register if it has adjust_perf without fast_switch 



If fast_switch_possible flag is set by the scaling driver, the governor
is free to select fast_switch function even if adjust_perf is set.  Some
scaling drivers which use adjust_perf don't set fast_switch thinking
that the governor would never fall back to fast_switch. But the governor
can fall back to fast_switch even in runtime if frequency invariance is
disabled due to some reason. This could crash the kernel if the driver
didn't set the fast_switch function pointer.

Therefore, fail driver registration if it has adjust_perf without
fast_switch.

Suggested-by: default avatarRafael J. Wysocki <rafael@kernel.org>
Suggested-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarWyes Karny <wyes.karny@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 858fd168

drivers/cpufreq/cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -2828,7 +2828,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
	     (driver_data->setpolicy && (driver_data->target_index ||

		    driver_data->target)) ||

	     (!driver_data->get_intermediate != !driver_data->target_intermediate) ||

	     (!driver_data->online != !driver_data->offline))

	     (!driver_data->online != !driver_data->offline) ||

		 (driver_data->adjust_perf && !driver_data->fast_switch))

		return -EINVAL;



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

include/linux/cpufreq.h

+4 −1
Original line number Diff line number Diff line
@@ -340,7 +340,10 @@ struct cpufreq_driver { 
	/*

	 * ->fast_switch() replacement for drivers that use an internal

	 * representation of performance levels and can pass hints other than

	 * the target performance level to the hardware.

	 * the target performance level to the hardware. This can only be set

	 * if ->fast_switch is set too, because in those cases (under specific

	 * conditions) scale invariance can be disabled, which causes the

	 * schedutil governor to fall back to the latter.

	 */

	void		(*adjust_perf)(unsigned int cpu,

				       unsigned long min_perf,