From: Sami Tolvanen <samitolvanen@google.com> To: Masahiro Yamada <masahiroy@kernel.org>, Steven Rostedt <rostedt@goodmis.org>, Will Deacon <will@kernel.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com>, 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, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v9 10/16] modpost: lto: strip .lto from module names Date: Fri, 11 Dec 2020 10:46:27 -0800 [thread overview] Message-ID: <20201211184633.3213045-11-samitolvanen@google.com> (raw) In-Reply-To: <20201211184633.3213045-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 f882ce0d9327..ebb15cc3f262 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.29.2.576.ga3fc446d84-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>, Will Deacon <will@kernel.org> Cc: linux-arch@vger.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, linux-pci@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen <samitolvanen@google.com>, Josh Poimboeuf <jpoimboe@redhat.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 10/16] modpost: lto: strip .lto from module names Date: Fri, 11 Dec 2020 10:46:27 -0800 [thread overview] Message-ID: <20201211184633.3213045-11-samitolvanen@google.com> (raw) In-Reply-To: <20201211184633.3213045-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 f882ce0d9327..ebb15cc3f262 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.29.2.576.ga3fc446d84-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-12-11 20:19 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-11 18:46 [PATCH v9 00/16] Add support for Clang LTO Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 01/16] tracing: move function tracer options to Kconfig Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2021-02-24 20:17 ` [PATCH v9 01/16] tracing: move function tracer options to Kconfig (causing parisc build failures) Guenter Roeck 2021-02-24 20:17 ` Guenter Roeck 2021-02-24 20:38 ` Kees Cook 2021-02-24 20:38 ` Kees Cook 2021-02-24 20:54 ` Sami Tolvanen 2021-02-24 20:54 ` Sami Tolvanen 2021-02-24 20:54 ` Sami Tolvanen 2021-02-24 22:29 ` Guenter Roeck 2021-02-24 22:29 ` Guenter Roeck 2021-02-24 22:28 ` Guenter Roeck 2021-02-24 22:28 ` Guenter Roeck 2021-02-24 22:42 ` Kees Cook 2021-02-24 22:42 ` Kees Cook 2020-12-11 18:46 ` [PATCH v9 02/16] kbuild: add support for Clang LTO Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 03/16] kbuild: lto: fix module versioning Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 04/16] kbuild: lto: limit inlining Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 05/16] kbuild: lto: merge module sections Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2021-02-16 21:37 ` Stephen Boyd 2021-02-16 21:37 ` Stephen Boyd 2020-12-11 18:46 ` [PATCH v9 06/16] kbuild: lto: add a default list of used symbols Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 19:32 ` Kees Cook 2020-12-11 19:32 ` Kees Cook 2020-12-11 19:40 ` Sami Tolvanen 2020-12-11 19:40 ` Sami Tolvanen 2020-12-11 19:40 ` Sami Tolvanen 2020-12-11 19:45 ` Nick Desaulniers 2020-12-11 19:45 ` Nick Desaulniers 2020-12-11 19:45 ` Nick Desaulniers 2020-12-11 18:46 ` [PATCH v9 07/16] init: lto: ensure initcall ordering Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 08/16] init: lto: fix PREL32 relocations Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 09/16] PCI: Fix PREL32 relocations for LTO Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen [this message] 2020-12-11 18:46 ` [PATCH v9 10/16] modpost: lto: strip .lto from module names Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 11/16] scripts/mod: disable LTO for empty.c Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 12/16] efi/libstub: disable LTO Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 13/16] drivers/misc/lkdtm: disable LTO for rodata.o Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 14/16] arm64: vdso: disable LTO Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 15/16] arm64: disable recordmcount with DYNAMIC_FTRACE_WITH_REGS Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` [PATCH v9 16/16] arm64: allow LTO to be selected Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 18:46 ` Sami Tolvanen 2020-12-11 19:38 ` [PATCH v9 00/16] Add support for Clang LTO Kees Cook 2020-12-11 19:38 ` Kees Cook 2021-01-09 0:27 ` Kees Cook 2021-01-09 0:27 ` Kees Cook 2021-01-09 14:54 ` Sedat Dilek 2021-01-09 14:54 ` Sedat Dilek 2021-01-09 14:54 ` Sedat Dilek 2021-01-09 15:36 ` Josh Poimboeuf 2021-01-09 15:36 ` Josh Poimboeuf 2021-01-09 15:46 ` Sedat Dilek 2021-01-09 15:46 ` Sedat Dilek 2021-01-09 15:46 ` Sedat Dilek 2021-01-09 16:07 ` Josh Poimboeuf 2021-01-09 16:07 ` Josh Poimboeuf 2021-01-09 16:21 ` Sedat Dilek 2021-01-09 16:21 ` Sedat Dilek 2021-01-09 16:21 ` Sedat Dilek 2021-01-09 16:32 ` Josh Poimboeuf 2021-01-09 16:32 ` Josh Poimboeuf 2021-01-09 16:45 ` Sedat Dilek 2021-01-09 16:45 ` Sedat Dilek 2021-01-09 16:45 ` Sedat Dilek 2021-01-09 17:03 ` Josh Poimboeuf 2021-01-09 17:03 ` Josh Poimboeuf 2021-01-09 17:05 ` Josh Poimboeuf 2021-01-09 17:05 ` Josh Poimboeuf 2021-01-09 17:33 ` Sedat Dilek 2021-01-09 17:33 ` Sedat Dilek 2021-01-09 17:33 ` Sedat Dilek 2021-01-09 23:44 ` Sedat Dilek 2021-01-09 23:44 ` Sedat Dilek 2021-01-09 23:44 ` Sedat Dilek
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=20201211184633.3213045-11-samitolvanen@google.com \ --to=samitolvanen@google.com \ --cc=clang-built-linux@googlegroups.com \ --cc=gregkh@linuxfoundation.org \ --cc=jpoimboe@redhat.com \ --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 \ /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.