[PATCH] perf trace: Check if MAP_32BIT is defined (again)

[PATCH] perf trace: Check if MAP_32BIT is defined (again)

[Jiri Olsa]

There might be systems where MAP_32BIT is not defined,
like some some RHEL7 powerpc versions.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Kyle McMartin <kyle@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Fixes: 277cf08f3feb ("perf trace beauty mmap: Fix defines for non !x86_64")
Link: http://lkml.kernel.org/n/tip-qp5uczb0ln480l47xbv406cw@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/trace/beauty/mmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c
index fd710ab33684..af1cfde6b97b 100644
--- a/tools/perf/trace/beauty/mmap.c
+++ b/tools/perf/trace/beauty/mmap.c
@@ -42,7 +42,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
 
 	P_MMAP_FLAG(SHARED);
 	P_MMAP_FLAG(PRIVATE);
+#ifdef MAP_32BIT
 	P_MMAP_FLAG(32BIT);
+#endif
 	P_MMAP_FLAG(ANONYMOUS);
 	P_MMAP_FLAG(DENYWRITE);
 	P_MMAP_FLAG(EXECUTABLE);
-- 
2.7.4

Re: [PATCH] perf trace: Check if MAP_32BIT is defined (again)

[Arnaldo Carvalho de Melo]

Em Thu, Dec 15, 2016 at 08:56:54PM +0100, Jiri Olsa escreveu:
> There might be systems where MAP_32BIT is not defined,
> like some some RHEL7 powerpc versions.
> 
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> Cc: Kyle McMartin <kyle@redhat.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Fixes: 277cf08f3feb ("perf trace beauty mmap: Fix defines for non !x86_64")

Ouch, so we need what was removed in:

Fixes: 256763b01741 ("perf trace beauty mmap: Add more conditional defines")

I.e. the ifdef at the switch case entry, not the removal of the
conditional definition expecting that it would be available in the arch
header, as in some cases those are not there. So I'm replacing the Fixme
cset, ok?

Thanks for taking the time to fill in that tag, appreciated!

Also this all needs a revamp to support cross 'perf trace'ing, i.e.
collecting a file on arch A and doing 'perf trace -i perf.data' on a
different machine with a CPU fo a different arch, where either per arch
beautifiers are needed or a dynamic switch, i.e. the value for some
define is different between archs....

Patch applied, thanks,

- Arnaldo


> Link: http://lkml.kernel.org/n/tip-qp5uczb0ln480l47xbv406cw@git.kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/trace/beauty/mmap.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c
> index fd710ab33684..af1cfde6b97b 100644
> --- a/tools/perf/trace/beauty/mmap.c
> +++ b/tools/perf/trace/beauty/mmap.c
> @@ -42,7 +42,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
>  
>  	P_MMAP_FLAG(SHARED);
>  	P_MMAP_FLAG(PRIVATE);
> +#ifdef MAP_32BIT
>  	P_MMAP_FLAG(32BIT);
> +#endif
>  	P_MMAP_FLAG(ANONYMOUS);
>  	P_MMAP_FLAG(DENYWRITE);
>  	P_MMAP_FLAG(EXECUTABLE);
> -- 
> 2.7.4

Re: [PATCH] perf trace: Check if MAP_32BIT is defined (again)

[Jiri Olsa]

On Fri, Dec 16, 2016 at 11:02:47AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Thu, Dec 15, 2016 at 08:56:54PM +0100, Jiri Olsa escreveu:
> > There might be systems where MAP_32BIT is not defined,
> > like some some RHEL7 powerpc versions.
> > 
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > Cc: Kyle McMartin <kyle@redhat.com>
> > Cc: David Ahern <dsahern@gmail.com>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Fixes: 277cf08f3feb ("perf trace beauty mmap: Fix defines for non !x86_64")
> 
> Ouch, so we need what was removed in:
> 
> Fixes: 256763b01741 ("perf trace beauty mmap: Add more conditional defines")
> 
> I.e. the ifdef at the switch case entry, not the removal of the
> conditional definition expecting that it would be available in the arch
> header, as in some cases those are not there. So I'm replacing the Fixme
> cset, ok?

sure, ok

> 
> Thanks for taking the time to fill in that tag, appreciated!
> 
> Also this all needs a revamp to support cross 'perf trace'ing, i.e.
> collecting a file on arch A and doing 'perf trace -i perf.data' on a
> different machine with a CPU fo a different arch, where either per arch
> beautifiers are needed or a dynamic switch, i.e. the value for some
> define is different between archs....
> 
> Patch applied, thanks,

thanks,
jirka

[tip:perf/urgent] perf trace: Check if MAP_32BIT is defined (again)

[tip-bot for Jiri Olsa]

Commit-ID:  2bd42f3aaa53ebe78b9be6f898b7945dd61f9773
Gitweb:     http://git.kernel.org/tip/2bd42f3aaa53ebe78b9be6f898b7945dd61f9773
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Thu, 15 Dec 2016 20:56:54 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 20 Dec 2016 09:37:40 -0300

perf trace: Check if MAP_32BIT is defined (again)

There might be systems where MAP_32BIT is not defined, like some some
RHEL7 powerpc versions.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Kyle McMartin <kyle@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Fixes: 256763b01741 ("perf trace beauty mmap: Add more conditional defines")
Link: http://lkml.kernel.org/r/1481831814-23683-1-git-send-email-jolsa@kernel.org
[ Changed the Fixme cset to the one removing the conditional switch case for MAP_32BIT ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/trace/beauty/mmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c
index fd710ab..af1cfde 100644
--- a/tools/perf/trace/beauty/mmap.c
+++ b/tools/perf/trace/beauty/mmap.c
@@ -42,7 +42,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
 
 	P_MMAP_FLAG(SHARED);
 	P_MMAP_FLAG(PRIVATE);
+#ifdef MAP_32BIT
 	P_MMAP_FLAG(32BIT);
+#endif
 	P_MMAP_FLAG(ANONYMOUS);
 	P_MMAP_FLAG(DENYWRITE);
 	P_MMAP_FLAG(EXECUTABLE);