2014-10-16 03:10:19

by Wang Nan

Subject: [PATCH] perf tools: makes CPUINFO_PROC to array for different kernel version

After kerne 3.7 (commit b4b8f770eb10a1bccaf8aa0ec1956e2dd7ed1e0a),
/proc/cpuinfo replcae 'Processor' to 'model name'. This patch makes
CPUINFO_PROC to an array and provides two choices for ARM, make it
compatible for different kernel version.

Signed-off-by: Wang Nan <[email protected]>
---
tools/perf/perf-sys.h | 30 +++++++++++++++---------------
tools/perf/util/header.c | 26 ++++++++++++++++++++------
2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h
index 937e432..a3b13d7 100644
--- a/tools/perf/perf-sys.h
+++ b/tools/perf/perf-sys.h
@@ -13,7 +13,7 @@
#define wmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
#define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
-#define CPUINFO_PROC "model name"
+#define CPUINFO_PROC {"model name"}
#ifndef __NR_perf_event_open
# define __NR_perf_event_open 336
#endif
@@ -30,7 +30,7 @@
#define wmb() asm volatile("sfence" ::: "memory")
#define rmb() asm volatile("lfence" ::: "memory")
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
-#define CPUINFO_PROC "model name"
+#define CPUINFO_PROC {"model name"}
#ifndef __NR_perf_event_open
# define __NR_perf_event_open 298
#endif
@@ -47,14 +47,14 @@
#define mb() asm volatile ("sync" ::: "memory")
#define wmb() asm volatile ("sync" ::: "memory")
#define rmb() asm volatile ("sync" ::: "memory")
-#define CPUINFO_PROC "cpu"
+#define CPUINFO_PROC {"cpu"}
#endif

#ifdef __s390__
#define mb() asm volatile("bcr 15,0" ::: "memory")
#define wmb() asm volatile("bcr 15,0" ::: "memory")
#define rmb() asm volatile("bcr 15,0" ::: "memory")
-#define CPUINFO_PROC "vendor_id"
+#define CPUINFO_PROC {"vendor_id"}
#endif

#ifdef __sh__
@@ -67,14 +67,14 @@
# define wmb() asm volatile("" ::: "memory")
# define rmb() asm volatile("" ::: "memory")
#endif
-#define CPUINFO_PROC "cpu type"
+#define CPUINFO_PROC {"cpu type"}
#endif

#ifdef __hppa__
#define mb() asm volatile("" ::: "memory")
#define wmb() asm volatile("" ::: "memory")
#define rmb() asm volatile("" ::: "memory")
-#define CPUINFO_PROC "cpu"
+#define CPUINFO_PROC {"cpu"}
#endif

#ifdef __sparc__
@@ -87,14 +87,14 @@
#endif
#define wmb() asm volatile("":::"memory")
#define rmb() asm volatile("":::"memory")
-#define CPUINFO_PROC "cpu"
+#define CPUINFO_PROC {"cpu"}
#endif

#ifdef __alpha__
#define mb() asm volatile("mb" ::: "memory")
#define wmb() asm volatile("wmb" ::: "memory")
#define rmb() asm volatile("mb" ::: "memory")
-#define CPUINFO_PROC "cpu model"
+#define CPUINFO_PROC {"cpu model"}
#endif

#ifdef __ia64__
@@ -102,7 +102,7 @@
#define wmb() asm volatile ("mf" ::: "memory")
#define rmb() asm volatile ("mf" ::: "memory")
#define cpu_relax() asm volatile ("hint @pause" ::: "memory")
-#define CPUINFO_PROC "model name"
+#define CPUINFO_PROC {"model name"}
#endif

#ifdef __arm__
@@ -113,7 +113,7 @@
#define mb() ((void(*)(void))0xffff0fa0)()
#define wmb() ((void(*)(void))0xffff0fa0)()
#define rmb() ((void(*)(void))0xffff0fa0)()
-#define CPUINFO_PROC "Processor"
+#define CPUINFO_PROC {"model name", "Processor"}
#endif

