Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0199d244d6ed6bc1fcab38a8732fdba1ddf04080

Authored by Jiri Olsa
Committed by Arnaldo Carvalho de Melo
1 parent 49f4744307
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

perf tools: Fix report -F in_tx 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 in_tx
  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-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 1 changed file with 10 additions and 3 deletions Side-by-side Diff

tools/perf/util/sort.c
Diff comments   View file @ 0199d24
... ... @@ -1021,6 +1021,9 @@
1021 1021 static int64_t
1022 1022 sort__in_tx_cmp(struct hist_entry *left, struct hist_entry *right)
1023 1023 {
  1024 + if (!left->branch_info || !right->branch_info)
  1025 + return cmp_null(left->branch_info, right->branch_info);
  1026 +
1024 1027 return left->branch_info->flags.in_tx !=
1025 1028 right->branch_info->flags.in_tx;
1026 1029 }
1027 1030  
... ... @@ -1028,10 +1031,14 @@
1028 1031 static int hist_entry__in_tx_snprintf(struct hist_entry *he, char *bf,
1029 1032 size_t size, unsigned int width)
1030 1033 {
1031   - static const char *out = ".";
  1034 + static const char *out = "N/A";
1032 1035  
1033   - if (he->branch_info->flags.in_tx)
1034   - out = "T";
  1036 + if (he->branch_info) {
  1037 + if (he->branch_info->flags.in_tx)
  1038 + out = "T";
  1039 + else
  1040 + out = ".";
  1041 + }
1035 1042  
1036 1043 return repsep_snprintf(bf, size, "%-*s", width, out);
1037 1044 }