[GIT PULL 0/3] perf/core improvements and fixes

[GIT PULL 0/3] perf/core improvements and fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (2):
  perf test: Clarify some error reports in the open syscall test
  perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1)

Stephane Eranian (1):
  perf tools: Fix perf_event.h header usage

 tools/perf/builtin-test.c      |  124 +++++++++++++++++++++++++++++++++++++--
 tools/perf/util/evsel.c        |   75 +++++++++++++-----------
 tools/perf/util/evsel.h        |    2 +-
 tools/perf/util/parse-events.h |    2 +-
 4 files changed, 159 insertions(+), 44 deletions(-)

Re: [GIT PULL 0/3] perf/core improvements and fixes

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please consider pulling from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
> 
> Regards,
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (2):
>   perf test: Clarify some error reports in the open syscall test
>   perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1)
> 
> Stephane Eranian (1):
>   perf tools: Fix perf_event.h header usage
> 
>  tools/perf/builtin-test.c      |  124 +++++++++++++++++++++++++++++++++++++--
>  tools/perf/util/evsel.c        |   75 +++++++++++++-----------
>  tools/perf/util/evsel.h        |    2 +-
>  tools/perf/util/parse-events.h |    2 +-
>  4 files changed, 159 insertions(+), 44 deletions(-)

Pulled, thanks a lot Arnaldo!

	Ingo

Re: [GIT PULL 0/3] perf/core improvements and fixes

[Ingo Molnar]

sorry, had to unpull it:

util/evsel.c: In function ‘perf_evsel__open_per_cpu’:
util/evsel.c:137: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
util/evsel.c:158: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
util/evsel.c:141: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
util/evsel.c:142: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
util/evsel.c:185: note: initialized from here
cc1: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
util/evsel.c:185: note: initialized from here
make: *** [util/evsel.o] Error 1
make: *** Waiting for unfinished jobs....

gcc version 4.4.4 20100630 (Red Hat 4.4.4-10) (GCC) 

on a 32-bit Fedora 12 box.

Thanks,

	Ingo

Re: [GIT PULL 0/3] perf/core improvements and fixes

[Arnaldo Carvalho de Melo]

Em Wed, Jan 05, 2011 at 02:14:11PM +0100, Ingo Molnar escreveu:
> 
> sorry, had to unpull it:
> 
> util/evsel.c: In function ‘perf_evsel__open_per_cpu’:
> util/evsel.c:137: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
> util/evsel.c:158: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
> util/evsel.c:141: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
> util/evsel.c:142: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
> util/evsel.c:185: note: initialized from here
> cc1: error: dereferencing pointer ‘map__empty.57’ does break strict-aliasing rules
> util/evsel.c:185: note: initialized from here
> make: *** [util/evsel.o] Error 1
> make: *** Waiting for unfinished jobs....
> 
> gcc version 4.4.4 20100630 (Red Hat 4.4.4-10) (GCC) 
> 
> on a 32-bit Fedora 12 box.

Checking it,

- Arnaldo

[GIT PULL 0/3] perf/core improvements and fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (3):
  perf annotate: Fix --stdio rendering
  perf annotate: Move locking to struct annotation
  perf annotate: Fix annotate context lines regression

 tools/perf/builtin-annotate.c          |   14 ++--
 tools/perf/builtin-report.c            |    5 +-
 tools/perf/builtin-top.c               |   67 ++++++++--------
 tools/perf/util/annotate.c             |  134 +++++++++++++++++++++-----------
 tools/perf/util/annotate.h             |   35 +++++----
 tools/perf/util/hist.c                 |    5 +-
 tools/perf/util/hist.h                 |    3 +-
 tools/perf/util/top.h                  |    6 --
 tools/perf/util/ui/browsers/annotate.c |   18 ++--
 9 files changed, 168 insertions(+), 119 deletions(-)

