modpost, kallsyms: Treat add '$'-prefixed symbols as mapping symbols
Subsystems (3)
PATCH 1/1 modpost, kallsyms: Treat add '$'-prefixed symbols as mapping symbols
Trying to restrict the '$'-prefix change to RISC-V caused some fallout, so let's just treat all those symbols as special.
---
It wasn't clear if we should just revert the original patch and spin a new one, but looks like this is in at least some trees so I sent a follow-on patch -- at least this way I can make coffee before forgetting to send it ;)
--- include/linux/module_symbol.h | 16 ++-------------- kernel/module/kallsyms.c | 2 +- scripts/mod/modpost.c | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-)
include/linux/module_symbol.h +2 -14
@@ -3,25 +3,13 @@#define _LINUX_MODULE_SYMBOL_H/* This ignores the intensely annoying "mapping symbols" found in ELF files. */ -static inline int is_mapping_symbol (const char *str,int is_riscv) +static inline int is_mapping_symbol (const char *str) {if (str[0 ] =='.' && str[1 ] =='L' )return true;if (str[0 ] =='L' && str[1 ] =='0' )return true; -/* -* RISC-V defines various special symbols that start with "$". The -* mapping symbols, which exist to differentiate between incompatible -* instruction encodings when disassembling, show up all over the place -* and are generally not meant to be treated like other symbols. So -* just ignore any of the special symbols. -*/ -if (is_riscv) -return str[0 ] =='$' ; - -return str[0 ] =='$' && - (str[1 ] =='a' || str[1 ] =='d' || str[1 ] =='t' || str[1 ] =='x' ) - && (str[2 ] =='\0' || str[2 ] =='.' ); +return str[0 ] =='$' ; }#endif /* _LINUX_MODULE_SYMBOL_H */
kernel/module/kallsyms.c +1 -1
@@ -289,7 +289,7 @@ static const char *find_kallsyms_symbol(struct module *mod,* and inserted at a whim. */ if (*kallsyms_symbol_name (kallsyms, i) =='\0' || -is_mapping_symbol (kallsyms_symbol_name (kallsyms, i),IS_ENABLED (CONFIG_RISCV ))) +is_mapping_symbol (kallsyms_symbol_name (kallsyms, i)))continue ;if (thisval <= addr && thisval > bestval) {
scripts/mod/modpost.c +1 -1
@@ -1052,7 +1052,7 @@ static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)if (!name || !strlen (name))return 0 ; -return !is_mapping_symbol (name, elf->hdr->e_machine ==EM_RISCV ); +return !is_mapping_symbol (name); }/* Look up the nearest symbol based on the section and the address */
Signature · 7 lines
2.41.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 7 lines · Palmer Dabbelt
Trying to restrict the '$'-prefix change to RISC-V caused some fallout, so let's just treat all those symbols as special.
Fixes c05780ef3c1 ("module: Ignore RISC-V mapping symbols too")Signed-off-by Palmer Dabbelt <[email protected]>
Quoted 72 lines
---
It wasn't clear if we should just revert the original patch and spin a new one, but looks like this is in at least some trees so I sent a follow-on patch -- at least this way I can make coffee before forgetting to send it ;)--- include/linux/module_symbol.h | 16 ++-------------- kernel/module/kallsyms.c | 2 +- scripts/mod/modpost.c | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-)include/linux/module_symbol.h +2
-14@@ -3,25 +3,13 @@#define _LINUX_MODULE_SYMBOL_H/* This ignores the intensely annoying "mapping symbols" found in ELF files. */ -static inline int is_mapping_symbol (const char *str,int is_riscv) +static inline int is_mapping_symbol (const char *str) {if (str[0 ] =='.' && str[1 ] =='L' )return true;if (str[0 ] =='L' && str[1 ] =='0' )return true; -/* -* RISC-V defines various special symbols that start with "$". The -* mapping symbols, which exist to differentiate between incompatible -* instruction encodings when disassembling, show up all over the place -* and are generally not meant to be treated like other symbols. So -* just ignore any of the special symbols. -*/ -if (is_riscv) -return str[0 ] =='$' ; - -return str[0 ] =='$' && - (str[1 ] =='a' || str[1 ] =='d' || str[1 ] =='t' || str[1 ] =='x' ) - && (str[2 ] =='\0' || str[2 ] =='.' ); +return str[0 ] =='$' ; }#endif /* _LINUX_MODULE_SYMBOL_H */ kernel/module/kallsyms.c +1
-1@@ -289,7 +289,7 @@ static const char *find_kallsyms_symbol(struct module *mod,* and inserted at a whim. */ if (*kallsyms_symbol_name (kallsyms, i) =='\0' || -is_mapping_symbol (kallsyms_symbol_name (kallsyms, i),IS_ENABLED (CONFIG_RISCV ))) +is_mapping_symbol (kallsyms_symbol_name (kallsyms, i)))continue ;if (thisval <= addr && thisval > bestval) {scripts/mod/modpost.c +1
-2@@ -1052,7 +1052,7 @@ static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)if (!name || !strlen (name))return 0 ; -return !is_mapping_symbol (name, elf->hdr->e_machine ==EM_RISCV ); +return !is_mapping_symbol (name); }/* Look up the nearest symbol based on the section and the address */ --2.41.0
Signature · 2 lines
Best Regards Masahiro Yamada
Luis Chamberlain
maintainerQuoted 11 lines · Masahiro Yamada
Quoted 7 lines · Palmer Dabbelt
Trying to restrict the '$'-prefix change to RISC-V caused some fallout, so let's just treat all those symbols as special.
Fixes c05780ef3c1 ("module: Ignore RISC-V mapping symbols too")Signed-off-by Palmer Dabbelt <[email protected]>Reviewed-by Masahiro Yamada <[email protected]>
Patch applied and pushed, thanks!
Luis