Commit 7d5a9956 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

cpufreq: governor: Make governor private data per-policy

Some fields in struct od_cpu_dbs_info_s and struct cs_cpu_dbs_info_s
are only used for a limited set of CPUs.  Namely, if a policy is
shared between multiple CPUs, those fields will only be used for one
of them (policy->cpu).  This means that they really are per-policy
rather than per-CPU and holding room for them in per-CPU data
structures is generally wasteful.  Also moving those fields into
per-policy data structures will allow some significant simplifications
to be made going forward.

For this reason, introduce struct cs_policy_dbs_info and
struct od_policy_dbs_info to hold those fields.  Define each of the
new structures as an extension of struct policy_dbs_info (such that
struct policy_dbs_info is embedded in each of them) and introduce
new ->alloc and ->free governor callbacks to allocate and free
those structures, respectively, such that ->alloc() will return
a pointer to the struct policy_dbs_info embedded in the allocated
data structure and ->free() will take that pointer as its argument.

With that, modify the code accessing the data fields in question
in per-CPU data objects to look for them in the new structures
via the struct policy_dbs_info pointer available to it and drop
them from struct od_cpu_dbs_info_s and struct cs_cpu_dbs_info_s.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d1db75ff
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include "cpufreq_governor.h" #include "cpufreq_ondemand.h"
#define MSR_AMD64_FREQ_SENSITIVITY_ACTUAL 0xc0010080 #define MSR_AMD64_FREQ_SENSITIVITY_ACTUAL 0xc0010080
#define MSR_AMD64_FREQ_SENSITIVITY_REFERENCE 0xc0010081 #define MSR_AMD64_FREQ_SENSITIVITY_REFERENCE 0xc0010081
...@@ -48,8 +48,7 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy, ...@@ -48,8 +48,7 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy,
struct policy_dbs_info *policy_dbs = policy->governor_data; struct policy_dbs_info *policy_dbs = policy->governor_data;
struct dbs_data *od_data = policy_dbs->dbs_data; struct dbs_data *od_data = policy_dbs->dbs_data;
struct od_dbs_tuners *od_tuners = od_data->tuners; struct od_dbs_tuners *od_tuners = od_data->tuners;
struct od_cpu_dbs_info_s *od_info = struct od_policy_dbs_info *od_info = to_dbs_info(policy_dbs);
dbs_governor_of(policy)->get_cpu_dbs_info_s(policy->cpu);
if (!od_info->freq_table) if (!od_info->freq_table)
return freq_next; return freq_next;
......
...@@ -14,6 +14,17 @@ ...@@ -14,6 +14,17 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "cpufreq_governor.h" #include "cpufreq_governor.h"
struct cs_policy_dbs_info {
struct policy_dbs_info policy_dbs;
unsigned int down_skip;
unsigned int requested_freq;
};
static inline struct cs_policy_dbs_info *to_dbs_info(struct policy_dbs_info *policy_dbs)
{
return container_of(policy_dbs, struct cs_policy_dbs_info, policy_dbs);
}
/* Conservative governor macros */ /* Conservative governor macros */
#define DEF_FREQUENCY_UP_THRESHOLD (80) #define DEF_FREQUENCY_UP_THRESHOLD (80)
#define DEF_FREQUENCY_DOWN_THRESHOLD (20) #define DEF_FREQUENCY_DOWN_THRESHOLD (20)
...@@ -48,8 +59,8 @@ static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners, ...@@ -48,8 +59,8 @@ static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners,
*/ */
static unsigned int cs_dbs_timer(struct cpufreq_policy *policy) static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
{ {
struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, policy->cpu);
struct policy_dbs_info *policy_dbs = policy->governor_data; struct policy_dbs_info *policy_dbs = policy->governor_data;
struct cs_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);
struct dbs_data *dbs_data = policy_dbs->dbs_data; struct dbs_data *dbs_data = policy_dbs->dbs_data;
struct cs_dbs_tuners *cs_tuners = dbs_data->tuners; struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
unsigned int load = dbs_update(policy); unsigned int load = dbs_update(policy);
...@@ -238,6 +249,19 @@ static struct attribute *cs_attributes[] = { ...@@ -238,6 +249,19 @@ static struct attribute *cs_attributes[] = {
/************************** sysfs end ************************/ /************************** sysfs end ************************/
static struct policy_dbs_info *cs_alloc(void)
{
struct cs_policy_dbs_info *dbs_info;
dbs_info = kzalloc(sizeof(*dbs_info), GFP_KERNEL);
return dbs_info ? &dbs_info->policy_dbs : NULL;
}
static void cs_free(struct policy_dbs_info *policy_dbs)
{
kfree(to_dbs_info(policy_dbs));
}
static int cs_init(struct dbs_data *dbs_data, bool notify) static int cs_init(struct dbs_data *dbs_data, bool notify)
{ {
struct cs_dbs_tuners *tuners; struct cs_dbs_tuners *tuners;
...@@ -276,7 +300,7 @@ static void cs_exit(struct dbs_data *dbs_data, bool notify) ...@@ -276,7 +300,7 @@ static void cs_exit(struct dbs_data *dbs_data, bool notify)
static void cs_start(struct cpufreq_policy *policy) static void cs_start(struct cpufreq_policy *policy)
{ {
struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, policy->cpu); struct cs_policy_dbs_info *dbs_info = to_dbs_info(policy->governor_data);
dbs_info->down_skip = 0; dbs_info->down_skip = 0;
dbs_info->requested_freq = policy->cur; dbs_info->requested_freq = policy->cur;
...@@ -294,6 +318,8 @@ static struct dbs_governor cs_dbs_gov = { ...@@ -294,6 +318,8 @@ static struct dbs_governor cs_dbs_gov = {
.kobj_type = { .default_attrs = cs_attributes }, .kobj_type = { .default_attrs = cs_attributes },
.get_cpu_cdbs = get_cpu_cdbs, .get_cpu_cdbs = get_cpu_cdbs,
.gov_dbs_timer = cs_dbs_timer, .gov_dbs_timer = cs_dbs_timer,
.alloc = cs_alloc,
.free = cs_free,
.init = cs_init, .init = cs_init,
.exit = cs_exit, .exit = cs_exit,
.start = cs_start, .start = cs_start,
...@@ -305,9 +331,8 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val, ...@@ -305,9 +331,8 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
void *data) void *data)
{ {
struct cpufreq_freqs *freq = data; struct cpufreq_freqs *freq = data;
struct cs_cpu_dbs_info_s *dbs_info =
&per_cpu(cs_cpu_dbs_info, freq->cpu);
struct cpufreq_policy *policy = cpufreq_cpu_get_raw(freq->cpu); struct cpufreq_policy *policy = cpufreq_cpu_get_raw(freq->cpu);
struct cs_policy_dbs_info *dbs_info;
if (!policy) if (!policy)
return 0; return 0;
...@@ -316,6 +341,7 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val, ...@@ -316,6 +341,7 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
if (policy->governor != CPU_FREQ_GOV_CONSERVATIVE) if (policy->governor != CPU_FREQ_GOV_CONSERVATIVE)
return 0; return 0;
dbs_info = to_dbs_info(policy->governor_data);
/* /*
* we only care if our internally tracked freq moves outside the 'valid' * we only care if our internally tracked freq moves outside the 'valid'
* ranges of frequency available to us otherwise we do not change it * ranges of frequency available to us otherwise we do not change it
......
...@@ -385,8 +385,8 @@ static struct policy_dbs_info *alloc_policy_dbs_info(struct cpufreq_policy *poli ...@@ -385,8 +385,8 @@ static struct policy_dbs_info *alloc_policy_dbs_info(struct cpufreq_policy *poli
struct policy_dbs_info *policy_dbs; struct policy_dbs_info *policy_dbs;
int j; int j;
/* Allocate memory for the common information for policy->cpus */ /* Allocate memory for per-policy governor data. */
policy_dbs = kzalloc(sizeof(*policy_dbs), GFP_KERNEL); policy_dbs = gov->alloc();
if (!policy_dbs) if (!policy_dbs)
return NULL; return NULL;
...@@ -421,7 +421,7 @@ static void free_policy_dbs_info(struct cpufreq_policy *policy, ...@@ -421,7 +421,7 @@ static void free_policy_dbs_info(struct cpufreq_policy *policy,
j_cdbs->policy_dbs = NULL; j_cdbs->policy_dbs = NULL;
j_cdbs->update_util.func = NULL; j_cdbs->update_util.func = NULL;
} }
kfree(policy_dbs); gov->free(policy_dbs);
} }
static int cpufreq_governor_init(struct cpufreq_policy *policy) static int cpufreq_governor_init(struct cpufreq_policy *policy)
...@@ -582,7 +582,6 @@ static int cpufreq_governor_start(struct cpufreq_policy *policy) ...@@ -582,7 +582,6 @@ static int cpufreq_governor_start(struct cpufreq_policy *policy)
static int cpufreq_governor_stop(struct cpufreq_policy *policy) static int cpufreq_governor_stop(struct cpufreq_policy *policy)
{ {
gov_cancel_work(policy); gov_cancel_work(policy);
return 0; return 0;
} }
......
...@@ -157,17 +157,10 @@ struct cpu_dbs_info { ...@@ -157,17 +157,10 @@ struct cpu_dbs_info {
struct od_cpu_dbs_info_s { struct od_cpu_dbs_info_s {
struct cpu_dbs_info cdbs; struct cpu_dbs_info cdbs;
struct cpufreq_frequency_table *freq_table;
unsigned int freq_lo;
unsigned int freq_lo_delay_us;
unsigned int freq_hi_delay_us;
unsigned int sample_type:1;
}; };
struct cs_cpu_dbs_info_s { struct cs_cpu_dbs_info_s {
struct cpu_dbs_info cdbs; struct cpu_dbs_info cdbs;
unsigned int down_skip;
unsigned int requested_freq;
}; };
/* Per policy Governors sysfs tunables */ /* Per policy Governors sysfs tunables */
...@@ -193,6 +186,8 @@ struct dbs_governor { ...@@ -193,6 +186,8 @@ struct dbs_governor {
struct cpu_dbs_info *(*get_cpu_cdbs)(int cpu); struct cpu_dbs_info *(*get_cpu_cdbs)(int cpu);
unsigned int (*gov_dbs_timer)(struct cpufreq_policy *policy); unsigned int (*gov_dbs_timer)(struct cpufreq_policy *policy);
struct policy_dbs_info *(*alloc)(void);
void (*free)(struct policy_dbs_info *policy_dbs);
int (*init)(struct dbs_data *dbs_data, bool notify); int (*init)(struct dbs_data *dbs_data, bool notify);
void (*exit)(struct dbs_data *dbs_data, bool notify); void (*exit)(struct dbs_data *dbs_data, bool notify);
void (*start)(struct cpufreq_policy *policy); void (*start)(struct cpufreq_policy *policy);
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
#include <linux/percpu-defs.h> #include <linux/percpu-defs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/tick.h> #include <linux/tick.h>
#include "cpufreq_governor.h"
#include "cpufreq_ondemand.h"
/* On-demand governor macros */ /* On-demand governor macros */
#define DEF_FREQUENCY_UP_THRESHOLD (80) #define DEF_FREQUENCY_UP_THRESHOLD (80)
...@@ -69,9 +70,8 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy, ...@@ -69,9 +70,8 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy,
unsigned int freq_hi, freq_lo; unsigned int freq_hi, freq_lo;
unsigned int index = 0; unsigned int index = 0;
unsigned int delay_hi_us; unsigned int delay_hi_us;
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info,
policy->cpu);
struct policy_dbs_info *policy_dbs = policy->governor_data; struct policy_dbs_info *policy_dbs = policy->governor_data;
struct od_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);
struct dbs_data *dbs_data = policy_dbs->dbs_data; struct dbs_data *dbs_data = policy_dbs->dbs_data;
struct od_dbs_tuners *od_tuners = dbs_data->tuners; struct od_dbs_tuners *od_tuners = dbs_data->tuners;
...@@ -114,10 +114,9 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy, ...@@ -114,10 +114,9 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy,
static void ondemand_powersave_bias_init(struct cpufreq_policy *policy) static void ondemand_powersave_bias_init(struct cpufreq_policy *policy)
{ {
unsigned int cpu = policy->cpu; struct od_policy_dbs_info *dbs_info = to_dbs_info(policy->governor_data);
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, cpu);
dbs_info->freq_table = cpufreq_frequency_get_table(cpu); dbs_info->freq_table = cpufreq_frequency_get_table(policy->cpu);
dbs_info->freq_lo = 0; dbs_info->freq_lo = 0;
} }
...@@ -144,8 +143,8 @@ static void dbs_freq_increase(struct cpufreq_policy *policy, unsigned int freq) ...@@ -144,8 +143,8 @@ static void dbs_freq_increase(struct cpufreq_policy *policy, unsigned int freq)
*/ */
static void od_update(struct cpufreq_policy *policy) static void od_update(struct cpufreq_policy *policy)
{ {
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, policy->cpu); struct policy_dbs_info *policy_dbs = policy->governor_data;
struct policy_dbs_info *policy_dbs = dbs_info->cdbs.policy_dbs; struct od_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);
struct dbs_data *dbs_data = policy_dbs->dbs_data; struct dbs_data *dbs_data = policy_dbs->dbs_data;
struct od_dbs_tuners *od_tuners = dbs_data->tuners; struct od_dbs_tuners *od_tuners = dbs_data->tuners;
unsigned int load = dbs_update(policy); unsigned int load = dbs_update(policy);
...@@ -182,7 +181,7 @@ static unsigned int od_dbs_timer(struct cpufreq_policy *policy) ...@@ -182,7 +181,7 @@ static unsigned int od_dbs_timer(struct cpufreq_policy *policy)
{ {
struct policy_dbs_info *policy_dbs = policy->governor_data; struct policy_dbs_info *policy_dbs = policy->governor_data;
struct dbs_data *dbs_data = policy_dbs->dbs_data; struct dbs_data *dbs_data = policy_dbs->dbs_data;
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, policy->cpu); struct od_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);
int sample_type = dbs_info->sample_type; int sample_type = dbs_info->sample_type;
/* Common NORMAL_SAMPLE setup */ /* Common NORMAL_SAMPLE setup */
...@@ -347,6 +346,19 @@ static struct attribute *od_attributes[] = { ...@@ -347,6 +346,19 @@ static struct attribute *od_attributes[] = {
/************************** sysfs end ************************/ /************************** sysfs end ************************/
static struct policy_dbs_info *od_alloc(void)
{
struct od_policy_dbs_info *dbs_info;
dbs_info = kzalloc(sizeof(*dbs_info), GFP_KERNEL);
return dbs_info ? &dbs_info->policy_dbs : NULL;
}
static void od_free(struct policy_dbs_info *policy_dbs)
{
kfree(to_dbs_info(policy_dbs));
}
static int od_init(struct dbs_data *dbs_data, bool notify) static int od_init(struct dbs_data *dbs_data, bool notify)
{ {
struct od_dbs_tuners *tuners; struct od_dbs_tuners *tuners;
...@@ -395,7 +407,7 @@ static void od_exit(struct dbs_data *dbs_data, bool notify) ...@@ -395,7 +407,7 @@ static void od_exit(struct dbs_data *dbs_data, bool notify)
static void od_start(struct cpufreq_policy *policy) static void od_start(struct cpufreq_policy *policy)
{ {
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, policy->cpu); struct od_policy_dbs_info *dbs_info = to_dbs_info(policy->governor_data);
dbs_info->sample_type = OD_NORMAL_SAMPLE; dbs_info->sample_type = OD_NORMAL_SAMPLE;
ondemand_powersave_bias_init(policy); ondemand_powersave_bias_init(policy);
...@@ -417,6 +429,8 @@ static struct dbs_governor od_dbs_gov = { ...@@ -417,6 +429,8 @@ static struct dbs_governor od_dbs_gov = {
.kobj_type = { .default_attrs = od_attributes }, .kobj_type = { .default_attrs = od_attributes },
.get_cpu_cdbs = get_cpu_cdbs, .get_cpu_cdbs = get_cpu_cdbs,
.gov_dbs_timer = od_dbs_timer, .gov_dbs_timer = od_dbs_timer,
.alloc = od_alloc,
.free = od_free,
.init = od_init, .init = od_init,
.exit = od_exit, .exit = od_exit,
.start = od_start, .start = od_start,
......
/*
* Header file for CPUFreq ondemand governor and related code.
*
* Copyright (C) 2016, Intel Corporation
* Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include "cpufreq_governor.h"
struct od_policy_dbs_info {
struct policy_dbs_info policy_dbs;
struct cpufreq_frequency_table *freq_table;
unsigned int freq_lo;
unsigned int freq_lo_delay_us;
unsigned int freq_hi_delay_us;
unsigned int sample_type:1;
};
static inline struct od_policy_dbs_info *to_dbs_info(struct policy_dbs_info *policy_dbs)
{
return container_of(policy_dbs, struct od_policy_dbs_info, policy_dbs);
}
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