diff mbox series

[v8,1/4] kbuild: add mod(name,file)_flags to assembler flags for module objects

Message ID 20240822181942.2626536-2-kris.van.hees@oracle.com (mailing list archive)
State Handled Elsewhere
Commit 23d93aa4b3b90b6e3dc8e6b6bb36580c1068bc07
Headers show
Series [v8,1/4] kbuild: add mod(name,file)_flags to assembler flags for module objects | expand

Commit Message

Kris Van Hees Aug. 22, 2024, 6:19 p.m. UTC 
In order to create the file at build time, modules.builtin.ranges, that
contains the range of addresses for all built-in modules, there needs to
be a way to identify what code is compiled into modules.

To identify what code is compiled into modules during a kernel build,
one can look for the presence of the -DKBUILD_MODFILE and -DKBUILD_MODNAME
options in the compile command lines.  A simple grep in .*.cmd files for
those options is sufficient for this.

Unfortunately, these options are only passed when compiling C source files.
Various modules also include objects built from assembler source, and these
options are not passed in that case.

Adding $(modfile_flags) to modkern_aflags (similar to modkern_cflahs), and
adding $(modname_flags) to a_flags (similar to c_flags) makes it possible
to identify which objects are compiled into modules for both C and
assembler soure files.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 scripts/Makefile.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Masahiro Yamada Aug. 23, 2024, 5:37 p.m. UTC | #1 
On Fri, Aug 23, 2024 at 3:21 AM Kris Van Hees <kris.van.hees@oracle.com> wrote:
>
> In order to create the file at build time, modules.builtin.ranges, that
> contains the range of addresses for all built-in modules, there needs to
> be a way to identify what code is compiled into modules.
>
> To identify what code is compiled into modules during a kernel build,
> one can look for the presence of the -DKBUILD_MODFILE and -DKBUILD_MODNAME
> options in the compile command lines.  A simple grep in .*.cmd files for
> those options is sufficient for this.
>
> Unfortunately, these options are only passed when compiling C source files.
> Various modules also include objects built from assembler source, and these
> options are not passed in that case.
>
> Adding $(modfile_flags) to modkern_aflags (similar to modkern_cflahs), and


modkern_cflahs  ->  modkern_cflags


> adding $(modname_flags) to a_flags (similar to c_flags) makes it possible
> to identify which objects are compiled into modules for both C and
> assembler soure files.

soure  -> source



Strictly speaking, only KBUILD_MODFILE was used in 2/4 or 3/4.

KBUILD_MODNAME was unneeded, but If you want to add KBUILD_MODNAME
for consistency, it is fine too.


RUST_MODFILE exists, but RUST_MODNAME does not.



>
> Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
>  scripts/Makefile.lib | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index fe3668dc4954..170f462537a8 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -238,7 +238,7 @@ modkern_rustflags =                                              \
>
>  modkern_aflags = $(if $(part-of-module),                               \
>                         $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE),       \
> -                       $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL))
> +                       $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) $(modfile_flags))
>
>  c_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
>                  -include $(srctree)/include/linux/compiler_types.h       \
> @@ -248,7 +248,7 @@ c_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
>  rust_flags     = $(_rust_flags) $(modkern_rustflags) @$(objtree)/include/generated/rustc_cfg
>
>  a_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
> -                $(_a_flags) $(modkern_aflags)
> +                $(_a_flags) $(modkern_aflags) $(modname_flags)
>
>  cpp_flags      = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
>                  $(_cpp_flags)
> --
> 2.45.2
>
diff mbox series

Patch

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index fe3668dc4954..170f462537a8 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -238,7 +238,7 @@  modkern_rustflags =                                              \
 
 modkern_aflags = $(if $(part-of-module),				\
 			$(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE),	\
-			$(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL))
+			$(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) $(modfile_flags))
 
 c_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 		 -include $(srctree)/include/linux/compiler_types.h       \
@@ -248,7 +248,7 @@  c_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 rust_flags     = $(_rust_flags) $(modkern_rustflags) @$(objtree)/include/generated/rustc_cfg
 
 a_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
-		 $(_a_flags) $(modkern_aflags)
+		 $(_a_flags) $(modkern_aflags) $(modname_flags)
 
 cpp_flags      = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 		 $(_cpp_flags)