On 17.09.2025 18:03, Josh Poimboeuf wrote:
> In preparation for the objtool klp diff subcommand, remove the arbitrary
> 'kmod_' prefix from __KBUILD_MODNAME and instead add it explicitly in
> the __initcall_id() macro.
>
> This change supports the standardization of "unique" symbol naming by
> ensuring the non-unique portion of the name comes before the unique
> part. That will enable objtool to properly correlate symbols across
> builds.
>
> Cc: Masahiro Yamada <[email protected]>
> Signed-off-by: Josh Poimboeuf <[email protected]>
This patch landed recently in linux-next as commit 6717e8f91db7
("kbuild: Remove 'kmod_' prefix from __KBUILD_MODNAME"). In my tests I
found that it completely breaks automatic modules loading on all tested
boards (ARM 32bit, ARM 64bit and RiscV64 based), what looks like some
kind of a generic issue. Reverting it on top of current linux-next fixes
this issue.
> ---
> include/linux/init.h | 3 ++-
> scripts/Makefile.lib | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/init.h b/include/linux/init.h
> index 17c1bc712e234..40331923b9f4a 100644
> --- a/include/linux/init.h
> +++ b/include/linux/init.h
> @@ -200,12 +200,13 @@ extern struct module __this_module;
>
> /* Format: <modname>__<counter>_<line>_<fn> */
> #define __initcall_id(fn) \
> + __PASTE(kmod_, \
> __PASTE(__KBUILD_MODNAME, \
> __PASTE(__, \
> __PASTE(__COUNTER__, \
> __PASTE(_, \
> __PASTE(__LINE__, \
> - __PASTE(_, fn))))))
> + __PASTE(_, fn)))))))
>
> /* Format: __<prefix>__<iid><id> */
> #define __initcall_name(prefix, __iid, id) \
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 1d581ba5df66f..b955602661240 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -20,7 +20,7 @@ name-fix-token = $(subst $(comma),_,$(subst -,_,$1))
> name-fix = $(call stringify,$(call name-fix-token,$1))
> basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget))
> modname_flags = -DKBUILD_MODNAME=$(call name-fix,$(modname)) \
> - -D__KBUILD_MODNAME=kmod_$(call name-fix-token,$(modname))
> + -D__KBUILD_MODNAME=$(call name-fix-token,$(modname))
> modfile_flags = -DKBUILD_MODFILE=$(call stringify,$(modfile))
>
> _c_flags = $(filter-out $(CFLAGS_REMOVE_$(target-stem).o), \
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
