2017-03-13 08:34:25

by Du, Changbin

Subject: [PATCH] perf sort: Segmentation fault of basic block cycles sort dimension

From: Changbin Du <[email protected]>

Skip the sample which doesn't have branch_info to avoid segmentation
fault occurrence.

The fault can be reproduced by:
perf record -a
perf report -F cycles

Signed-off-by: Changbin Du <[email protected]>
---
tools/perf/util/sort.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 0ff6222..b6db140 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -846,6 +846,9 @@ static int hist_entry__mispredict_snprintf(struct hist_entry *he, char *bf,
static int64_t
sort__cycles_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 left->branch_info->flags.cycles -
right->branch_info->flags.cycles;
}
@@ -853,6 +856,8 @@ sort__cycles_cmp(struct hist_entry *left, struct hist_entry *right)
static int hist_entry__cycles_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
+ if (!he->branch_info)
+ return scnprintf(bf, size, "%-.*s", width, "N/A");
if (he->branch_info->flags.cycles == 0)
return repsep_snprintf(bf, size, "%-*s", width, "-");
return repsep_snprintf(bf, size, "%-*hd", width,
--
2.7.4

2017-03-13 14:42:13

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf sort: Segmentation fault of basic block cycles sort dimension

Em Mon, Mar 13, 2017 at 04:31:48PM +0800, [email protected] escreveu:
> From: Changbin Du <[email protected]>
>
> Skip the sample which doesn't have branch_info to avoid segmentation
> fault occurrence.
>
> The fault can be reproduced by:
> perf record -a
> perf report -F cycles

Thanks, applied.

- Arnaldo

> Signed-off-by: Changbin Du <[email protected]>
> ---
> tools/perf/util/sort.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
> index 0ff6222..b6db140 100644
> --- a/tools/perf/util/sort.c
> +++ b/tools/perf/util/sort.c
> @@ -846,6 +846,9 @@ static int hist_entry__mispredict_snprintf(struct hist_entry *he, char *bf,
> static int64_t
> sort__cycles_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 left->branch_info->flags.cycles -
> right->branch_info->flags.cycles;
> }
> @@ -853,6 +856,8 @@ sort__cycles_cmp(struct hist_entry *left, struct hist_entry *right)
> static int hist_entry__cycles_snprintf(struct hist_entry *he, char *bf,
> size_t size, unsigned int width)
> {
> + if (!he->branch_info)
> + return scnprintf(bf, size, "%-.*s", width, "N/A");
> if (he->branch_info->flags.cycles == 0)
> return repsep_snprintf(bf, size, "%-*s", width, "-");
> return repsep_snprintf(bf, size, "%-*hd", width,
> --
> 2.7.4

2017-03-15 18:41:02

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf sort: Fix segfault with basic block 'cycles' sort dimension

Commit-ID: 4b0b3aa6a2756e6115fdf275c521e4552a7082f3
Gitweb: http://git.kernel.org/tip/4b0b3aa6a2756e6115fdf275c521e4552a7082f3
Author: Changbin Du <[email protected]>
AuthorDate: Mon, 13 Mar 2017 16:31:48 +0800
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 13 Mar 2017 11:41:20 -0300

perf sort: Fix segfault with basic block 'cycles' sort dimension

Skip the sample which doesn't have branch_info to avoid segmentation
fault:

The fault can be reproduced by:

perf record -a
perf report -F cycles

Signed-off-by: Changbin Du <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Fixes: 0e332f033a82 ("perf tools: Add support for cycles, weight branch_info field")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/sort.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index f8f16c0..93f755a 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -846,6 +846,9 @@ static int hist_entry__mispredict_snprintf(struct hist_entry *he, char *bf,
static int64_t
sort__cycles_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 left->branch_info->flags.cycles -
right->branch_info->flags.cycles;
}
@@ -853,6 +856,8 @@ sort__cycles_cmp(struct hist_entry *left, struct hist_entry *right)
static int hist_entry__cycles_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
+ if (!he->branch_info)
+ return scnprintf(bf, size, "%-.*s", width, "N/A");
if (he->branch_info->flags.cycles == 0)
return repsep_snprintf(bf, size, "%-*s", width, "-");
return repsep_snprintf(bf, size, "%-*hd", width,