From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: paulus@samba.org, hpa@zytor.com, ak@linux.intel.com,
dsahern@gmail.com, mingo@kernel.org,
linux-kernel@vger.kernel.org, jolsa@kernel.org,
tglx@linutronix.de, fweisbec@gmail.com,
cjashfor@linux.vnet.ibm.com, namhyung@kernel.org,
acme@redhat.com, a.p.zijlstra@chello.nl
Subject: [tip:perf/core] perf tools: Fix report -F dso_to for data without branch info
Date: Wed, 29 Oct 2014 23:41:27 -0700 [thread overview]
Message-ID: <tip-8b62fa59ed62bf1f42d35360fae8592c6b816a06@git.kernel.org> (raw)
In-Reply-To: <1413468427-31049-7-git-send-email-jolsa@kernel.org>
Commit-ID: 8b62fa59ed62bf1f42d35360fae8592c6b816a06
Gitweb: http://git.kernel.org/tip/8b62fa59ed62bf1f42d35360fae8592c6b816a06
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Thu, 16 Oct 2014 16:07:06 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 29 Oct 2014 10:28:48 -0200
perf tools: Fix report -F dso_to for data without branch info
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 dso_to
perf: Segmentation fault
Checking that hist_entry::branch_info is valid and display "N/A" string
in snprint callback if it's not.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.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>
Link: http://lkml.kernel.org/r/1413468427-31049-7-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/sort.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index fc4ff2a..7a9054a 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -387,6 +387,9 @@ static int hist_entry__dso_from_snprintf(struct hist_entry *he, char *bf,
static int64_t
sort__dso_to_cmp(struct hist_entry *left, struct hist_entry *right)
{
+ if (!left->branch_info || !right->branch_info)
+ return cmp_null(left->branch_info, right->branch_info);
+
return _sort__dso_cmp(left->branch_info->to.map,
right->branch_info->to.map);
}
@@ -394,8 +397,11 @@ sort__dso_to_cmp(struct hist_entry *left, struct hist_entry *right)
static int hist_entry__dso_to_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
- return _hist_entry__dso_snprintf(he->branch_info->to.map,
- bf, size, width);
+ if (he->branch_info)
+ return _hist_entry__dso_snprintf(he->branch_info->to.map,
+ bf, size, width);
+ else
+ return repsep_snprintf(bf, size, "%-*.*s", width, width, "N/A");
}
static int64_t
next prev parent reply other threads:[~2014-10-30 6:41 UTC|newest]
Thread overview: 18+ 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 ` [PATCH 4/7] perf tools: Fix report -F symbol_to " Jiri Olsa
2014-10-30 6:40 ` [tip:perf/core] " 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-bot for Jiri Olsa [this message]
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
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-8b62fa59ed62bf1f42d35360fae8592c6b816a06@git.kernel.org \
--to=tipbot@zytor.com \
--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=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).