Received-SPF: pass (google.com: domain of linux-kernel+bounces-157961-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240424230015.1054013-1-namhyung@kernel.org>
In-Reply-To: <20240424230015.1054013-1-namhyung@kernel.org>
From: Ian Rogers <irogers@google.com>
Date: Wed, 24 Apr 2024 20:18:24 -0700
Message-ID: <CAP-5=fV5mgVqi2rEgV1hY0BSCZ_6dLKjc0Mp=EDxDirzmB9qPg@mail.gmail.com>
Subject: Re: [PATCH] perf annotate-data: Check annotation on perf report TUI
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>, Kan Liang <kan.liang@linux.intel.com>, 
	Jiri Olsa <jolsa@kernel.org>, Adrian Hunter <adrian.hunter@intel.com>, 
	Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@kernel.org>, 
	LKML <linux-kernel@vger.kernel.org>, linux-perf-users@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Apr 24, 2024 at 4:00=E2=80=AFPM Namhyung Kim <namhyung@kernel.org> =
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 unnec=
essarily")
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Reviewed-by: Ian Rogers <irogers@google.com>

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 ev=
sel *evsel,
>         if (parch)
>                 *parch =3D arch;
>
> -       if (!list_empty(&notes->src->source))
> +       if (notes->src && !list_empty(&notes->src->source))
>                 return 0;
>
>         args.arch =3D arch;
> --
> 2.44.0.769.g3c40516874-goog
>
>