From nobody Mon Oct 6 03:14:00 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 18F6025B2F4; Fri, 25 Jul 2025 19:38:05 +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=1753472286; cv=none; b=AZDl6DKoCOguEp+h1edySY3126etjwGiAppo9qfvwax77v8F38fgxqY9IJgGwssWYPeDSFxtPMPOGSmNexAUbDOercQQ+WUn3BQX6C6L9rip9nbCPEVQ9LiWt7Xp22pvuap/2e4jKcnXdRA36PWsacJ/pwcasd87ndBkBz1R/Xw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753472286; c=relaxed/simple; bh=sV+jtxkR0MKnjqlOdl3FeDkrZ+55eI0w/gMHwiB93nk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F2DHfI3sPMF1Ija7oc/59+XkboAoh1E63Lmk27+iDBMGdO7U89MVuujus7OBrTPoAv6OsdxJgW7CDFUUecCut35DO6dWBbwZoKVXjvnQlimDjttCA44qpplKlq43RKQDLRx8v7KyjAZhEXLnv9ch/yHsCzAvgHE/hE1k8uhjD2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K1SlLC9j; 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="K1SlLC9j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50DEBC4CEEF; Fri, 25 Jul 2025 19:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753472285; bh=sV+jtxkR0MKnjqlOdl3FeDkrZ+55eI0w/gMHwiB93nk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K1SlLC9jj/UI/axYvABCWKItSIiMjyJEmzXv7yx9Qz4k8GrfozvIB+pMfW6wy3eCD TtBCdRlwR6PbueVIye1DhUU/IRxFT6Mtvkn/4uIN92ZE1Svm/sO6hFw4XGiDf2QXxF FOt5F/WPSZjYuRYuiEUhvVyfGHSRDoJR/Cf1WPzBc65ecXcup3C7wwAAKX9avOqyUG e9ZK4qWLPmMhjsK7Y7Zsq/8MELaxsoWUIZaqTCPJ1ewyIcOFxAHw0vx0GBsTiTHPZ3 nRBcQSmdCn5SgewNusqEIBLR+g6fB5YP9xEn1QPrjOYp17Efv/w1m4kSM9ptMZEWl+ NoZ2RZL1e+CGg== 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 v4 8/9] perf annotate: Hide data-type for stack operation and canary Date: Fri, 25 Jul 2025 12:37:54 -0700 Message-ID: <20250725193755.12276-9-namhyung@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250725193755.12276-1-namhyung@kernel.org> References: <20250725193755.12276-1-namhyung@kernel.org> 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" It's mostly unnecessary to print when it has no actual type information like in the stack operations and canary. Let's have them if -v option is given. Before: $ perf annotate --code-with-type ... : 0 0xd640 <_dl_relocate_object>: 0.00 : 0: endbr64 0.00 : 4: pushq %rbp # data-type: (stack operati= on) 0.00 : 5: movq %rsp, %rbp 0.00 : 8: pushq %r15 # data-type: (stack operati= on) 0.00 : a: pushq %r14 # data-type: (stack operati= on) 0.00 : c: pushq %r13 # data-type: (stack operati= on) 0.00 : e: pushq %r12 # data-type: (stack operati= on) 0.00 : 10: pushq %rbx # data-type: (stack operati= on) 0.00 : 11: subq $0xf8, %rsp ... 0.00 : d4: testl %eax, %eax 0.00 : d6: jne 0xf424 0.00 : dc: movq 0xf0(%r14), %rbx # data-type= : struct link_map +0xf0 0.00 : e3: testq %rbx, %rbx 0.00 : e6: jne 0xf2dd 0.00 : ec: cmpq $0, 0xf8(%r14) # data-type: struct= link_map +0xf8 ... After: : 0 0xd640 <_dl_relocate_object>: 0.00 : 0: endbr64 0.00 : 4: pushq %rbp 0.00 : 5: movq %rsp, %rbp 0.00 : 8: pushq %r15 0.00 : a: pushq %r14 0.00 : c: pushq %r13 0.00 : e: pushq %r12 0.00 : 10: pushq %rbx 0.00 : 11: subq $0xf8, %rsp ... 0.00 : d4: testl %eax, %eax 0.00 : d6: jne 0xf424 0.00 : dc: movq 0xf0(%r14), %rbx # data-type= : struct link_map +0xf0 0.00 : e3: testq %rbx, %rbx 0.00 : e6: jne 0xf2dd 0.00 : ec: cmpq $0, 0xf8(%r14) # data-type: struct= link_map +0xf8 ... Signed-off-by: Namhyung Kim Reviewed-by: Ian Rogers --- tools/perf/util/annotate.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 06ddc7a9f58722a4..6fc07971631ac8a3 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -765,6 +765,17 @@ __hist_entry__get_data_type(struct hist_entry *he, str= uct arch *arch, struct debuginfo *dbg, struct disasm_line *dl, int *type_offset); =20 +static bool needs_type_info(struct annotated_data_type *data_type) +{ + if (data_type =3D=3D NULL || data_type =3D=3D NO_TYPE) + return false; + + if (verbose) + return true; + + return (data_type !=3D &stackop_type) && (data_type !=3D &canary_type); +} + static int annotation_line__print(struct annotation_line *al, struct annotation_print= _data *apd, struct annotation_options *opts, int printed, @@ -844,7 +855,7 @@ annotation_line__print(struct annotation_line *al, stru= ct annotation_print_data =20 data_type =3D __hist_entry__get_data_type(apd->he, apd->arch, apd->dbg, dl, &offset); - if (data_type && data_type !=3D NO_TYPE) { + if (needs_type_info(data_type)) { char buf[4096]; =20 printf("\t\t# data-type: %s", @@ -2138,7 +2149,7 @@ void annotation_line__write(struct annotation_line *a= l, struct annotation *notes apd->dbg, disasm_line(al), &offset); - if (data_type && data_type !=3D NO_TYPE) { + if (needs_type_info(data_type)) { char member[256]; =20 printed =3D scnprintf(bf, sizeof(bf), --=20 2.50.1