From: Nicolas Schier <nicolas@fjasle.eu>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-modules@vger.kernel.org, llvm@lists.linux.dev,
Ard Biesheuvel <ardb@kernel.org>,
Sami Tolvanen <samitolvanen@google.com>,
Kees Cook <keescook@chromium.org>,
Josh Poimboeuf <jpoimboe@redhat.com>
Subject: Re: [PATCH v5 12/12] kbuild: rebuild multi-object modules when objtool is updated
Date: Fri, 13 May 2022 13:40:43 +0200 [thread overview]
Message-ID: <Yn5Du6mifUMExntW@buildd.core.avm.de> (raw)
In-Reply-To: <20220511164514.2741934-13-masahiroy@kernel.org>
On Thu, May 12, 2022 at 01:45:14AM +0900, Masahiro Yamada wrote:
> When CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT is enabled, objtool for
> multi-object modules is postponed until the objects are linked together.
>
> Make sure to re-run objtool and re-link multi-object modules when
> objtool is updated.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
> ---
>
> (no changes since v4)
>
> Changes in v4:
> - New
> Resent of my previous submission
> https://lore.kernel.org/linux-kbuild/20210831074004.3195284-11-masahiroy@kernel.org/
>
> scripts/Makefile.build | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index f546b5f1f33f..4e6902e099e8 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -404,13 +404,18 @@ $(obj)/modules.order: $(obj-m) FORCE
> $(obj)/lib.a: $(lib-y) FORCE
> $(call if_changed,ar)
>
> -quiet_cmd_link_multi-m = LD [M] $@
> - cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ @$(patsubst %.o,%.mod,$@) $(cmd_objtool)
> +quiet_cmd_ld_multi_m = LD [M] $@
> + cmd_ld_multi_m = $(LD) $(ld_flags) -r -o $@ @$(patsubst %.o,%.mod,$@) $(cmd_objtool)
> +
> +define rule_ld_multi_m
> + $(call cmd_and_savecmd,ld_multi_m)
> + $(call cmd,gen_objtooldep)
> +endef
>
> $(multi-obj-m): objtool-enabled := $(delay-objtool)
> $(multi-obj-m): part-of-module := y
> $(multi-obj-m): %.o: %.mod FORCE
> - $(call if_changed,link_multi-m)
> + $(call if_changed_rule,ld_multi_m)
> $(call multi_depend, $(multi-obj-m), .o, -objs -y -m)
>
> targets := $(filter-out $(PHONY), $(targets))
> --
> 2.32.0
>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
next prev parent reply other threads:[~2022-05-13 11:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-11 16:45 [PATCH v5 00/12] kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS, export.h) Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 01/12] modpost: split the section mismatch checks into section-check.c Masahiro Yamada
2022-05-11 22:28 ` Nick Desaulniers
2022-05-12 3:32 ` Masahiro Yamada
2022-05-11 22:31 ` Nick Desaulniers
2022-05-12 3:35 ` Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 02/12] modpost: add sym_find_with_module() helper Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 03/12] modpost: extract symbol versions from *.cmd files Masahiro Yamada
2022-05-12 16:28 ` Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 04/12] kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS Masahiro Yamada
2022-05-11 19:57 ` Nicolas Schier
2022-05-11 16:45 ` [PATCH v5 05/12] kbuild: stop merging *.symversions Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 06/12] genksyms: adjust the output format to modpost Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 07/12] kbuild: do not create *.prelink.o for Clang LTO or IBT Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 08/12] kbuild: check static EXPORT_SYMBOL* by script instead of modpost Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 09/12] kbuild: make built-in.a rule robust against too long argument error Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 10/12] kbuild: make *.mod " Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 11/12] kbuild: add cmd_and_savecmd macro Masahiro Yamada
2022-05-13 11:40 ` Nicolas Schier
2022-05-11 16:45 ` [PATCH v5 12/12] kbuild: rebuild multi-object modules when objtool is updated Masahiro Yamada
2022-05-13 11:40 ` Nicolas Schier [this message]
2022-05-11 20:04 ` [PATCH v5 00/12] kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS, export.h) Nathan Chancellor
2022-05-13 11:18 ` Masahiro Yamada
2022-05-13 11:19 ` Masahiro Yamada
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=Yn5Du6mifUMExntW@buildd.core.avm.de \
--to=nicolas@fjasle.eu \
--cc=ardb@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=samitolvanen@google.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).