From patchwork Mon Oct 16 13:24:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 115916 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3683300qgn; Mon, 16 Oct 2017 06:24:57 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDbx6GOIU/RH8pKmL5J3tXozHjNxQ/FDkIX4y/gKqZ0lJDImRjstfvNi3v87HJQ78EfdZyf X-Received: by 10.99.8.5 with SMTP id 5mr8230777pgi.28.1508160297445; Mon, 16 Oct 2017 06:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508160297; cv=none; d=google.com; s=arc-20160816; b=bPdrKhIpAentpQEu0LUtbonpifphWkrrKMm7C9XZjzgLTQbfsXdySDwtKCOCVYqN24 xYmsj31PqAzHcsMSUydZJSfw5CFuHxnhUuqy1Q4/1/rwIc8jZ6OkebXzLbybZUGOCIKF v74SgqZ+De05UdwNLvot0UvkTiJQjZu4uREma8erlhTs2/kebJ0M6OU2ag7mRenqoVRR 55yHGRrIpsMi9s7oh2nWSRiK9mwb/P7u0nicrZdbm/5Lb3Nvi8xXfk5l/6KOkjXn71vn t6NnRxS9KDPCkf5Hv4sizVXf+HrlR/TA3W3xSSPF1RgQyMgx8EmtOMBaVv+Hs75OTxPu 2wKQ== 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:arc-authentication-results; bh=si+kID9eleHMCb5YjXWaluugzW2xB0A6cEPymspFK6o=; b=cjMkC7fZw0LOAXxsEOahCmDFydu9XYFoQQ3JJr8zdVSv+NlWrA7I/mKyciV1Z1bEYD UPwhEJM9PjzduU4Wp7sGNrIpNjsFe95EchkGhS9QvCRqLEaudvjLhyMOstFURmP9pnEu KBbqvhR8W0buUlzeX6+IntZS6dpNZJj0ZkPXphLHjAUiutfKxBK9NM6qFV09P8y248q8 iRGSVC72kChobNA5gaePMrBBfpz4PbEW6hVT7OVgcZyR7SEeaCr7s/wSwyl0FHI6dBrt TrXOUURvAyc2dd8sMLyNPWJHJcyulNA4dA7Fr/BkHP1VWQ8N/AXuD7DGXQFe5/jSeIJU Wkpw== ARC-Authentication-Results: i=1; mx.google.com; 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 d4si4392751pfl.429.2017.10.16.06.24.57; Mon, 16 Oct 2017 06:24:57 -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; 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 S1753046AbdJPNY4 (ORCPT + 27 others); Mon, 16 Oct 2017 09:24:56 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:56914 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753024AbdJPNYv (ORCPT ); Mon, 16 Oct 2017 09:24:51 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 49189164F; Mon, 16 Oct 2017 06:24:51 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 110CF3F53D; Mon, 16 Oct 2017 06:24:48 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, adech.fo@gmail.com, aryabinin@virtuozzo.com, catalin.marinas@arm.com, christoffer.dall@linaro.org, dvyukov@google.com, linux-kbuild@vger.kernel.org, mark.rutland@arm.com, mark.zyngier@arm.com, mmarek@suse.com, will.deacon@arm.com, yamada.masahiro@socionext.com Subject: [PATCH 1/4] kbuild: allow global override of CC instrumentation Date: Mon, 16 Oct 2017 14:24:37 +0100 Message-Id: <20171016132440.38098-2-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171016132440.38098-1-mark.rutland@arm.com> References: <20171016132440.38098-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, we have a number of compiler instrumentation features, each with its own overrides to disable instrumentation of a file or directory. In a few cases, there are files with special ABI requirements, for which we need to avoid all instrumentation. Having to apply each override manually is tedious, and error-prone as new instrumentation features are introduced. To make matters easier, this patch adds a new CC_INSTRUMENT override, allowing instrumentation to be avoided for certain files or directories. This can also be overridden on a per-file or per-directory basis, to allow opting in to some instrumentation. Signed-off-by: Mark Rutland Cc: Andrey Konovalov Cc: Andrey Ryabinin Cc: Dmitry Vyukov Cc: Masahiro Yamada Cc: Michal Marek Cc: Will Deacon Cc: linux-kbuild@vger.kernel.org --- scripts/Makefile.lib | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -- 2.11.0 Acked-by: Will Deacon diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 5e975fee0f5b..c7d71f482b57 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -109,6 +109,15 @@ orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ _a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) +# Each of the compiler instrumentation features below can be selectively +# enabled or disable for files or directoies. In decreasing order of +# predence, each option foo is controlled by: +# FOO_obj.o := [yn] +# CC_INSTRUMENT_obj.o := [yn] +# FOO := [yn] +# CC_INSTRUMENT := [yn] +# FOO_all := [yn] + # # Enable gcov profiling flags for a file, directory or for all files depending # on variables GCOV_PROFILE_obj.o, GCOV_PROFILE and CONFIG_GCOV_PROFILE_ALL @@ -116,7 +125,7 @@ _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) # ifeq ($(CONFIG_GCOV_KERNEL),y) _c_flags += $(if $(patsubst n%,, \ - $(GCOV_PROFILE_$(basetarget).o)$(GCOV_PROFILE)$(CONFIG_GCOV_PROFILE_ALL)), \ + $(GCOV_PROFILE_$(basetarget).o)$(CC_INSTRUMENT_$(basetarget).o)$(GCOV_PROFILE)$(CC_INSTRUMENT)$(CONFIG_GCOV_PROFILE_ALL)), \ $(CFLAGS_GCOV)) endif @@ -126,19 +135,19 @@ endif # ifeq ($(CONFIG_KASAN),y) _c_flags += $(if $(patsubst n%,, \ - $(KASAN_SANITIZE_$(basetarget).o)$(KASAN_SANITIZE)y), \ + $(KASAN_SANITIZE_$(basetarget).o)$(CC_INSTRUMENT_$(basetarget).o)$(KASAN_SANITIZE)$(CC_INSTRUMENT)y), \ $(CFLAGS_KASAN)) endif ifeq ($(CONFIG_UBSAN),y) _c_flags += $(if $(patsubst n%,, \ - $(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \ + $(UBSAN_SANITIZE_$(basetarget).o)$(CC_INSTRUMENT_$(basetarget).o)$(UBSAN_SANITIZE)$(CC_INSTRUMENT)$(CONFIG_UBSAN_SANITIZE_ALL)), \ $(CFLAGS_UBSAN)) endif ifeq ($(CONFIG_KCOV),y) _c_flags += $(if $(patsubst n%,, \ - $(KCOV_INSTRUMENT_$(basetarget).o)$(KCOV_INSTRUMENT)$(CONFIG_KCOV_INSTRUMENT_ALL)), \ + $(KCOV_INSTRUMENT_$(basetarget).o)$(CC_INSTRUMENT_$(basetarget).o)$(KCOV_INSTRUMENT)$(CC_INSTRUMENT)$(CONFIG_KCOV_INSTRUMENT_ALL)), \ $(CFLAGS_KCOV)) endif