Skip to content

Commit 43717aa

Browse files
yu-chen-surfrafaeljw
authored andcommitted
intel_pstate: Fix user input of min/max to legal policy region
In current code, max_perf_pct might be smaller than min_perf_pct by improper user input: $ grep . /sys/devices/system/cpu/intel_pstate/m*_perf_pct /sys/devices/system/cpu/intel_pstate/max_perf_pct:100 /sys/devices/system/cpu/intel_pstate/min_perf_pct:100 $ echo 80 > /sys/devices/system/cpu/intel_pstate/max_perf_pct $ grep . /sys/devices/system/cpu/intel_pstate/m*_perf_pct /sys/devices/system/cpu/intel_pstate/max_perf_pct:80 /sys/devices/system/cpu/intel_pstate/min_perf_pct:100 Fix this problem by 2 steps: 1. Normalize the user input to [min_policy, max_policy]. 2. Make sure max_perf_pct>=min_perf_pct, suggested by Seiichi Ikarashi. Signed-off-by: Chen Yu <yu.c.chen@intel.com> Acked-by: Kristen Carlson Accardi <kristen@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 953ba9f commit 43717aa

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

drivers/cpufreq/intel_pstate.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,8 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
423423

424424
limits.max_sysfs_pct = clamp_t(int, input, 0 , 100);
425425
limits.max_perf_pct = min(limits.max_policy_pct, limits.max_sysfs_pct);
426+
limits.max_perf_pct = max(limits.min_policy_pct, limits.max_perf_pct);
427+
limits.max_perf_pct = max(limits.min_perf_pct, limits.max_perf_pct);
426428
limits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));
427429

428430
if (hwp_active)
@@ -442,6 +444,8 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
442444

443445
limits.min_sysfs_pct = clamp_t(int, input, 0 , 100);
444446
limits.min_perf_pct = max(limits.min_policy_pct, limits.min_sysfs_pct);
447+
limits.min_perf_pct = min(limits.max_policy_pct, limits.min_perf_pct);
448+
limits.min_perf_pct = min(limits.max_perf_pct, limits.min_perf_pct);
445449
limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));
446450

447451
if (hwp_active)
@@ -989,12 +993,19 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
989993

990994
limits.min_policy_pct = (policy->min * 100) / policy->cpuinfo.max_freq;
991995
limits.min_policy_pct = clamp_t(int, limits.min_policy_pct, 0 , 100);
992-
limits.min_perf_pct = max(limits.min_policy_pct, limits.min_sysfs_pct);
993-
limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));
994-
995996
limits.max_policy_pct = (policy->max * 100) / policy->cpuinfo.max_freq;
996997
limits.max_policy_pct = clamp_t(int, limits.max_policy_pct, 0 , 100);
998+
999+
/* Normalize user input to [min_policy_pct, max_policy_pct] */
1000+
limits.min_perf_pct = max(limits.min_policy_pct, limits.min_sysfs_pct);
1001+
limits.min_perf_pct = min(limits.max_policy_pct, limits.min_perf_pct);
9971002
limits.max_perf_pct = min(limits.max_policy_pct, limits.max_sysfs_pct);
1003+
limits.max_perf_pct = max(limits.min_policy_pct, limits.max_perf_pct);
1004+
1005+
/* Make sure min_perf_pct <= max_perf_pct */
1006+
limits.min_perf_pct = min(limits.max_perf_pct, limits.min_perf_pct);
1007+
1008+
limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));
9981009
limits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));
9991010

10001011
if (hwp_active)

0 commit comments

Comments
 (0)