| Message ID | 20190410155058.9437-6-joe.lawrence@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | klp-convert livepatch build tooling | expand |
On Wed, Apr 10, 2019 at 11:50:54AM -0400, Joe Lawrence wrote: > > [ ... snip ... ] > > diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost > index 6b7f354f189a..1e8bb7442689 100644 > --- a/scripts/Makefile.modpost > +++ b/scripts/Makefile.modpost > @@ -124,8 +124,22 @@ quiet_cmd_ld_ko_o = LD [M] $@ > -o $@ $(real-prereqs) ; \ > $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) > > +SLIST = $(objtree)/Symbols.list > +KLP_CONVERT = scripts/livepatch/klp-convert > +quiet_cmd_klp_convert = KLP $@ > + cmd_klp_convert = mv $@ $(@:.ko=.klp.o); \ > + $(KLP_CONVERT) $(SLIST) $(@:.ko=.klp.o) $@ > + > +define rule_ld_ko_o > + $(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \ > + $(call save-cmd,ld_ko_o) ; \ > + $(if $(CONFIG_LIVEPATCH), \ > + $(if $(wildcard $(MODVERDIR)/$(basetarget).livepatch), \ > + $(call echo-cmd,klp_convert) $(cmd_klp_convert) )) > +endef > + > $(modules): %.ko :%.o %.mod.o FORCE > - +$(call if_changed,ld_ko_o) > + +$(call if_changed_rule,ld_ko_o) > > targets += $(modules) I just noticed that rule_ld_ko_o produces verbose output when linking modules: % make ... echo ' LD [M] drivers/ata/ata_generic.ko'; ld -r -m elf_x86_64 -z max-page-size=0x200000 -T ./scripts/module-common.lds --build-id -o drivers/ata/ata_generic.ko drivers/ata/ata_generic.o drivers/ata/ata_generic.mod.o ; true ; printf '%s\n' 'cmd_drivers/ata/ata_generic.ko := ld -r -m elf_x86_64 -z max-page-size=0x200000 -T ./scripts/module-common.lds --build-id -o drivers/ata/ata_generic.ko drivers/ata/ata_generic.o drivers/ata/ata_generic.mod.o ; true' > drivers/ata/.ata_generic.ko.cmd ; LD [M] drivers/ata/ata_generic.ko so I think we need to use the $(Q) macro to respect the KBUILD_VERBOSE and V kbuild settings. Masahiro, does something like this look correct? Thanks, -- Joe -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- From 5c8a2c58c7be98c0a9156155f201b88cc61bf0bd Mon Sep 17 00:00:00 2001 From: Joe Lawrence <joe.lawrence@redhat.com> Date: Thu, 11 Apr 2019 11:32:37 -0400 Subject: [PATCH] [squash] modpost: fix rule_ld_ko_o verbosity Note: squash with ("modpost: Integrate klp-convert") rule_ld_ko_o should include $(Q) to honor build verbosity setting. Cargo-cult-stolen from 70923bd26c73 ("perf tools: Make flex/bison calls honour V=1"). [joe: quiet down rule_ld_ko_o] Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> --- scripts/Makefile.modpost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 9fe4c5760aca..f2aee6b8dcfd 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -135,11 +135,11 @@ KLP_CONVERT = scripts/livepatch/klp-convert quiet_cmd_klp_convert = KLP $@ cmd_klp_convert = mv $@ $(@:.ko=.klp.o); \ $(KLP_CONVERT) $(SLIST) $(@:.ko=.klp.o) $@ define rule_ld_ko_o - $(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \ + $(Q)$(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \ $(call save-cmd,ld_ko_o) ; \ $(if $(CONFIG_LIVEPATCH), \ $(if $(wildcard $(MODVERDIR)/$(basetarget).livepatch), \ $(call echo-cmd,klp_convert) $(cmd_klp_convert) )) endef
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 7484b9d8272f..f8b7d12e44c9 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -236,6 +236,8 @@ endif # (needed for the shell) make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1))))) +save-cmd = printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd + # Find any prerequisites that is newer than target or that does not exist. # PHONY targets skipped in both cases. any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) @@ -243,7 +245,7 @@ any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) # Execute command if command has changed or prerequisite(s) are updated. if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ $(cmd); \ - printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) + $(save-cmd), @:) # Execute the command and also postprocess generated .d dependencies file. if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)),$(cmd_and_fixdep),@:) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 6b7f354f189a..1e8bb7442689 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -124,8 +124,22 @@ quiet_cmd_ld_ko_o = LD [M] $@ -o $@ $(real-prereqs) ; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) +SLIST = $(objtree)/Symbols.list +KLP_CONVERT = scripts/livepatch/klp-convert +quiet_cmd_klp_convert = KLP $@ + cmd_klp_convert = mv $@ $(@:.ko=.klp.o); \ + $(KLP_CONVERT) $(SLIST) $(@:.ko=.klp.o) $@ + +define rule_ld_ko_o + $(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \ + $(call save-cmd,ld_ko_o) ; \ + $(if $(CONFIG_LIVEPATCH), \ + $(if $(wildcard $(MODVERDIR)/$(basetarget).livepatch), \ + $(call echo-cmd,klp_convert) $(cmd_klp_convert) )) +endef + $(modules): %.ko :%.o %.mod.o FORCE - +$(call if_changed,ld_ko_o) + +$(call if_changed_rule,ld_ko_o) targets += $(modules) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index f277e116e0eb..374b22c76ec5 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1974,6 +1974,10 @@ static void read_symbols(const char *modname) license = get_next_modinfo(&info, "license", license); } + /* Livepatch modules have unresolved symbols resolved by klp-convert */ + if (get_modinfo(&info, "livepatch")) + mod->livepatch = 1; + for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { symname = remove_dot(info.strtab + sym->st_name); @@ -2101,7 +2105,7 @@ static int check_exports(struct module *mod) const char *basename; exp = find_symbol(s->name); if (!exp || exp->module == mod) { - if (have_vmlinux && !s->weak) { + if (have_vmlinux && !s->weak && !mod->livepatch) { if (warn_unresolved) { warn("\"%s\" [%s.ko] undefined!\n", s->name, mod->name); diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 8453d6ac2f77..2acfaae064ec 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -118,6 +118,7 @@ struct module { int skip; int has_init; int has_cleanup; + int livepatch; struct buffer dev_table_buf; char srcversion[25]; int is_dot_o;