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 operation)
0.00 : 5: movq %rsp, %rbp
0.00 : 8: pushq %r15 # data-type: (stack operation)
0.00 : a: pushq %r14 # data-type: (stack operation)
0.00 : c: pushq %r13 # data-type: (stack operation)
0.00 : e: pushq %r12 # data-type: (stack operation)
0.00 : 10: pushq %rbx # data-type: (stack operation)
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
...
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
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 99e976d254493de2..ea68b32da7ce584a 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, struct arch *arch,
struct debuginfo *dbg, struct disasm_line *dl,
int *type_offset);
+static bool needs_type_info(struct annotated_data_type *data_type)
+{
+ if (data_type == NULL || data_type == NO_TYPE)
+ return false;
+
+ if (verbose)
+ return true;
+
+ return (data_type != &stackop_type) && (data_type != &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, struct annotation_print_data
data_type = __hist_entry__get_data_type(apd->he, apd->arch,
apd->dbg, dl, &offset);
- if (data_type && data_type != NO_TYPE) {
+ if (needs_type_info(data_type)) {
char buf[4096];
printf("\t\t# data-type: %s",
@@ -1958,7 +1969,7 @@ static int disasm_line__snprint_type_info(struct disasm_line *dl,
return 1;
data_type = __hist_entry__get_data_type(apd->he, apd->arch, apd->dbg, dl, &offset);
- if (data_type == NULL || data_type == NO_TYPE)
+ if (!needs_type_info(data_type))
return 1;
printed = scnprintf(buf, len, "\t\t# data-type: %s", data_type->self.type_name);
--
2.50.1On Fri, Aug 15, 2025 at 08:16:33PM -0700, Namhyung Kim wrote:
> 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.
In the main 'report' TUI the 'V' key is wired to bumping the verbose
level, wiring it up in the annotation view seems in order :-)
- Arnaldo
> Before:
> $ perf annotate --code-with-type
> ...
> : 0 0xd640 <_dl_relocate_object>:
> 0.00 : 0: endbr64
> 0.00 : 4: pushq %rbp # data-type: (stack operation)
> 0.00 : 5: movq %rsp, %rbp
> 0.00 : 8: pushq %r15 # data-type: (stack operation)
> 0.00 : a: pushq %r14 # data-type: (stack operation)
> 0.00 : c: pushq %r13 # data-type: (stack operation)
> 0.00 : e: pushq %r12 # data-type: (stack operation)
> 0.00 : 10: pushq %rbx # data-type: (stack operation)
> 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
> ...
>
> Reviewed-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> 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 99e976d254493de2..ea68b32da7ce584a 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, struct arch *arch,
> struct debuginfo *dbg, struct disasm_line *dl,
> int *type_offset);
>
> +static bool needs_type_info(struct annotated_data_type *data_type)
> +{
> + if (data_type == NULL || data_type == NO_TYPE)
> + return false;
> +
> + if (verbose)
> + return true;
> +
> + return (data_type != &stackop_type) && (data_type != &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, struct annotation_print_data
>
> data_type = __hist_entry__get_data_type(apd->he, apd->arch,
> apd->dbg, dl, &offset);
> - if (data_type && data_type != NO_TYPE) {
> + if (needs_type_info(data_type)) {
> char buf[4096];
>
> printf("\t\t# data-type: %s",
> @@ -1958,7 +1969,7 @@ static int disasm_line__snprint_type_info(struct disasm_line *dl,
> return 1;
>
> data_type = __hist_entry__get_data_type(apd->he, apd->arch, apd->dbg, dl, &offset);
> - if (data_type == NULL || data_type == NO_TYPE)
> + if (!needs_type_info(data_type))
> return 1;
>
> printed = scnprintf(buf, len, "\t\t# data-type: %s", data_type->self.type_name);
> --
> 2.50.1
>
On Wed, Aug 20, 2025 at 06:28:53PM -0300, Arnaldo Carvalho de Melo wrote:
> On Fri, Aug 15, 2025 at 08:16:33PM -0700, Namhyung Kim wrote:
> > 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.
>
> In the main 'report' TUI the 'V' key is wired to bumping the verbose
> level, wiring it up in the annotation view seems in order :-)
So using just 'perf top', then pressing 'V' and then going into the
annotation gets the verbose level needed to show these stack operations
in the annotate view :-)
- Arnaldo
> > Before:
> > $ perf annotate --code-with-type
> > ...
> > : 0 0xd640 <_dl_relocate_object>:
> > 0.00 : 0: endbr64
> > 0.00 : 4: pushq %rbp # data-type: (stack operation)
> > 0.00 : 5: movq %rsp, %rbp
> > 0.00 : 8: pushq %r15 # data-type: (stack operation)
> > 0.00 : a: pushq %r14 # data-type: (stack operation)
> > 0.00 : c: pushq %r13 # data-type: (stack operation)
> > 0.00 : e: pushq %r12 # data-type: (stack operation)
> > 0.00 : 10: pushq %rbx # data-type: (stack operation)
> > 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
> > ...
> >
> > Reviewed-by: Ian Rogers <irogers@google.com>
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> > 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 99e976d254493de2..ea68b32da7ce584a 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, struct arch *arch,
> > struct debuginfo *dbg, struct disasm_line *dl,
> > int *type_offset);
> >
> > +static bool needs_type_info(struct annotated_data_type *data_type)
> > +{
> > + if (data_type == NULL || data_type == NO_TYPE)
> > + return false;
> > +
> > + if (verbose)
> > + return true;
> > +
> > + return (data_type != &stackop_type) && (data_type != &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, struct annotation_print_data
> >
> > data_type = __hist_entry__get_data_type(apd->he, apd->arch,
> > apd->dbg, dl, &offset);
> > - if (data_type && data_type != NO_TYPE) {
> > + if (needs_type_info(data_type)) {
> > char buf[4096];
> >
> > printf("\t\t# data-type: %s",
> > @@ -1958,7 +1969,7 @@ static int disasm_line__snprint_type_info(struct disasm_line *dl,
> > return 1;
> >
> > data_type = __hist_entry__get_data_type(apd->he, apd->arch, apd->dbg, dl, &offset);
> > - if (data_type == NULL || data_type == NO_TYPE)
> > + if (!needs_type_info(data_type))
> > return 1;
> >
> > printed = scnprintf(buf, len, "\t\t# data-type: %s", data_type->self.type_name);
> > --
> > 2.50.1
> >
© 2016 - 2025 Red Hat, Inc.