History

kbuild: create modules.builtin without Makefile.modbuiltin or tristate.conf

Commit bc081dd6e9f6 ("kbuild: generate modules.builtin") added infrastructure to generate modules.builtin, the list of all builtin modules. Basically, it works like this: - Kconfig generates include/config/tristate.conf, the list of tristate CONFIG options with a value in a capital letter. - scripts/Makefile.modbuiltin makes Kbuild descend into directories to collect the information of builtin modules. I am not a big fan of it because Kbuild ends up with traversing the source tree twice. I am not sure how perfectly it should work, but this approach cannot avoid false positives; even if the relevant CONFIG option is tristate, some Makefiles forces obj-m to obj-y. Some examples are: arch/powerpc/platforms/powermac/Makefile: obj-$(CONFIG_NVRAM:m=y) += nvram.o net/ipv6/Makefile: obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o net/netlabel/Makefile: obj-$(subst m,y,$(CONFIG_IPV6)) += netlabel_calipso.o Nobody has complained about (or noticed) it, so it is probably fine to have false positives in modules.builtin. This commit simplifies the implementation. Let's exploit the fact that every module has MODULE_LICENSE(). (modpost shows a warning if MODULE_LICENSE is missing. If so, 0-day bot would already have blocked such a module.) I added MODULE_FILE to <linux/module.h>. When the code is being compiled as builtin, it will be filled with the file path of the module, and collected into modules.builtin.info. Then, scripts/link-vmlinux.sh extracts the list of builtin modules out of it. This new approach fixes the false-positives above, but adds another type of false-positives; non-modular code may have MODULE_LICENSE() by mistake. This is not a big deal, it is just the code is always orphan. We can clean it up if we like. You can see cleanup examples by: $ git log --grep='make.* explicitly non-modular' To sum up, this commits deletes lots of code, but still produces almost equivalent results. Please note it does not increase the vmlinux size at all. As you can see in include/asm-generic/vmlinux.lds.h, the .modinfo section is discarded in the link stage.

Masahiro Yamada committed 6 years ago

Commit 8b41fc41 parent 1664a377 files · +22 −128Browse files

Showing the changes to include/linux (1 of 7 files). Show all

Unified · Split

include/linux/module.h+11−1
@@ -169,6 +169,16 @@ extern void cleanup_module(void); · 168 unmodified lines
169169 */
170170 #define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep)
171171
172+/*
173+ * MODULE_FILE is used for generating modules.builtin
174+ * So, make it no-op when this is being built as a module
175+ */
176+#ifdef MODULE
177+#define MODULE_FILE
178+#else
179+#define MODULE_FILE MODULE_INFO(file, KBUILD_MODFILE);
180+#endif
181+
172182 /*
173183 * The following license idents are currently accepted as indicating free
174184 * software modules
@@ -213,7 +223,7 @@ extern void cleanup_module(void); · 38 unmodified lines
213223 * 2. So the community can ignore bug reports including proprietary modules
214224 * 3. So vendors can do likewise based on their own policies
215225 */
216−#define MODULE_LICENSE(_license) MODULE_INFO(license, _license)
226+#define MODULE_LICENSE(_license) MODULE_FILE MODULE_INFO(license, _license)
217227
218228 /*
219229 * Author(s), use "Name <email>" or just "Name", for multiple