[GIT PULL 0/3] perf/core improvements and fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (3):
  perf annotate: Fix --stdio rendering
  perf annotate: Move locking to struct annotation
  perf annotate: Fix annotate context lines regression

 tools/perf/builtin-annotate.c          |   14 ++--
 tools/perf/builtin-report.c            |    5 +-
 tools/perf/builtin-top.c               |   67 ++++++++--------
 tools/perf/util/annotate.c             |  134 +++++++++++++++++++++-----------
 tools/perf/util/annotate.h             |   35 +++++----
 tools/perf/util/hist.c                 |    5 +-
 tools/perf/util/hist.h                 |    3 +-
 tools/perf/util/top.h                  |    6 --
 tools/perf/util/ui/browsers/annotate.c |   18 ++--
 9 files changed, 168 insertions(+), 119 deletions(-)

[GIT PULL 0/3] perf/core improvements and fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

	This one has everything in acme/perf/urgent, i.e. starts the next
tools/ devel cycle :-)

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (1):
  perf tools: Fixup exit path when not able to open events

David Ahern (1):
  perf tools: Emit clearer message for sys_perf_event_open ENOENT
    return

Lin Ming (1):
  perf probe: Add fastpath to do lookup by function name

 tools/perf/builtin-record.c    |   19 +++++++---
 tools/perf/builtin-top.c       |   44 ++++++++++++++++--------
 tools/perf/util/debug.c        |   10 +++++
 tools/perf/util/debug.h        |    1 +
 tools/perf/util/probe-finder.c |   72 ++++++++++++++++++++++++++++++++++++++++
 tools/perf/util/probe-finder.h |    2 +
 6 files changed, 128 insertions(+), 20 deletions(-)

Re: [GIT PULL 0/3] perf/core improvements and fixes

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please consider pulling from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
> 
> 	This one has everything in acme/perf/urgent, i.e. starts the next
> tools/ devel cycle :-)
> 
> Regards,
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (1):
>   perf tools: Fixup exit path when not able to open events
> 
> David Ahern (1):
>   perf tools: Emit clearer message for sys_perf_event_open ENOENT
>     return
> 
> Lin Ming (1):
>   perf probe: Add fastpath to do lookup by function name
> 
>  tools/perf/builtin-record.c    |   19 +++++++---
>  tools/perf/builtin-top.c       |   44 ++++++++++++++++--------
>  tools/perf/util/debug.c        |   10 +++++
>  tools/perf/util/debug.h        |    1 +
>  tools/perf/util/probe-finder.c |   72 ++++++++++++++++++++++++++++++++++++++++
>  tools/perf/util/probe-finder.h |    2 +
>  6 files changed, 128 insertions(+), 20 deletions(-)

Pulled, thanks Arnaldo!

Note, i merged these two also into perf/urgent:

  ca6a42586fae: perf tools: Emit clearer message for sys_perf_event_open ENOENT return
  c286c419c784: perf tools: Fixup exit path when not able to open events

as both are simple and fix real bugs.

Thanks,

	Ingo

[GIT PULL 0/3] perf/core improvements and fixes

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acmeinfradead.org>

Hi Ingo,

	Please consider pulling,

- Arnaldo

The following changes since commit 9ec60972a38011ad8a5676f4cd5e51ac508c36b6:

  perf hists: Add missing period_* fields when collapsing a hist entry (2012-09-26 20:44:11 -0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux tags/perf-core-for-mingo

for you to fetch changes up to aec1930b0f6f281a0ca038cd03aceace3fe0bb61:

  perf trace: Add aliases for some syscalls (2012-09-27 13:18:49 -0300)

----------------------------------------------------------------
perf/core improvements and fixes

. Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee.

. Don't stop the build if the audit libraries are not installed, fix from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

----------------------------------------------------------------
Arnaldo Carvalho de Melo (1):
      perf trace: Add aliases for some syscalls

Hyeoncheol Lee (1):
      perf probe: Print an enum type variable in "enum variable-name" format when showing accessible variables

Namhyung Kim (1):
      perf tools: Check libaudit availability for perf-trace builtin

 tools/perf/Makefile                 |   16 ++++++++++++++--
 tools/perf/builtin-trace.c          |   26 ++++++++++++++++++--------
 tools/perf/config/feature-tests.mak |   11 +++++++++++
 tools/perf/perf.c                   |    2 ++
 tools/perf/util/dwarf-aux.c         |    2 ++
 5 files changed, 47 insertions(+), 10 deletions(-)

[PATCH 1/3] perf tools: Check libaudit availability for perf-trace builtin

[Arnaldo Carvalho de Melo]

From: Namhyung Kim <namhyung.kim@lge.com>

The newly added trace command requires an external audit library.

However it can cause a build error because it's not checked whether the
libaudit is installed on system:

    CC builtin-trace.o
  builtin-trace.c:7:22: fatal error: libaudit.h: No such file or directory
  compilation terminated.
  make: *** [builtin-trace.o] Error 1

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1348745018-21744-1-git-send-email-namhyung@kernel.org
[ committer note: Added ", disables 'trace tool' to the feature warning msg ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile                 |   16 ++++++++++++++--
 tools/perf/config/feature-tests.mak |   11 +++++++++++
 tools/perf/perf.c                   |    2 ++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 6958ba4..e5e71e7 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -102,7 +102,7 @@ ifdef PARSER_DEBUG
 endif
 
 CFLAGS = -fno-omit-frame-pointer -ggdb3 -funwind-tables -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) $(PARSER_DEBUG_CFLAGS)
-EXTLIBS = -lpthread -lrt -lelf -lm -laudit
+EXTLIBS = -lpthread -lrt -lelf -lm
 ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
@@ -442,7 +442,6 @@ BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o
 BUILTIN_OBJS += $(OUTPUT)builtin-lock.o
 BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
 BUILTIN_OBJS += $(OUTPUT)builtin-test.o
-BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
 BUILTIN_OBJS += $(OUTPUT)builtin-inject.o
 
 PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)
