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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85D28C433EF for ; Thu, 17 Mar 2022 19:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229612AbiCQTx7 (ORCPT ); Thu, 17 Mar 2022 15:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiCQTx5 (ORCPT ); Thu, 17 Mar 2022 15:53:57 -0400 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A435282561; Thu, 17 Mar 2022 12:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ryH9ljonsXytXG2DnUpgXWcY+PPBTH4gQXM5AkXiazw=; b=QR2SAarMkc0tFPFJAN70d+qhN4 eDSnM7lK3VRDc2q6lVgueIZIot+09iAue20w+oOwmUioWTvAJl9NFboeA1CSAbuP9dNBXepQhpXws jR1gJO7mi2VgfuSpy8KqY0svssuuAfmHDwWiCbG5FVuFfv6u/Ovp2TJihuIlCaMXx072X2Tge252E gihu/eVUVPyfwCMizEjIZ8/3Cjs5DkwefRYC4UJaduIszCes77HwUucLC2LCZRKeOchlb2unfvrzI V872oL4UxjwApro9n0ncBxmLcf1NCd2iYRGsps4mgKNBpKxP54bi0EY/3zIjNXvV5IxnO53f9Zzcg 4+/T3FIw==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUwAR-001z0Y-Eu; Thu, 17 Mar 2022 19:52:15 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 98B813001EA; Thu, 17 Mar 2022 20:52:14 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 6F1043021E88F; Thu, 17 Mar 2022 20:52:14 +0100 (CET) Date: Thu, 17 Mar 2022 20:52:14 +0100 From: Peter Zijlstra To: Masahiro Yamada Cc: Alexei Starovoitov , Kumar Kartikeya Dwivedi , X86 ML , joao@overdrivepizza.com, "H . J . Lu" , Josh Poimboeuf , Andrew Cooper , LKML , Nick Desaulniers , Kees Cook , Sami Tolvanen , Mark Rutland , alyssa.milburn@intel.com, Miroslav Benes , Steven Rostedt , Masami Hiramatsu , Daniel Borkmann , Andrii Nakryiko , bpf Subject: Re: [PATCH v4 00/45] x86: Kernel IBT Message-ID: References: <20220312154407.GF28057@worktop.programming.kicks-ass.net> <20220313085214.GK28057@worktop.programming.kicks-ass.net> <20220315081522.GA8939@worktop.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 18, 2022 at 03:15:59AM +0900, Masahiro Yamada wrote: This is somewhat similar to my first attempt, except I thought it had a extra/superflous link pass in it.. > @@ -288,24 +289,24 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE > $(call if_changed_rule,cc_o_c) > $(call cmd,force_checksrc) > > -ifdef CONFIG_LTO_CLANG > +ifneq ($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT),) > # 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 = \ > +quiet_cmd_cc_prelink_modules = LD [M] $@ > + cmd_cc_prelink_modules = \ > $(LD) $(ld_flags) -r -o $@ \ > - $(shell [ -s $(@:.lto.o=.o.symversions) ] && \ > - echo -T $(@:.lto.o=.o.symversions)) \ > + $(shell [ -s $(@:.prelink.o=.o.symversions) ] && > \ > + echo -T $(@:.prelink.o=.o.symversions)) \ > --whole-archive $(filter-out FORCE,$^) \ > $(cmd_objtool) > > @@ -469,7 +470,7 @@ $(obj)/lib.a: $(lib-y) FORCE > # 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 > +ifneq ($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT),) > quiet_cmd_link_multi-m = AR [M] $@ > cmd_link_multi-m = \ > $(cmd_update_lto_symversions); \ Except I overlooked this part, where ar is used instead of ld to combine the individual files. Let me go make the change, Thanks!