diff options
| author | Namhyung Kim <[email protected]> | 2024-04-11 03:32:50 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2024-04-12 15:02:06 +0000 |
| commit | eb833488631b171e693a6917eb17b41fdedda659 (patch) | |
| tree | 6ad14f45365cff8843c7e92a5ecbdc2dcead5256 /tools/perf/util/annotate.c | |
| parent | perf tests: Remove dependency on lscpu (diff) | |
| download | kernel-eb833488631b171e693a6917eb17b41fdedda659.tar.gz kernel-eb833488631b171e693a6917eb17b41fdedda659.zip | |
perf annotate-data: Skip sample histogram for stack canary
It's a pseudo data type and has no field.
Fixes: b3c95109c131fcc9 ("perf annotate-data: Add stack canary type")
Closes: https://lore.kernel.org/lkml/Zhb6jJneP36Z-or0@x1
Reported-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Namhyung Kim <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: Ian Rogers <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 11da27801d88..ec79c120a7d2 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2399,8 +2399,9 @@ retry: mem_type = find_data_type(&dloc); if (mem_type == NULL && is_stack_canary(arch, op_loc)) { - mem_type = &canary_type; - dloc.type_offset = 0; + istat->good++; + he->mem_type_off = 0; + return &canary_type; } if (mem_type) |