intel_pstate: Fix user input of min/max to legal policy region
Subsystems (2)
PATCH v2 1/1 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.
---
v2:
- Add logic to ensure max_perf_pct>=min_perf_pct.
--- drivers/cpufreq/intel_pstate.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/cpufreq/intel_pstate.c +14 -3
@@ -423,6 +423,8 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b, limits.max_sysfs_pct =clamp_t (int, input,0 ,100 ); limits.max_perf_pct =min (limits.max_policy_pct, limits.max_sysfs_pct); + limits.max_perf_pct =max (limits.min_policy_pct, limits.max_perf_pct); + limits.max_perf_pct =max (limits.min_perf_pct, limits.max_perf_pct); limits.max_perf =div_fp (int_tofp (limits.max_perf_pct),int_tofp (100 ));if (hwp_active)
@@ -442,6 +444,8 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b, limits.min_sysfs_pct =clamp_t (int, input,0 ,100 ); limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); + limits.min_perf_pct =min (limits.max_policy_pct, limits.min_perf_pct); + limits.min_perf_pct =min (limits.max_perf_pct, limits.min_perf_pct); limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 ));if (hwp_active)
@@ -985,12 +989,19 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) limits.min_policy_pct = (policy->min *100 ) / policy->cpuinfo.max_freq; limits.min_policy_pct =clamp_t (int, limits.min_policy_pct,0 ,100 ); - limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); - limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 )); - limits.max_policy_pct = (policy->max *100 ) / policy->cpuinfo.max_freq; limits.max_policy_pct =clamp_t (int, limits.max_policy_pct,0 ,100 ); + +/* Normalize user input to [min_policy_pct, max_policy_pct] */ + limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); + limits.min_perf_pct =min (limits.max_policy_pct, limits.min_perf_pct); limits.max_perf_pct =min (limits.max_policy_pct, limits.max_sysfs_pct); + limits.max_perf_pct =max (limits.min_policy_pct, limits.max_perf_pct); + +/* Make sure min_perf_pct <= max_perf_pct */ + limits.min_perf_pct =min (limits.max_perf_pct, limits.min_perf_pct); + + limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 )); limits.max_perf =div_fp (int_tofp (limits.max_perf_pct),int_tofp (100 ));if (hwp_active)
Signature · 1 line
1.8.4.2
Hi, Yu
Quoted 55 lines · Chen Yu
In current code,
max_perf_pctmight be smaller thanmin_perf_pctby 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:100Fix 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 <[email protected]>---
v2:
- Add logic to ensure max_perf_pct>=min_perf_pct.--- drivers/cpufreq/intel_pstate.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/cpufreq/intel_pstate.c +4
-3@@ -423,6 +423,8 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b, limits.max_sysfs_pct =clamp_t (int, input,0 ,100 ); limits.max_perf_pct =min (limits.max_policy_pct, limits.max_sysfs_pct); + limits.max_perf_pct =max (limits.min_policy_pct, limits.max_perf_pct); + limits.max_perf_pct =max (limits.min_perf_pct, limits.max_perf_pct); limits.max_perf =div_fp (int_tofp (limits.max_perf_pct),int_tofp (100 ));if (hwp_active)@@ -442,6 +444,8 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b, limits.min_sysfs_pct =clamp_t (int, input,0 ,100 ); limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); + limits.min_perf_pct =min (limits.max_policy_pct, limits.min_perf_pct); + limits.min_perf_pct =min (limits.max_perf_pct, limits.min_perf_pct); limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 ));if (hwp_active)@@ -985,12 +989,19 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) limits.min_policy_pct = (policy->min *100 ) / policy->cpuinfo.max_freq; limits.min_policy_pct =clamp_t (int, limits.min_policy_pct,0 ,100 ); - limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); - limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 )); - limits.max_policy_pct = (policy->max *100 ) / policy->cpuinfo.max_freq;
drivers/cpufreq/intel_pstate.c static int intel_pstate_set_policy(struct cpufreq_policy *policy) · line 1002
Quoted 10 lines
drivers/cpufreq/intel_pstate.c +8
-0limits.max_policy_pct =clamp_t (int, limits.max_policy_pct,0 ,100 ); + +/* Normalize user input to [min_policy_pct, max_policy_pct] */ + limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); + limits.min_perf_pct =min (limits.max_policy_pct, limits.min_perf_pct); limits.max_perf_pct =min (limits.max_policy_pct, limits.max_sysfs_pct); + limits.max_perf_pct =max (limits.min_policy_pct, limits.max_perf_pct); + +/* Make sure min_perf_pct <= max_perf_pct */ + limits.min_perf_pct =min (limits.max_perf_pct, limits.min_perf_pct);
You chose max_perf_pct prior to min_perf_pct here. I agree.
drivers/cpufreq/intel_pstate.c static int intel_pstate_set_policy(struct cpufreq_policy *policy) · line 1007
Quoted 6 lines
drivers/cpufreq/intel_pstate.c +2
-0+ + limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 )); limits.max_perf =div_fp (int_tofp (limits.max_perf_pct),int_tofp (100 ));if (hwp_active)
I think this patch is what it should be. Good job.
Regards,
Seiichi
Quoted 13 lines · On Wed, 9 Sep 2015 18:27:31 +0800 Chen Yu <[email protected]> wrote:
In current code,
max_perf_pctmight be smaller thanmin_perf_pctby 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
Quoted 5 lines
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 <[email protected]>
Quoted 52 lines
---
v2:
- Add logic to ensure max_perf_pct>=min_perf_pct.--- drivers/cpufreq/intel_pstate.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/cpufreq/intel_pstate.c +14
-3@@ -423,6 +423,8 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b, limits.max_sysfs_pct =clamp_t (int, input,0 ,100 ); limits.max_perf_pct =min (limits.max_policy_pct, limits.max_sysfs_pct); + limits.max_perf_pct =max (limits.min_policy_pct, limits.max_perf_pct); + limits.max_perf_pct =max (limits.min_perf_pct, limits.max_perf_pct); limits.max_perf =div_fp (int_tofp (limits.max_perf_pct),int_tofp (100 ));if (hwp_active)@@ -442,6 +444,8 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b, limits.min_sysfs_pct =clamp_t (int, input,0 ,100 ); limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); + limits.min_perf_pct =min (limits.max_policy_pct, limits.min_perf_pct); + limits.min_perf_pct =min (limits.max_perf_pct, limits.min_perf_pct); limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 ));if (hwp_active)@@ -985,12 +989,19 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) limits.min_policy_pct = (policy->min *100 ) / policy->cpuinfo.max_freq; limits.min_policy_pct =clamp_t (int, limits.min_policy_pct,0 ,100 ); - limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); - limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 )); - limits.max_policy_pct = (policy->max *100 ) / policy->cpuinfo.max_freq; limits.max_policy_pct =clamp_t (int, limits.max_policy_pct,0 ,100 ); + +/* Normalize user input to [min_policy_pct, max_policy_pct] */ + limits.min_perf_pct =max (limits.min_policy_pct, limits.min_sysfs_pct); + limits.min_perf_pct =min (limits.max_policy_pct, limits.min_perf_pct); limits.max_perf_pct =min (limits.max_policy_pct, limits.max_sysfs_pct); + limits.max_perf_pct =max (limits.min_policy_pct, limits.max_perf_pct); + +/* Make sure min_perf_pct <= max_perf_pct */ + limits.min_perf_pct =min (limits.max_perf_pct, limits.min_perf_pct); + + limits.min_perf =div_fp (int_tofp (limits.min_perf_pct),int_tofp (100 )); limits.max_perf =div_fp (int_tofp (limits.max_perf_pct),int_tofp (100 ));if (hwp_active)