Changes in Makefile.modinst

25ff08aa - kbuild: Fix signing issue for external modules

Mon, 13 Jan 2025 06:01:29 +0000

kbuild: Fix signing issue for external modulesWhen running the sign script the kernel is within the source directoryof external modules. This caused issues when the kernel uses relativepaths, like:make[5]: Entering directory '/build/client/devel/kernel/work/linux-2.6'make[6]: Entering directory '/build/client/devel/addmodules/vtx/work/vtx' INSTALL /build/client/devel/addmodules/vtx/_/lib/modules/6.13.0-devel+/extra/vtx.ko SIGN /build/client/devel/addmodules/vtx/_/lib/modules/6.13.0-devel+/extra/vtx.ko/bin/sh: 1: scripts/sign-file: not found DEPMOD /build/client/devel/addmodules/vtx/_/lib/modules/6.13.0-devel+Working around it by using absolute pathes here.Fixes: 13b25489b6f8 ("kbuild: change working directory to external module directory with M=")Signed-off-by: Torsten Hilbrich Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.modinst

bad6beb2 - kbuild: remove extmod_prefix, MODORDER, MODULES_NSDEPS variables

Sun, 10 Nov 2024 01:34:34 +0000

kbuild: remove extmod_prefix, MODORDER, MODULES_NSDEPS variablesWith the previous changes, $(extmod_prefix), $(MODORDER), and$(MODULES_NSDEPS) are constant. (empty, modules.order, andmodules.nsdeps, respectively).Remove these variables and hard-code their values.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

214c0eea - kbuild: add $(objtree)/ prefix to some in-kernel build artifacts

Sun, 10 Nov 2024 01:34:30 +0000

kbuild: add $(objtree)/ prefix to some in-kernel build artifacts$(objtree) refers to the top of the output directory of kernel builds.This commit adds the explicit $(objtree)/ prefix to build artifactsneeded for building external modules.This change has no immediate impact, as the top-level Makefilecurrently defines: objtree := .This commit prepares for supporting the building of external modulesin a different directory.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

ae70d708 - kbuild: add install target for modules.builtin.ranges

Fri, 06 Sep 2024 14:45:05 +0000

kbuild: add install target for modules.builtin.rangesWhen CONFIG_BUILTIN_MODULE_RANGES is enabled, the modules.builtin.rangesfile should be installed in the module install location.Signed-off-by: Kris Van Hees Reviewed-by: Nick Alcock Tested-by: Sam James Reviewed-by: Sami Tolvanen Tested-by: Sami Tolvanen Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.modinst

0c4beffb - kbuild: modinst: remove the multithread option from zstd compression

Sun, 04 Aug 2024 03:33:07 +0000

kbuild: modinst: remove the multithread option from zstd compressionParallel execution is supported by GNU Make: $ make -j modules_installIt is questionable to enable multithreading within each zstd processby default.If you still want to do it, you can use the environment variable: $ ZSTD_NBTHREADS= make modules_installSigned-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Sedat Dilek List of files: /linux-6.15/scripts/Makefile.modinst

c7ff693f - module: Split modules_install compression and in-kernel decompression

Mon, 22 Jul 2024 09:06:21 +0000

module: Split modules_install compression and in-kernel decompressionThe kernel configuration allows specifying a module compression mode. Ifone is selected then each module gets compressed during'make modules_install' and additionally one can also enable support fora respective direct in-kernel decompression support. This means that thedecompression support cannot be enabled without the automatic compression.Some distributions, such as the (open)SUSE family, use a signer service formodules. A build runs on a worker machine but signing is done by a separatelocked-down server that is in possession of the signing key. The buildinvokes 'make modules_install' to create a modules tree, collectsinformation about the modules, asks the signer service for their signature,appends each signature to the respective module and compresses all modules.When using this arrangment, the 'make modules_install' step producesunsigned+uncompressed modules and the distribution's own build recipe takescare of signing and compression later.The signing support can be currently enabled without automatically signingmodules during 'make modules_install'. However, the in-kernel decompressionsupport can be selected only after first enabling automatic compressionduring this step.To allow only enabling the in-kernel decompression support without theautomatic compression during 'make modules_install', separate thecompression options similarly to the signing options, as follows:> Enable loadable module support[*] Module compression Module compression type (GZIP) --->[*] Automatically compress all modules[ ] Support in-kernel module decompression* "Module compression" (MODULE_COMPRESS) is a new main switch for the compression/decompression support. It replaces MODULE_COMPRESS_NONE.* "Module compression type" (MODULE_COMPRESS_) chooses the compression type, one of GZ, XZ, ZSTD.* "Automatically compress all modules" (MODULE_COMPRESS_ALL) is a new option to enable module compression during 'make modules_install'. It defaults to Y.* "Support in-kernel module decompression" (MODULE_DECOMPRESS) enables in-kernel decompression.Signed-off-by: Petr Pavlu Acked-by: Masahiro Yamada Signed-off-by: Luis Chamberlain List of files: /linux-6.15/scripts/Makefile.modinst