@@ -560,6 +559,19 @@ else
 	LIB_OBJS += $(OUTPUT)util/unwind.o
 endif
 
+ifdef NO_LIBAUDIT
+	BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT
+else
+	FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit
+	ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y)
+		msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);
+		BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT
+	else
+		BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
+		EXTLIBS += -laudit
+	endif
+endif
+
 ifdef NO_NEWT
 	BASIC_CFLAGS += -DNO_NEWT_SUPPORT
 else
diff --git a/tools/perf/config/feature-tests.mak b/tools/perf/config/feature-tests.mak
index 116690a..4add41b 100644
--- a/tools/perf/config/feature-tests.mak
+++ b/tools/perf/config/feature-tests.mak
@@ -193,3 +193,14 @@ int main(void)
 }
 endef
 endif
+
+ifndef NO_LIBAUDIT
+define SOURCE_LIBAUDIT
+#include <libaudit.h>
+
+int main(void)
+{
+	return audit_open();
+}
+endef
+endif
\ No newline at end of file
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 3fb052c..fc2f770 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -55,7 +55,9 @@ static struct cmd_struct commands[] = {
 	{ "lock",	cmd_lock,	0 },
 	{ "kvm",	cmd_kvm,	0 },
 	{ "test",	cmd_test,	0 },
+#ifndef NO_LIBAUDIT_SUPPORT
 	{ "trace",	cmd_trace,	0 },
+#endif
 	{ "inject",	cmd_inject,	0 },
 };
 
-- 
1.7.9.2.358.g22243

[PATCH 2/3] perf probe: Print an enum type variable in "enum variable-name" format when showing accessible variables

[Arnaldo Carvalho de Melo]

From: Hyeoncheol Lee <hyc.lee@gmail.com>

When showing accessible variables, an enum type variable was printed in
"variable-name" format. Change this format into "enum variable-name".

Signed-off-by: Hyeoncheol Lee <hyc.lee@gmail.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/r/1348713399-4541-1-git-send-email-hyc.lee@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/dwarf-aux.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
index ee51e9b..3e5f543 100644
--- a/tools/perf/util/dwarf-aux.c
+++ b/tools/perf/util/dwarf-aux.c
@@ -804,6 +804,8 @@ int die_get_typename(Dwarf_Die *vr_die, char *buf, int len)
 			tmp = "union ";
 		else if (tag == DW_TAG_structure_type)
 			tmp = "struct ";
+		else if (tag == DW_TAG_enumeration_type)
+			tmp = "enum ";
 		/* Write a base name */
 		ret = snprintf(buf, len, "%s%s", tmp, dwarf_diename(&type));
 		return (ret >= len) ? -E2BIG : ret;
-- 
1.7.9.2.358.g22243

[PATCH 3/3] perf trace: Add aliases for some syscalls

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

