From nobody Wed Oct 8 16:38:07 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A8441F9F61; Wed, 25 Jun 2025 23:03:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750892620; cv=none; b=SpeM/WoE3RzI/VsPjT+heYWB2dY3i6r+n0xmEswWwrQZNidDRryqlDNDHazKZGbNreVcMmNu2txyV5V9KD2BXb//N8Q56aovhf8QRnogRSX1H/032aSrH1erj/JoQqUHeNKGxV26/nXTEC61qs9wB+NkejnU6zwbvaRDXyxpalc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750892620; c=relaxed/simple; bh=WbL21ClUCvI73aydFyWzSChUA7XXSVBEq6UHySXvbDg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=T6cuD7yhepTKS0AiW8UKodyOwNdoedlq0ilMDNzTwjXJMJtDJxNgQNr2ihP/X58L3xG7CShQGdLtK6qAq3hHp0K4BEGk6B/JKfw+5RHY3H7ihkSfSzBylHQwhGJIYk/KYtLd/hUeHH5ItVCstFOFkaU5UUWa2bm8K/TcUbBpFWU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ipfDCTLP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ipfDCTLP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBA1FC4CEEA; Wed, 25 Jun 2025 23:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750892620; bh=WbL21ClUCvI73aydFyWzSChUA7XXSVBEq6UHySXvbDg=; h=From:To:Cc:Subject:Date:From; b=ipfDCTLP6ZxiEdpvnjqe6jxLU0Bvk5JIKMTDCrzQDENpiwbZ2Db+0omxVSlJAG3xI mRcyNHSC68Za8j5mlCLIVYo8ECyLSh+AVEXg14LaDnvajBtIWrvQE1Ke1otAZ4KlU3 ZOeVL6fUdIxHzeJcfV2RYEZkQB1OCoo2g9O4n0JZnFKi+hdB+m8/XR2J0ycnR2NBF2 MYfJ0tuuS4V6JgWlKMsNPxc6MKMEiChRW3fUmbU6pYzSkyx0w0U72Dj7JN05CbOoK7 rg+J7tItyoJOLhcIde0kU6/fmIVnOcFrs5WYeAFAEvy5dw/A3d409YcqP7FHK0v4Oq DvFOCBEA0a5WA== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org Subject: [PATCH v3] perf annotate: Fix source code annotate with objdump Date: Wed, 25 Jun 2025 16:03:39 -0700 Message-ID: <20250625230339.702610-1-namhyung@kernel.org> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Recently it uses llvm and capstone to speed up annotation or disassembly of instructions. But they don't support source code view yet. Until it fixed, we can force to use objdump for source code annotation. To prevent performance loss, it's disabled by default and turned it on when user requests it in TUI by pressing 's' key. Link: https://lore.kernel.org/r/20250608004613.238291-1-namhyung@kernel.org Reported-by: Ingo Molnar Signed-off-by: Namhyung Kim Acked-by: Ian Rogers --- v3) * show warning when there's no source code tools/perf/ui/browsers/annotate.c | 86 +++++++++++++++++++++++++++++-- tools/perf/util/annotate.c | 2 + tools/perf/util/annotate.h | 1 + tools/perf/util/disasm.c | 7 +++ 4 files changed, 93 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/ann= otate.c index ab776b1ed2d5b4ba..183902dac042ecb0 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -345,6 +345,23 @@ static void annotate_browser__calc_percent(struct anno= tate_browser *browser, browser->curr_hot =3D rb_last(&browser->entries); } =20 +static struct annotation_line *annotate_browser__find_new_asm_line( + struct annotate_browser *browser, + int idx_asm) +{ + struct annotation_line *al; + struct list_head *head =3D browser->b.entries; + + /* find an annotation line in the new list with the same idx_asm */ + list_for_each_entry(al, head, node) { + if (al->idx_asm =3D=3D idx_asm) + return al; + } + + /* There are no asm lines */ + return NULL; +} + static struct annotation_line *annotate_browser__find_next_asm_line( struct annotate_browser *browser, struct annotation_line *al) @@ -368,7 +385,31 @@ static struct annotation_line *annotate_browser__find_= next_asm_line( return NULL; } =20 -static bool annotate_browser__toggle_source(struct annotate_browser *brows= er) +static bool annotation__has_source(struct annotation *notes) +{ + struct annotation_line *al; + bool found_asm =3D false; + + /* Let's skip the first non-asm lines which present regardless of source.= */ + list_for_each_entry(al, ¬es->src->source, node) { + if (al->offset >=3D 0) { + found_asm =3D true; + break; + } + } + + if (found_asm) { + /* After assembly lines, any line without offset means source. */ + list_for_each_entry_continue(al, ¬es->src->source, node) { + if (al->offset =3D=3D -1) + return true; + } + } + return false; +} + +static bool annotate_browser__toggle_source(struct annotate_browser *brows= er, + struct evsel *evsel) { struct annotation *notes =3D browser__annotation(&browser->b); struct annotation_line *al; @@ -377,6 +418,39 @@ static bool annotate_browser__toggle_source(struct ann= otate_browser *browser) browser->b.seek(&browser->b, offset, SEEK_CUR); al =3D list_entry(browser->b.top, struct annotation_line, node); =20 + if (!annotate_opts.annotate_src) + annotate_opts.annotate_src =3D true; + + /* + * It's about to get source code annotation for the first time. + * Drop the existing annotation_lines and get the new one with source. + * And then move to the original line at the same asm index. + */ + if (annotate_opts.hide_src_code && !notes->src->tried_source) { + struct map_symbol *ms =3D browser->b.priv; + int orig_idx_asm =3D al->idx_asm; + + /* annotate again with source code info */ + annotate_opts.hide_src_code =3D false; + annotated_source__purge(notes->src); + symbol__annotate2(ms, evsel, &browser->arch); + annotate_opts.hide_src_code =3D true; + + /* should be after annotated_source__purge() */ + notes->src->tried_source =3D true; + + if (!annotation__has_source(notes)) + ui__warning("Annotation has no source code."); + + browser->b.entries =3D ¬es->src->source; + al =3D annotate_browser__find_new_asm_line(browser, orig_idx_asm); + if (unlikely(al =3D=3D NULL)) { + al =3D list_first_entry(¬es->src->source, + struct annotation_line, node); + } + browser->b.seek(&browser->b, al->idx_asm, SEEK_SET); + } + if (annotate_opts.hide_src_code) { if (al->idx_asm < offset) offset =3D al->idx; @@ -833,7 +907,7 @@ static int annotate_browser__run(struct annotate_browse= r *browser, nd =3D browser->curr_hot; break; case 's': - if (annotate_browser__toggle_source(browser)) + if (annotate_browser__toggle_source(browser, evsel)) ui_helpline__puts(help); annotate__scnprintf_title(hists, title, sizeof(title)); annotate_browser__show(&browser->b, title, help); @@ -1011,6 +1085,12 @@ int symbol__tui_annotate(struct map_symbol *ms, stru= ct evsel *evsel, ui__error("Couldn't annotate %s:\n%s", sym->name, msg); return -1; } + + if (!annotate_opts.hide_src_code) { + notes->src->tried_source =3D true; + if (!annotation__has_source(notes)) + ui__warning("Annotation has no source code."); + } } =20 ui_helpline__push("Press ESC to exit"); @@ -1025,7 +1105,7 @@ int symbol__tui_annotate(struct map_symbol *ms, struc= t evsel *evsel, =20 ret =3D annotate_browser__run(&browser, evsel, hbt); =20 - if(not_annotated) + if (not_annotated && !notes->src->tried_source) annotated_source__purge(notes->src); =20 return ret; diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 264a212b47df850c..0dd475a744b6dfac 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1451,6 +1451,7 @@ void annotated_source__purge(struct annotated_source = *as) list_del_init(&al->node); disasm_line__free(disasm_line(al)); } + as->tried_source =3D false; } =20 static size_t disasm_line__fprintf(struct disasm_line *dl, FILE *fp) @@ -2280,6 +2281,7 @@ void annotation_options__init(void) opt->annotate_src =3D true; opt->offset_level =3D ANNOTATION__OFFSET_JUMP_TARGETS; opt->percent_type =3D PERCENT_PERIOD_LOCAL; + opt->hide_src_code =3D true; opt->hide_src_code_on_title =3D true; } =20 diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index bbb89b32f398b3c9..8b5131d257b01e3e 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -294,6 +294,7 @@ struct annotated_source { int nr_entries; int nr_asm_entries; int max_jump_sources; + bool tried_source; u64 start; struct { u8 addr; diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 8f0eb56c6fc66a96..ff475a239f4b0db4 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -2284,6 +2284,13 @@ int symbol__disassemble(struct symbol *sym, struct a= nnotate_args *args) } } =20 + /* FIXME: LLVM and CAPSTONE should support source code */ + if (options->annotate_src && !options->hide_src_code) { + err =3D symbol__disassemble_objdump(symfs_filename, sym, args); + if (err =3D=3D 0) + goto out_remove_tmp; + } + err =3D -1; for (u8 i =3D 0; i < ARRAY_SIZE(options->disassemblers) && err !=3D 0; i+= +) { enum perf_disassembler dis =3D options->disassemblers[i]; --=20 2.50.0.727.gbf7dc18ff4-goog