diff options
| author | Namhyung Kim <[email protected]> | 2024-04-05 21:17:57 +0000 |
|---|---|---|
| committer | Namhyung Kim <[email protected]> | 2024-04-11 17:14:58 +0000 |
| commit | 2b8dbf69ec60faf6c7db49e57d7f316409ccec92 (patch) | |
| tree | 9097841df1a9231412a9eb7c0f8887bf703b0c85 /tools/perf/ui/browsers/annotate.c | |
| parent | Linux 6.9-rc3 (diff) | |
| download | kernel-2b8dbf69ec60faf6c7db49e57d7f316409ccec92.tar.gz kernel-2b8dbf69ec60faf6c7db49e57d7f316409ccec92.zip | |
perf annotate: Make sure to call symbol__annotate2() in TUI
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 <[email protected]>
Signed-off-by: Namhyung Kim <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
| -rw-r--r-- | tools/perf/ui/browsers/annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index ec5e21932876..4790c735599b 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]; |