iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kallsyms: Take callthunks into account

Browse Source 
Since the pre-symbol function padding is an integral part of the
symbol make kallsyms report it as part of the symbol by reporting it
as sym-x instead of prev_sym+y.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220915111148.409656012@infradead.org
This commit is contained in:
Peter Zijlstra 2022-09-15 13:11:32 +02:00
parent 7825451fa4
commit f138918162
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
kernel/kallsyms.c
View File

@ -293,6 +293,12 @@ static unsigned long get_symbol_pos(unsigned long addr,
return low; return low;
} }
#ifdef CONFIG_FUNCTION_PADDING_BYTES
#define PADDING_BYTES CONFIG_FUNCTION_PADDING_BYTES
#else
#define PADDING_BYTES 0
#endif
/* /*
* Lookup an address but don't bother to find any names. * Lookup an address but don't bother to find any names.
*/ */
@ -300,13 +306,25 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize,
unsigned long *offset) unsigned long *offset)
{ {
char namebuf[KSYM_NAME_LEN]; char namebuf[KSYM_NAME_LEN];
int ret;
addr += PADDING_BYTES;
if (is_ksym_addr(addr)) { if (is_ksym_addr(addr)) {
get_symbol_pos(addr, symbolsize, offset); get_symbol_pos(addr, symbolsize, offset);
return 1; ret = 1;
goto found;
} }
return !!module_address_lookup(addr, symbolsize, offset, NULL, NULL, namebuf) ||
!!__bpf_address_lookup(addr, symbolsize, offset, namebuf); ret = !!module_address_lookup(addr, symbolsize, offset, NULL, NULL, namebuf);
if (!ret) {
ret = !!__bpf_address_lookup(addr, symbolsize,
offset, namebuf);
}
found:
if (ret && offset)
*offset -= PADDING_BYTES;
return ret;
} }
static const char *kallsyms_lookup_buildid(unsigned long addr, static const char *kallsyms_lookup_buildid(unsigned long addr,
@ -319,6 +337,8 @@ static const char *kallsyms_lookup_buildid(unsigned long addr,
namebuf[KSYM_NAME_LEN - 1] = 0; namebuf[KSYM_NAME_LEN - 1] = 0;
namebuf[0] = 0; namebuf[0] = 0;
addr += PADDING_BYTES;
if (is_ksym_addr(addr)) { if (is_ksym_addr(addr)) {
unsigned long pos; unsigned long pos;
@ -348,6 +368,8 @@ static const char *kallsyms_lookup_buildid(unsigned long addr,
found: found:
cleanup_symbol_name(namebuf); cleanup_symbol_name(namebuf);
if (ret && offset)
*offset -= PADDING_BYTES;
return ret; return ret;
} }
@ -374,6 +396,8 @@ int lookup_symbol_name(unsigned long addr, char *symname)
symname[0] = '\0'; symname[0] = '\0';
symname[KSYM_NAME_LEN - 1] = '\0'; symname[KSYM_NAME_LEN - 1] = '\0';
addr += PADDING_BYTES;
if (is_ksym_addr(addr)) { if (is_ksym_addr(addr)) {
unsigned long pos; unsigned long pos;
@ -401,6 +425,8 @@ int lookup_symbol_attrs(unsigned long addr, unsigned long *size,
name[0] = '\0'; name[0] = '\0';
name[KSYM_NAME_LEN - 1] = '\0'; name[KSYM_NAME_LEN - 1] = '\0';
addr += PADDING_BYTES;
if (is_ksym_addr(addr)) { if (is_ksym_addr(addr)) {
unsigned long pos; unsigned long pos;
@ -417,6 +443,8 @@ int lookup_symbol_attrs(unsigned long addr, unsigned long *size,
return res; return res;
found: found:
if (offset)
*offset -= PADDING_BYTES;
cleanup_symbol_name(name); cleanup_symbol_name(name);
return 0; return 0;
} }
@ -442,8 +470,15 @@ static int __sprint_symbol(char *buffer, unsigned long address,
len = strlen(buffer); len = strlen(buffer);
offset -= symbol_offset; offset -= symbol_offset;
if (add_offset) if (add_offset) {
len += sprintf(buffer + len, "+%#lx/%#lx", offset, size); char s = '+';
if ((long)offset < 0) {
s = '-';
offset = 0UL - offset;
}
len += sprintf(buffer + len, "%c%#lx/%#lx", s, offset, size);
}
if (modname) { if (modname) {
len += sprintf(buffer + len, " [%s", modname); len += sprintf(buffer + len, " [%s", modname);