From patchwork Tue Oct 16 09:10:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 148922 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4828355lji; Tue, 16 Oct 2018 02:12:13 -0700 (PDT) X-Google-Smtp-Source: ACcGV60GQEe199ec477QXKLDQigpV99SjeX87XCfvAoFepEFscjkIh5pxTwUfQMubK7N7d6RhZUs X-Received: by 2002:a63:2a11:: with SMTP id q17-v6mr19399739pgq.374.1539681133268; Tue, 16 Oct 2018 02:12:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539681133; cv=none; d=google.com; s=arc-20160816; b=KKLIHRSgvMxROk0bMGfLlx32GmFSZykle1hSFNK7FFOr+9TntbvV1iawoyKVKmYt+H 4XTsMIkZVQDjULZim+01Ig7Mlc0ojgbYiDLpdHCK8hCG63XNheHVzZeDx3GyNcMJBN06 bsXIi5ACraymuZyAmdsx+64zGD3c/Y2RMEaOYMGfzCG2TjblulxPcV+ovNjtP3x+cSSf bXOHSBbaG675Rr2hOeP6Ij3CmN2hDYY75VxBp4545OHwBwtoN36KSj06hT6b4/spBfjI 6DQrKaIExwE6xAiuJTfj2Unj7NnhCEldLKDtwWUCoKuRXeD/acQPLPGq+UAKsdzeLss6 GVuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=CqiDXGBClPJg3L6ZPE6aRkpV3O7/PTqNTFi2pZNHYq8=; b=XZvl/v0eSJlVZENXCa79yhDA0uZ6ZqwdBkKt6j5nZf6KKV36XI9pxz2m4aJMRk3lGt 8CiBGx8epXrvpGEf5VCp3zV3BMCggTId8d1cAdhDpV3IetFQ9+dstuI1XUIk80cSw++H rqF5SiGDZ/hPo3nP0Ql+OMFIao54XZU/anlAWvxFg8gxqrxPTe3BwCpr0lmrIiUq4V/W e+xIKGgB+Ykh1CIwuyfcdOPkXVcvc8YpUwrDtg1vu2vjCZiPq+mUT4gA6C29o7ZURflt B3oRuV8VG2passT51zPOX8N1MhtkDJvKuwZW60LWyTdDRI1I2Xb2mC87P/vXTiet2FZG YwYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="kV/KIjbD"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f62-v6si14378831plf.288.2018.10.16.02.12.13; Tue, 16 Oct 2018 02:12:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="kV/KIjbD"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727223AbeJPRBh (ORCPT + 32 others); Tue, 16 Oct 2018 13:01:37 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:57572 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726958AbeJPRBh (ORCPT ); Tue, 16 Oct 2018 13:01:37 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w9G9BLLw029692; Tue, 16 Oct 2018 18:11:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w9G9BLLw029692 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1539681084; bh=CqiDXGBClPJg3L6ZPE6aRkpV3O7/PTqNTFi2pZNHYq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kV/KIjbDjvBKMNqpBjOjPliwu/kMV3OXCe1rYCNAfeed8Gq/HGtuvjgEe6H4mJrAx QEtcVb+1J/UIMOlVk2ndoZCTBeap2GzeDIQTZ04nv3jh2EMi38SyF+h2Bgm37w5W0x A1PPBLwDW5vRDKgh33gEAOg1YO2eoz52YrB0yPuLJCMFW9zX8dz4HivQQiwJMq2UeT wSsRNbH1U1KxUhZ2ZtnZFEjWF22d9WP3MKbmAoNB4mIHzFQt2Spuvn3/4Rm5zrwy5u WSfKlt/NwwYC2trosg4jfuCFPFOUaSmZnbMlLlN+RBqdblRvIXV3/UTj6OPXla1kau n7Qh/p6XHG1cg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ingo Molnar , Josh Poimboeuf , Bernd Edlinger , Borislav Petkov , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] objtool: move libelf check out of top Makefile Date: Tue, 16 Oct 2018 18:10:52 +0900 Message-Id: <1539681053-24388-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539681053-24388-1-git-send-email-yamada.masahiro@socionext.com> References: <1539681053-24388-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bernd Edlinger reports: The next make after an oldconfig reads in the outdated include/config/auto.conf which can kill the make before it is able to call the syncconfig target. $ make defconfig *** Default configuration is based on 'x86_64_defconfig' $ make scripts/kconfig/conf --syncconfig Kconfig Makefile:936: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop. $ sed -i s/CONFIG_UNWINDER_ORC=y// .configs $ make oldconfig Choose kernel unwinder > 1. ORC unwinder (UNWINDER_ORC) (NEW) 2. Frame pointer unwinder (UNWINDER_FRAME_POINTER) choice[1-2?]: 2 $ make Makefile:936: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop. I tried to fix it by moving the libelf evaluation to the Kconfig stage [1], but it was rejected. Kconfig is now able to run shell commands to evaluate any prerequisites needed to enable CONFIG options. For example, as shown in commit 2a61f4747eea ("stack-protector: test compiler capability in Kconfig and drop AUTO mode"), the new Kconfig syntax is useful to evaluate target compiler capabilities. However, disabling the CONFIG option silently just because of missing libelf would not be a preferred behavior; in this case, installing an appropriate package will solve the problem. Hence, this check will be kept in a makefile, but somewhere else than the top Makefile. Move the check to scripts/Makefile.toolcheck so that it is run after syncconfig. Another behavioral change is, missing libelf for CONFIG_STACK_VALIDATION was previously a warning, but now a error. [1] https://patchwork.kernel.org/patch/10516049/ Reported-by: Bernd Edlinger Signed-off-by: Masahiro Yamada --- Makefile | 21 +++------------------ scripts/Makefile.build | 2 -- scripts/Makefile.toolcheck | 5 +++++ 3 files changed, 8 insertions(+), 20 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 23a204a..71940b7 100644 --- a/Makefile +++ b/Makefile @@ -949,23 +949,6 @@ mod_sign_cmd = true endif export mod_sign_cmd -ifdef CONFIG_STACK_VALIDATION - has_libelf := $(call try-run,\ - echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0) - ifeq ($(has_libelf),1) - objtool_target := tools/objtool FORCE - else - ifdef CONFIG_UNWINDER_ORC - $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel") - else - $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel") - endif - SKIP_STACK_VALIDATION := 1 - export SKIP_STACK_VALIDATION - endif -endif - - ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ @@ -1115,7 +1098,9 @@ uapi-asm-generic: src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm PHONY += prepare-objtool -prepare-objtool: $(objtool_target) +ifdef CONFIG_STACK_VALIDATION +prepare-objtool: tools/objtool +endif # Generate some files # --------------------------------------------------------------------------- diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 54da4b0..e9dabe4 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -233,7 +233,6 @@ endif # CC_USING_RECORD_MCOUNT endif # CONFIG_FTRACE_MCOUNT_RECORD ifdef CONFIG_STACK_VALIDATION -ifneq ($(SKIP_STACK_VALIDATION),1) __objtool_obj := $(objtree)/tools/objtool/objtool @@ -270,7 +269,6 @@ objtool_obj = $(if $(patsubst y%,, \ $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \ $(__objtool_obj)) -endif # SKIP_STACK_VALIDATION endif # CONFIG_STACK_VALIDATION # Rebuild all objects when objtool changes, or is enabled/disabled. diff --git a/scripts/Makefile.toolcheck b/scripts/Makefile.toolcheck index f3c165d..bc26fc0 100644 --- a/scripts/Makefile.toolcheck +++ b/scripts/Makefile.toolcheck @@ -12,6 +12,11 @@ include include/config/auto.conf __toolcheck: @: +chk_stack_validation = echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf - +msg_stack_validation = "libelf is necessary for building the objtool." \ + "Please install libelf-dev, libelf-devel or elfutils-libelf-devel." +toolcheck-$(CONFIG_STACK_VALIDATION) += stack_validation + PHONY += $(toolcheck-y) __toolcheck: $(toolcheck-y)