kallsyms: Do not cleanup .llvm.<hash> suffix before sorting symbols

[ Upstream commit 020925ce92990c3bf59ab2cde386ac6d9ec734ff ]

Cleaning up the symbols causes various issues afterwards. Let's sort
the list based on original name.

Signed-off-by: Song Liu <song@kernel.org>
Fixes: 8cc32a9bbf29 ("kallsyms: strip LTO-only suffixes from promoted global functions")
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Tested-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20240807220513.3100483-2-song@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 55a423519f2e5c243e17f9643cdb6454443a4724..839d9c49f28ce4c23fda8c48b96d964b184185a1 100644 (file)
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -5,8 +5,7 @@
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.
  *
- * Usage: kallsyms [--all-symbols] [--absolute-percpu]
- *                         [--lto-clang] in.map > out.S
+ * Usage: kallsyms [--all-symbols] [--absolute-percpu]  in.map > out.S
  *
  *      Table compression uses all the unused char codes on the symbols and
  *  maps these to the most used substrings (tokens). For instance, it might
@@ -63,7 +62,6 @@ static struct sym_entry **table;
 static unsigned int table_size, table_cnt;
 static int all_symbols;
 static int absolute_percpu;
-static int lto_clang;
 
 static int token_profit[0x10000];
 
@@ -74,8 +72,7 @@ static unsigned char best_table_len[256];
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: kallsyms [--all-symbols] [--absolute-percpu] "
-                       "[--lto-clang] in.map > out.S\n");
+       fprintf(stderr, "Usage: kallsyms [--all-symbols] [--absolute-percpu] in.map > out.S\n");
        exit(1);
 }
 
@@ -345,25 +342,6 @@ static int symbol_absolute(const struct sym_entry *s)
        return s->percpu_absolute;
 }
 
-static void cleanup_symbol_name(char *s)
-{
-       char *p;
-
-       /*
-        * ASCII[.]   = 2e
-        * ASCII[0-9] = 30,39
-        * ASCII[A-Z] = 41,5a
-        * ASCII[_]   = 5f
-        * ASCII[a-z] = 61,7a
-        *
-        * As above, replacing the first '.' in ".llvm." with '\0' does not
-        * affect the main sorting, but it helps us with subsorting.
-        */
-       p = strstr(s, ".llvm.");
-       if (p)
-               *p = '\0';
-}
-
 static int compare_names(const void *a, const void *b)
 {
        int ret;
@@ -528,10 +506,6 @@ static void write_src(void)
        output_address(relative_base);
        printf("\n");
 
-       if (lto_clang)
-               for (i = 0; i < table_cnt; i++)
-                       cleanup_symbol_name((char *)table[i]->sym);
-
        sort_symbols_by_name();
        output_label("kallsyms_seqs_of_names");
        for (i = 0; i < table_cnt; i++)
@@ -808,7 +782,6 @@ int main(int argc, char **argv)
                static const struct option long_options[] = {
                        {"all-symbols",     no_argument, &all_symbols,     1},
                        {"absolute-percpu", no_argument, &absolute_percpu, 1},
-                       {"lto-clang",       no_argument, &lto_clang,       1},
                        {},
                };
 

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 31581504489ef6bd020872a3f35f7723d30c7dc6..1e41b330550e649bf346ae24262af9fe695e0131 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -159,10 +159,6 @@ kallsyms()
                kallsymopt="${kallsymopt} --absolute-percpu"
        fi
 
-       if is_enabled CONFIG_LTO_CLANG; then
-               kallsymopt="${kallsymopt} --lto-clang"
-       fi
-
        info KSYMS "${2}.S"
        scripts/kallsyms ${kallsymopt} "${1}" > "${2}.S"