kbuild: apply fixdep logic to link-vmlinux.sh
PATCH 1/1 kbuild: apply fixdep logic to link-vmlinux.sh
The patch adding CONFIG_VMLINUX_MAP revealed a small defect in the build system: link-vmlinux.sh takes decisions based on CONFIG_* options, but changing one of those does not always lead to vmlinux being linked again.
For most of the CONFIG_* knobs referenced previously, this has probably been hidden by those knobs also affecting some object file, hence indirectly also vmlinux.
But CONFIG_VMLINUX_MAP is only handled inside link-vmlinux.sh, and changing CONFIG_VMLINUX_MAP=n to CONFIG_VMLINUX_MAP=y does not cause the build system to re-link (and hence have vmlinux.map emitted). Since that map file is mostly a debugging aid, this is merely a nuisance which is easily worked around by just deleting vmlinux and building again.
But one could imagine other (possibly future) CONFIG options that actually do affect the vmlinux binary but which are not captured through some object file dependency.
To fix this, make link-vmlinux.sh emit a .vmlinux.d file in the same format as the dependency files generated by gcc, and apply the fixdep logic to that. I've tested that this correctly works with both in-tree and out-of-tree builds.
--- Makefile | 2 +- scripts/link-vmlinux.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
Makefile +1 -1
@@ -1192,7 +1192,7 @@ cmd_link-vmlinux = \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE - +$(call if_changed,link-vmlinux) + +$(call if_changed_dep,link-vmlinux) targets := vmlinux
scripts/link-vmlinux.sh +2 -0
@@ -312,6 +312,7 @@ cleanup() rm -f vmlinux rm -f vmlinux.map rm -f vmlinux.o + rm -f .vmlinux.d } on_exit()
@@ -421,6 +422,7 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then fi vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} +echo "vmlinux: $0" > .vmlinux.d # fill in BTF IDs if [ -n "${CONFIG_DEBUG_INFO_BTF}" -a -n "${CONFIG_BPF}" ]; then
Signature · 1 line
2.29.2
Quoted 21 lines · Rasmus Villemoes
The patch adding
CONFIG_VMLINUX_MAPrevealed a small defect in the build system:link-vmlinux.shtakes decisions based on CONFIG_* options, but changing one of those does not always lead to vmlinux being linked again.For most of the CONFIG_* knobs referenced previously, this has probably been hidden by those knobs also affecting some object file, hence indirectly also vmlinux.
But
CONFIG_VMLINUX_MAPis only handled insidelink-vmlinux.sh, and changingCONFIG_VMLINUX_MAP=ntoCONFIG_VMLINUX_MAP=ydoes not cause the build system to re-link (and hence have vmlinux.map emitted). Since that map file is mostly a debugging aid, this is merely a nuisance which is easily worked around by just deleting vmlinux and building again.But one could imagine other (possibly future) CONFIG options that actually do affect the vmlinux binary but which are not captured through some object file dependency.
Quoted 7 lines
To fix this, make
link-vmlinux.shemit a .vmlinux.d file in the same format as the dependency files generated by gcc, and apply the fixdep logic to that. I've tested that this correctly works with both in-tree and out-of-tree builds.Signed-off-by Rasmus Villemoes <[email protected]>---
Another person finally noticed this long-standing bug!
Actually, I had known about this bug some years before, and was wondering how to fix this,
but your patch is much more elegant than my idea.
My original idea was to grep (or sed) CONFIG_
in scripts/link-vmlinux.sh, and
surround the output by /* ... */ (or prefix //)
into init/dummy.c so that fixdep handles this
as a usual C code case.
(But, I did not send a patch)
But, you are right.
There is no reason to restrict fixdep only to C source files.
I did not come up with the idea to make fixdep scan this shell script directly.
Applied to linux-kbuild. Thanks!
Quoted 38 lines
Makefile | 2 +- scripts/link-vmlinux.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)Makefile +1
-1@@ -1192,7 +1192,7 @@ cmd_link-vmlinux = \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE - +$(call if_changed,link-vmlinux) + +$(call if_changed_dep,link-vmlinux) targets := vmlinuxscripts/link-vmlinux.sh +2
-1@@ -312,6 +312,7 @@ cleanup() rm -f vmlinux rm -f vmlinux.map rm -f vmlinux.o + rm -f .vmlinux.d } on_exit()@@ -421,6 +422,7 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then fi vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} +echo "vmlinux: $0" > .vmlinux.d # fill in BTF IDs if [ -n "${CONFIG_DEBUG_INFO_BTF}" -a -n "${CONFIG_BPF}" ]; then --
Quoted 2 lines
2.29.2
--
Best Regards
Masahiro Yamada
Quoted 24 lines · Masahiro Yamada
Quoted 21 lines · Rasmus Villemoes
The patch adding
CONFIG_VMLINUX_MAPrevealed a small defect in the build system:link-vmlinux.shtakes decisions based on CONFIG_* options, but changing one of those does not always lead to vmlinux being linked again.For most of the CONFIG_* knobs referenced previously, this has probably been hidden by those knobs also affecting some object file, hence indirectly also vmlinux.
But
CONFIG_VMLINUX_MAPis only handled insidelink-vmlinux.sh, and changingCONFIG_VMLINUX_MAP=ntoCONFIG_VMLINUX_MAP=ydoes not cause the build system to re-link (and hence have vmlinux.map emitted). Since that map file is mostly a debugging aid, this is merely a nuisance which is easily worked around by just deleting vmlinux and building again.But one could imagine other (possibly future) CONFIG options that actually do affect the vmlinux binary but which are not captured through some object file dependency.
Quoted 8 lines
Quoted 7 lines
To fix this, make
link-vmlinux.shemit a .vmlinux.d file in the same format as the dependency files generated by gcc, and apply the fixdep logic to that. I've tested that this correctly works with both in-tree and out-of-tree builds.Signed-off-by Rasmus Villemoes <[email protected]>---
I moved the code to the last line of scripts/link-vmlinux.sh, and added a comment, otherwise, the intent is obscure.
scripts/link-vmlinux.sh +3 -1
@@ -422,7 +422,6 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then fi vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} -echo "vmlinux: $0" > .vmlinux.d # fill in BTF IDs if [ -n "${CONFIG_DEBUG_INFO_BTF}" -a -n "${CONFIG_BPF}" ]; then
@@ -451,3 +450,6 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then exit 1 fi fi + +# For fixdep +echo "vmlinux: $0" > .vmlinux.d
Signature · 2 lines
Best Regards Masahiro Yamada