From patchwork Wed Nov 15 21:34:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 10060307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F231960231 for ; Wed, 15 Nov 2017 21:35:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEF702A118 for ; Wed, 15 Nov 2017 21:35:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3A872A312; Wed, 15 Nov 2017 21:35:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FA712A118 for ; Wed, 15 Nov 2017 21:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759509AbdKOVfv (ORCPT ); Wed, 15 Nov 2017 16:35:51 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:46878 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758960AbdKOVfF (ORCPT ); Wed, 15 Nov 2017 16:35:05 -0500 Received: by mail-it0-f66.google.com with SMTP id r127so3450535itb.5 for ; Wed, 15 Nov 2017 13:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QbKfZQgqSshlQ9e27idT1jk7Qg5b9xg8Vd2vJFeumlM=; b=iZPnARRGaoM4U1Tokq5v9nFLP80sM0lLBwlyOg+tBlOI+pkyTRJp1xtr3/DMEygYzh bcp+jwd3PwdDueZmHIRH6lkaxCPibCgtMORijdXy/C9QvgxgPXlHphjf7yHatT8MlZfN 0RIWvTymkW6/FqOSFyoBi453Ym23SKRutrQpe7BqeMF7NQcBrZgH+y9ILASwV3tDFo/w PJxUedoQJW9ZzrwyxdHh9vWLNBxIvK45qvJ8YqoUG5sfXRizZyxrbH5rR9xFB0RTi7FO SGUE9Pn4T/FsPUrxUujfGKRj7yJp5QlFZo1rhZXohH+HSsA1yLSLLk3ivBFyZ2M/M76m IkwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QbKfZQgqSshlQ9e27idT1jk7Qg5b9xg8Vd2vJFeumlM=; b=I3eNzF1O9wWAAWOQq/qCwQgDVtqHmRNBL+uA1fq8nCdJUUpCk3KKTnuP4NSGYOqflV un08d74BlC+Zkp7gV39Pt8S7i+Am8g7tk4g/uoYrO7vq706RgBwEko5k2cDdlJF8eGb8 s/0yY5qhrY0x73O0ReyI6LxlS7Bj70uHKSMIMysDItjKw6nj+KbEteclg809EEZkuZKk CjQ59q40IMWQrEKP6z31qPThy0CWe4NMzMQrLNoefKjzy8iLsXWecclNPee/JbUbH2kL h2313xWeQlT3zpMp35+uUnFCI+MU3Nnsxewvi494CeBgVHJx17lbEe7Ex1uxme9sbRje 2MYw== X-Gm-Message-State: AJaThX507NEeZhN04o/blNuVzjvcJNerHgEeox9DPz7UcPvi09FVci4J awy7ViXnfBkAAR0t1Z0+a2LIow== X-Google-Smtp-Source: AGs4zMZMKyqcvVXp5VjF4CNl7PAvBmNDVO7+vuGY4GAtAb8zCUJ/7pENIhp3b2YRODazB6QgtBaa4A== X-Received: by 10.36.249.132 with SMTP id l126mr22433534ith.52.1510781704723; Wed, 15 Nov 2017 13:35:04 -0800 (PST) Received: from samitolvanen.mtv.corp.google.com ([100.98.112.14]) by smtp.gmail.com with ESMTPSA id 68sm9735197iov.2.2017.11.15.13.35.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Nov 2017 13:35:03 -0800 (PST) From: Sami Tolvanen To: Alex Matveev , Andi Kleen , Ard Biesheuvel , Greg Hackmann , Kees Cook , linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Rutland , Masahiro Yamada , Maxim Kuvyrkov , Michal Marek , Nick Desaulniers , Yury Norov , Matthias Kaehlcke Cc: Sami Tolvanen Subject: [PATCH v2 13/18] kbuild: fix dynamic ftrace with clang LTO Date: Wed, 15 Nov 2017 13:34:23 -0800 Message-Id: <20171115213428.22559-14-samitolvanen@google.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a-goog In-Reply-To: <20171115213428.22559-1-samitolvanen@google.com> References: <20171115213428.22559-1-samitolvanen@google.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With CONFIG_LTO_CLANG enabled, LLVM IR won't be compiled into object files until modpost_link. This change postpones calls to recordmcount until after this step. In order to exclude ftrace_process_locs from inspection, we add a new code section .text..ftrace, which we tell recordmcount to ignore, and a __norecordmcount attribute for moving functions to this section. Signed-off-by: Sami Tolvanen --- arch/Kconfig | 2 +- include/asm-generic/vmlinux.lds.h | 1 + include/linux/compiler-clang.h | 7 +++++++ include/linux/compiler_types.h | 4 ++++ kernel/trace/ftrace.c | 6 +++--- scripts/Makefile.build | 14 +++++++++++++- scripts/Makefile.modpost | 4 ++++ scripts/link-vmlinux.sh | 16 ++++++++++++++++ scripts/recordmcount.c | 3 ++- 9 files changed, 51 insertions(+), 6 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index bb5296ecebdd..e0d0084308e2 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -620,7 +620,7 @@ config ARCH_SUPPORTS_LTO_CLANG config LTO_CLANG bool "Use clang Link Time Optimization (LTO)" depends on ARCH_SUPPORTS_LTO_CLANG - depends on !FTRACE_MCOUNT_RECORD + depends on !FTRACE_MCOUNT_RECORD || HAVE_C_RECORDMCOUNT select LTO select LD_DEAD_CODE_DATA_ELIMINATION help diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index ce0244780988..c4c44ea73930 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -459,6 +459,7 @@ #define TEXT_TEXT \ ALIGN_FUNCTION(); \ *(.text.hot TEXT_MAIN .text.fixup .text.unlikely) \ + *(.text..ftrace) \ *(.text..refcount) \ *(.ref.text) \ MEM_KEEP(init.text) \ diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index a06583e41f80..62604537ea66 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -16,3 +16,10 @@ * with any version that can compile the kernel */ #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) + +#ifdef CONFIG_CLANG_LTO +#ifdef CONFIG_FTRACE_MCOUNT_RECORD +#define __norecordmcount \ + __attribute__((__section__(".text..ftrace"))) +#endif +#endif diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 6b79a9bba9a7..231c413c615a 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -253,6 +253,10 @@ struct ftrace_likely_data { # define __nostackprotector #endif +#ifndef __norecordmcount +#define __norecordmcount +#endif + /* * Assume alignment of return value. */ diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 8319e09e15b9..e117b849f9dc 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5573,9 +5573,9 @@ static int ftrace_cmp_ips(const void *a, const void *b) return 0; } -static int ftrace_process_locs(struct module *mod, - unsigned long *start, - unsigned long *end) +static int __norecordmcount ftrace_process_locs(struct module *mod, + unsigned long *start, + unsigned long *end) { struct ftrace_page *start_pg; struct ftrace_page *pg; diff --git a/scripts/Makefile.build b/scripts/Makefile.build index e8bf5c440612..4d990c7cbe34 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -246,6 +246,12 @@ ifdef BUILD_C_RECORDMCOUNT ifeq ("$(origin RECORDMCOUNT_WARN)", "command line") RECORDMCOUNT_FLAGS = -w endif + +ifdef CONFIG_LTO_CLANG +# With LTO, we postpone running recordmcount until after the LTO link step, so +# let's export the parameters for the link script. +export RECORDMCOUNT_FLAGS +else # Due to recursion, we must skip empty.o. # The empty.o file is created in the make process in order to determine # the target endianness and word size. It is made before all other C @@ -254,17 +260,22 @@ sub_cmd_record_mcount = \ if [ $(@) != "scripts/mod/empty.o" ]; then \ $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ fi; +endif + recordmcount_source := $(srctree)/scripts/recordmcount.c \ $(srctree)/scripts/recordmcount.h -else +else # !BUILD_C_RECORDMCOUNT sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ "$(if $(CONFIG_64BIT),64,32)" \ "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \ "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; + recordmcount_source := $(srctree)/scripts/recordmcount.pl endif # BUILD_C_RECORDMCOUNT + +ifndef CONFIG_LTO_CLANG cmd_record_mcount = \ if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" = \ "$(CC_FLAGS_FTRACE)" ]; then \ @@ -287,6 +298,7 @@ objtool_args += --no-unreachable else objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable) endif +endif # CONFIG_FTRACE_MCOUNT_RECORD # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index cb1c040a006c..5896e07c499b 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -164,6 +164,10 @@ lto_ko_objects = $(foreach o,$(1:$(modpost-ext).o=.o), \ $(shell [ -s $(@:.ko=.modversions) ] && \ echo -T $(@:.ko=.modversions)) \ -o $@ $(call lto_ko_objects, $(filter-out FORCE,$^)) + +ifdef CONFIG_FTRACE_MCOUNT_RECORD +cmd_ld_ko_o += ; $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) $@ +endif else cmd_ld_ko_o = \ $(LD) -r $(LDFLAGS) \ diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index fccc123b691f..44ec43c781e0 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -143,6 +143,19 @@ modpost_link() ${LD} ${LDFLAGS} -r -o ${1} $(modversions) ${objects} } +# If CONFIG_LTO_CLANG is selected, we postpone running recordmcount until +# we have compiled LLVM IR to an object file. +recordmcount() +{ + if [ -z "${CONFIG_LTO_CLANG}" ]; then + return + fi + + if [ -n "${CONFIG_FTRACE_MCOUNT_RECORD}" ]; then + scripts/recordmcount ${RECORDMCOUNT_FLAGS} $* + fi +} + # Link of vmlinux # ${1} - optional extra .o files # ${2} - output file @@ -327,6 +340,9 @@ if [ -n "${CONFIG_LTO_CLANG}" ]; then KBUILD_VMLINUX_INIT= KBUILD_VMLINUX_MAIN=vmlinux.o KBUILD_VMLINUX_LIBS= + + # Call recordmcount if needed + recordmcount vmlinux.o fi kallsymso="" diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 16e086dcc567..69a769904da7 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -420,7 +420,8 @@ is_mcounted_section_name(char const *const txtname) strcmp(".softirqentry.text", txtname) == 0 || strcmp(".kprobes.text", txtname) == 0 || strcmp(".cpuidle.text", txtname) == 0 || - strcmp(".text.unlikely", txtname) == 0; + (strncmp(".text.", txtname, 6) == 0 && + strcmp(".text..ftrace", txtname) != 0); } /* 32 bit and 64 bit are very similar */