fbf5892d - kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules

Fri, 15 Sep 2023 10:15:39 +0000

kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modulesKmod is now (since kmod commit 09c9f8c5df04 ("libkmod: Use kerneldecompression when available")) using the kernel decompressor, whenloading compressed modules.However, the kernel XZ decompressor is XZ Embedded, which doesn'thandle CRC64 and dictionaries larger than 1MiB.Use CRC32 and 1MiB dictionary when XZ compressing and installingkernel modules.Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050582Signed-off-by: Martin Nybo Andersen Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.modinst

552c5013 - kbuild: avoid long argument lists in make modules_install

Mon, 11 Sep 2023 08:01:29 +0000

kbuild: avoid long argument lists in make modules_installRunning "make modules_install" may fail with make[2]: execvp: /bin/sh: Argument list too longif many modules are built and INSTALL_MOD_PATH is long. This is becausescripts/Makefile.modinst creates all directories with one mkdir command.Use $(foreach ...) instead to prevent an excessive argument list.Fixes: 2dfec887c0fd ("kbuild: reduce the number of mkdir calls during modules_install")Signed-off-by: Michal Kubecek Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.modinst

151aeca2 - kbuild: support modules_sign for external modules as well

Wed, 23 Aug 2023 11:50:48 +0000

kbuild: support modules_sign for external modules as wellThe modules_sign target is currently only available for in-tree modules,but it actually works for external modules as well.Move the modules_sign rule to the common part.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

02e8487b - kbuild: support 'make modules_sign' with CONFIG_MODULE_SIG_ALL=n

Wed, 23 Aug 2023 11:50:47 +0000

kbuild: support 'make modules_sign' with CONFIG_MODULE_SIG_ALL=nCommit d890f510c8e4 ("MODSIGN: Add modules_sign make target") introduced'make modules_sign' to manually sign modules.Some time later, commit d9d8d7ed498e ("MODSIGN: Add option to not signmodules during modules_install") introduced CONFIG_MODULE_SIG_ALL.If it was disabled, mod_sign_cmd was set to no-op ('true' command).It affected not only 'make modules_install' but also 'make modules_sign'.With CONFIG_MODULE_SIG_ALL=n, neither modules_install nor modules_signis able to sign modules.Kbuild has kept that behavior, and nobody has complained about it, butI think it is weird.CONFIG_MODULE_SIG_ALL=n should turn off signing only for modules_install.If users want to sign modules manually, modules_sign should be offered.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

5e02797b - kbuild: move more module installation code to scripts/Makefile.modinst

Wed, 23 Aug 2023 11:50:46 +0000

kbuild: move more module installation code to scripts/Makefile.modinstMove more relevant code to scripts/Makefile.modinst.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

2dfec887 - kbuild: reduce the number of mkdir calls during modules_install

Wed, 23 Aug 2023 11:50:45 +0000

kbuild: reduce the number of mkdir calls during modules_installCalling 'mkdir' for every module results in redundant syscalls.Use $(sort ...) to drop the duplicated directories.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

79b96c33 - kbuild: move depmod rule to scripts/Makefile.modinst

Wed, 23 Aug 2023 11:50:43 +0000

kbuild: move depmod rule to scripts/Makefile.modinstdepmod is a part of the module installation.scripts/Makefile.modinst is a better place to run it.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

22e46f64 - kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI

Tue, 31 Jan 2023 08:43:23 +0000

kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URIWhen CONFIG_MODULE_SIG_KEY is PKCS#11 URI (pkcs11:*), signing of modulesfails: scripts/sign-file sha256 /.../linux/pkcs11:token=foo;object=bar;pin-value=1111 certs/signing_key.x509 /.../kernel/crypto/tcrypt.ko Usage: scripts/sign-file [-dp] [] scripts/sign-file -s []First, we need to avoid adding the $(srctree)/ prefix to the URL.Second, since the kconfig string values no longer include quotes, we need to addthem again when passing a PKCS#11 URI to sign-file. This avoidssplitting by the shell if the URI contains semicolons.Fixes: 4db9c2e3d055 ("kbuild: stop using config_filename in scripts/Makefile.modsign")Fixes: 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf")Signed-off-by: Jan Luebbe Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.modinst

b74d7bb7 - kbuild: Modify default INSTALL_MOD_DIR from extra to updates

Wed, 14 Dec 2022 23:17:18 +0000

kbuild: Modify default INSTALL_MOD_DIR from extra to updatesThe default INSTALL_MOD_DIR of using the /lib/modules/$(uname -r)/extradirectory for external modules assumes distributions will have somethinglike /etc/depmod.d/dist.conf with:search updates extra built-inHowever, only some Red Hat releases have and use the "extra" stuff foryears now. Meanwhile, the depmod.c tool in kmod has *forever* usedthe "updates" directory as part of the search path by default *if*your distribution does not have any depmod.d configuration.If you compile and install an external module today, even upstreamkernel mock drivers (tools/testing/cxl) the modules_install targetwill pick up the new drivers but will not allow override of driversfrom updates to override built-in ones.Since module-init-tools was deprecated over 11 years ago and now kmodhas since its inception used the "updates" directory as part of itsdefault search path to allow overrides, and since the "extra" stuffwas in practice only used by Red Hat stuff, use the more distroagnostic override path "updates" to allow external modules toalso override proper production kernel modules.This would allow mocking drivers tools to not have to muck withdepmod.d config files or assume that your distro will have extraon a configuration file over built-in.With today's default you end up actually *crashing* Linux whentrying to load cxl_test with the default "extra" [0] directory beingused. This fixes that and allows other mocking drivers to doless work.[0] https://lkml.kernel.org/r/20221209062919.1096779-1-mcgrof@kernel.orgSigned-off-by: Luis Chamberlain Acked-by: Dan Williams Acked-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

f65a4868 - kbuild: change module.order to list .o instead of .ko

Sun, 11 Dec 2022 13:04:07 +0000

kbuild: change module.order to list *.o instead of *.koscripts/Makefile.build replaces the suffix .o with .ko, thenscripts/Makefile.modpost calls the sed command to change .ko backto the original .o suffix.Instead of converting the suffixes back-and-forth, store the .o pathsin modules.order, and replace it with .ko in 'make modules_install'.This avoids the unneeded sed command.Signed-off-by: Masahiro Yamada Reviewed-by: Luis Chamberlain List of files: /linux-6.15/scripts/Makefile.modinst

6768fa4b - kbuild: add read-file macro

Sun, 11 Dec 2022 02:54:47 +0000

kbuild: add read-file macroSince GNU Make 4.2, $(file ...) supports the read operater '<', whichis useful to read a file without forking a new process. No warning isshown even if the input file is missing.For older Make versions, it falls back to the cat command.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Reviewed-by: Alexander Lobakin Tested-by: Alexander Lobakin List of files: /linux-6.15/scripts/Makefile.modinst

a5db80c6 - kbuild: do not sort after reading modules.order

Sun, 11 Dec 2022 09:49:18 +0000

kbuild: do not sort after reading modules.ordermodules.order lists modules in the deterministic order (that is why"modules order"), and there is no duplication in the list.$(sort ) is pointless.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

84850dbb - kbuild: error out if $(INSTALL_MOD_PATH) contains % or :

Thu, 14 Jul 2022 05:02:43 +0000

kbuild: error out if $(INSTALL_MOD_PATH) contains % or :If the directory path given to INSTALL_MOD_PATH contains % or :,the module_install fails.% is used in pattern rules, and : as the separator of dependencies.Bail out with a clearer error message.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.modinst

f5a46185 - kbuild: remove unused cmd_none in scripts/Makefile.modinst

Thu, 30 Jun 2022 08:09:35 +0000

kbuild: remove unused cmd_none in scripts/Makefile.modinstCommit 65ce9c38326e ("kbuild: move module strip/compression code intoscripts/Makefile.modinst") added this unused code.Perhaps, I thought cmd_none was useful for CONFIG_MODULE_COMPRESS_NONE,but I did not use it after all.Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers List of files: /linux-6.15/scripts/Makefile.modinst