From: Nicolas Schier <n.schier@avm.de>
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>,
Nicolas Schier <nicolas@fjasle.eu>
Subject: Re: [PATCH 4/4] kbuild: refactor module BTF rule
Date: Tue, 17 Oct 2023 14:58:04 +0200 [thread overview]
Message-ID: <ZS6E3EA68GOjonB8@buildd.core.avm.de> (raw)
In-Reply-To: <20231017103742.130927-4-masahiroy@kernel.org>
On Tue, Oct 17, 2023 at 07:37:42PM +0900, Masahiro Yamada wrote:
> newer_prereqs_except and if_changed_except are ugly hacks of the
> newer_prereqs and if_changed in scripts/Kbuild.include.
newer-prereqs
>
> Remove.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> scripts/Makefile.modfinal | 23 +++++------------------
> 1 file changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal
> index 9fd7a26e4fe9..6ab10dba05c7 100644
> --- a/scripts/Makefile.modfinal
> +++ b/scripts/Makefile.modfinal
> @@ -19,6 +19,9 @@ vmlinux :=
> ifdef CONFIG_DEBUG_INFO_BTF_MODULES
> ifneq ($(wildcard vmlinux),)
> vmlinux := vmlinux
> +cmd_btf = ; \
while reading, I stumpled over this semicolon, but probably it's a good
reminder that cmd_btf is only a cmd extension.
> + LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \
> + $(RESOLVE_BTFIDS) -b vmlinux $@
> else
> $(warning Skipping BTF generation due to unavailability of vmlinux)
> endif
> @@ -41,27 +44,11 @@ quiet_cmd_ld_ko_o = LD [M] $@
> cmd_ld_ko_o += \
> $(LD) -r $(KBUILD_LDFLAGS) \
> $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
> - -T scripts/module.lds -o $@ $(filter %.o, $^)
> + -T scripts/module.lds -o $@ $(filter %.o, $^) \
> + $(cmd_btf)
>
> -quiet_cmd_btf_ko = BTF [M] $@
> - cmd_btf_ko = \
> - LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \
> - $(RESOLVE_BTFIDS) -b vmlinux $@
> -
> -# Same as newer-prereqs, but allows to exclude specified extra dependencies
> -newer_prereqs_except = $(filter-out $(PHONY) $(1),$?)
> -
> -# Same as if_changed, but allows to exclude specified extra dependencies
> -if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \
> - $(cmd); \
> - printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
> -
> -# Re-generate module BTFs if either module's .ko or vmlinux changed
> %.ko: %.o %.mod.o scripts/module.lds $(vmlinux) FORCE
> +$(call if_changed_except,ld_ko_o,vmlinux)
This should probably be:
+$(call if_changed,ld_ko_o)
> -ifdef vmlinux
> - +$(if $(newer-prereqs),$(call cmd,btf_ko))
> -endif
>
> targets += $(modules:%.o=%.ko) $(modules:%.o=%.mod.o)
>
> --
> 2.40.1
>
next prev parent reply other threads:[~2023-10-17 12:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 10:37 [PATCH 1/4] kbuild: remove ARCH_POSTLINK from module builds Masahiro Yamada
2023-10-17 10:37 ` Masahiro Yamada
2023-10-17 10:37 ` Masahiro Yamada
2023-10-17 10:37 ` [PATCH 2/4] kbuild: avoid too many execution of scripts/pahole-flags.sh Masahiro Yamada
2023-10-17 12:14 ` Alan Maguire
2023-10-17 12:15 ` Jiri Olsa
2023-10-17 12:29 ` Nicolas Schier
2023-10-17 15:21 ` Miguel Ojeda
2023-10-18 12:14 ` Masahiro Yamada
2023-10-17 19:56 ` Andrii Nakryiko
2023-10-18 5:00 ` Masahiro Yamada
2023-10-23 0:30 ` Martin Rodriguez Reboredo
2023-10-17 10:37 ` [PATCH 3/4] kbuild: skip module BTF with one-time check for vmlinux Masahiro Yamada
2023-10-17 12:37 ` Nicolas Schier
2023-10-17 10:37 ` [PATCH 4/4] kbuild: refactor module BTF rule Masahiro Yamada
2023-10-17 12:58 ` Nicolas Schier [this message]
2023-10-18 15:16 ` Masahiro Yamada
2023-10-17 12:09 ` [PATCH 1/4] kbuild: remove ARCH_POSTLINK from module builds Nicolas Schier
2023-10-17 12:09 ` Nicolas Schier
2023-10-17 12:09 ` Nicolas Schier
2023-11-12 0:55 ` patchwork-bot+linux-riscv
2023-11-12 0:55 ` patchwork-bot+linux-riscv
2023-11-12 0:55 ` patchwork-bot+linux-riscv
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=ZS6E3EA68GOjonB8@buildd.core.avm.de \
--to=n.schier@avm.de \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/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 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.