OSDN Git Service

modpost, kallsyms: Treat add '$'-prefixed symbols as mapping symbols
authorPalmer Dabbelt <palmer@rivosinc.com>
Fri, 21 Jul 2023 15:01:48 +0000 (08:01 -0700)
committerLuis Chamberlain <mcgrof@kernel.org>
Mon, 24 Jul 2023 19:09:47 +0000 (12:09 -0700)
Trying to restrict the '$'-prefix change to RISC-V caused some fallout,
so let's just treat all those symbols as special.

Fixes: c05780ef3c190 ("module: Ignore RISC-V mapping symbols too")
Link: https://lore.kernel.org/all/20230712015747.77263-1-wangkefeng.wang@huawei.com/
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
include/linux/module_symbol.h
kernel/module/kallsyms.c
scripts/mod/modpost.c

index 5b79994..1269543 100644 (file)
@@ -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 */
index 78a1ffc..ef73ae7 100644 (file)
@@ -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) {
index 7c71429..b29b297 100644 (file)
@@ -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 */