Revision 3cf6a32f3f2a45944dd5be5c6ac4deb46bcd3bee authored by Michael Petlan on 17 March 2022, 13:55:36 UTC, committed by Arnaldo Carvalho de Melo on 18 March 2022, 21:39:09 UTC
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.

Fixes: 3b01a413c196c910 ("perf symbols: Improve kallsyms symbol end addr calculation")
Signed-off-by: Michael Petlan <mpetlan@redhat.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: http://lore.kernel.org/lkml/20220317135536.805-1-mpetlan@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 34e047a
History
File Mode Size
Kconfig -rw-r--r-- 5.4 KB
Makefile -rw-r--r-- 967 bytes
dsa.c -rw-r--r-- 11.6 KB
dsa2.c -rw-r--r-- 38.5 KB
dsa_priv.h -rw-r--r-- 16.4 KB
master.c -rw-r--r-- 10.3 KB
port.c -rw-r--r-- 32.9 KB
slave.c -rw-r--r-- 65.6 KB
switch.c -rw-r--r-- 18.7 KB
tag_8021q.c -rw-r--r-- 17.2 KB
tag_ar9331.c -rw-r--r-- 2.3 KB
tag_brcm.c -rw-r--r-- 8.6 KB
tag_dsa.c -rw-r--r-- 11.2 KB
tag_gswip.c -rw-r--r-- 2.7 KB
tag_hellcreek.c -rw-r--r-- 1.4 KB
tag_ksz.c -rw-r--r-- 5.6 KB
tag_lan9303.c -rw-r--r-- 3.5 KB
tag_mtk.c -rw-r--r-- 2.6 KB
tag_ocelot.c -rw-r--r-- 6.5 KB
tag_ocelot_8021q.c -rw-r--r-- 3.3 KB
tag_qca.c -rw-r--r-- 2.3 KB
tag_rtl4_a.c -rw-r--r-- 3.0 KB
tag_rtl8_4.c -rw-r--r-- 5.8 KB
tag_sja1105.c -rw-r--r-- 23.7 KB
tag_trailer.c -rw-r--r-- 1.3 KB
tag_xrs700x.c -rw-r--r-- 1.3 KB

back to top