Skip to content

L
linux
Commit dac1c1a5 authored by Dave Jones's avatar Dave Jones
Browse files
Options

[CPUFREQ] ondemand,conservative minor bug-fix and cleanup 

[PATCH] [1/5] ondemand,conservative minor bug-fix and cleanup

Attached patch fixes some minor issues with Alexander's patch and related
cleanup in both ondemand and conservative governor.
Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 1206aaac
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 73 deletions
drivers/cpufreq/cpufreq_conservative.c
View file @ dac1c1a5
...@@ -89,6 +89,15 @@ static struct dbs_tuners dbs_tuners_ins = { ...@@ -89,6 +89,15 @@ static struct dbs_tuners dbs_tuners_ins = {
.sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR, .sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR,
}; };
static inline unsigned int get_cpu_idle_time(unsigned int cpu)
{
return kstat_cpu(cpu).cpustat.idle +
kstat_cpu(cpu).cpustat.iowait +
( !dbs_tuners_ins.ignore_nice ?
kstat_cpu(cpu).cpustat.nice :
0);
}
/************************** sysfs interface ************************/ /************************** sysfs interface ************************/
static ssize_t show_sampling_rate_max(struct cpufreq_policy *policy, char *buf) static ssize_t show_sampling_rate_max(struct cpufreq_policy *policy, char *buf)
{ {
...@@ -221,16 +230,10 @@ static ssize_t store_ignore_nice(struct cpufreq_policy *policy, ...@@ -221,16 +230,10 @@ static ssize_t store_ignore_nice(struct cpufreq_policy *policy,
dbs_tuners_ins.ignore_nice = input; dbs_tuners_ins.ignore_nice = input;
/* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */ /* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */
for_each_cpu_mask(j, policy->cpus) { for_each_online_cpu(j) {
struct cpu_dbs_info_s *j_dbs_info; struct cpu_dbs_info_s *j_dbs_info;
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
j_dbs_info->cur_policy = policy; j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
j_dbs_info->prev_cpu_idle_up =
kstat_cpu(j).cpustat.idle +
kstat_cpu(j).cpustat.iowait +
( !dbs_tuners_ins.ignore_nice
? kstat_cpu(j).cpustat.nice : 0 );
j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up; j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
} }
up(&dbs_sem); up(&dbs_sem);
...@@ -335,11 +338,7 @@ static void dbs_check_cpu(int cpu) ...@@ -335,11 +338,7 @@ static void dbs_check_cpu(int cpu)
*/ */
/* Check for frequency increase */ /* Check for frequency increase */
total_idle_ticks = kstat_cpu(cpu).cpustat.idle + total_idle_ticks = get_cpu_idle_time(cpu);
kstat_cpu(cpu).cpustat.iowait;
/* consider 'nice' tasks as 'idle' time too if required */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(cpu).cpustat.nice;
idle_ticks = total_idle_ticks - idle_ticks = total_idle_ticks -
this_dbs_info->prev_cpu_idle_up; this_dbs_info->prev_cpu_idle_up;
this_dbs_info->prev_cpu_idle_up = total_idle_ticks; this_dbs_info->prev_cpu_idle_up = total_idle_ticks;
...@@ -354,11 +353,7 @@ static void dbs_check_cpu(int cpu) ...@@ -354,11 +353,7 @@ static void dbs_check_cpu(int cpu)
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
/* Check for frequency increase */ /* Check for frequency increase */
total_idle_ticks = kstat_cpu(j).cpustat.idle + total_idle_ticks = get_cpu_idle_time(j);
kstat_cpu(j).cpustat.iowait;
/* consider 'nice' too? */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(j).cpustat.nice;
tmp_idle_ticks = total_idle_ticks - tmp_idle_ticks = total_idle_ticks -
j_dbs_info->prev_cpu_idle_up; j_dbs_info->prev_cpu_idle_up;
j_dbs_info->prev_cpu_idle_up = total_idle_ticks; j_dbs_info->prev_cpu_idle_up = total_idle_ticks;
...@@ -373,6 +368,8 @@ static void dbs_check_cpu(int cpu) ...@@ -373,6 +368,8 @@ static void dbs_check_cpu(int cpu)
usecs_to_jiffies(dbs_tuners_ins.sampling_rate); usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
if (idle_ticks < up_idle_ticks) { if (idle_ticks < up_idle_ticks) {
down_skip[cpu] = 0;
this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
/* if we are already at full speed then break out early */ /* if we are already at full speed then break out early */
if (requested_freq[cpu] == policy->max) if (requested_freq[cpu] == policy->max)
return; return;
...@@ -389,8 +386,6 @@ static void dbs_check_cpu(int cpu) ...@@ -389,8 +386,6 @@ static void dbs_check_cpu(int cpu)
__cpufreq_driver_target(policy, requested_freq[cpu], __cpufreq_driver_target(policy, requested_freq[cpu],
CPUFREQ_RELATION_H); CPUFREQ_RELATION_H);
down_skip[cpu] = 0;
this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
return; return;
} }
...@@ -399,11 +394,7 @@ static void dbs_check_cpu(int cpu) ...@@ -399,11 +394,7 @@ static void dbs_check_cpu(int cpu)
if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor) if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
return; return;
total_idle_ticks = kstat_cpu(cpu).cpustat.idle + total_idle_ticks = this_dbs_info->prev_cpu_idle_up;
kstat_cpu(cpu).cpustat.iowait;
/* consider 'nice' too? */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(cpu).cpustat.nice;
idle_ticks = total_idle_ticks - idle_ticks = total_idle_ticks -
this_dbs_info->prev_cpu_idle_down; this_dbs_info->prev_cpu_idle_down;
this_dbs_info->prev_cpu_idle_down = total_idle_ticks; this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
...@@ -417,11 +408,7 @@ static void dbs_check_cpu(int cpu) ...@@ -417,11 +408,7 @@ static void dbs_check_cpu(int cpu)
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
/* Check for frequency increase */ /* Check for frequency increase */
total_idle_ticks = kstat_cpu(j).cpustat.idle + total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
kstat_cpu(j).cpustat.iowait;
/* consider 'nice' too? */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(j).cpustat.nice;
tmp_idle_ticks = total_idle_ticks - tmp_idle_ticks = total_idle_ticks -
j_dbs_info->prev_cpu_idle_down; j_dbs_info->prev_cpu_idle_down;
j_dbs_info->prev_cpu_idle_down = total_idle_ticks; j_dbs_info->prev_cpu_idle_down = total_idle_ticks;
...@@ -516,11 +503,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ...@@ -516,11 +503,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
j_dbs_info->cur_policy = policy; j_dbs_info->cur_policy = policy;
j_dbs_info->prev_cpu_idle_up = j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
kstat_cpu(j).cpustat.idle +
kstat_cpu(j).cpustat.iowait +
( !dbs_tuners_ins.ignore_nice
? kstat_cpu(j).cpustat.nice : 0 );
j_dbs_info->prev_cpu_idle_down j_dbs_info->prev_cpu_idle_down
= j_dbs_info->prev_cpu_idle_up; = j_dbs_info->prev_cpu_idle_up;
} }
......
drivers/cpufreq/cpufreq_ondemand.c
View file @ dac1c1a5
...@@ -88,6 +88,15 @@ static struct dbs_tuners dbs_tuners_ins = { ...@@ -88,6 +88,15 @@ static struct dbs_tuners dbs_tuners_ins = {
.sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR, .sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR,
}; };
static inline unsigned int get_cpu_idle_time(unsigned int cpu)
{
return kstat_cpu(cpu).cpustat.idle +
kstat_cpu(cpu).cpustat.iowait +
( !dbs_tuners_ins.ignore_nice ?
kstat_cpu(cpu).cpustat.nice :
0);
}
/************************** sysfs interface ************************/ /************************** sysfs interface ************************/
static ssize_t show_sampling_rate_max(struct cpufreq_policy *policy, char *buf) static ssize_t show_sampling_rate_max(struct cpufreq_policy *policy, char *buf)
{ {
...@@ -220,16 +229,10 @@ static ssize_t store_ignore_nice(struct cpufreq_policy *policy, ...@@ -220,16 +229,10 @@ static ssize_t store_ignore_nice(struct cpufreq_policy *policy,
dbs_tuners_ins.ignore_nice = input; dbs_tuners_ins.ignore_nice = input;
/* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */ /* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */
for_each_cpu_mask(j, policy->cpus) { for_each_online_cpu(j) {
struct cpu_dbs_info_s *j_dbs_info; struct cpu_dbs_info_s *j_dbs_info;
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
j_dbs_info->cur_policy = policy; j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
j_dbs_info->prev_cpu_idle_up =
kstat_cpu(j).cpustat.idle +
kstat_cpu(j).cpustat.iowait +
( !dbs_tuners_ins.ignore_nice
? kstat_cpu(j).cpustat.nice : 0 );
j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up; j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
} }
up(&dbs_sem); up(&dbs_sem);
...@@ -322,16 +325,11 @@ static void dbs_check_cpu(int cpu) ...@@ -322,16 +325,11 @@ static void dbs_check_cpu(int cpu)
*/ */
/* Check for frequency increase */ /* Check for frequency increase */
total_idle_ticks = kstat_cpu(cpu).cpustat.idle + total_idle_ticks = get_cpu_idle_time(cpu);
kstat_cpu(cpu).cpustat.iowait;
/* consider 'nice' tasks as 'idle' time too if required */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(cpu).cpustat.nice;
idle_ticks = total_idle_ticks - idle_ticks = total_idle_ticks -
this_dbs_info->prev_cpu_idle_up; this_dbs_info->prev_cpu_idle_up;
this_dbs_info->prev_cpu_idle_up = total_idle_ticks; this_dbs_info->prev_cpu_idle_up = total_idle_ticks;
for_each_cpu_mask(j, policy->cpus) { for_each_cpu_mask(j, policy->cpus) {
unsigned int tmp_idle_ticks; unsigned int tmp_idle_ticks;
struct cpu_dbs_info_s *j_dbs_info; struct cpu_dbs_info_s *j_dbs_info;
...@@ -341,11 +339,7 @@ static void dbs_check_cpu(int cpu) ...@@ -341,11 +339,7 @@ static void dbs_check_cpu(int cpu)
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
/* Check for frequency increase */ /* Check for frequency increase */
total_idle_ticks = kstat_cpu(j).cpustat.idle + total_idle_ticks = get_cpu_idle_time(j);
kstat_cpu(j).cpustat.iowait;
/* consider 'nice' too? */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(j).cpustat.nice;
tmp_idle_ticks = total_idle_ticks - tmp_idle_ticks = total_idle_ticks -
j_dbs_info->prev_cpu_idle_up; j_dbs_info->prev_cpu_idle_up;
j_dbs_info->prev_cpu_idle_up = total_idle_ticks; j_dbs_info->prev_cpu_idle_up = total_idle_ticks;
...@@ -360,14 +354,14 @@ static void dbs_check_cpu(int cpu) ...@@ -360,14 +354,14 @@ static void dbs_check_cpu(int cpu)
usecs_to_jiffies(dbs_tuners_ins.sampling_rate); usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
if (idle_ticks < up_idle_ticks) { if (idle_ticks < up_idle_ticks) {
down_skip[cpu] = 0;
this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
/* if we are already at full speed then break out early */ /* if we are already at full speed then break out early */
if (policy->cur == policy->max) if (policy->cur == policy->max)
return; return;
__cpufreq_driver_target(policy, policy->max, __cpufreq_driver_target(policy, policy->max,
CPUFREQ_RELATION_H); CPUFREQ_RELATION_H);
down_skip[cpu] = 0;
this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
return; return;
} }
...@@ -376,11 +370,7 @@ static void dbs_check_cpu(int cpu) ...@@ -376,11 +370,7 @@ static void dbs_check_cpu(int cpu)
if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor) if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
return; return;
total_idle_ticks = kstat_cpu(cpu).cpustat.idle + total_idle_ticks = this_dbs_info->prev_cpu_idle_up;
kstat_cpu(cpu).cpustat.iowait;
/* consider 'nice' too? */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(cpu).cpustat.nice;
idle_ticks = total_idle_ticks - idle_ticks = total_idle_ticks -
this_dbs_info->prev_cpu_idle_down; this_dbs_info->prev_cpu_idle_down;
this_dbs_info->prev_cpu_idle_down = total_idle_ticks; this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
...@@ -393,12 +383,8 @@ static void dbs_check_cpu(int cpu) ...@@ -393,12 +383,8 @@ static void dbs_check_cpu(int cpu)
continue; continue;
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
/* Check for frequency increase */ /* Check for frequency decrease */
total_idle_ticks = kstat_cpu(j).cpustat.idle + total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
kstat_cpu(j).cpustat.iowait;
/* consider 'nice' too? */
if (dbs_tuners_ins.ignore_nice == 0)
total_idle_ticks += kstat_cpu(j).cpustat.nice;
tmp_idle_ticks = total_idle_ticks - tmp_idle_ticks = total_idle_ticks -
j_dbs_info->prev_cpu_idle_down; j_dbs_info->prev_cpu_idle_down;
j_dbs_info->prev_cpu_idle_down = total_idle_ticks; j_dbs_info->prev_cpu_idle_down = total_idle_ticks;
...@@ -488,11 +474,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ...@@ -488,11 +474,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
j_dbs_info = &per_cpu(cpu_dbs_info, j); j_dbs_info = &per_cpu(cpu_dbs_info, j);
j_dbs_info->cur_policy = policy; j_dbs_info->cur_policy = policy;
j_dbs_info->prev_cpu_idle_up = j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
kstat_cpu(j).cpustat.idle +
kstat_cpu(j).cpustat.iowait +
( !dbs_tuners_ins.ignore_nice
? kstat_cpu(j).cpustat.nice : 0 );
j_dbs_info->prev_cpu_idle_down j_dbs_info->prev_cpu_idle_down
= j_dbs_info->prev_cpu_idle_up; = j_dbs_info->prev_cpu_idle_up;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7