Currently, modpost is executed twice; first for vmlinux, second for modules. This commit merges them. Current build flow ================== 1) build obj-y and obj-m objects 2) link vmlinux.o 3) modpost for vmlinux 4) link vmlinux 5) modpost for modules 6) link modules (*.ko) The build steps 1) through 6) are serialized, that is, modules are built after vmlinux. You do not get benefits of parallel builds when scripts/link-vmlinux.sh is being run. New build flow ============== 1) build obj-y and obj-m objects 2) link vmlinux.o 3) modpost for vmlinux and modules 4a) link vmlinux 4b) link modules (*.ko) In the new build flow, modpost is invoked just once. vmlinux and modules are built in parallel. One exception is CONFIG_DEBUG_INFO_BTF_MODULES=y, where modules depend on vmlinux.
Showing the changes to scripts (3 of 4 files). Show all
Unified · Split
| @@ -55,7 +55,7 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \ · 54 unmodified lines | |||
| 55 | printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) | 55 | printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) |
| 56 | 56 | ||
| 57 | # Re-generate module BTFs if either module's .ko or vmlinux changed | 57 | # Re-generate module BTFs if either module's .ko or vmlinux changed |
| 58 | $(modules): %.ko: %.o %.mod.o scripts/module.lds $(if $(KBUILD_BUILTIN),vmlinux) FORCE | 58 | $(modules): %.ko: %.o %.mod.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE |
| 59 | +$(call if_changed_except,ld_ko_o,vmlinux) | 59 | +$(call if_changed_except,ld_ko_o,vmlinux) |
| 60 | ifdef CONFIG_DEBUG_INFO_BTF_MODULES | 60 | ifdef CONFIG_DEBUG_INFO_BTF_MODULES |
| 61 | +$(if $(newer-prereqs),$(call cmd,btf_ko)) | 61 | +$(if $(newer-prereqs),$(call cmd,btf_ko)) |
| @@ -32,9 +32,6 @@ · 31 unmodified lines | |||
| 32 | # Step 4 is solely used to allow module versioning in external modules, | 32 | # Step 4 is solely used to allow module versioning in external modules, |
| 33 | # where the CRC of each module is retrieved from the Module.symvers file. | 33 | # where the CRC of each module is retrieved from the Module.symvers file. |
| 34 | 34 | ||
| 35 | # KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. | ||
| 36 | # This is solely useful to speed up test compiles | ||
| 37 | |||
| 38 | PHONY := __modpost | 35 | PHONY := __modpost |
| 39 | __modpost: | 36 | __modpost: |
| 40 | 37 | ||
| @@ -45,24 +42,23 @@ MODPOST = scripts/mod/modpost \ · 4 unmodified lines | |||
| 45 | $(if $(CONFIG_MODVERSIONS),-m) \ | 42 | $(if $(CONFIG_MODVERSIONS),-m) \ |
| 46 | $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \ | 43 | $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \ |
| 47 | $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ | 44 | $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ |
| 45 | $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \ | ||
| 46 | $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N) \ | ||
| 48 | -o $@ | 47 | -o $@ |
| 49 | 48 | ||
| 50 | ifdef MODPOST_VMLINUX | 49 | # 'make -i -k' ignores compile errors, and builds as many modules as possible. |
| 51 | 50 | ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),) | |
| 52 | quiet_cmd_modpost = MODPOST $@ | 51 | MODPOST += -n |
| 53 | cmd_modpost = $(MODPOST) $< | 52 | endif |
| 54 | |||
| 55 | vmlinux.symvers: vmlinux.o | ||
| 56 | $(call cmd,modpost) | ||
| 57 | 53 | ||
| 58 | __modpost: vmlinux.symvers | 54 | ifeq ($(KBUILD_EXTMOD),) |
| 59 | 55 | ||
| 60 | # Generate the list of in-tree objects in vmlinux | 56 | # Generate the list of in-tree objects in vmlinux |
| 61 | # --------------------------------------------------------------------------- | 57 | # --------------------------------------------------------------------------- |
| 62 | 58 | ||
| 63 | # This is used to retrieve symbol versions generated by genksyms. | 59 | # This is used to retrieve symbol versions generated by genksyms. |
| 64 | ifdef CONFIG_MODVERSIONS | 60 | ifdef CONFIG_MODVERSIONS |
| 65 | vmlinux.symvers: .vmlinux.objs | 61 | vmlinux.symvers Module.symvers: .vmlinux.objs |
| 66 | endif | 62 | endif |
| 67 | 63 | ||
| 68 | # Ignore libgcc.a | 64 | # Ignore libgcc.a |
| @@ -83,24 +79,12 @@ targets += .vmlinux.objs · 14 unmodified lines | |||
| 83 | .vmlinux.objs: $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE | 79 | .vmlinux.objs: $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE |
| 84 | $(call if_changed,vmlinux_objs) | 80 | $(call if_changed,vmlinux_objs) |
| 85 | 81 | ||
| 86 | else | 82 | vmlinux.o-if-present := $(wildcard vmlinux.o) |
| 87 | 83 | output-symdump := vmlinux.symvers | |
| 88 | ifeq ($(KBUILD_EXTMOD),) | ||
| 89 | |||
| 90 | input-symdump := vmlinux.symvers | ||
| 91 | output-symdump := modules-only.symvers | ||
| 92 | |||
| 93 | quiet_cmd_cat = GEN $@ | ||
| 94 | cmd_cat = cat $(real-prereqs) > $@ | ||
| 95 | |||
| 96 | ifneq ($(wildcard vmlinux.symvers),) | ||
| 97 | |||
| 98 | __modpost: Module.symvers | ||
| 99 | Module.symvers: vmlinux.symvers modules-only.symvers FORCE | ||
| 100 | $(call if_changed,cat) | ||
| 101 | |||
| 102 | targets += Module.symvers | ||
| 103 | 84 | ||
| 85 | ifdef KBUILD_MODULES | ||
| 86 | output-symdump := $(if $(vmlinux.o-if-present), Module.symvers, modules-only.symvers) | ||
| 87 | missing-input := $(filter-out $(vmlinux.o-if-present),vmlinux.o) | ||
| 104 | endif | 88 | endif |
| 105 | 89 | ||
| 106 | else | 90 | else |
| @@ -112,56 +96,35 @@ src := $(obj) · 5 unmodified lines | |||
| 112 | # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS | 96 | # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS |
| 113 | include $(or $(wildcard $(src)/Kbuild), $(src)/Makefile) | 97 | include $(or $(wildcard $(src)/Kbuild), $(src)/Makefile) |
| 114 | 98 | ||
| 115 | # modpost option for external modules | 99 | module.symvers-if-present := $(wildcard Module.symvers) |
| 116 | MODPOST += -e | ||
| 117 | |||
| 118 | input-symdump := Module.symvers $(KBUILD_EXTRA_SYMBOLS) | ||
| 119 | output-symdump := $(KBUILD_EXTMOD)/Module.symvers | 100 | output-symdump := $(KBUILD_EXTMOD)/Module.symvers |
| 101 | missing-input := $(filter-out $(module.symvers-if-present), Module.symvers) | ||
| 120 | 102 | ||
| 121 | endif | 103 | MODPOST += -e $(addprefix -i ,$(module.symvers-if-present) $(KBUILD_EXTRA_SYMBOLS)) |
| 122 | |||
| 123 | existing-input-symdump := $(wildcard $(input-symdump)) | ||
| 124 | |||
| 125 | # modpost options for modules (both in-kernel and external) | ||
| 126 | MODPOST += \ | ||
| 127 | $(addprefix -i ,$(existing-input-symdump)) \ | ||
| 128 | $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \ | ||
| 129 | $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N) | ||
| 130 | |||
| 131 | # 'make -i -k' ignores compile errors, and builds as many modules as possible. | ||
| 132 | ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),) | ||
| 133 | MODPOST += -n | ||
| 134 | endif | ||
| 135 | 104 | ||
| 136 | # Clear VPATH to not search for *.symvers in $(srctree). Check only $(objtree). | 105 | endif # ($(KBUILD_EXTMOD),) |
| 137 | VPATH := | ||
| 138 | $(input-symdump): | ||
| 139 | @echo >&2 'WARNING: Symbol version dump "$@" is missing.' | ||
| 140 | @echo >&2 ' Modules may not have dependencies or modversions.' | ||
| 141 | @echo >&2 ' You may get many unresolved symbol warnings.' | ||
| 142 | 106 | ||
| 143 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined symbols | 107 | ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),) |
| 144 | ifneq ($(KBUILD_MODPOST_WARN)$(filter-out $(existing-input-symdump), $(input-symdump)),) | ||
| 145 | MODPOST += -w | 108 | MODPOST += -w |
| 146 | endif | 109 | endif |
| 147 | 110 | ||
| 111 | modorder-if-needed := $(if $(KBUILD_MODULES), $(MODORDER)) | ||
| 112 | |||
| 148 | # Read out modules.order to pass in modpost. | 113 | # Read out modules.order to pass in modpost. |
| 149 | # Otherwise, allmodconfig would fail with "Argument list too long". | 114 | # Otherwise, allmodconfig would fail with "Argument list too long". |
| 150 | quiet_cmd_modpost = MODPOST $@ | 115 | quiet_cmd_modpost = MODPOST $@ |
| 151 | cmd_modpost = sed 's/ko$$/o/' $< | $(MODPOST) -T - | 116 | cmd_modpost = \ |
| 152 | 117 | $(if $(missing-input), \ | |
| 153 | $(output-symdump): $(MODORDER) $(input-symdump) FORCE | 118 | echo >&2 "WARNING: $(missing-input) is missing."; \ |
| 154 | $(call if_changed,modpost) | 119 | echo >&2 " Modules may not have dependencies or modversions."; \ |
| 120 | echo >&2 " You may get many unresolved symbol warnings.";) \ | ||
| 121 | sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(vmlinux.o-if-present) -T - | ||
| 155 | 122 | ||
| 156 | targets += $(output-symdump) | 123 | targets += $(output-symdump) |
| 124 | $(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) FORCE | ||
| 125 | $(call if_changed,modpost) | ||
| 157 | 126 | ||
| 158 | __modpost: $(output-symdump) | 127 | __modpost: $(output-symdump) |
| 159 | ifneq ($(KBUILD_MODPOST_NOFINAL),1) | ||
| 160 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal | ||
| 161 | endif | ||
| 162 | |||
| 163 | endif | ||
| 164 | |||
| 165 | PHONY += FORCE | 128 | PHONY += FORCE |
| 166 | FORCE: | 129 | FORCE: |
| 167 | 130 | ||
| @@ -214,9 +214,6 @@ if [ "$1" = "clean" ]; then · 213 unmodified lines | |||
| 214 | exit 0 | 214 | exit 0 |
| 215 | fi | 215 | fi |
| 216 | 216 | ||
| 217 | # modpost vmlinux.o to check for section mismatches | ||
| 218 | ${MAKE} -f "${srctree}/scripts/Makefile.modpost" MODPOST_VMLINUX=1 | ||
| 219 | |||
| 220 | info MODINFO modules.builtin.modinfo | 217 | info MODINFO modules.builtin.modinfo |
| 221 | ${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo | 218 | ${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo |
| 222 | info GEN modules.builtin | 219 | info GEN modules.builtin |