Received-SPF: pass (google.com: domain of linux-kernel+bounces-158627-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 25 Apr 2024 10:55:21 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>, 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
Subject: Re: [PATCH] perf annotate-data: Check annotation on perf report TUI
Message-ID: <ZipgyUwHjjujlHsO@x1>
References: <20240424230015.1054013-1-namhyung@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20240424230015.1054013-1-namhyung@kernel.org>

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 <namhyung@kernel.org>

Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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