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.5 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 55A09C4320A for ; Thu, 19 Aug 2021 02:45:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EAEC610FB for ; Thu, 19 Aug 2021 02:45:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235744AbhHSCqK (ORCPT ); Wed, 18 Aug 2021 22:46:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235670AbhHSCqJ (ORCPT ); Wed, 18 Aug 2021 22:46:09 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49669C0613CF for ; Wed, 18 Aug 2021 19:45:34 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id j12-20020a17090aeb0c00b00179530520b3so10377413pjz.0 for ; Wed, 18 Aug 2021 19:45:34 -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=CSaGB3k7M6BK7DdRWWMnUwx7S+7PIDCc8H9F6AQI7Ko=; b=Te/Kit9LTOJpgzvCvQ4D7iEhZigPhamI41CWBfK1ejgCiZNYgT9evw9SIQ/tIwEhEW sWktd6u+iNT1ulXUhCgPSgcEwRGWnuCqtSqbhi0m4yTKeWlN6zOigSPQY4/Wrdw3RNaq MUBsdTaoC3WhEKdJ/gX606xiN58jXJ8YZvhTQ= 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=CSaGB3k7M6BK7DdRWWMnUwx7S+7PIDCc8H9F6AQI7Ko=; b=P76mtQJI8JHleEJAF9+8b1azjyXMrvcqFt6J5jn0gWBoWAcapeq/Skyn72aT2Qw6w8 OTB9go3/014wmgVwmqcratX/rz0fXbytRGHqmawjWNKoQXAcOmH4MXe6Xa4Vb7nX35/o m+TuF2rbUVVoTCnagYQM/jSNbHQKELIAyV4U3zJZ5E0Jn9EXci9HPXhFi2U7v9Kb5nsk o1aDKMyp8ZLgjcrrpGHafwpHWHJd7swn6L+Unym7A+smaQRyZBbKr4jD4ZofPEenoxCA OCqC8lXTDglf12ffsA7EcWr5bfJLSLrFHbnFAbVz1SPqjKHsm6eMzIUkICPe1W1DZ9Xk q/vw== X-Gm-Message-State: AOAM53036iGCO645S1tBUK2z9R1A3XjsAUibmcTny7oosufn4pO/lGQq GGuENT/g+c5hHevPxWjQ2t0KEw== X-Google-Smtp-Source: ABdhPJzc2/w5A7yHUB1LmMxy6GwFAGJY5KD4HDcBRNq1GXSWmG+1E1YYGsT87VlXr5u4zpNfDBnmqQ== X-Received: by 2002:a17:902:db0b:b0:12d:bd2c:6e6e with SMTP id m11-20020a170902db0b00b0012dbd2c6e6emr9537018plx.26.1629341133775; Wed, 18 Aug 2021 19:45:33 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id v25sm1154428pfm.202.2021.08.18.19.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 19:45:33 -0700 (PDT) Date: Wed, 18 Aug 2021 19:45:32 -0700 From: Kees Cook To: Masahiro Yamada Cc: linux-kbuild@vger.kernel.org, Sami Tolvanen , linux-kernel@vger.kernel.org, Michal Marek , Nick Desaulniers Subject: Re: [PATCH 01/13] kbuild: move objtool_args back to scripts/Makefile.build Message-ID: <202108181944.C6006C032A@keescook> References: <20210819005744.644908-1-masahiroy@kernel.org> <20210819005744.644908-2-masahiroy@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210819005744.644908-2-masahiroy@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 19, 2021 at 09:57:32AM +0900, Masahiro Yamada wrote: > Commit b1a1a1a09b46 ("kbuild: lto: postpone objtool") moved objtool_args > to Makefile.lib, so the arguments can be used in Makefile.modfinal as > well as Makefile.build. > > With commit 2b1d7fc05467 ("kbuild: Fix TRIM_UNUSED_KSYMS with > LTO_CLANG"), module LTO linking came back to scripts/Makefile.build > again. > > So, there is no more reason to keep objtool_args separately in > scripts/Makefile.lib. > > Get it back to the original place, close to the objtool command. Ah, yup. Good point. Nice cleanup. Reviewed-by: Kees Cook -Kees > > Signed-off-by: Masahiro Yamada > --- > > scripts/Makefile.build | 13 +++++++++++++ > scripts/Makefile.lib | 12 ------------ > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index ea549579bfb7..31154e44c251 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -222,6 +222,19 @@ cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), > endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT > > ifdef CONFIG_STACK_VALIDATION > + > +# Objtool arguments are also needed for modfinal with LTO, so we define > +# then here to avoid duplication. > +objtool_args = \ > + $(if $(CONFIG_UNWINDER_ORC),orc generate,check) \ > + $(if $(part-of-module), --module,) \ > + $(if $(CONFIG_FRAME_POINTER),, --no-fp) \ > + $(if $(or $(CONFIG_GCOV_KERNEL),$(CONFIG_LTO_CLANG)), \ > + --no-unreachable,) \ > + $(if $(CONFIG_RETPOLINE), --retpoline,) \ > + $(if $(CONFIG_X86_SMAP), --uaccess,) \ > + $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount,) > + > ifndef CONFIG_LTO_CLANG > > __objtool_obj := $(objtree)/tools/objtool/objtool > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index af1c920a585c..34c4c11c4bc1 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -232,18 +232,6 @@ ifeq ($(CONFIG_LTO_CLANG),y) > mod-prelink-ext := .lto > endif > > -# Objtool arguments are also needed for modfinal with LTO, so we define > -# then here to avoid duplication. > -objtool_args = \ > - $(if $(CONFIG_UNWINDER_ORC),orc generate,check) \ > - $(if $(part-of-module), --module,) \ > - $(if $(CONFIG_FRAME_POINTER),, --no-fp) \ > - $(if $(or $(CONFIG_GCOV_KERNEL),$(CONFIG_LTO_CLANG)), \ > - --no-unreachable,) \ > - $(if $(CONFIG_RETPOLINE), --retpoline,) \ > - $(if $(CONFIG_X86_SMAP), --uaccess,) \ > - $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount,) > - > # Useful for describing the dependency of composite objects > # Usage: > # $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add) > -- > 2.30.2 > -- Kees Cook