public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, tglx@linutronix.de, peterz@infradead.org,
	milian.wolff@kdab.com, jolsa@redhat.com, mingo@kernel.org,
	dsahern@gmail.com, jolsa@kernel.org, hpa@zytor.com,
	wangnan0@huawei.com, namhyung@kernel.org,
	linux-kernel@vger.kernel.org
Subject: [tip:perf/core] perf callchain: Add order support for libunwind DWARF unwinder
Date: Thu, 26 Nov 2015 00:18:53 -0800	[thread overview]
Message-ID: <tip-cb1dc22dce6e54dbd1eac213c9216e1aa57084da@git.kernel.org> (raw)
In-Reply-To: <20151118075247.GA5416@krava.brq.redhat.com>

Commit-ID:  cb1dc22dce6e54dbd1eac213c9216e1aa57084da
Gitweb:     http://git.kernel.org/tip/cb1dc22dce6e54dbd1eac213c9216e1aa57084da
Author:     Jiri Olsa <jolsa@redhat.com>
AuthorDate: Wed, 18 Nov 2015 08:52:47 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 23 Nov 2015 18:30:41 -0300

perf callchain: Add order support for libunwind DWARF unwinder

As reported by Milian, currently for DWARF unwind (both libdw and
libunwind) we display callchain in callee order only.

Adding the support to follow callchain order setup to libunwind DWARF
unwinder, so we could get following output for report:

  $ perf record --call-graph dwarf ls
  ...
  $ perf report --no-children --stdio

    39.26%  ls       libc-2.21.so      [.] __strcoll_l
                 |
                 ---__strcoll_l
                    mpsort_with_tmp
                    mpsort_with_tmp
                    sort_files
                    main
                    __libc_start_main
                    _start
                    0

  $ perf report -g caller --no-children --stdio
    ...
    39.26%  ls       libc-2.21.so      [.] __strcoll_l
                 |
                 ---0
                    _start
                    __libc_start_main
                    main
                    sort_files
                    mpsort_with_tmp
                    mpsort_with_tmp
                    __strcoll_l

Based-on-patch-by: Milian Wolff <milian.wolff@kdab.com>
Reported-and-Tested-by: Milian Wolff <milian.wolff@kdab.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Wang Nan <wangnan0@huawei.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20151118075247.GA5416@krava.brq.redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/unwind-libunwind.c | 47 ++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index 0ae8844..3c258a0 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -615,34 +615,47 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
 		       void *arg, int max_stack)
 {
 	u64 val;
+	unw_word_t ips[max_stack];
 	unw_addr_space_t addr_space;
 	unw_cursor_t c;
-	int ret;
+	int ret, i = 0;
 
 	ret = perf_reg_value(&val, &ui->sample->user_regs, PERF_REG_IP);
 	if (ret)
 		return ret;
 
-	ret = entry(val, ui->thread, cb, arg);
-	if (ret)
-		return -ENOMEM;
+	ips[i++] = (unw_word_t) val;
 
-	if (--max_stack == 0)
-		return 0;
-
-	addr_space = thread__priv(ui->thread);
-	if (addr_space == NULL)
-		return -1;
+	/*
+	 * If we need more than one entry, do the DWARF
+	 * unwind itself.
+	 */
+	if (max_stack - 1 > 0) {
+		addr_space = thread__priv(ui->thread);
+		if (addr_space == NULL)
+			return -1;
+
+		ret = unw_init_remote(&c, addr_space, ui);
+		if (ret)
+			display_error(ret);
+
+		while (!ret && (unw_step(&c) > 0) && i < max_stack) {
+			unw_get_reg(&c, UNW_REG_IP, &ips[i]);
+			++i;
+		}
 
-	ret = unw_init_remote(&c, addr_space, ui);
-	if (ret)
-		display_error(ret);
+		max_stack = i;
+	}
 
-	while (!ret && (unw_step(&c) > 0) && max_stack--) {
-		unw_word_t ip;
+	/*
+	 * Display what we got based on the order setup.
+	 */
+	for (i = 0; i < max_stack && !ret; i++) {
+		int j = i;
 
-		unw_get_reg(&c, UNW_REG_IP, &ip);
-		ret = ip ? entry(ip, ui->thread, cb, arg) : 0;
+		if (callchain_param.order == ORDER_CALLER)
+			j = max_stack - i - 1;
+		ret = ips[j] ? entry(ips[j], ui->thread, cb, arg) : 0;
 	}
 
 	return ret;

  parent reply	other threads:[~2015-11-26  8:19 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-17 15:05 [PATCH 0/3] perf tools DWARF libunwind: Add callchain order support Jiri Olsa
2015-11-17 15:05 ` [PATCH 1/3] perf tools: Move initial entry call into get_entries function Jiri Olsa
2015-11-26  8:18   ` [tip:perf/core] perf callchain: " tip-bot for Jiri Olsa
2015-11-17 15:05 ` [PATCH 2/3] perf tools: Add callchain order support for libunwind DWARF unwinder Jiri Olsa
2015-11-18  4:13   ` Wangnan (F)
2015-11-18  5:41     ` Namhyung Kim
2015-11-18  7:26       ` Wangnan (F)
2015-11-22 15:27         ` Namhyung Kim
2015-11-18  8:25       ` Jiri Olsa
2015-11-18  9:25         ` Namhyung Kim
2015-11-18  8:26       ` Jiri Olsa
2015-11-18  7:52     ` [PATCHv2 " Jiri Olsa
2015-11-18  9:29       ` Wangnan (F)
2015-11-26  8:18       ` tip-bot for Jiri Olsa [this message]
2015-11-18  7:54     ` [PATCH " Jiri Olsa
2015-11-18  7:59       ` Wangnan (F)
2015-11-18  8:12       ` Jiri Olsa
2015-11-17 15:05 ` [PATCH 3/3] perf test: Add callchain order setup for DWARF unwinder test Jiri Olsa
2015-11-26  8:19   ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-11-18  4:22 ` [PATCH 0/3] perf tools DWARF libunwind: Add callchain order support Wangnan (F)
2015-11-19 11:22 ` [PATCH 4/3] perf tools: Add callchain order support for libdw DWARF unwinder Jiri Olsa
2015-11-19 12:10   ` Wangnan (F)
2015-11-19 12:18     ` Wangnan (F)
2015-11-19 13:01     ` [PATCHv2 " Jiri Olsa
2015-11-26  8:19       ` [tip:perf/core] perf callchain: Add " tip-bot for Jiri Olsa
2015-11-19 19:10 ` [PATCH 0/3] perf tools DWARF libunwind: Add callchain order support Arnaldo Carvalho de Melo
2015-11-20  8:38   ` Jiri Olsa
2015-11-22 19:13   ` Milian Wolff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-cb1dc22dce6e54dbd1eac213c9216e1aa57084da@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=milian.wolff@kdab.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox