All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>, Andi Kleen <ak@linux.intel.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Corey Ashford <cjashfor@linux.vnet.ibm.com>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 4/7] perf tools: Fix report -F symbol_to for data without branch info
Date: Thu, 16 Oct 2014 16:07:04 +0200	[thread overview]
Message-ID: <1413468427-31049-5-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1413468427-31049-1-git-send-email-jolsa@kernel.org>

The branch field sorting code assumes hist_entry::branch_info
is allocated, which is wrong and following perf session ends
up with report segfault.

  $ perf record ls
  $ perf report -F symbol_to
  perf: Segmentation fault

Checking that hist_entry::branch_info is valid and display
"N/A" string in snprint callback if it's not.

Cc: Andi Kleen <ak@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/sort.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 0c68af83e7dd..57047c0a247c 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -413,8 +413,13 @@ sort__sym_from_cmp(struct hist_entry *left, struct hist_entry *right)
 static int64_t
 sort__sym_to_cmp(struct hist_entry *left, struct hist_entry *right)
 {
-	struct addr_map_symbol *to_l = &left->branch_info->to;
-	struct addr_map_symbol *to_r = &right->branch_info->to;
+	struct addr_map_symbol *to_l, *to_r;
+
+	if (!left->branch_info || !right->branch_info)
+		return cmp_null(left->branch_info, right->branch_info);
+
+	to_l = &left->branch_info->to;
+	to_r = &right->branch_info->to;
 
 	if (!to_l->sym && !to_r->sym)
 		return _sort__addr_cmp(to_l->addr, to_r->addr);
@@ -434,10 +439,14 @@ static int hist_entry__sym_from_snprintf(struct hist_entry *he, char *bf,
 static int hist_entry__sym_to_snprintf(struct hist_entry *he, char *bf,
 				       size_t size, unsigned int width)
 {
-	struct addr_map_symbol *to = &he->branch_info->to;
-	return _hist_entry__sym_snprintf(to->map, to->sym, to->addr,
-					 he->level, bf, size, width);
+	if (he->branch_info) {
+		struct addr_map_symbol *to = &he->branch_info->to;
+
+		return _hist_entry__sym_snprintf(to->map, to->sym, to->addr,
+						 he->level, bf, size, width);
+	}
 
+	return repsep_snprintf(bf, size, "%-*.*s", width, width, "N/A");
 }
 
 struct sort_entry sort_dso_from = {
-- 
1.9.3


  parent reply	other threads:[~2014-10-16 14:07 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-16 14:07 [PATCHv2 0/7] perf tools: Fix branch report segfaults Jiri Olsa
2014-10-16 14:07 ` [PATCH 1/7] perf tools: Fix report -F abort for data without branch info Jiri Olsa
2014-10-30  6:40   ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-10-16 14:07 ` [PATCH 2/7] perf tools: Fix report -F in_tx " Jiri Olsa
2014-10-30  6:40   ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-10-16 14:07 ` [PATCH 3/7] perf tools: Fix report -F mispredict " Jiri Olsa
2014-10-30  6:40   ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-10-16 14:07 ` Jiri Olsa [this message]
2014-10-30  6:40   ` [tip:perf/core] perf tools: Fix report -F symbol_to " tip-bot for Jiri Olsa
2014-10-16 14:07 ` [PATCH 5/7] perf tools: Fix report -F symbol_from " Jiri Olsa
2014-10-30  6:41   ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-10-16 14:07 ` [PATCH 6/7] perf tools: Fix report -F dso_to " Jiri Olsa
2014-10-30  6:41   ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-10-16 14:07 ` [PATCH 7/7] perf tools: Fix report -F dso_from " Jiri Olsa
2014-10-30  6:41   ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-10-17 22:27 ` [PATCHv2 0/7] perf tools: Fix branch report segfaults Arnaldo Carvalho de Melo
2014-10-22  1:36 ` Namhyung Kim
2014-10-25  0:37   ` Arnaldo Carvalho de Melo
  -- strict thread matches above, loose matches on Subject: below --
2014-10-16 12:20 [PATCH " Jiri Olsa
2014-10-16 12:20 ` [PATCH 4/7] perf tools: Fix report -F symbol_to for data without branch info Jiri Olsa

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=1413468427-31049-5-git-send-email-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=cjashfor@linux.vnet.ibm.com \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.