perf tools: Tidy up symbol end fixup (v3)
Subsystems (3)
Namhyung Kim
maintainercover perf tools: Tidy up symbol end fixup (v3)
Hello,
This work is a follow-up of Ian's previous one at
https://lore.kernel.org/all/[email protected]/
Fixing up more symbol ends as introduced in:
https://lore.kernel.org/lkml/[email protected]/
it caused perf annotate to run into memory limits - every symbol holds all the disassembled code in the annotation, and so making symbols ends further away dramatically increased memory usage (40MB to >1GB).
Modify the symbol end fixup logic so that special kernel cases aren't applied in the common case.
v3 changes)
* rename is_kernel to is_kallsyms
* move the logic to generic function
* remove arch-specific functions
Thanks,
Namhyung
Namhyung Kim (3):
perf symbol: Pass is_kallsyms to symbols__fixup_end() perf symbol: Update symbols__fixup_end() perf symbol: Remove arch__symbols__fixup_end()
tools/perf/arch/arm64/util/machine.c | 21 --------------- tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/powerpc/util/machine.c | 25 ----------------- tools/perf/arch/s390/util/machine.c | 16 ----------- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 37 +++++++++++++++++++------- tools/perf/util/symbol.h | 3 +-- 7 files changed, 29 insertions(+), 76 deletions(-) delete mode 100644 tools/perf/arch/powerpc/util/machine.c
base-commit: 41204da4c16071be9090940b18f566832d46becc
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
Namhyung Kim
maintainerPATCH 1/3 perf symbol: Pass is_kallsyms to symbols__fixup_end()
The symbol fixup is necessary for symbols in kallsyms since they don't have size info. So we use the next symbol's address to calculate the size. Now it's also used for user binaries because sometimes they miss size for hand-written asm functions.
There's a arch-specific function to handle kallsyms differently but currently it cannot distinguish kallsyms from others. Pass this information explicitly to handle it properly. Note that those arch functions will be moved to the generic function so I didn't added it to the arch-functions.
--- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 7 ++++--- tools/perf/util/symbol.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
tools/perf/util/symbol-elf.c +1 -1
@@ -1290,7 +1290,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,* For misannotated, zeroed, ASM function sizes. */ if (nr >0 ) { -symbols__fixup_end (&dso->symbols); +symbols__fixup_end (&dso->symbols, false);symbols__fixup_duplicate (&dso->symbols);if (kmap) {/*
tools/perf/util/symbol.c +4 -3
@@ -217,7 +217,8 @@ void symbols__fixup_duplicate(struct rb_root_cached *symbols) } } -void symbols__fixup_end (struct rb_root_cached *symbols) +void symbols__fixup_end (struct rb_root_cached *symbols, +bool is_kallsyms__maybe_unused ) {struct rb_node *nd, *prevnd =rb_first_cached (symbols);struct symbol *curr, *prev;
@@ -1467,7 +1468,7 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename,if (kallsyms__delta (kmap, filename, &delta))return -1 ; -symbols__fixup_end (&dso->symbols); +symbols__fixup_end (&dso->symbols, true);symbols__fixup_duplicate (&dso->symbols);if (dso->kernel ==DSO_SPACE__KERNEL_GUEST )
@@ -1659,7 +1660,7 @@ int dso__load_bfd_symbols(struct dso *dso, const char *debugfile)#undef bfd_asymbol_section#endif -symbols__fixup_end (&dso->symbols); +symbols__fixup_end (&dso->symbols, false);symbols__fixup_duplicate (&dso->symbols); dso->adjust_symbols =1 ;
tools/perf/util/symbol.h +1 -1
@@ -203,7 +203,7 @@ void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym, bool kernel);void symbols__insert (struct rb_root_cached *symbols,struct symbol *sym);void symbols__fixup_duplicate (struct rb_root_cached *symbols); -void symbols__fixup_end (struct rb_root_cached *symbols); +void symbols__fixup_end (struct rb_root_cached *symbols,bool is_kallsyms);void maps__fixup_end (struct maps *maps);typedef int (*mapfn_t )(u64 start,u64 len,u64 pgoff,void *data);
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
Ian Rogers
reviewerRe: [PATCH 1/3] perf symbol: Pass is_kallsyms to symbols__fixup_end()
Quoted 11 lines · Namhyung Kim
The symbol fixup is necessary for symbols in kallsyms since they don't have size info. So we use the next symbol's address to calculate the size. Now it's also used for user binaries because sometimes they miss size for hand-written asm functions.
There's a arch-specific function to handle kallsyms differently but currently it cannot distinguish kallsyms from others. Pass this information explicitly to handle it properly. Note that those arch functions will be moved to the generic function so I didn't added it to the arch-functions.
Thanks Namhyung, in:
https://lore.kernel.org/linux-perf-users/[email protected]/
I used "dso->kernel != DSO_SPACE__USER" in symbol-elf to make this more than just kallsyms as presumably kernel code is the issue. Do we know elf kernel code has correctly sized symbols?
Thanks,
Ian
Quoted 68 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 7 ++++--- tools/perf/util/symbol.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)tools/perf/util/symbol-elf.c +1
-1@@ -1290,7 +1290,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,* For misannotated, zeroed, ASM function sizes. */ if (nr >0 ) { -symbols__fixup_end (&dso->symbols); +symbols__fixup_end (&dso->symbols, false);symbols__fixup_duplicate (&dso->symbols);if (kmap) {/* tools/perf/util/symbol.c +4
-3@@ -217,7 +217,8 @@ void symbols__fixup_duplicate(struct rb_root_cached *symbols) } } -void symbols__fixup_end (struct rb_root_cached *symbols) +void symbols__fixup_end (struct rb_root_cached *symbols, +bool is_kallsyms__maybe_unused ) {struct rb_node *nd, *prevnd =rb_first_cached (symbols);struct symbol *curr, *prev;@@ -1467,7 +1468,7 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename,if (kallsyms__delta (kmap, filename, &delta))return -1 ; -symbols__fixup_end (&dso->symbols); +symbols__fixup_end (&dso->symbols, true);symbols__fixup_duplicate (&dso->symbols);if (dso->kernel ==DSO_SPACE__KERNEL_GUEST )@@ -1659,7 +1660,7 @@ int dso__load_bfd_symbols(struct dso *dso, const char *debugfile)#undef bfd_asymbol_section#endif -symbols__fixup_end (&dso->symbols); +symbols__fixup_end (&dso->symbols, false);symbols__fixup_duplicate (&dso->symbols); dso->adjust_symbols =1 ;tools/perf/util/symbol.h +1
-2@@ -203,7 +203,7 @@ void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym, bool kernel);void symbols__insert (struct rb_root_cached *symbols,struct symbol *sym);void symbols__fixup_duplicate (struct rb_root_cached *symbols); -void symbols__fixup_end (struct rb_root_cached *symbols); +void symbols__fixup_end (struct rb_root_cached *symbols,bool is_kallsyms);void maps__fixup_end (struct maps *maps);typedef int (*mapfn_t )(u64 start,u64 len,u64 pgoff,void *data); --2.36.0.rc0.470.gd361397f0d-goog
Namhyung Kim
maintainerRe: [PATCH 1/3] perf symbol: Pass is_kallsyms to symbols__fixup_end()
Hi Ian,
Quoted 14 lines · Ian Rogers
Quoted 11 lines · Namhyung Kim
The symbol fixup is necessary for symbols in kallsyms since they don't have size info. So we use the next symbol's address to calculate the size. Now it's also used for user binaries because sometimes they miss size for hand-written asm functions.
There's a arch-specific function to handle kallsyms differently but currently it cannot distinguish kallsyms from others. Pass this information explicitly to handle it properly. Note that those arch functions will be moved to the generic function so I didn't added it to the arch-functions.
Quoted 5 lines
Thanks Namhyung, in:
https://lore.kernel.org/linux-perf-users/[email protected]/
I used "dso->kernel!=DSO_SPACE__USER" in symbol-elf to make this more than just kallsyms as presumably kernel code is the issue. Do we know elf kernel code has correctly sized symbols?
Yeah, IIUC the whole point of the symbol end fixup is because the kallsyms doesn't have the symbol size info. Every ELF binaries should have the size except for some hand-written asm functions which missed adding it manually. I guess that's the reason it was added to other DSO loading paths.
Also considering "[" (and "]") in the symbol name is specific to kallsyms which has both kernel and module symbols together.
Thanks,
Namhyung
Namhyung Kim
maintainerPATCH 2/3 perf symbol: Update symbols__fixup_end()
In reply to Namhyung KimNow arch-specific functions all do the same thing. When it fixes the symbol address it needs to check the boundary between the kernel image and modules. For the last symbol in the previous region, it cannot know the exact size as it's discarded already. Thus it just uses a small page size (4096) and rounds it up like the last symbol.
--- tools/perf/util/symbol.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
tools/perf/util/symbol.c +25 -4
@@ -217,8 +217,8 @@ void symbols__fixup_duplicate(struct rb_root_cached *symbols) } } -void symbols__fixup_end (struct rb_root_cached *symbols, -bool is_kallsyms__maybe_unused ) +/* Update zero-sized symbols using the address of the next symbol */ +void symbols__fixup_end (struct rb_root_cached *symbols,bool is_kallsyms) {struct rb_node *nd, *prevnd =rb_first_cached (symbols);struct symbol *curr, *prev;
@@ -232,8 +232,29 @@ void symbols__fixup_end(struct rb_root_cached *symbols, prev = curr; curr = rb_entry(nd, struct symbol, rb_node); -if (prev->end == prev->start || prev->end != curr->start) -arch__symbols__fixup_end (prev, curr); +/* +* On some architecture kernel text segment start is located at +* some low memory address, while modules are located at high +* memory addresses (or vice versa). The gap between end of +* kernel text segment and beginning of first module's text +* segment is very big. Therefore do not fill this gap and do +* not assign it to the kernel dso map (kallsyms). +* +* In kallsyms, it determines module symbols using '[' character +* like in: +* ffffffffc1937000 T hdmi_driver_init [snd_hda_codec_hdmi] +*/ +if (prev->end == prev->start) { +/* Last kernel/module symbol mapped to end of page */ +if (is_kallsyms && (!strchr (prev->name,'[' ) != + !strchr (curr->name,'[' ))) + prev->end =roundup (prev->end +4096 ,4096 ); +else + prev->end = curr->start; + +pr_debug4 ("%s sym:%s end:%#" PRIx64"\n" , + __func__, prev->name, prev->end); + } }/* Last entry */
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
Namhyung Kim
maintainerPATCH 3/3 perf symbol: Remove arch__symbols__fixup_end()
In reply to Namhyung KimNow the generic code can handle kallsyms fixup properly so no need to keep the arch-functions anymore.
--- tools/perf/arch/arm64/util/machine.c | 21 --------------------- tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/powerpc/util/machine.c | 25 ------------------------- tools/perf/arch/s390/util/machine.c | 16 ---------------- tools/perf/util/symbol.c | 5 ----- tools/perf/util/symbol.h | 1 - 6 files changed, 69 deletions(-) delete mode 100644 tools/perf/arch/powerpc/util/machine.c
tools/perf/arch/arm64/util/machine.c +0 -21
@@ -8,27 +8,6 @@#include "callchain.h" #include "record.h" -/* On arm64, kernel text segment starts at high memory address, -* for example 0xffff 0000 8xxx xxxx. Modules start at a low memory -* address, like 0xffff 0000 00ax xxxx. When only small amount of -* memory is used by modules, gap between end of module's text segment -* and start of kernel text segment may reach 2G. -* Therefore do not fill this gap and do not assign it to the kernel dso map. -*/ - -#define SYMBOL_LIMIT (1 << 12)/* 4K */ - -void arch__symbols__fixup_end (struct symbol *p,struct symbol *c) -{ -if ((strchr (p->name,'[' ) &&strchr (c->name,'[' ) ==NULL ) || - (strchr (p->name,'[' ) ==NULL &&strchr (c->name,'[' ))) -/* Limit range of last symbol in module and kernel */ - p->end +=SYMBOL_LIMIT ; -else - p->end = c->start; -pr_debug4 ("%s sym:%s end:%#" PRIx64"\n" , __func__, p->name, p->end); -} -void arch__add_leaf_frame_record_opts (struct record_opts *opts) { opts->sample_user_regs |= sample_reg_masks[PERF_REG_ARM64_LR ].mask;
tools/perf/arch/powerpc/util/Build +0 -1
@@ -1,5 +1,4 @@ perf-y += header.o -perf-y += machine.o perf-y += kvm-stat.o perf-y += perf_regs.o perf-y += mem-events.o
tools/perf/arch/powerpc/util/machine.c deleted +0 -25
@@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include <inttypes.h> -#include <stdio.h> -#include <string.h> -#include <internal/lib.h> // page_size -#include "debug.h" -#include "symbol.h" - -/* On powerpc kernel text segment start at memory addresses, 0xc000000000000000 -* whereas the modules are located at very high memory addresses, -* for example 0xc00800000xxxxxxx. The gap between end of kernel text segment -* and beginning of first module's text segment is very high. -* Therefore do not fill this gap and do not assign it to the kernel dso map. -*/ - -void arch__symbols__fixup_end (struct symbol *p,struct symbol *c) -{ -if (strchr (p->name,'[' ) ==NULL &&strchr (c->name,'[' )) -/* Limit the range of last kernel symbol */ - p->end += page_size; -else - p->end = c->start; -pr_debug4 ("%s sym:%s end:%#" PRIx64"\n" , __func__, p->name, p->end); -}
tools/perf/arch/s390/util/machine.c +0 -16
@@ -35,19 +35,3 @@ int arch__fix_module_text_start(u64 *start, u64 *size, const char *name)return 0 ; } - -/* On s390 kernel text segment start is located at very low memory addresses, -* for example 0x10000. Modules are located at very high memory addresses, -* for example 0x3ff xxxx xxxx. The gap between end of kernel text segment -* and beginning of first module's text segment is very big. -* Therefore do not fill this gap and do not assign it to the kernel dso map. -*/ -void arch__symbols__fixup_end (struct symbol *p,struct symbol *c) -{ -if (strchr (p->name,'[' ) ==NULL &&strchr (c->name,'[' )) -/* Last kernel symbol mapped to end of page */ - p->end =roundup (p->end, page_size); -else - p->end = c->start; -pr_debug4 ("%s sym:%s end:%#" PRIx64"\n" , __func__, p->name, p->end); -}
tools/perf/util/symbol.c +0 -5
@@ -101,11 +101,6 @@ static int prefix_underscores_count(const char *str)return tail - str; } -void __weak arch__symbols__fixup_end (struct symbol *p,struct symbol *c) -{ - p->end = c->start; -} -const char *__weak arch__normalize_symbol_name (const char *name) {return name;
tools/perf/util/symbol.h +0 -1
@@ -241,7 +241,6 @@ const char *arch__normalize_symbol_name(const char *name);#define SYMBOL_A 0#define SYMBOL_B 1 -void arch__symbols__fixup_end (struct symbol *p,struct symbol *c);int arch__compare_symbol_names (const char *namea,const char *nameb);int arch__compare_symbol_names_n (const char *namea,const char *nameb,unsigned int n);
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
Quoted 16 lines · Namhyung Kim
Hello,
This work is a follow-up of Ian's previous one at
https://lore.kernel.org/all/[email protected]/Fixing up more symbol ends as introduced in:
https://lore.kernel.org/lkml/[email protected]/it caused perf annotate to run into memory limits - every symbol holds all the disassembled code in the annotation, and so making symbols ends further away dramatically increased memory usage (40MB to >1GB).
Modify the symbol end fixup logic so that special kernel cases aren't applied in the common case.
Quoted 7 lines
v3 changes)
* renameis_kerneltois_kallsyms
* move the logic to generic function
* remove arch-specific functionsThanks,
Namhyung
Thanks Namhyung! The series:
Quoted 20 lines
Namhyung Kim (3):
perf symbol: Passis_kallsymstosymbols__fixup_end()perf symbol: Updatesymbols__fixup_end()perf symbol: Removearch__symbols__fixup_end()tools/perf/arch/arm64/util/machine.c | 21 --------------- tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/powerpc/util/machine.c | 25 ----------------- tools/perf/arch/s390/util/machine.c | 16 ----------- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 37 +++++++++++++++++++------- tools/perf/util/symbol.h | 3 +-- 7 files changed, 29 insertions(+), 76 deletions(-) delete mode 100644 tools/perf/arch/powerpc/util/machine.cbase-commit:
41204da4c16071be9090940b18f566832d46becc--
2.36.0.rc0.470.gd361397f0d-goog
Em Mon, Apr 25, 2022 at 01:59:03PM -0700, Ian Rogers escreveu:
Quoted 22 lines · Namhyung Kim
Quoted 21 lines
Hello,
This work is a follow-up of Ian's previous one at
https://lore.kernel.org/all/[email protected]/Fixing up more symbol ends as introduced in:
https://lore.kernel.org/lkml/[email protected]/it caused perf annotate to run into memory limits - every symbol holds all the disassembled code in the annotation, and so making symbols ends further away dramatically increased memory usage (40MB to >1GB).
Modify the symbol end fixup logic so that special kernel cases aren't applied in the common case.
v3 changes)
* renameis_kerneltois_kallsyms
* move the logic to generic function
* remove arch-specific functions
Quoted 6 lines
Quoted 2 lines
Thanks,
NamhyungThanks Namhyung! The series:
Acked-by Ian Rogers <[email protected]>
Thanks, applied to perf/urgent.
- Arnaldo
Quoted 20 lines
Quoted 20 lines
Namhyung Kim (3):
perf symbol: Passis_kallsymstosymbols__fixup_end()perf symbol: Updatesymbols__fixup_end()perf symbol: Removearch__symbols__fixup_end()tools/perf/arch/arm64/util/machine.c | 21 --------------- tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/powerpc/util/machine.c | 25 ----------------- tools/perf/arch/s390/util/machine.c | 16 ----------- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 37 +++++++++++++++++++------- tools/perf/util/symbol.h | 3 +-- 7 files changed, 29 insertions(+), 76 deletions(-) delete mode 100644 tools/perf/arch/powerpc/util/machine.cbase-commit:
41204da4c16071be9090940b18f566832d46becc--
2.36.0.rc0.470.gd361397f0d-goog
Signature · 1 line
- Arnaldo