From: Kan Liang <[email protected]> Get cpu max frequency from the first online cpu, and save the MHz value in perf.data header.
Signed-off-by: Kan Liang <[email protected]> --- tools/perf/util/cpumap.c | 32 ++++++++++++++++++++++++++++++++ tools/perf/util/cpumap.h | 1 + tools/perf/util/header.c | 35 +++++++++++++++++++++++++++++++++++ tools/perf/util/header.h | 2 ++ 4 files changed, 70 insertions(+) diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index 3667e21..548ef13 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -499,3 +499,35 @@ int cpu__setup_cpunode_map(void) closedir(dir1); return 0; } + +unsigned int get_cpu_max_freq(void) +{ + const char *mnt; + char path[PATH_MAX], tmp; + FILE *fp; + unsigned int freq; + int cpu = 0; + int ret; + + mnt = sysfs__mountpoint(); + if (!mnt) + return 0; + + snprintf(path, PATH_MAX, "%s/devices/system/cpu/online", mnt); + fp = fopen(path, "r"); + if (fp) { + ret = fscanf(fp, "%u%c", &cpu, &tmp); + fclose(fp); + if (ret < 1) + return 0; + } + + snprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", mnt, cpu); + fp = fopen(path, "r"); + if (!fp) + return 0; + ret = fscanf(fp, "%u", &freq); + fclose(fp); + + return (ret == 1) ? freq : 0; +} diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index 0af9cec..6784677 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -58,6 +58,7 @@ int max_node_num; int *cpunode_map; int cpu__setup_cpunode_map(void); +unsigned int get_cpu_max_freq(void); static inline int cpu__max_node(void) { diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 03ace57..287a488 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -862,6 +862,16 @@ write_it: return do_write_string(fd, buffer); } +static int write_cpu_max_freq(int fd, struct perf_header *h __maybe_unused, + struct perf_evlist *evlist __maybe_unused) +{ + u32 freq; + + freq = get_cpu_max_freq() / 1000; + + return do_write(fd, &freq, sizeof(freq)); +} + static int write_branch_stack(int fd __maybe_unused, struct perf_header *h __maybe_unused, struct perf_evlist *evlist __maybe_unused) @@ -1158,6 +1168,11 @@ static void print_cpuid(struct perf_header *ph, int fd __maybe_unused, FILE *fp) fprintf(fp, "# cpuid : %s\n", ph->env.cpuid); } +static void print_cpu_max_freq(struct perf_header *ph, int fd __maybe_unused, FILE *fp) +{ + fprintf(fp, "# CPU max frequency : %u MHz\n", ph->env.cpu_max_freq); +} + static void print_branch_stack(struct perf_header *ph __maybe_unused, int fd __maybe_unused, FILE *fp) { @@ -1471,6 +1486,25 @@ static int process_cpuid(struct perf_file_section *section __maybe_unused, return ph->env.cpuid ? 0 : -ENOMEM; } +static int process_cpu_max_freq(struct perf_file_section *section __maybe_unused, + struct perf_header *ph, int fd, + void *data __maybe_unused) +{ + ssize_t ret; + u32 nr; + + ret = readn(fd, &nr, sizeof(nr)); + if (ret != sizeof(nr)) + return -1; + + if (ph->needs_swap) + nr = bswap_32(nr); + + ph->env.cpu_max_freq = nr; + + return 0; +} + static int process_total_mem(struct perf_file_section *section __maybe_unused, struct perf_header *ph, int fd, void *data __maybe_unused) @@ -1885,6 +1919,7 @@ static const struct feature_ops feat_ops[HEADER_LAST_FEATURE] = { FEAT_OPP(HEADER_NRCPUS, nrcpus), FEAT_OPP(HEADER_CPUDESC, cpudesc), FEAT_OPP(HEADER_CPUID, cpuid), + FEAT_OPP(HEADER_CPU_MAX_FREQ, cpu_max_freq), FEAT_OPP(HEADER_TOTAL_MEM, total_mem), FEAT_OPP(HEADER_EVENT_DESC, event_desc), FEAT_OPP(HEADER_CMDLINE, cmdline), diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index d4d5796..a646025 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -22,6 +22,7 @@ enum { HEADER_NRCPUS, HEADER_CPUDESC, HEADER_CPUID, + HEADER_CPU_MAX_FREQ, HEADER_TOTAL_MEM, HEADER_CMDLINE, HEADER_EVENT_DESC, @@ -75,6 +76,7 @@ struct perf_session_env { int nr_cpus_avail; char *cpu_desc; char *cpuid; + int cpu_max_freq; unsigned long long total_mem; int nr_cmdline; -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
