On Tue, Apr 6, 2010 at 10:48 AM, Daniel Walker <dwalker@xxxxxxxxxx> wrote: > On Mon, 2010-04-05 at 12:33 -0700, Mike Chan wrote: >> New file: cpuacct.cpufreq when CONFIG_CPU_FREQ_STATS is enabled. >> >> cpuacct.cpufreq accounts for cpu time per-cpu frequency, time is exported >> in nano-seconds >> >> We do not know the cpufreq table size at compile time. >> So a new config option CONFIG_CPUACCT_CPUFREQ_TABLE_MAX is intruduced, >> to determine the cpufreq table per-cpu in the cpuacct struct. >> >> Signed-off-by: Mike Chan <mike@xxxxxxxxxxx> >> --- >> init/Kconfig | 5 +++ >> kernel/sched.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 104 insertions(+), 0 deletions(-) >> >> diff --git a/init/Kconfig b/init/Kconfig >> index eb77e8c..e1e86df 100644 >> --- a/init/Kconfig >> +++ b/init/Kconfig >> @@ -534,6 +534,11 @@ config CGROUP_CPUACCT >> Provides a simple Resource Controller for monitoring the >> total CPU consumed by the tasks in a cgroup. >> >> +config CPUACCT_CPUFREQ_TABLE_MAX >> + int "Max CPUFREQ table size" >> + depends on CGROUP_CPUACCT && CPU_FREQ_TABLE >> + default 32 >> + > > I'd say make it just a regular define unless you can think of a reason > why a non-developer would want to touch this value. I originally thought about doing this, but my concern here is for future (or existing) cpu's that have more than 32 speed stepping. This will have to be updated as new cpu's are supported in mainline (if they exceed the max). Which might be acceptable or not. Ideally it would be nice to be able to pull the table size from the board-file, or determine the size at run-time instead of compile time. -- Mike > >> config RESOURCE_COUNTERS >> bool "Resource counters" >> help >> diff --git a/kernel/sched.c b/kernel/sched.c >> index 528a105..a0b56b5 100644 >> --- a/kernel/sched.c >> +++ b/kernel/sched.c >> @@ -71,6 +71,7 @@ >> #include <linux/debugfs.h> >> #include <linux/ctype.h> >> #include <linux/ftrace.h> >> +#include <linux/cpufreq.h> >> >> #include <asm/tlb.h> >> #include <asm/irq_regs.h> >> @@ -8817,6 +8818,11 @@ struct cgroup_subsys cpu_cgroup_subsys = { >> * (balbir@xxxxxxxxxx). >> */ >> >> +#ifdef CONFIG_CPU_FREQ_STAT >> +/* The alloc_percpu macro uses typeof so we must define a type here. */ >> +typedef struct { u64 usage[CONFIG_CPUACCT_CPUFREQ_TABLE_MAX]; } cpufreq_usage_t; >> +#endif > > you should be able to send it a regular struct . I found this usage, > > lport->dev_stats = alloc_percpu(struct fcoe_dev_stats); > > as an example. > True, I shouldn't need the typedef. Actually I think I can get away with getting rid of this statement all together and just define an anonymous struct in the alloc_percpu function. ca->cpufreq_usage = alloc_percpu(struct { u64 usage[CONFIG_CPUACCT_CPUFREQ_TABLE_MAX]; }); > Daniel > > -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html