#ifdef __aarch64__
@@ -133,28 +133,28 @@
: "memory")
#define wmb() mb()
#define rmb() mb()
-#define CPUINFO_PROC "cpu model"
+#define CPUINFO_PROC {"cpu model"}
#endif

#ifdef __arc__
#define mb() asm volatile("" ::: "memory")
#define wmb() asm volatile("" ::: "memory")
#define rmb() asm volatile("" ::: "memory")
-#define CPUINFO_PROC "Processor"
+#define CPUINFO_PROC {"Processor"}
#endif

#ifdef __metag__
#define mb() asm volatile("" ::: "memory")
#define wmb() asm volatile("" ::: "memory")
#define rmb() asm volatile("" ::: "memory")
-#define CPUINFO_PROC "CPU"
+#define CPUINFO_PROC {"CPU"}
#endif

#ifdef __xtensa__
#define mb() asm volatile("memw" ::: "memory")
#define wmb() asm volatile("memw" ::: "memory")
#define rmb() asm volatile("" ::: "memory")
-#define CPUINFO_PROC "core ID"
+#define CPUINFO_PROC {"core ID"}
#endif

#ifdef __tile__
@@ -162,7 +162,7 @@
#define wmb() asm volatile ("mf" ::: "memory")
#define rmb() asm volatile ("mf" ::: "memory")
#define cpu_relax() asm volatile ("mfspr zero, PASS" ::: "memory")
-#define CPUINFO_PROC "model name"
+#define CPUINFO_PROC {"model name"}
#endif

#define barrier() asm volatile ("" ::: "memory")
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 39b80ac..e23cd45 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -579,16 +579,13 @@ static int write_version(int fd, struct perf_header *h __maybe_unused,
return do_write_string(fd, perf_version_string);
}

-static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
- struct perf_evlist *evlist __maybe_unused)
+static int __write_cpudesc(int fd, struct perf_header *h __maybe_unused,
+ struct perf_evlist *evlist __maybe_unused, const char *cpuinfo_proc)
{
-#ifndef CPUINFO_PROC
-#define CPUINFO_PROC NULL
-#endif
FILE *file;
char *buf = NULL;
char *s, *p;
- const char *search = CPUINFO_PROC;
+ const char *search = cpuinfo_proc;
size_t len = 0;
int ret = -1;

@@ -640,6 +637,23 @@ done:
return ret;
}

+static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
+ struct perf_evlist *evlist __maybe_unused)
+{
+#ifndef CPUINFO_PROC
+#define CPUINFO_PROC {"model name", }
+#endif
+ const char *cpuinfo_procs[] = CPUINFO_PROC;
+ unsigned int i;
+ for (i = 0; i < ARRAY_SIZE(cpuinfo_procs); i++) {
+ int ret;
+ ret = __write_cpudesc(fd, h, evlist, cpuinfo_procs[i]);
+ if (ret >= 0)
+ return ret;
+ }
+ return -1;
+}
+
static int write_nrcpus(int fd, struct perf_header *h __maybe_unused,
struct perf_evlist *evlist __maybe_unused)
{
--
1.8.4

2014-10-22 06:44:21

by Namhyung Kim

Subject: Re: [PATCH] perf tools: makes CPUINFO_PROC to array for different kernel version

Hi Wang,

On Thu, 16 Oct 2014 11:08:43 +0800, Wang Nan wrote:
> After kerne 3.7 (commit b4b8f770eb10a1bccaf8aa0ec1956e2dd7ed1e0a),
> /proc/cpuinfo replcae 'Processor' to 'model name'. This patch makes
> CPUINFO_PROC to an array and provides two choices for ARM, make it
> compatible for different kernel version.
>
> Signed-off-by: Wang Nan <[email protected]>
> -static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
> - struct perf_evlist *evlist __maybe_unused)
> +static int __write_cpudesc(int fd, struct perf_header *h __maybe_unused,
> + struct perf_evlist *evlist __maybe_unused, const char *cpuinfo_proc)

