From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43A5AC4320A for ; Tue, 31 Aug 2021 17:39:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1EBA460C3E for ; Tue, 31 Aug 2021 17:39:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240442AbhHaRkQ (ORCPT ); Tue, 31 Aug 2021 13:40:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240339AbhHaRkN (ORCPT ); Tue, 31 Aug 2021 13:40:13 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA3FDC061764 for ; Tue, 31 Aug 2021 10:39:17 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id k24so17474221pgh.8 for ; Tue, 31 Aug 2021 10:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=F7echhAfjgqeCGKrHcBGPpDR6/tLyVVtHE9PZ+Scui8=; b=XPjSJ+1RVFjxeLSLmJt/kusVQ4ZbgYhJ7jw7H73ON6aMh7Ls0G/2tGC1HO/KX1OnyC 9f6xpH65HDw0j2shEjBIqLavPbGz1USbCq6i2IeI+RXl2SGFS8qmJAG1ng4Dpjk/Cs1J SuqY2uMWltW2enKHEQM2zvLvfkV5fFmgA3NUg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=F7echhAfjgqeCGKrHcBGPpDR6/tLyVVtHE9PZ+Scui8=; b=Ums6uPu9fGBlTdiICcE2eAXLgBHUN1S+Dtoikv3izLZmpsBvUjKO6+XLYZlV4GS8ok kFDwWfZ60NxexSpPCV5tFt4fJ7XKG3N6O4CQ00yo1FZLeDntP76XdibomIBpXHiVTpSC OVLuoctL1dREUTDvNR897AuSUqzAAQ943zRsJtVkFBh1+YhWWiNnaktTBx71FRi4fUWo y2cY9/Y50iJrjzs+xolEnANaACMBKOYl+P8gesDZGsr6VuqCbyemuRD/gq0b4g7z3a3v 7GIW6NXqB3aSnIDO4vuJYKNtd1qQGcFpRObnUzvsNiD/iaWp1gNh5zR2KfvF1wtvJulI Zs9g== X-Gm-Message-State: AOAM530vAqyFT0g6BmLk+2cbUStwbwjrIudYxsbrMz/app0IYMxRDfrw vf/YbyV8sos3SbsOx8NJxRIlrQ== X-Google-Smtp-Source: ABdhPJxTaAdX3MjiVgn0ALtx53taEe1/yoVJLVgsEPxtqq4y+tXnWm89P8HQ3DwC1MsBE2oRynCX9w== X-Received: by 2002:a63:5317:: with SMTP id h23mr28060938pgb.446.1630431556989; Tue, 31 Aug 2021 10:39:16 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id v17sm18016268pff.6.2021.08.31.10.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Aug 2021 10:39:16 -0700 (PDT) Date: Tue, 31 Aug 2021 10:39:15 -0700 From: Kees Cook To: Masahiro Yamada Cc: linux-kbuild@vger.kernel.org, Michal Marek , Nathan Chancellor , Nick Desaulniers , clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 08/13] kbuild: build modules in the same way with/without Clang LTO Message-ID: <202108311037.B3C7FCAF@keescook> References: <20210831074004.3195284-1-masahiroy@kernel.org> <20210831074004.3195284-9-masahiroy@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210831074004.3195284-9-masahiroy@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 31, 2021 at 04:39:59PM +0900, Masahiro Yamada wrote: > When Clang LTO is enabled, additional intermediate files *.lto.o are > created because LLVM bitcode must be converted to ELF before modpost. > > For non-LTO builds: > > $(LD) $(LD) > objects ---> .o -----> .ko > | > .mod.o ---/ > > For Clang LTO builds: > > $(AR) $(LD) $(LD) > objects ---> .o ---> .lto.o -----> .ko > | > .mod.o --/ > > Since the Clang LTO introduction, Kbuild code is complicated due to > CONFIG_LTO_CLANG conditionals sprinkled everywhere. > > Another confusion for Clang LTO builds is, .o is an archive > that contains LLVM bitcode files. The suffix should be .a instead of .o > > To clean up the code, unify the build process of modules, as follows: > > $(AR) $(LD) $(LD) > objects ---> .a ---> .prelink.o -----> .ko > | > .mod.o ------/ > > Here, 'objects' are either ELF or LLVM bitcode. .a is an archive, > .prelink.o is ELF. This is a good diagram and helps me understand what's happening here. Do you think there's a place for it somewhere in the kbuild documentation? > > Signed-off-by: Masahiro Yamada My question about speed changes also applies to this, since there's now a new step for non-LTO builds. I think you said it wasn't a meaningful change in speed, but I think it'd be worth mentioning performance changes in this commit message. > --- > > scripts/Makefile.build | 100 +++++++++++++++++--------------------- > scripts/Makefile.lib | 11 ++--- > scripts/Makefile.modfinal | 4 +- > scripts/Makefile.modpost | 7 +-- > scripts/mod/modpost.c | 6 +-- > 5 files changed, 56 insertions(+), 72 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 3ad1b1227371..cdc09e9080ca 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -88,9 +88,7 @@ endif > > targets-for-modules := $(patsubst %.o, %.mod, $(filter %.o, $(obj-m))) > > -ifdef CONFIG_LTO_CLANG > -targets-for-modules += $(patsubst %.o, %.lto.o, $(filter %.o, $(obj-m))) > -endif > +targets-for-modules += $(patsubst %.o, %.prelink.o, $(filter %.o, $(obj-m))) > > ifdef need-modorder > targets-for-modules += $(obj)/modules.order > @@ -243,9 +241,12 @@ endif # CONFIG_STACK_VALIDATION > > ifdef CONFIG_LTO_CLANG > > -# Skip objtool for LLVM bitcode > +# Skip objtool LLVM bitcode Nit: needless comment change? > $(obj)/%o: objtool-enabled := > > +# Run objtool now that we have compiled modules into native code > +$(obj)/%.prelink.o: objtool-enabled := y > + > else > > # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory > @@ -255,6 +256,8 @@ else > $(obj)/%o: objtool-enabled = $(if $(filter-out y%, \ > $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n),y) > > +$(obj)/%.prelink.o: objtool-enabled := > + > endif > > ifdef CONFIG_TRIM_UNUSED_KSYMS > @@ -287,32 +290,12 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE > $(call if_changed_rule,cc_o_c) > $(call cmd,force_checksrc) > > -ifdef CONFIG_LTO_CLANG > -# Module .o files may contain LLVM bitcode, compile them into native code > -# before ELF processing > -quiet_cmd_cc_lto_link_modules = LTO [M] $@ > -cmd_cc_lto_link_modules = \ > - $(LD) $(ld_flags) -r -o $@ \ > - $(shell [ -s $(@:.lto.o=.o.symversions) ] && \ > - echo -T $(@:.lto.o=.o.symversions)) \ > - --whole-archive $(filter-out FORCE,$^) \ > - $(cmd_objtool) > - > -# objtool was skipped for LLVM bitcode, run it now that we have compiled > -# modules into native code > -$(obj)/%.lto.o: objtool-enabled = y > -$(obj)/%.lto.o: part-of-module := y > - > -$(obj)/%.lto.o: $(obj)/%.o FORCE > - $(call if_changed,cc_lto_link_modules) > -endif > - > cmd_mod = { \ > echo $(if $($*-objs)$($*-y)$($*-m), $(addprefix $(obj)/, $($*-objs) $($*-y) $($*-m)), $(@:.mod=.o)); \ > $(undefined_syms) echo; \ > } > $@ > > -$(obj)/%.mod: $(obj)/%$(mod-prelink-ext).o FORCE > +$(obj)/%.mod: $(obj)/%.prelink.o FORCE > $(call if_changed,mod) > > quiet_cmd_cc_lst_c = MKLST $@ > @@ -416,17 +399,6 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler > $(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ; > $(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ; > > -# combine symversions for later processing > -ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y) > - cmd_update_lto_symversions = \ > - rm -f $@.symversions \ > - $(foreach n, $(filter-out FORCE,$^), \ > - $(if $(shell test -s $(n).symversions && echo y), \ > - ; cat $(n).symversions >> $@.symversions)) > -else > - cmd_update_lto_symversions = echo >/dev/null > -endif > - > # > # Rule to compile a set of .o files into one .a file (without symbol table) > # > @@ -446,10 +418,10 @@ $(obj)/built-in.a: $(real-obj-y) FORCE > # modules.order unless contained modules are updated. > > cmd_modules_order = { $(foreach m, $(real-prereqs), \ > - $(if $(filter %/modules.order, $m), cat $m, echo $(patsubst %.o,%.ko,$m));) :; } \ > + $(if $(filter %/modules.order, $m), cat $m, echo $(patsubst %.a,%.ko,$m));) :; } \ > | $(AWK) '!x[$$0]++' - > $@ > > -$(obj)/modules.order: $(obj-m) FORCE > +$(obj)/modules.order: $(modules) FORCE > $(call if_changed,modules_order) > > # > @@ -458,26 +430,44 @@ $(obj)/modules.order: $(obj-m) FORCE > $(obj)/lib.a: $(lib-y) FORCE > $(call if_changed,ar) > > -# NOTE: > -# Do not replace $(filter %.o,^) with $(real-prereqs). When a single object > -# module is turned into a multi object module, $^ will contain header file > -# dependencies recorded in the .*.cmd file. > -ifdef CONFIG_LTO_CLANG > -quiet_cmd_link_multi-m = AR [M] $@ > -cmd_link_multi-m = \ > - $(cmd_update_lto_symversions); \ > - rm -f $@; \ > - $(AR) cDPrsT $@ $(filter %.o,$^) > -else > -quiet_cmd_link_multi-m = LD [M] $@ > - cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) > +# > +# Rule to prelink modules > +# > + > +ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y) > + > +cmd_merge_symver = $(PERL) scripts/merge-symvers.pl -a $(AR) -o $@ $< > + > +$(obj)/%.prelink.symversions: $(obj)/%.a FORCE > + $(call if_changed,merge_symver) > + > +targets += $(patsubst %.a, %.prelink.symversions, $(modules)) > + > +$(obj)/%.prelink.o: ld_flags += --script=$(filter %.symversions,$^) > +module-symver = $(obj)/%.prelink.symversions > + > endif > > -$(multi-obj-m): FORCE > - $(call if_changed,link_multi-m) > -$(call multi_depend, $(multi-obj-m), .o, -objs -y -m) > +quiet_cmd_ld_o_a = LD [M] $@ > + cmd_ld_o_a = $(LD) $(ld_flags) -r -o $@ --whole-archive $< $(cmd_objtool) > + > +$(obj)/%.prelink.o: part-of-module := y > + > +$(obj)/%.prelink.o: $(obj)/%.a $(module-symver) FORCE > + $(call if_changed,ld_o_a) > + > +quiet_cmd_ar_module = AR [M] $@ > + cmd_ar_module = rm -f $@; $(AR) cDPrST $@ $(real-prereqs) > + > +$(modules-single): %.a: %.o FORCE > + $(call if_changed,ar_module) > + > +$(modules-multi): FORCE > + $(call if_changed,ar_module) > +$(call multi_depend, $(modules-multi), .a, -objs -y -m) > + > +targets += $(modules-single) $(modules-multi) > > -targets += $(multi-obj-m) > targets := $(filter-out $(PHONY), $(targets)) > > # Add intermediate targets: > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 34c4c11c4bc1..5074922db82d 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -106,6 +106,10 @@ multi-dtb-y := $(addprefix $(obj)/, $(multi-dtb-y)) > real-dtb-y := $(addprefix $(obj)/, $(real-dtb-y)) > subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) > > +modules := $(patsubst %.o, %.a, $(obj-m)) > +modules-multi := $(sort $(patsubst %.o, %.a, $(multi-obj-m))) > +modules-single := $(sort $(filter-out $(modules-multi), $(filter %.a, $(modules)))) > + > # Finds the multi-part object the current object will be linked into. > # If the object belongs to two or more multi-part objects, list them all. > modname-multi = $(sort $(foreach m,$(multi-obj-ym),\ > @@ -225,13 +229,6 @@ dtc_cpp_flags = -Wp,-MMD,$(depfile).pre.tmp -nostdinc \ > $(addprefix -I,$(DTC_INCLUDE)) \ > -undef -D__DTS__ > > -ifeq ($(CONFIG_LTO_CLANG),y) > -# With CONFIG_LTO_CLANG, .o files in modules might be LLVM bitcode, so we > -# need to run LTO to compile them into native code (.lto.o) before further > -# processing. > -mod-prelink-ext := .lto > -endif > - > # Useful for describing the dependency of composite objects > # Usage: > # $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add) > diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal > index ff805777431c..1b6401f53662 100644 > --- a/scripts/Makefile.modfinal > +++ b/scripts/Makefile.modfinal > @@ -9,7 +9,7 @@ __modfinal: > include include/config/auto.conf > include $(srctree)/scripts/Kbuild.include > > -# for c_flags and mod-prelink-ext > +# for c_flags > include $(srctree)/scripts/Makefile.lib > > # find all modules listed in modules.order > @@ -55,7 +55,7 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \ > > > # Re-generate module BTFs if either module's .ko or vmlinux changed > -$(modules): %.ko: %$(mod-prelink-ext).o %.mod.o scripts/module.lds $(if $(KBUILD_BUILTIN),vmlinux) FORCE > +$(modules): %.ko: %.prelink.o %.mod.o scripts/module.lds $(if $(KBUILD_BUILTIN),vmlinux) FORCE > +$(call if_changed_except,ld_ko_o,vmlinux) > ifdef CONFIG_DEBUG_INFO_BTF_MODULES > +$(if $(newer-prereqs),$(call cmd,btf_ko)) > diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost > index eef56d629799..11883b31c615 100644 > --- a/scripts/Makefile.modpost > +++ b/scripts/Makefile.modpost > @@ -41,9 +41,6 @@ __modpost: > include include/config/auto.conf > include $(srctree)/scripts/Kbuild.include > > -# for mod-prelink-ext > -include $(srctree)/scripts/Makefile.lib > - > MODPOST = scripts/mod/modpost \ > $(if $(CONFIG_MODVERSIONS),-m) \ > $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \ > @@ -128,9 +125,9 @@ endif > # Read out modules.order to pass in modpost. > # Otherwise, allmodconfig would fail with "Argument list too long". > quiet_cmd_modpost = MODPOST $@ > - cmd_modpost = sed 's/\.ko$$/$(mod-prelink-ext)\.o/' $< | $(MODPOST) -T - > + cmd_modpost = sed 's/ko$$/prelink.o/' $< | $(MODPOST) -T - > > -$(output-symdump): $(MODORDER) $(input-symdump) $(modules:.ko=$(mod-prelink-ext).o) FORCE > +$(output-symdump): $(MODORDER) $(input-symdump) $(modules:ko=prelink.o) FORCE > $(call if_changed,modpost) > > targets += $(output-symdump) > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index a26139aa57fd..56cd9b7a5dd0 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -2000,9 +2000,9 @@ static void read_symbols(const char *modname) > /* strip trailing .o */ > tmp = NOFAIL(strdup(modname)); > tmp[strlen(tmp) - 2] = '\0'; > - /* strip trailing .lto */ > - if (strends(tmp, ".lto")) > - tmp[strlen(tmp) - 4] = '\0'; > + /* strip trailing .prelink */ > + if (strends(tmp, ".prelink")) > + tmp[strlen(tmp) - 8] = '\0'; > mod = new_module(tmp); > free(tmp); > } > -- > 2.30.2 > Otherwise, looks good! -- Kees Cook