From: Sami Tolvanen <samitolvanen@google.com>
To: Masahiro Yamada <masahiroy@kernel.org>, Will Deacon <will@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Kees Cook <keescook@chromium.org>,
Nick Desaulniers <ndesaulniers@google.com>,
clang-built-linux@googlegroups.com,
kernel-hardening@lists.openwall.com, linux-arch@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, x86@kernel.org,
Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH v3 08/30] kbuild: add support for objtool mcount
Date: Fri, 18 Sep 2020 13:14:14 -0700 [thread overview]
Message-ID: <20200918201436.2932360-9-samitolvanen@google.com> (raw)
In-Reply-To: <20200918201436.2932360-1-samitolvanen@google.com>
This change adds build support for using objtool to generate
__mcount_loc sections.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
Makefile | 38 ++++++++++++++++++++++++++++++--------
kernel/trace/Kconfig | 5 +++++
scripts/Makefile.build | 9 +++++----
3 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 24fd733c142e..d2fb3cd0f506 100644
--- a/Makefile
+++ b/Makefile
@@ -858,17 +858,34 @@ ifdef CONFIG_HAVE_FENTRY
ifeq ($(call cc-option-yn, -mfentry),y)
CC_FLAGS_FTRACE += -mfentry
CC_FLAGS_USING += -DCC_USING_FENTRY
+ export CC_USING_FENTRY := 1
endif
endif
export CC_FLAGS_FTRACE
-KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)
-KBUILD_AFLAGS += $(CC_FLAGS_USING)
ifdef CONFIG_DYNAMIC_FTRACE
- ifdef CONFIG_HAVE_C_RECORDMCOUNT
- BUILD_C_RECORDMCOUNT := y
- export BUILD_C_RECORDMCOUNT
- endif
+ ifndef CC_USING_RECORD_MCOUNT
+ ifndef CC_USING_PATCHABLE_FUNCTION_ENTRY
+ # use objtool or recordmcount to generate mcount tables
+ ifdef CONFIG_HAVE_OBJTOOL_MCOUNT
+ ifdef CC_USING_FENTRY
+ USE_OBJTOOL_MCOUNT := y
+ CC_FLAGS_USING += -DCC_USING_NOP_MCOUNT
+ export USE_OBJTOOL_MCOUNT
+ endif
+ endif
+ ifndef USE_OBJTOOL_MCOUNT
+ USE_RECORDMCOUNT := y
+ export USE_RECORDMCOUNT
+ ifdef CONFIG_HAVE_C_RECORDMCOUNT
+ BUILD_C_RECORDMCOUNT := y
+ export BUILD_C_RECORDMCOUNT
+ endif
+ endif
+ endif
+ endif
endif
+KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)
+KBUILD_AFLAGS += $(CC_FLAGS_USING)
endif
# We trigger additional mismatches with less inlining
@@ -1213,11 +1230,16 @@ uapi-asm-generic:
PHONY += prepare-objtool prepare-resolve_btfids
prepare-objtool: $(objtool_target)
ifeq ($(SKIP_STACK_VALIDATION),1)
+objtool-lib-prompt := "please install libelf-dev, libelf-devel or elfutils-libelf-devel"
+ifdef USE_OBJTOOL_MCOUNT
+ @echo "error: Cannot generate __mcount_loc for CONFIG_DYNAMIC_FTRACE=y, $(objtool-lib-prompt)" >&2
+ @false
+endif
ifdef CONFIG_UNWINDER_ORC
- @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
+ @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, $(objtool-lib-prompt)" >&2
@false
else
- @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
+ @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, $(objtool-lib-prompt)" >&2
endif
endif
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index a4020c0b4508..b510af5b216c 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -56,6 +56,11 @@ config HAVE_C_RECORDMCOUNT
help
C version of recordmcount available?
+config HAVE_OBJTOOL_MCOUNT
+ bool
+ help
+ Arch supports objtool --mcount
+
config TRACER_MAX_TRACE
bool
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a467b9323442..6ecf30c70ced 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -178,8 +178,7 @@ cmd_modversions_c = \
fi
endif
-ifdef CONFIG_FTRACE_MCOUNT_RECORD
-ifndef CC_USING_RECORD_MCOUNT
+ifdef USE_RECORDMCOUNT
# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl
ifdef BUILD_C_RECORDMCOUNT
ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
@@ -206,8 +205,7 @@ recordmcount_source := $(srctree)/scripts/recordmcount.pl
endif # BUILD_C_RECORDMCOUNT
cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \
$(sub_cmd_record_mcount))
-endif # CC_USING_RECORD_MCOUNT
-endif # CONFIG_FTRACE_MCOUNT_RECORD
+endif # USE_RECORDMCOUNT
ifdef CONFIG_STACK_VALIDATION
ifneq ($(SKIP_STACK_VALIDATION),1)
@@ -230,6 +228,9 @@ endif
ifdef CONFIG_X86_SMAP
objtool_args += --uaccess
endif
+ifdef USE_OBJTOOL_MCOUNT
+ objtool_args += --mcount
+endif
# 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
# 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
--
2.28.0.681.g6f77f65b4e-goog
next prev parent reply other threads:[~2020-09-18 20:16 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 20:14 [PATCH v3 00/30] Add support for Clang LTO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 01/30] lib/string.c: implement stpcpy Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 02/30] RAS/CEC: Fix cec_init() prototype Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 03/30] x86/boot/compressed: Disable relocation relaxation Sami Tolvanen
2020-09-21 15:53 ` Nick Desaulniers
2020-09-18 20:14 ` [PATCH v3 04/30] x86/asm: Replace __force_order with memory clobber Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 05/30] kbuild: preprocess module linker script Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 06/30] objtool: Add a pass for generating __mcount_loc Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 07/30] objtool: Don't autodetect vmlinux.o Sami Tolvanen
2020-09-18 20:14 ` Sami Tolvanen [this message]
2020-09-18 20:14 ` [PATCH v3 09/30] x86, build: use objtool mcount Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 10/30] treewide: remove DISABLE_LTO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 11/30] kbuild: add support for Clang LTO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 12/30] kbuild: lto: fix module versioning Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 13/30] kbuild: lto: postpone objtool Sami Tolvanen
2020-09-18 21:27 ` Kees Cook
2020-09-21 18:58 ` Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 14/30] kbuild: lto: limit inlining Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 15/30] kbuild: lto: merge module sections Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 16/30] kbuild: lto: remove duplicate dependencies from .mod files Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 17/30] init: lto: ensure initcall ordering Sami Tolvanen
2020-09-18 21:29 ` Kees Cook
2020-09-18 20:14 ` [PATCH v3 18/30] init: lto: fix PREL32 relocations Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 19/30] PCI: Fix PREL32 relocations for LTO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 20/30] modpost: lto: strip .lto from module names Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 21/30] scripts/mod: disable LTO for empty.c Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 22/30] efi/libstub: disable LTO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 23/30] drivers/misc/lkdtm: disable LTO for rodata.o Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 24/30] arm64: export CC_USING_PATCHABLE_FUNCTION_ENTRY Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 25/30] arm64: vdso: disable LTO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 26/30] KVM: arm64: disable LTO for the nVHE directory Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 27/30] arm64: allow LTO_CLANG and THINLTO to be selected Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 28/30] x86, vdso: disable LTO only for vDSO Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 29/30] x86, cpu: disable LTO for cpu.c Sami Tolvanen
2020-09-18 20:14 ` [PATCH v3 30/30] x86, build: allow LTO_CLANG and THINLTO to be selected Sami Tolvanen
2020-09-18 20:22 ` [PATCH v3 00/30] Add support for Clang LTO Sedat Dilek
2020-09-18 20:50 ` Sami Tolvanen
2020-09-18 20:53 ` Nick Desaulniers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918201436.2932360-9-samitolvanen@google.com \
--to=samitolvanen@google.com \
--cc=clang-built-linux@googlegroups.com \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).