2024-04-24 23:08:16

by Namhyung Kim

Subject: [PATCH] perf annotate-data: Check annotation on perf report TUI

As it removed the sample accounting for code when no symbol sort key is
given for perf report TUI, it might not allocate the annotated_source
yet. Let's check if it's NULL first.

Fixes: 6cdd977ec24e1 ("perf report: Do not collect sample histogram unnecessarily")
Signed-off-by: Namhyung Kim <[email protected]>
---
tools/perf/util/annotate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index dca2c08ab8c5..f5b6b5e5e757 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -906,7 +906,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
if (parch)
*parch = arch;

- if (!list_empty(&notes->src->source))
+ if (notes->src && !list_empty(&notes->src->source))
return 0;

args.arch = arch;
--
2.44.0.769.g3c40516874-goog

2024-04-25 03:18:43

by Ian Rogers

Subject: Re: [PATCH] perf annotate-data: Check annotation on perf report TUI

On Wed, Apr 24, 2024 at 4:00 PM Namhyung Kim <[email protected]> wrote:
>
> As it removed the sample accounting for code when no symbol sort key is
> given for perf report TUI, it might not allocate the annotated_source
> yet. Let's check if it's NULL first.
>
> Fixes: 6cdd977ec24e1 ("perf report: Do not collect sample histogram unnecessarily")
> Signed-off-by: Namhyung Kim <[email protected]>

Reviewed-by: Ian Rogers <[email protected]>

Thanks,
Ian

> ---
> tools/perf/util/annotate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index dca2c08ab8c5..f5b6b5e5e757 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -906,7 +906,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
> if (parch)
> *parch = arch;
>
> - if (!list_empty(&notes->src->source))
> + if (notes->src && !list_empty(&notes->src->source))
> return 0;
>
> args.arch = arch;
> --
> 2.44.0.769.g3c40516874-goog
>
>

2024-04-25 14:04:00

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf annotate-data: Check annotation on perf report TUI

On Wed, Apr 24, 2024 at 04:00:15PM -0700, Namhyung Kim wrote:
> As it removed the sample accounting for code when no symbol sort key is
> given for perf report TUI, it might not allocate the annotated_source
> yet. Let's check if it's NULL first.
>
> Fixes: 6cdd977ec24e1 ("perf report: Do not collect sample histogram unnecessarily")
> Signed-off-by: Namhyung Kim <[email protected]>

Reviewed-by: Arnaldo Carvalho de Melo <[email protected]>

Picking it up into perf-tools-next:

⬢[acme@toolbox perf-tools-next]$ git log torvalds/master.. perf-tools-next | grep 6cdd977ec24e1
commit 6cdd977ec24e1538b35a08bde823a74b69e829f2
⬢[acme@toolbox perf-tools-next]$

- Arnaldo

> ---
> tools/perf/util/annotate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index dca2c08ab8c5..f5b6b5e5e757 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -906,7 +906,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
> if (parch)
> *parch = arch;
>
> - if (!list_empty(&notes->src->source))
> + if (notes->src && !list_empty(&notes->src->source))
> return 0;
>
> args.arch = arch;
> --
> 2.44.0.769.g3c40516874-goog