Patch "perf annotate: Make sure to call symbol__annotate2() in TUI" has been added to the 6.8-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf annotate: Make sure to call symbol__annotate2() in TUI

to the 6.8-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-annotate-make-sure-to-call-symbol__annotate2-in.patch
and it can be found in the queue-6.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8f1b0066988a40901dcd3ef3feb55db2f8ec1502
Author: Namhyung Kim <namhyung@xxxxxxxxxx>
Date:   Fri Apr 5 14:17:57 2024 -0700

    perf annotate: Make sure to call symbol__annotate2() in TUI
    
    [ Upstream commit 2b8dbf69ec60faf6c7db49e57d7f316409ccec92 ]
    
    The symbol__annotate2() initializes some data structures needed by TUI.
    It has a logic to prevent calling it multiple times by checking if it
    has the annotated source.  But data type profiling uses a different
    code (symbol__annotate) to allocate the annotated lines in advance.
    So TUI missed to call symbol__annotate2() when it shows the annotation
    browser.
    
    Make symbol__annotate() reentrant and handle that situation properly.
    This fixes a crash in the annotation browser started by perf report in
    TUI like below.
    
      $ perf report -s type,sym --tui
      # and press 'a' key and then move down
    
    Fixes: 81e57deec325 ("perf report: Support data type profiling")
    Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>
    Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240405211800.1412920-2-namhyung@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index ec5e219328760..4790c735599bd 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -970,7 +970,7 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,
 	if (dso->annotate_warned)
 		return -1;
 
-	if (not_annotated) {
+	if (not_annotated || !sym->annotate2) {
 		err = symbol__annotate2(ms, evsel, &browser.arch);
 		if (err) {
 			char msg[BUFSIZ];
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 9b70ab110ce79..86a996290e9ab 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2435,6 +2435,9 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
 	if (parch)
 		*parch = arch;
 
+	if (!list_empty(&notes->src->source))
+		return 0;
+
 	args.arch = arch;
 	args.ms = *ms;
 	if (annotate_opts.full_addr)