You don't need to pass @h and @evlist if they're not used.


> {
> -#ifndef CPUINFO_PROC
> -#define CPUINFO_PROC NULL
> -#endif
> FILE *file;
> char *buf = NULL;
> char *s, *p;
> - const char *search = CPUINFO_PROC;
> + const char *search = cpuinfo_proc;
> size_t len = 0;
> int ret = -1;
>
> @@ -640,6 +637,23 @@ done:
> return ret;
> }
>
> +static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
> + struct perf_evlist *evlist __maybe_unused)
> +{
> +#ifndef CPUINFO_PROC
> +#define CPUINFO_PROC {"model name", }
> +#endif
> + const char *cpuinfo_procs[] = CPUINFO_PROC;
> + unsigned int i;

Please put a blank line between declaration and the function body.

Other than that, looks good to me.

Thanks,
Namhyung


> + for (i = 0; i < ARRAY_SIZE(cpuinfo_procs); i++) {
> + int ret;
> + ret = __write_cpudesc(fd, h, evlist, cpuinfo_procs[i]);
> + if (ret >= 0)
> + return ret;
> + }
> + return -1;
> +}
> +
> static int write_nrcpus(int fd, struct perf_header *h __maybe_unused,
> struct perf_evlist *evlist __maybe_unused)
> {

2014-10-22 07:49:49

by Wang Nan

Subject: Re: [PATCH] perf tools: makes CPUINFO_PROC to array for different kernel version

On 2014/10/22 14:44, Namhyung Kim wrote:
> Hi Wang,
>
> On Thu, 16 Oct 2014 11:08:43 +0800, Wang Nan wrote:
>> After kerne 3.7 (commit b4b8f770eb10a1bccaf8aa0ec1956e2dd7ed1e0a),
>> /proc/cpuinfo replcae 'Processor' to 'model name'. This patch makes
>> CPUINFO_PROC to an array and provides two choices for ARM, make it
>> compatible for different kernel version.
>>
>> Signed-off-by: Wang Nan <[email protected]>
>> -static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
>> - struct perf_evlist *evlist __maybe_unused)
>> +static int __write_cpudesc(int fd, struct perf_header *h __maybe_unused,
>> + struct perf_evlist *evlist __maybe_unused, const char *cpuinfo_proc)
>
> You don't need to pass @h and @evlist if they're not used.
>
>
>> {
>> -#ifndef CPUINFO_PROC
>> -#define CPUINFO_PROC NULL
>> -#endif
>> FILE *file;
>> char *buf = NULL;
>> char *s, *p;
>> - const char *search = CPUINFO_PROC;
>> + const char *search = cpuinfo_proc;
>> size_t len = 0;
>> int ret = -1;
>>
>> @@ -640,6 +637,23 @@ done:
>> return ret;
>> }
>>
>> +static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
>> + struct perf_evlist *evlist __maybe_unused)
>> +{
>> +#ifndef CPUINFO_PROC
>> +#define CPUINFO_PROC {"model name", }
>> +#endif
>> + const char *cpuinfo_procs[] = CPUINFO_PROC;
>> + unsigned int i;
>
> Please put a blank line between declaration and the function body.
>
> Other than that, looks good to me.
>
> Thanks,
> Namhyung
>

I posted a v2 patch, please refer to https://lkml.org/lkml/2014/10/22/85 .

Thanks.

>
>> + for (i = 0; i < ARRAY_SIZE(cpuinfo_procs); i++) {
>> + int ret;
>> + ret = __write_cpudesc(fd, h, evlist, cpuinfo_procs[i]);
>> + if (ret >= 0)
>> + return ret;
>> + }
>> + return -1;
>> +}
>> +
>> static int write_nrcpus(int fd, struct perf_header *h __maybe_unused,
>> struct perf_evlist *evlist __maybe_unused)
>> {