From: Sami Tolvanen <samitolvanen@google.com> To: Masahiro Yamada <masahiroy@kernel.org>, Steven Rostedt <rostedt@goodmis.org> Cc: Will Deacon <will@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Paul E. McKenney" <paulmck@kernel.org>, Kees Cook <keescook@chromium.org>, Nick Desaulniers <ndesaulniers@google.com>, clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, x86@kernel.org, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v6 18/25] modpost: lto: strip .lto from module names Date: Mon, 12 Oct 2020 17:31:56 -0700 [thread overview] Message-ID: <20201013003203.4168817-19-samitolvanen@google.com> (raw) In-Reply-To: <20201013003203.4168817-1-samitolvanen@google.com> With LTO, everything is compiled into LLVM bitcode, so we have to link each module into native code before modpost. Kbuild uses the .lto.o suffix for these files, which also ends up in module information. This change strips the unnecessary .lto suffix from the module name. Suggested-by: Bill Wendling <morbo@google.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> --- scripts/mod/modpost.c | 16 +++++++--------- scripts/mod/modpost.h | 9 +++++++++ scripts/mod/sumversion.c | 6 +++++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 69341b36f271..5a329df55cc3 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -17,7 +17,6 @@ #include <ctype.h> #include <string.h> #include <limits.h> -#include <stdbool.h> #include <errno.h> #include "modpost.h" #include "../../include/linux/license.h" @@ -80,14 +79,6 @@ modpost_log(enum loglevel loglevel, const char *fmt, ...) exit(1); } -static inline bool strends(const char *str, const char *postfix) -{ - if (strlen(str) < strlen(postfix)) - return false; - - return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0; -} - void *do_nofail(void *ptr, const char *expr) { if (!ptr) @@ -1984,6 +1975,10 @@ static char *remove_dot(char *s) size_t m = strspn(s + n + 1, "0123456789"); if (m && (s[n + m] == '.' || s[n + m] == 0)) s[n] = 0; + + /* strip trailing .lto */ + if (strends(s, ".lto")) + s[strlen(s) - 4] = '\0'; } return s; } @@ -2007,6 +2002,9 @@ static void read_symbols(const char *modname) /* strip trailing .o */ tmp = NOFAIL(strdup(modname)); tmp[strlen(tmp) - 2] = '\0'; + /* strip trailing .lto */ + if (strends(tmp, ".lto")) + tmp[strlen(tmp) - 4] = '\0'; mod = new_module(tmp); free(tmp); } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 3aa052722233..fab30d201f9e 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -2,6 +2,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <stdbool.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> @@ -180,6 +181,14 @@ static inline unsigned int get_secindex(const struct elf_info *info, return info->symtab_shndx_start[sym - info->symtab_start]; } +static inline bool strends(const char *str, const char *postfix) +{ + if (strlen(str) < strlen(postfix)) + return false; + + return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0; +} + /* file2alias.c */ extern unsigned int cross_build; void handle_moddevtable(struct module *mod, struct elf_info *info, diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index d587f40f1117..760e6baa7eda 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -391,10 +391,14 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) struct md4_ctx md; char *fname; char filelist[PATH_MAX + 1]; + int postfix_len = 1; + + if (strends(modname, ".lto.o")) + postfix_len = 5; /* objects for a module are listed in the first line of *.mod file. */ snprintf(filelist, sizeof(filelist), "%.*smod", - (int)strlen(modname) - 1, modname); + (int)strlen(modname) - postfix_len, modname); buf = read_text_file(filelist); -- 2.28.0.1011.ga647a8990f-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sami Tolvanen <samitolvanen@google.com> To: Masahiro Yamada <masahiroy@kernel.org>, Steven Rostedt <rostedt@goodmis.org> Cc: linux-arch@vger.kernel.org, x86@kernel.org, Kees Cook <keescook@chromium.org>, "Paul E. McKenney" <paulmck@kernel.org>, kernel-hardening@lists.openwall.com, Peter Zijlstra <peterz@infradead.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kbuild@vger.kernel.org, Nick Desaulniers <ndesaulniers@google.com>, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen <samitolvanen@google.com>, linux-pci@vger.kernel.org, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 18/25] modpost: lto: strip .lto from module names Date: Mon, 12 Oct 2020 17:31:56 -0700 [thread overview] Message-ID: <20201013003203.4168817-19-samitolvanen@google.com> (raw) In-Reply-To: <20201013003203.4168817-1-samitolvanen@google.com> With LTO, everything is compiled into LLVM bitcode, so we have to link each module into native code before modpost. Kbuild uses the .lto.o suffix for these files, which also ends up in module information. This change strips the unnecessary .lto suffix from the module name. Suggested-by: Bill Wendling <morbo@google.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> --- scripts/mod/modpost.c | 16 +++++++--------- scripts/mod/modpost.h | 9 +++++++++ scripts/mod/sumversion.c | 6 +++++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 69341b36f271..5a329df55cc3 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -17,7 +17,6 @@ #include <ctype.h> #include <string.h> #include <limits.h> -#include <stdbool.h> #include <errno.h> #include "modpost.h" #include "../../include/linux/license.h" @@ -80,14 +79,6 @@ modpost_log(enum loglevel loglevel, const char *fmt, ...) exit(1); } -static inline bool strends(const char *str, const char *postfix) -{ - if (strlen(str) < strlen(postfix)) - return false; - - return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0; -} - void *do_nofail(void *ptr, const char *expr) { if (!ptr) @@ -1984,6 +1975,10 @@ static char *remove_dot(char *s) size_t m = strspn(s + n + 1, "0123456789"); if (m && (s[n + m] == '.' || s[n + m] == 0)) s[n] = 0; + + /* strip trailing .lto */ + if (strends(s, ".lto")) + s[strlen(s) - 4] = '\0'; } return s; } @@ -2007,6 +2002,9 @@ static void read_symbols(const char *modname) /* strip trailing .o */ tmp = NOFAIL(strdup(modname)); tmp[strlen(tmp) - 2] = '\0'; + /* strip trailing .lto */ + if (strends(tmp, ".lto")) + tmp[strlen(tmp) - 4] = '\0'; mod = new_module(tmp); free(tmp); } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 3aa052722233..fab30d201f9e 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -2,6 +2,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <stdbool.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> @@ -180,6 +181,14 @@ static inline unsigned int get_secindex(const struct elf_info *info, return info->symtab_shndx_start[sym - info->symtab_start]; } +static inline bool strends(const char *str, const char *postfix) +{ + if (strlen(str) < strlen(postfix)) + return false; + + return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0; +} + /* file2alias.c */ extern unsigned int cross_build; void handle_moddevtable(struct module *mod, struct elf_info *info, diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index d587f40f1117..760e6baa7eda 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -391,10 +391,14 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) struct md4_ctx md; char *fname; char filelist[PATH_MAX + 1]; + int postfix_len = 1; + + if (strends(modname, ".lto.o")) + postfix_len = 5; /* objects for a module are listed in the first line of *.mod file. */ snprintf(filelist, sizeof(filelist), "%.*smod", - (int)strlen(modname) - 1, modname); + (int)strlen(modname) - postfix_len, modname); buf = read_text_file(filelist); -- 2.28.0.1011.ga647a8990f-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-10-13 2:42 UTC|newest] Thread overview: 188+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-13 0:31 [PATCH v6 00/25] Add support for Clang LTO Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 01/25] kbuild: preprocess module linker script Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 02/25] objtool: Add a pass for generating __mcount_loc Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-14 16:50 ` Ingo Molnar 2020-10-14 16:50 ` Ingo Molnar 2020-10-14 18:21 ` Peter Zijlstra 2020-10-14 18:21 ` Peter Zijlstra 2020-10-15 20:10 ` Josh Poimboeuf 2020-10-15 20:10 ` Josh Poimboeuf 2020-10-13 0:31 ` [PATCH v6 03/25] objtool: Don't autodetect vmlinux.o Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 04/25] tracing: move function tracer options to Kconfig Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 05/25] tracing: add support for objtool mcount Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 06/25] x86, build: use " Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 07/25] treewide: remove DISABLE_LTO Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-14 22:43 ` Kees Cook 2020-10-14 22:43 ` Kees Cook 2020-10-17 1:46 ` Masahiro Yamada 2020-10-17 1:46 ` Masahiro Yamada 2020-10-13 0:31 ` [PATCH v6 08/25] kbuild: add support for Clang LTO Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 09/25] kbuild: lto: fix module versioning Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 10/25] objtool: Split noinstr validation from --vmlinux Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 11/25] kbuild: lto: postpone objtool Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 12/25] kbuild: lto: limit inlining Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 13/25] kbuild: lto: merge module sections Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-14 22:49 ` Kees Cook 2020-10-14 22:49 ` Kees Cook 2020-10-20 16:42 ` Sami Tolvanen 2020-10-20 16:42 ` Sami Tolvanen 2020-10-20 16:42 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 14/25] kbuild: lto: remove duplicate dependencies from .mod files Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-14 22:50 ` Kees Cook 2020-10-14 22:50 ` Kees Cook 2020-12-03 17:59 ` Masahiro Yamada 2020-12-03 17:59 ` Masahiro Yamada 2020-12-03 18:47 ` Sami Tolvanen 2020-12-03 18:47 ` Sami Tolvanen 2020-12-03 18:47 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 15/25] init: lto: ensure initcall ordering Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 16/25] init: lto: fix PREL32 relocations Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-14 22:53 ` Kees Cook 2020-10-14 22:53 ` Kees Cook 2020-10-15 0:12 ` Jann Horn 2020-10-15 0:12 ` Jann Horn 2020-10-15 0:12 ` Jann Horn 2020-10-13 0:31 ` [PATCH v6 17/25] PCI: Fix PREL32 relocations for LTO Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-14 22:58 ` Kees Cook 2020-10-14 22:58 ` Kees Cook 2020-10-13 0:31 ` Sami Tolvanen [this message] 2020-10-13 0:31 ` [PATCH v6 18/25] modpost: lto: strip .lto from module names Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 19/25] scripts/mod: disable LTO for empty.c Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 20/25] efi/libstub: disable LTO Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` [PATCH v6 21/25] drivers/misc/lkdtm: disable LTO for rodata.o Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:31 ` Sami Tolvanen 2020-10-13 0:32 ` [PATCH v6 22/25] x86/asm: annotate indirect jumps Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-14 22:46 ` Kees Cook 2020-10-14 22:46 ` Kees Cook 2020-10-14 23:23 ` Jann Horn 2020-10-14 23:23 ` Jann Horn 2020-10-14 23:23 ` Jann Horn 2020-10-15 10:22 ` Peter Zijlstra 2020-10-15 10:22 ` Peter Zijlstra 2020-10-15 20:39 ` Josh Poimboeuf 2020-10-15 20:39 ` Josh Poimboeuf 2020-10-20 16:45 ` Sami Tolvanen 2020-10-20 16:45 ` Sami Tolvanen 2020-10-20 16:45 ` Sami Tolvanen 2020-10-20 18:52 ` Josh Poimboeuf 2020-10-20 18:52 ` Josh Poimboeuf 2020-10-20 19:24 ` Sami Tolvanen 2020-10-20 19:24 ` Sami Tolvanen 2020-10-20 19:24 ` Sami Tolvanen 2020-10-21 8:56 ` Peter Zijlstra 2020-10-21 8:56 ` Peter Zijlstra 2020-10-21 9:08 ` Peter Zijlstra 2020-10-21 9:08 ` Peter Zijlstra 2020-10-21 9:32 ` Peter Zijlstra 2020-10-21 9:32 ` Peter Zijlstra 2020-10-21 21:27 ` Josh Poimboeuf 2020-10-21 21:27 ` Josh Poimboeuf 2020-10-22 7:25 ` Peter Zijlstra 2020-10-22 7:25 ` Peter Zijlstra 2020-10-23 17:48 ` Sami Tolvanen 2020-10-23 17:48 ` Sami Tolvanen 2020-10-23 18:04 ` Nick Desaulniers 2020-10-23 18:04 ` Nick Desaulniers 2020-10-23 18:04 ` Nick Desaulniers 2020-10-21 15:01 ` Sami Tolvanen 2020-10-21 15:01 ` Sami Tolvanen 2020-10-21 15:01 ` Sami Tolvanen 2020-10-22 0:22 ` Sami Tolvanen 2020-10-22 0:22 ` Sami Tolvanen 2020-10-22 0:22 ` Sami Tolvanen 2020-10-23 17:36 ` Sami Tolvanen 2020-10-23 17:36 ` Sami Tolvanen 2020-11-09 23:11 ` Sami Tolvanen 2020-11-09 23:11 ` Sami Tolvanen 2020-11-09 23:11 ` Sami Tolvanen 2020-11-10 2:29 ` Josh Poimboeuf 2020-11-10 2:29 ` Josh Poimboeuf 2020-11-10 3:18 ` Nick Desaulniers 2020-11-10 3:18 ` Nick Desaulniers 2020-11-10 3:18 ` Nick Desaulniers 2020-11-10 4:48 ` Sami Tolvanen 2020-11-10 4:48 ` Sami Tolvanen 2020-11-10 4:48 ` Sami Tolvanen 2020-11-10 16:11 ` Josh Poimboeuf 2020-11-10 16:11 ` Josh Poimboeuf 2020-11-10 17:46 ` Josh Poimboeuf 2020-11-10 17:46 ` Josh Poimboeuf 2020-11-10 18:59 ` Sami Tolvanen 2020-11-10 18:59 ` Sami Tolvanen 2020-11-10 18:59 ` Sami Tolvanen 2020-11-13 19:54 ` Josh Poimboeuf 2020-11-13 19:54 ` Josh Poimboeuf 2020-11-13 20:24 ` Sami Tolvanen 2020-11-13 20:24 ` Sami Tolvanen 2020-11-13 20:24 ` Sami Tolvanen 2020-11-13 20:52 ` Josh Poimboeuf 2020-11-13 20:52 ` Josh Poimboeuf 2020-11-13 22:34 ` Josh Poimboeuf 2020-11-13 22:34 ` Josh Poimboeuf 2020-11-13 22:54 ` Sami Tolvanen 2020-11-13 22:54 ` Sami Tolvanen 2020-11-13 22:54 ` Sami Tolvanen 2020-11-13 22:56 ` Josh Poimboeuf 2020-11-13 22:56 ` Josh Poimboeuf 2020-11-13 23:31 ` Sami Tolvanen 2020-11-13 23:31 ` Sami Tolvanen 2020-11-13 23:31 ` Sami Tolvanen 2020-11-14 0:49 ` Josh Poimboeuf 2020-11-14 0:49 ` Josh Poimboeuf 2020-10-21 9:51 ` Peter Zijlstra 2020-10-21 9:51 ` Peter Zijlstra 2020-10-21 18:30 ` Josh Poimboeuf 2020-10-21 18:30 ` Josh Poimboeuf 2020-10-13 0:32 ` [PATCH v6 23/25] x86, vdso: disable LTO only for vDSO Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-13 0:32 ` [PATCH v6 24/25] x86, cpu: disable LTO for cpu.c Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-13 0:32 ` [PATCH v6 25/25] x86, build: allow LTO_CLANG and THINLTO to be selected Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen 2020-10-13 0:32 ` Sami Tolvanen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201013003203.4168817-19-samitolvanen@google.com \ --to=samitolvanen@google.com \ --cc=clang-built-linux@googlegroups.com \ --cc=gregkh@linuxfoundation.org \ --cc=keescook@chromium.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=masahiroy@kernel.org \ --cc=ndesaulniers@google.com \ --cc=paulmck@kernel.org \ --cc=peterz@infradead.org \ --cc=rostedt@goodmis.org \ --cc=will@kernel.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.