Tell kallsyms_lookup_name() to ignore type U entries
PATCH 1/1 Tell kallsyms_lookup_name() to ignore type U entries
When one module exports a function symbol and another module uses that symbol then kallsyms shows the symbol twice. Once from the consumer with a type of 'U' and once from the provider with a type of 't' or 'T'. On most architectures, both entries have the same address so it does not matter which one is returned by kallsyms_lookup_name(). But on architectures with function descriptors, the 'U' entry points to the descriptor, not to the code body, which is not what we want.
IA64 # grep -w qla2x00_remove_one /proc/kallsyms
a000000208c25ef8 U qla2x00_remove_one [qla2300] <= descriptor a000000208bf44c0 t qla2x00_remove_one [qla2xxx] <= function body
Tell kallsyms_lookup_name() to ignore type U entries.
---
kallsyms.c | 6 ++++-- module.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)
kernel/kallsyms.c +4 -2
@@ -144,12 +144,14 @@ unsigned long kallsyms_lookup_name(const {char namebuf[KSYM_NAME_LEN +1 ];unsigned long i; -unsigned int off; +unsigned int off, prev_off;for (i =0 , off =0 ; i < kallsyms_num_syms; i++) { + prev_off = off; off =kallsyms_expand_symbol (off, namebuf); -if (strcmp (namebuf, name) ==0 ) +if (strcmp (namebuf, name) ==0 && +kallsyms_get_symbol_type (prev_off) !='U' )return kallsyms_addresses[i]; }return module_kallsyms_lookup_name (name);
kernel/module.c +2 -1
@@ -2050,7 +2050,8 @@ static unsigned long mod_find_symname(stunsigned int i;for (i =0 ; i < mod->num_symtab; i++) -if (strcmp (name, mod->strtab+mod->symtab[i].st_name) ==0 ) +if (strcmp (name, mod->strtab+mod->symtab[i].st_name) ==0 && + mod->symtab[i].st_info !='U' )return mod->symtab[i].st_value;return 0 ; }
Quoted 19 lines · Keith Owens
When one module exports a function symbol and another module uses that symbol then kallsyms shows the symbol twice. Once from the consumer with a type of 'U' and once from the provider with a type of 't' or 'T'. On most architectures, both entries have the same address so it does not matter which one is returned by
kallsyms_lookup_name(). But on architectures with function descriptors, the 'U' entry points to the descriptor, not to the code body, which is not what we want.IA64 # grep -w
qla2x00_remove_one/proc/kallsymsa000000208c25ef8 U qla2x00_remove_one [qla2300] <= descriptor a000000208bf44c0 t qla2x00_remove_one [qla2xxx] <= function body[...]
kernel/kallsyms.c +0
-0@@ -144,12 +144,14 @@ unsigned long kallsyms_lookup_name(const {char namebuf[KSYM_NAME_LEN +1 ];unsigned long i;
kernel/kallsyms.c unsigned long kallsyms_lookup_name(const · line 154
Quoted 10 lines
kernel/kallsyms.c +4
-2-unsigned int off; +unsigned int off, prev_off;for (i =0 , off =0 ; i < kallsyms_num_syms; i++) { + prev_off = off; off =kallsyms_expand_symbol (off, namebuf); -if (strcmp (namebuf, name) ==0 ) +if (strcmp (namebuf, name) ==0 && +kallsyms_get_symbol_type (prev_off) !='U' )
This check should not be needed as it is already done in scripts/kallsyms.c so that these symbols don't end up in the kernel symbol table at all.
It seems that only symbols from modules can suffer from this problem, but maybe I'm missing something here...
Signature · 4 lines
Paulo Marques - www.grupopie.com
Pointy-Haired Boss: I don't see anything that could stand in our way.
Dilbert: Sanity? Reality? The laws of physics?PATCH v2 1/1 Tell kallsyms_lookup_name() to ignore type U entries
When one module exports a function symbol and another module uses that symbol then kallsyms shows the symbol twice. Once from the consumer with a type of 'U' and once from the provider with a type of 't' or 'T'. On most architectures, both entries have the same address so it does not matter which one is returned by kallsyms_lookup_name(). But on architectures with function descriptors, the 'U' entry points to the descriptor, not to the code body, which is not what we want.
IA64 # grep -w qla2x00_remove_one /proc/kallsyms
a000000208c25ef8 U qla2x00_remove_one [qla2300] <= descriptor a000000208bf44c0 t qla2x00_remove_one [qla2xxx] <= function body
Tell kallsyms_lookup_name() to ignore type U entries in modules.
---
module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/module.c +2 -1
@@ -2050,7 +2050,8 @@ static unsigned long mod_find_symname(stunsigned int i;for (i =0 ; i < mod->num_symtab; i++) -if (strcmp (name, mod->strtab+mod->symtab[i].st_name) ==0 ) +if (strcmp (name, mod->strtab+mod->symtab[i].st_name) ==0 && + mod->symtab[i].st_info !='U' )return mod->symtab[i].st_value;return 0 ; }