What we get from audit_syscall_to_name isn't what we find in the
syscalls: tracepoint events, so add the alias that allows the tool to
find prctl, fstat, fstatat and stat.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-3m9su7jhwnxvepnr3ne1du5k@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-trace.c |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 5fa1820..8f113da 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -9,15 +9,20 @@
 
 static struct syscall_fmt {
 	const char *name;
+	const char *alias;
 	bool	   errmsg;
 	bool	   timeout;
 } syscall_fmts[] = {
-	{ .name	    = "futex",	  .errmsg = true, },
-	{ .name	    = "poll",	  .errmsg = true, .timeout = true, },
-	{ .name	    = "ppoll",	  .errmsg = true, .timeout = true, },
-	{ .name	    = "read",	  .errmsg = true, },
-	{ .name	    = "recvfrom", .errmsg = true, },
-	{ .name	    = "select",	  .errmsg = true, .timeout = true, },
+	{ .name	    = "arch_prctl", .errmsg = true, .alias = "prctl", },
+	{ .name	    = "fstat",	    .errmsg = true, .alias = "newfstat", },
+	{ .name	    = "fstatat",    .errmsg = true, .alias = "newfstatat", },
+	{ .name	    = "futex",	    .errmsg = true, },
+	{ .name	    = "poll",	    .errmsg = true, .timeout = true, },
+	{ .name	    = "ppoll",	    .errmsg = true, .timeout = true, },
+	{ .name	    = "read",	    .errmsg = true, },
+	{ .name	    = "recvfrom",   .errmsg = true, },
+	{ .name	    = "select",	    .errmsg = true, .timeout = true, },
+	{ .name	    = "stat",	    .errmsg = true, .alias = "newstat", },
 };
 
 static int syscall_fmt__cmp(const void *name, const void *fmtp)
@@ -74,10 +79,15 @@ static int trace__read_syscall_info(struct trace *trace, int id)
 	if (sc->name == NULL)
 		return -1;
 
-	snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
+	sc->fmt = syscall_fmt__find(sc->name);
 
+	snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
 	sc->tp_format = event_format__new("syscalls", tp_name);
-	sc->fmt = syscall_fmt__find(sc->name);
+
+	if (sc->tp_format == NULL && sc->fmt && sc->fmt->alias) {
+		snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->fmt->alias);
+		sc->tp_format = event_format__new("syscalls", tp_name);
+	}
 
 	return sc->tp_format != NULL ? 0 : -1;
 }
-- 
1.7.9.2.358.g22243

Re: [GIT PULL 0/3] perf/core improvements and fixes

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> From: Arnaldo Carvalho de Melo <acmeinfradead.org>
> 
> Hi Ingo,
> 
> 	Please consider pulling,
> 
> - Arnaldo
> 
> The following changes since commit 9ec60972a38011ad8a5676f4cd5e51ac508c36b6:
> 
>   perf hists: Add missing period_* fields when collapsing a hist entry (2012-09-26 20:44:11 -0300)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux tags/perf-core-for-mingo
> 
> for you to fetch changes up to aec1930b0f6f281a0ca038cd03aceace3fe0bb61:
> 
>   perf trace: Add aliases for some syscalls (2012-09-27 13:18:49 -0300)
> 
> ----------------------------------------------------------------
> perf/core improvements and fixes
> 
> . Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee.
> 
> . Don't stop the build if the audit libraries are not installed, fix from Namhyung Kim.
> 
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> ----------------------------------------------------------------
> Arnaldo Carvalho de Melo (1):
>       perf trace: Add aliases for some syscalls
> 
> Hyeoncheol Lee (1):
>       perf probe: Print an enum type variable in "enum variable-name" format when showing accessible variables
> 
> Namhyung Kim (1):
>       perf tools: Check libaudit availability for perf-trace builtin
> 
>  tools/perf/Makefile                 |   16 ++++++++++++++--
>  tools/perf/builtin-trace.c          |   26 ++++++++++++++++++--------
>  tools/perf/config/feature-tests.mak |   11 +++++++++++
>  tools/perf/perf.c                   |    2 ++
>  tools/perf/util/dwarf-aux.c         |    2 ++
>  5 files changed, 47 insertions(+), 10 deletions(-)

Pulled, thanks Arnaldo!

	Ingo