Skip to content

Commit 60fd39a

Browse files
willdeaconjpoimboe
authored andcommitted
scripts/faddr2line: Skip over mapping symbols in output from readelf
Mapping symbols emitted in the readelf output can confuse the 'faddr2line' symbol size calculation, resulting in the erroneous rejection of valid offsets. This is especially prevalent when building an arm64 kernel with CONFIG_CFI_CLANG=y, where most functions are prefixed with a 32-bit data value in a '$d.n' section. For example: 447538: ffff800080014b80 548 FUNC GLOBAL DEFAULT 2 do_one_initcall 104: ffff800080014c74 0 NOTYPE LOCAL DEFAULT 2 $x.73 106: ffff800080014d30 0 NOTYPE LOCAL DEFAULT 2 $x.75 111: ffff800080014da4 0 NOTYPE LOCAL DEFAULT 2 $d.78 112: ffff800080014da8 0 NOTYPE LOCAL DEFAULT 2 $x.79 36: ffff800080014de0 200 FUNC LOCAL DEFAULT 2 run_init_process Adding a warning to do_one_initcall() results in: | WARNING: CPU: 0 PID: 1 at init/main.c:1236 do_one_initcall+0xf4/0x260 Which 'faddr2line' refuses to accept: $ ./scripts/faddr2line vmlinux do_one_initcall+0xf4/0x260 skipping do_one_initcall address at 0xffff800080014c74 due to size mismatch (0x260 != 0x224) no match for do_one_initcall+0xf4/0x260 Filter out these entries from readelf using a shell reimplementation of is_mapping_symbol(), so that the size of a symbol is calculated as a delta to the next symbol present in ksymtab. Suggested-by: Masahiro Yamada <[email protected]> Signed-off-by: Will Deacon <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Josh Poimboeuf <[email protected]>
1 parent 86bf86e commit 60fd39a

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

scripts/faddr2line

+5
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@ __faddr2line() {
179179
local cur_sym_elf_size=${fields[2]}
180180
local cur_sym_name=${fields[7]:-}
181181

182+
# is_mapping_symbol(cur_sym_name)
183+
if [[ ${cur_sym_name} =~ ^(\.L|L0|\$) ]]; then
184+
continue
185+
fi
186+
182187
if [[ $cur_sym_addr = $sym_addr ]] &&
183188
[[ $cur_sym_elf_size = $sym_elf_size ]] &&
184189
[[ $cur_sym_name = $sym_name ]]; then

0 commit comments

Comments
 (0)