mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 20:32:22 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
386 lines
9.5 KiB
C
386 lines
9.5 KiB
C
/*
|
|
* drivers/cpufreq/cpufreq_stats.c
|
|
*
|
|
* Copyright (C) 2003-2004 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>.
|
|
* (C) 2004 Zou Nan hai <nanhai.zou@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 <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sysdev.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/cpufreq.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/kobject.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/notifier.h>
|
|
#include <asm/cputime.h>
|
|
|
|
static spinlock_t cpufreq_stats_lock;
|
|
|
|
#define CPUFREQ_STATDEVICE_ATTR(_name, _mode, _show) \
|
|
static struct freq_attr _attr_##_name = {\
|
|
.attr = {.name = __stringify(_name), .mode = _mode, }, \
|
|
.show = _show,\
|
|
};
|
|
|
|
struct cpufreq_stats {
|
|
unsigned int cpu;
|
|
unsigned int total_trans;
|
|
unsigned long long last_time;
|
|
unsigned int max_state;
|
|
unsigned int state_num;
|
|
unsigned int last_index;
|
|
cputime64_t *time_in_state;
|
|
unsigned int *freq_table;
|
|
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS
|
|
unsigned int *trans_table;
|
|
#endif
|
|
};
|
|
|
|
static DEFINE_PER_CPU(struct cpufreq_stats *, cpufreq_stats_table);
|
|
|
|
struct cpufreq_stats_attribute {
|
|
struct attribute attr;
|
|
ssize_t(*show) (struct cpufreq_stats *, char *);
|
|
};
|
|
|
|
static int cpufreq_stats_update(unsigned int cpu)
|
|
{
|
|
struct cpufreq_stats *stat;
|
|
unsigned long long cur_time;
|
|
|
|
cur_time = get_jiffies_64();
|
|
spin_lock(&cpufreq_stats_lock);
|
|
stat = per_cpu(cpufreq_stats_table, cpu);
|
|
if (stat->time_in_state)
|
|
stat->time_in_state[stat->last_index] =
|
|
cputime64_add(stat->time_in_state[stat->last_index],
|
|
cputime_sub(cur_time, stat->last_time));
|
|
stat->last_time = cur_time;
|
|
spin_unlock(&cpufreq_stats_lock);
|
|
return 0;
|
|
}
|
|
|
|
static ssize_t show_total_trans(struct cpufreq_policy *policy, char *buf)
|
|
{
|
|
struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu);
|
|
if (!stat)
|
|
return 0;
|
|
return sprintf(buf, "%d\n",
|
|
per_cpu(cpufreq_stats_table, stat->cpu)->total_trans);
|
|
}
|
|
|
|
static ssize_t show_time_in_state(struct cpufreq_policy *policy, char *buf)
|
|
{
|
|
ssize_t len = 0;
|
|
int i;
|
|
struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu);
|
|
if (!stat)
|
|
return 0;
|
|
cpufreq_stats_update(stat->cpu);
|
|
for (i = 0; i < stat->state_num; i++) {
|
|
len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i],
|
|
(unsigned long long)
|
|
cputime64_to_clock_t(stat->time_in_state[i]));
|
|
}
|
|
return len;
|
|
}
|
|
|
|
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS
|
|
static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
|
|
{
|
|
ssize_t len = 0;
|
|
int i, j;
|
|
|
|
struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu);
|
|
if (!stat)
|
|
return 0;
|
|
cpufreq_stats_update(stat->cpu);
|
|
len += snprintf(buf + len, PAGE_SIZE - len, " From : To\n");
|
|
len += snprintf(buf + len, PAGE_SIZE - len, " : ");
|
|
for (i = 0; i < stat->state_num; i++) {
|
|
if (len >= PAGE_SIZE)
|
|
break;
|
|
len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
|
|
stat->freq_table[i]);
|
|
}
|
|
if (len >= PAGE_SIZE)
|
|
return PAGE_SIZE;
|
|
|
|
len += snprintf(buf + len, PAGE_SIZE - len, "\n");
|
|
|
|
for (i = 0; i < stat->state_num; i++) {
|
|
if (len >= PAGE_SIZE)
|
|
break;
|
|
|
|
len += snprintf(buf + len, PAGE_SIZE - len, "%9u: ",
|
|
stat->freq_table[i]);
|
|
|
|
for (j = 0; j < stat->state_num; j++) {
|
|
if (len >= PAGE_SIZE)
|
|
break;
|
|
len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
|
|
stat->trans_table[i*stat->max_state+j]);
|
|
}
|
|
if (len >= PAGE_SIZE)
|
|
break;
|
|
len += snprintf(buf + len, PAGE_SIZE - len, "\n");
|
|
}
|
|
if (len >= PAGE_SIZE)
|
|
return PAGE_SIZE;
|
|
return len;
|
|
}
|
|
CPUFREQ_STATDEVICE_ATTR(trans_table, 0444, show_trans_table);
|
|
#endif
|
|
|
|
CPUFREQ_STATDEVICE_ATTR(total_trans, 0444, show_total_trans);
|
|
CPUFREQ_STATDEVICE_ATTR(time_in_state, 0444, show_time_in_state);
|
|
|
|
static struct attribute *default_attrs[] = {
|
|
&_attr_total_trans.attr,
|
|
&_attr_time_in_state.attr,
|
|
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS
|
|
&_attr_trans_table.attr,
|
|
#endif
|
|
NULL
|
|
};
|
|
static struct attribute_group stats_attr_group = {
|
|
.attrs = default_attrs,
|
|
.name = "stats"
|
|
};
|
|
|
|
static int freq_table_get_index(struct cpufreq_stats *stat, unsigned int freq)
|
|
{
|
|
int index;
|
|
for (index = 0; index < stat->max_state; index++)
|
|
if (stat->freq_table[index] == freq)
|
|
return index;
|
|
return -1;
|
|
}
|
|
|
|
static void cpufreq_stats_free_table(unsigned int cpu)
|
|
{
|
|
struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, cpu);
|
|
struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
|
|
if (policy && policy->cpu == cpu)
|
|
sysfs_remove_group(&policy->kobj, &stats_attr_group);
|
|
if (stat) {
|
|
kfree(stat->time_in_state);
|
|
kfree(stat);
|
|
}
|
|
per_cpu(cpufreq_stats_table, cpu) = NULL;
|
|
if (policy)
|
|
cpufreq_cpu_put(policy);
|
|
}
|
|
|
|
static int cpufreq_stats_create_table(struct cpufreq_policy *policy,
|
|
struct cpufreq_frequency_table *table)
|
|
{
|
|
unsigned int i, j, count = 0, ret = 0;
|
|
struct cpufreq_stats *stat;
|
|
struct cpufreq_policy *data;
|
|
unsigned int alloc_size;
|
|
unsigned int cpu = policy->cpu;
|
|
if (per_cpu(cpufreq_stats_table, cpu))
|
|
return -EBUSY;
|
|
stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL);
|
|
if ((stat) == NULL)
|
|
return -ENOMEM;
|
|
|
|
data = cpufreq_cpu_get(cpu);
|
|
if (data == NULL) {
|
|
ret = -EINVAL;
|
|
goto error_get_fail;
|
|
}
|
|
|
|
ret = sysfs_create_group(&data->kobj, &stats_attr_group);
|
|
if (ret)
|
|
goto error_out;
|
|
|
|
stat->cpu = cpu;
|
|
per_cpu(cpufreq_stats_table, cpu) = stat;
|
|
|
|
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
|
|
unsigned int freq = table[i].frequency;
|
|
if (freq == CPUFREQ_ENTRY_INVALID)
|
|
continue;
|
|
count++;
|
|
}
|
|
|
|
alloc_size = count * sizeof(int) + count * sizeof(cputime64_t);
|
|
|
|
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS
|
|
alloc_size += count * count * sizeof(int);
|
|
#endif
|
|
stat->max_state = count;
|
|
stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL);
|
|
if (!stat->time_in_state) {
|
|
ret = -ENOMEM;
|
|
goto error_out;
|
|
}
|
|
stat->freq_table = (unsigned int *)(stat->time_in_state + count);
|
|
|
|
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS
|
|
stat->trans_table = stat->freq_table + count;
|
|
#endif
|
|
j = 0;
|
|
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
|
|
unsigned int freq = table[i].frequency;
|
|
if (freq == CPUFREQ_ENTRY_INVALID)
|
|
continue;
|
|
if (freq_table_get_index(stat, freq) == -1)
|
|
stat->freq_table[j++] = freq;
|
|
}
|
|
stat->state_num = j;
|
|
spin_lock(&cpufreq_stats_lock);
|
|
stat->last_time = get_jiffies_64();
|
|
stat->last_index = freq_table_get_index(stat, policy->cur);
|
|
spin_unlock(&cpufreq_stats_lock);
|
|
cpufreq_cpu_put(data);
|
|
return 0;
|
|
error_out:
|
|
cpufreq_cpu_put(data);
|
|
error_get_fail:
|
|
kfree(stat);
|
|
per_cpu(cpufreq_stats_table, cpu) = NULL;
|
|
return ret;
|
|
}
|
|
|
|
static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
|
|
unsigned long val, void *data)
|
|
{
|
|
int ret;
|
|
struct cpufreq_policy *policy = data;
|
|
struct cpufreq_frequency_table *table;
|
|
unsigned int cpu = policy->cpu;
|
|
if (val != CPUFREQ_NOTIFY)
|
|
return 0;
|
|
table = cpufreq_frequency_get_table(cpu);
|
|
if (!table)
|
|
return 0;
|
|
ret = cpufreq_stats_create_table(policy, table);
|
|
if (ret)
|
|
return ret;
|
|
return 0;
|
|
}
|
|
|
|
static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
|
|
unsigned long val, void *data)
|
|
{
|
|
struct cpufreq_freqs *freq = data;
|
|
struct cpufreq_stats *stat;
|
|
int old_index, new_index;
|
|
|
|
if (val != CPUFREQ_POSTCHANGE)
|
|
return 0;
|
|
|
|
stat = per_cpu(cpufreq_stats_table, freq->cpu);
|
|
if (!stat)
|
|
return 0;
|
|
|
|
old_index = stat->last_index;
|
|
new_index = freq_table_get_index(stat, freq->new);
|
|
|
|
cpufreq_stats_update(freq->cpu);
|
|
if (old_index == new_index)
|
|
return 0;
|
|
|
|
if (old_index == -1 || new_index == -1)
|
|
return 0;
|
|
|
|
spin_lock(&cpufreq_stats_lock);
|
|
stat->last_index = new_index;
|
|
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS
|
|
stat->trans_table[old_index * stat->max_state + new_index]++;
|
|
#endif
|
|
stat->total_trans++;
|
|
spin_unlock(&cpufreq_stats_lock);
|
|
return 0;
|
|
}
|
|
|
|
static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
|
|
unsigned long action,
|
|
void *hcpu)
|
|
{
|
|
unsigned int cpu = (unsigned long)hcpu;
|
|
|
|
switch (action) {
|
|
case CPU_ONLINE:
|
|
case CPU_ONLINE_FROZEN:
|
|
cpufreq_update_policy(cpu);
|
|
break;
|
|
case CPU_DEAD:
|
|
case CPU_DEAD_FROZEN:
|
|
cpufreq_stats_free_table(cpu);
|
|
break;
|
|
}
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
static struct notifier_block cpufreq_stat_cpu_notifier __refdata =
|
|
{
|
|
.notifier_call = cpufreq_stat_cpu_callback,
|
|
};
|
|
|
|
static struct notifier_block notifier_policy_block = {
|
|
.notifier_call = cpufreq_stat_notifier_policy
|
|
};
|
|
|
|
static struct notifier_block notifier_trans_block = {
|
|
.notifier_call = cpufreq_stat_notifier_trans
|
|
};
|
|
|
|
static int __init cpufreq_stats_init(void)
|
|
{
|
|
int ret;
|
|
unsigned int cpu;
|
|
|
|
spin_lock_init(&cpufreq_stats_lock);
|
|
ret = cpufreq_register_notifier(¬ifier_policy_block,
|
|
CPUFREQ_POLICY_NOTIFIER);
|
|
if (ret)
|
|
return ret;
|
|
|
|
ret = cpufreq_register_notifier(¬ifier_trans_block,
|
|
CPUFREQ_TRANSITION_NOTIFIER);
|
|
if (ret) {
|
|
cpufreq_unregister_notifier(¬ifier_policy_block,
|
|
CPUFREQ_POLICY_NOTIFIER);
|
|
return ret;
|
|
}
|
|
|
|
register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
|
|
for_each_online_cpu(cpu) {
|
|
cpufreq_update_policy(cpu);
|
|
}
|
|
return 0;
|
|
}
|
|
static void __exit cpufreq_stats_exit(void)
|
|
{
|
|
unsigned int cpu;
|
|
|
|
cpufreq_unregister_notifier(¬ifier_policy_block,
|
|
CPUFREQ_POLICY_NOTIFIER);
|
|
cpufreq_unregister_notifier(¬ifier_trans_block,
|
|
CPUFREQ_TRANSITION_NOTIFIER);
|
|
unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
|
|
for_each_online_cpu(cpu) {
|
|
cpufreq_stats_free_table(cpu);
|
|
}
|
|
}
|
|
|
|
MODULE_AUTHOR("Zou Nan hai <nanhai.zou@intel.com>");
|
|
MODULE_DESCRIPTION("'cpufreq_stats' - A driver to export cpufreq stats "
|
|
"through sysfs filesystem");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
module_init(cpufreq_stats_init);
|
|
module_exit(cpufreq_stats_exit);
|