lkml.org 
[lkml]   [2014]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 2/8] perf, tools: Support handling complete branch stacks as histograms v4
> segfaults here..
>
> [jolsa@krava perf]$ ./perf record -g sleep 1
> [ perf record: Woken up 1 times to write data ]
> [ perf record: Captured and wrote 0.013 MB perf.data (~567 samples) ]
> [jolsa@krava perf]$ ./perf report
> perf: Segmentation fault
> [jolsa@krava perf]$

Thanks. Fixed with this patch:

commit 124014960a8fb09043914fb79ea86e0444408ab0
Author: Andi Kleen <ak@linux.intel.com>
Date: Wed Mar 5 07:28:56 2014 -0800

perf, tools, report: Fix perf report without -b

Fix report crash when -b is not used. Reported by Jiri Olsa.

Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index ef198c3..04ec451 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1381,15 +1381,15 @@ static int machine__resolve_callchain_sample(struct machine *machine,
* - No annotations (should annotate somehow)
*/

- if (branch->nr > PERF_MAX_BRANCH_DEPTH) {
- pr_warning("corrupted branch chain. skipping...\n");
- return 0;
- }
-
- if (callchain_param.branch_callstack) {
+ if (branch && callchain_param.branch_callstack) {
int nr = min(max_stack, (int)branch->nr);
struct branch_entry be[nr];

+ if (branch->nr > PERF_MAX_BRANCH_DEPTH) {
+ pr_warning("corrupted branch chain. skipping...\n");
+ return 0;
+ }
+
for (i = 0; i < nr; i++) {
if (callchain_param.order == ORDER_CALLEE) {
be[i] = branch->entries[i];

--
ak@linux.intel.com -- Speaking for myself only


\
 
 \ /
  Last update: 2014-03-05 17:21    [W:0.455 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site