perf symbols: Fix symbol size calculation condition
PATCH 1/1 perf symbols: Fix symbol size calculation condition
Before this patch, the symbol end address fixup to be called, needed two conditions being met:
if (prev->end == prev->start && prev->end != curr->start)
Where
"prev->end == prev->start" means that prev is zero-long
(and thus needs a fixup)
and
"prev->end != curr->start" means that fixup hasn't been applied yet
However, this logic is incorrect in the following situation:
*curr = {rb_node = {__rb_parent_color = 278218928,
rb_right = 0x0, rb_left = 0x0},
start = 0xc000000000062354,
end = 0xc000000000062354, namelen = 40, type = 2 '\002', binding = 0 '\000', idle = 0 '\000', ignore = 0 '\000', inlined = 0 '\000', arch_sym = 0 '\000', annotate2 = false, name = 0x1159739e "kprobe_optinsn_page\t[__builtin__kprobes]"}
*prev = {rb_node = {__rb_parent_color = 278219041,
rb_right = 0x109548b0, rb_left = 0x109547c0}, start = 0xc000000000062354,
end = 0xc000000000062354, namelen = 12, type = 2 '\002', binding = 1 '\001', idle = 0 '\000', ignore = 0 '\000', inlined = 0 '\000', arch_sym = 0 '\000', annotate2 = false, name = 0x1095486e "optinsn_slot"}
In this case, prev->start == prev->end == curr->start == curr->end, thus the condition above thinks that "we need a fixup due to zero length of prev symbol, but it has been probably done, since the prev->end == curr->start", which is wrong.
After the patch, the execution path proceeds to arch__symbols__fixup_end function which fixes up the size of prev symbol by adding page_size to its end offset.
--- tools/perf/util/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/symbol.c +1 -1
@@ -231,7 +231,7 @@ 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) +if (prev->end == prev->start || prev->end != curr->start)arch__symbols__fixup_end (prev, curr); }
Signature · 1 line
2.18.4
Arnaldo Carvalho de Melo
maintainerEm Thu, Mar 17, 2022 at 02:55:36PM +0100, Michael Petlan escreveu:
Quoted 29 lines
Before this patch, the symbol end address fixup to be called, needed two conditions being met:
if (prev->end == prev->start && prev->end != curr->start)Where
"prev->end==prev->start" means that prev is zero-long
(and thus needs a fixup)
and
"prev->end!=curr->start" means that fixup hasn't been applied yetHowever, this logic is incorrect in the following situation:
*curr = {
rb_node= {__rb_parent_color= 278218928,
rb_right=0x0,rb_left=0x0},
start =0xc000000000062354,
end =0xc000000000062354, namelen = 40, type = 2 '\002', binding = 0 '\000', idle = 0 '\000', ignore = 0 '\000', inlined = 0 '\000',arch_sym= 0 '\000', annotate2 = false, name =0x1159739e"kprobe_optinsn_page\t[__builtin__kprobes]"}*prev = {
rb_node= {__rb_parent_color= 278219041,
rb_right=0x109548b0,rb_left=0x109547c0}, start =0xc000000000062354,
end =0xc000000000062354, namelen = 12, type = 2 '\002', binding = 1 '\001', idle = 0 '\000', ignore = 0 '\000', inlined = 0 '\000',arch_sym= 0 '\000', annotate2 = false, name =0x1095486e"optinsn_slot"}
Quoted 8 lines
In this case,
prev->start==prev->end==curr->start==curr->end, thus the condition above thinks that "we need a fixup due to zero length of prev symbol, but it has been probably done, since theprev->end==curr->start", which is wrong.After the patch, the execution path proceeds to
arch__symbols__fixup_endfunction which fixes up the size of prev symbol by addingpage_sizeto its end offset.
You missed this:
I'll add it to the patch, ok?
- Arnaldo
Quoted 20 lines
Signed-off-by Michael Petlan <[email protected]>--- tools/perf/util/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/symbol.c +1
-1@@ -231,7 +231,7 @@ 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) +if (prev->end == prev->start || prev->end != curr->start)arch__symbols__fixup_end (prev, curr); }Signature · 1 line
2.18.4
Signature · 1 line
- Arnaldo
Quoted 39 lines · Arnaldo Carvalho de Melo
Em Thu, Mar 17, 2022 at 02:55:36PM +0100, Michael Petlan escreveu:
Quoted 29 lines
Before this patch, the symbol end address fixup to be called, needed two conditions being met:
if (prev->end == prev->start && prev->end != curr->start)Where
"prev->end==prev->start" means that prev is zero-long
(and thus needs a fixup)
and
"prev->end!=curr->start" means that fixup hasn't been applied yetHowever, this logic is incorrect in the following situation:
*curr = {
rb_node= {__rb_parent_color= 278218928,
rb_right=0x0,rb_left=0x0},
start =0xc000000000062354,
end =0xc000000000062354, namelen = 40, type = 2 '\002', binding = 0 '\000', idle = 0 '\000', ignore = 0 '\000', inlined = 0 '\000',arch_sym= 0 '\000', annotate2 = false, name =0x1159739e"kprobe_optinsn_page\t[__builtin__kprobes]"}*prev = {
rb_node= {__rb_parent_color= 278219041,
rb_right=0x109548b0,rb_left=0x109547c0}, start =0xc000000000062354,
end =0xc000000000062354, namelen = 12, type = 2 '\002', binding = 1 '\001', idle = 0 '\000', ignore = 0 '\000', inlined = 0 '\000',arch_sym= 0 '\000', annotate2 = false, name =0x1095486e"optinsn_slot"}Quoted 8 lines
In this case,
prev->start==prev->end==curr->start==curr->end, thus the condition above thinks that "we need a fixup due to zero length of prev symbol, but it has been probably done, since theprev->end==curr->start", which is wrong.After the patch, the execution path proceeds to
arch__symbols__fixup_endfunction which fixes up the size of prev symbol by addingpage_sizeto its end offset.
Quoted 5 lines
You missed this:
Fixes 3b01a413c196c910 ("perf symbols: Improve kallsyms symbol end addr calculation")I'll add it to the patch, ok?
Sure thing. Thanks.
M
Quoted 29 lines
- Arnaldo
Quoted 20 lines
Signed-off-by Michael Petlan <[email protected]>--- tools/perf/util/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/symbol.c +1
-1@@ -231,7 +231,7 @@ 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) +if (prev->end == prev->start || prev->end != curr->start)arch__symbols__fixup_end (prev, curr); }Signature · 1 line
2.18.4Signature · 1 line
- Arnaldo