2014-10-22 07:41:37

by Wang Nan

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

euler inclusion
target: kernel 3.10
category: bugfix
DTS: DTS2014101306477
Bugzilla: 623
directory: upstreamed
archive: https://lkml.org/lkml/2014/10/15/611

----------------------------------------

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

v1 -> v2: minor changes as suggested by Namhyung Kim:

- Doesn't pass @h and @evlist to __write_cpudesc;
- Coding style fix.

Signed-off-by: Wang Nan <[email protected]>
Cc: Namhyung Kim <[email protected]>
---
tools/perf/perf.h | 24 ++++++++++++------------
tools/perf/util/header.c | 27 +++++++++++++++++++++------
2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 32bd102..1a23392 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -6,7 +6,7 @@
#if defined(__i386__)
#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
@@ -15,7 +15,7 @@
#if defined(__x86_64__)
#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
@@ -25,7 +25,7 @@
#include "../../arch/powerpc/include/uapi/asm/unistd.h"
#define rmb() asm volatile ("sync" ::: "memory")
#define cpu_relax() asm volatile ("" ::: "memory");
-#define CPUINFO_PROC "cpu"
+#define CPUINFO_PROC {"cpu"}
#endif

#ifdef __s390__
@@ -40,31 +40,31 @@
# define rmb() asm volatile("" ::: "memory")
#endif
#define cpu_relax() asm volatile("" ::: "memory")
-#define CPUINFO_PROC "cpu type"
+#define CPUINFO_PROC {"cpu type"}
#endif

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

#ifdef __sparc__
#define rmb() asm volatile("":::"memory")
#define cpu_relax() asm volatile("":::"memory")
-#define CPUINFO_PROC "cpu"
+#define CPUINFO_PROC {"cpu"}
#endif

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

#ifdef __ia64__
#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__
@@ -74,7 +74,7 @@
*/
#define rmb() ((void(*)(void))0xffff0fa0)()
#define cpu_relax() asm volatile("":::"memory")
-#define CPUINFO_PROC "Processor"
+#define CPUINFO_PROC {"model name", "Processor"}
#endif

#ifdef __aarch64__
@@ -91,19 +91,19 @@
: /* no input */ \
: "memory")
#define cpu_relax() asm volatile("" ::: "memory")
-#define CPUINFO_PROC "cpu model"
+#define CPUINFO_PROC {"cpu model"}
#endif

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

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

#include <time.h>
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index b59350f..d48f571 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -550,16 +550,12 @@ 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, 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;

@@ -611,6 +607,25 @@ 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, 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 08:02:51

by Wang Nan

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

On 2014/10/22 15:39, Wang Nan wrote:
> euler inclusion
> target: kernel 3.10
> category: bugfix
> DTS: DTS2014101306477
> Bugzilla: 623
> directory: upstreamed
> archive: https://lkml.org/lkml/2014/10/15/611
>
> ----------------------------------------
>

Sorry, the header is for our internal use only.

Please ignore it and see

https://lkml.org/lkml/2014/10/22/85

Thanks.

> After kernel 3.7 (commit b4b8f770eb10a1bccaf8aa0ec1956e2dd7ed1e0a),
> /proc/cpuinfo replaces 'Processor' to 'model name'. This patch makes
> CPUINFO_PROC to an array and provides two choices for ARM, makes it
> compatible for different kernel version.
>
> v1 -> v2: minor changes as suggested by Namhyung Kim:
>
> - Doesn't pass @h and @evlist to __write_cpudesc;
> - Coding style fix.
>
> Signed-off-by: Wang Nan <[email protected]>
> Cc: Namhyung Kim <[email protected]>