| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <fe3e0e4e-4f13-5193-c684-f995c8310e54@redhat.com>
Date: Tue, 9 Jun 2020 10:00:59 +0100
From: Julien Thierry <jthierry@...hat.com>
To: Matt Helsley <mhelsley@...are.com>, linux-kernel@...r.kernel.org
Cc: Josh Poimboeuf <jpoimboe@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Steven Rostedt <rostedt@...dmis.org>,
Sami Tolvanen <samitolvanen@...gle.com>,
Kamalesh Babulal <kamalesh@...ux.vnet.ibm.com>
Subject: Re: [RFC][PATCH v4 02/32] objtool: Make recordmcount into mcount
subcmd
Hi Matt,
On 6/2/20 8:49 PM, Matt Helsley wrote:
> Rather than a standalone executable merge recordmcount as a sub command
> of objtool. This is a small step towards cleaning up recordmcount and
> eventually sharing ELF code with objtool.
>
> For the initial step all that's required is a bit of Makefile changes
> and invoking the former main() function from recordmcount.c because the
> subcommand code uses similar function arguments as main when dispatching.
>
> objtool ignores some object files that tracing does not, specifically
> those with OBJECT_FILES_NON_STANDARD Makefile variables. For this reason
> we keep the recordmcount_dep separate from the objtool_dep. When using
> objtool mcount we can also, like the other objtool invocations, just
> depend on the binary rather than the source the binary is built from.
>
> Subsequent patches will gradually convert recordmcount to use
> more and more of libelf/objtool's ELF accessor code. This will both
> clean up recordmcount to be more easily readable and remove
> recordmcount's crude accessor wrapping code.
>
> Signed-off-by: Matt Helsley <mhelsley@...are.com>
> ---
> Documentation/dontdiff | 2 +-
> Documentation/trace/ftrace.rst | 6 ++--
> Makefile | 9 ++++--
> arch/arm64/include/asm/ftrace.h | 2 +-
> arch/x86/include/asm/ftrace.h | 2 +-
> kernel/trace/Kconfig | 2 +-
> scripts/Makefile.build | 19 +++++++------
> scripts/sorttable.h | 2 +-
> tools/objtool/Build | 4 +--
> tools/objtool/Makefile | 48 +++++++++++++++++++++++--------
> tools/objtool/builtin-mcount.c | 50 +++++++++++++++++++++++++++++++++
> tools/objtool/builtin.h | 2 ++
> tools/objtool/objtool.c | 1 +
> tools/objtool/objtool.h | 1 +
> tools/objtool/recordmcount.c | 36 +++++++-----------------
> tools/objtool/weak.c | 5 ++++
> 16 files changed, 131 insertions(+), 60 deletions(-)
> create mode 100644 tools/objtool/builtin-mcount.c
>
> diff --git a/Documentation/dontdiff b/Documentation/dontdiff
> index 72fc2e9e2b63..d7e0ec691e02 100644
> --- a/Documentation/dontdiff
> +++ b/Documentation/dontdiff
> @@ -211,7 +211,7 @@ r420_reg_safe.h
> r600_reg_safe.h
> randomize_layout_hash.h
> randomize_layout_seed.h
> -recordmcount
> +objtool
> relocs
> rlim_names.h
> rn50_reg_safe.h
> diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
> index 9adefcc3c7a8..6b9fc7cad543 100644
> --- a/Documentation/trace/ftrace.rst
> +++ b/Documentation/trace/ftrace.rst
> @@ -2684,8 +2684,8 @@ every kernel function, produced by the -pg switch in gcc),
> starts of pointing to a simple return. (Enabling FTRACE will
> include the -pg switch in the compiling of the kernel.)
>
> -At compile time every C file object is run through the
> -recordmcount program (located in the tools/objtool directory). This
> +At compile time every C file object is run through objtool's
> +mcount subcommand (located in the tools/objtool directory). This
> program will parse the ELF headers in the C object to find all
> the locations in the .text section that call mcount. Starting
> with gcc version 4.6, the -mfentry has been added for x86, which
> @@ -2699,7 +2699,7 @@ can be traced.
>
> A section called "__mcount_loc" is created that holds
> references to all the mcount/fentry call sites in the .text section.
> -The recordmcount program re-links this section back into the
> +Running "objtool mcount" re-links this section back into the
> original object. The final linking stage of the kernel will add all these
> references into a single table.
>
> diff --git a/Makefile b/Makefile
> index d353a0a65a71..99a4d8c61bdb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -842,12 +842,12 @@ 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
> + USE_OBJTOOL_MCOUNT := y
> + export USE_OBJTOOL_MCOUNT
> objtool_target := tools/objtool FORCE
> endif
> endif
> -endif
> +endif # CONFIG_FUNCTION_TRACER
>
> # We trigger additional mismatches with less inlining
> ifdef CONFIG_DEBUG_SECTION_MISMATCH
> @@ -1168,6 +1168,9 @@ ifneq ($(has_libelf),1)
> 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
> @false
> + else ifdef USE_OBJTOOL_MCOUNT
> + @echo "error: Cannot generate tracing metadata for CONFIG_DYNAMIC_FTRACE, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
> + @false
> else
> ifeq ($(SKIP_STACK_VALIDATION),1)
> @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
> diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h
> index 91fa4baa1a93..5fd71bf592d5 100644
> --- a/arch/arm64/include/asm/ftrace.h
> +++ b/arch/arm64/include/asm/ftrace.h
> @@ -62,7 +62,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
> return addr + AARCH64_INSN_SIZE;
> /*
> * addr is the address of the mcount call instruction.
> - * recordmcount does the necessary offset calculation.
> + * "objtool mcount" does the necessary offset calculation.
> */
> return addr;
> }
> diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
> index 84b9449be080..c849f3818369 100644
> --- a/arch/x86/include/asm/ftrace.h
> +++ b/arch/x86/include/asm/ftrace.h
> @@ -23,7 +23,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
> {
> /*
> * addr is the address of the mcount call instruction.
> - * recordmcount does the necessary offset calculation.
> + * "objtool mcount" does the necessary offset calculation.
> */
> return addr;
> }
> diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
> index 743647005f64..ae74647b06fa 100644
> --- a/kernel/trace/Kconfig
> +++ b/kernel/trace/Kconfig
> @@ -59,7 +59,7 @@ config HAVE_NOP_MCOUNT
> config HAVE_C_RECORDMCOUNT
> bool
> help
> - C version of recordmcount available?
> + C version of objtool mcount available?
The "C version" doesn't make much sense here. "Objtool mcount
available?" or "mcount subcommand of objtool available?" perhaps?
>
> config TRACER_MAX_TRACE
> bool
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index d753facdb943..ab0aa6088039 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -163,22 +163,23 @@ endif
>
> ifdef CONFIG_FTRACE_MCOUNT_RECORD
> ifndef CC_USING_RECORD_MCOUNT
> -# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl
> -ifdef BUILD_C_RECORDMCOUNT
> +# The compiler does not support generation of the __mcount_loc section.
> +# Generate it manually with "objtool mcount record" or recordmcount.pl
> +ifdef USE_OBJTOOL_MCOUNT
> ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
> RECORDMCOUNT_FLAGS = -w
> endif
> # 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
> -# files, including recordmcount.
> +# files, including objtool.
> sub_cmd_record_mcount = \
> if [ $(@) != "scripts/mod/empty.o" ]; then \
> - $(objtree)/tools/objtool/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \
> + $(objtree)/tools/objtool/objtool mcount record $(RECORDMCOUNT_FLAGS) "$(@)"; \
> fi;
>
> -recordmcount_source := $(srctree)/tools/objtool/recordmcount.c \
> - $(srctree)/tools/objtool/recordmcount.h
> +recordmcount_dep = $(objtree)/tools/objtool/objtool \
> + $(wildcard include/config/ftrace/mcount/record.h)
> else
> sub_cmd_record_mcount = perl $(srctree)/tools/objtool/recordmcount.pl "$(ARCH)" \
> "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
> @@ -186,8 +187,8 @@ sub_cmd_record_mcount = perl $(srctree)/tools/objtool/recordmcount.pl "$(ARCH)"
> "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \
> "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \
> "$(if $(part-of-module),1,0)" "$(@)";
> -recordmcount_source := $(srctree)/tools/objtool/recordmcount.pl
> -endif # BUILD_C_RECORDMCOUNT
> +recordmcount_dep = $(srctree)/tools/objtool/recordmcount.pl
> +endif # USE_OBJTOOL_MCOUNT
> cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \
> $(sub_cmd_record_mcount))
> endif # CC_USING_RECORD_MCOUNT
> @@ -263,7 +264,7 @@ cmd_undef_syms = echo
> endif
>
> # Built-in and composite module parts
> -$(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE
> +$(obj)/%.o: $(src)/%.c $(recordmcount_dep) $(objtool_dep) FORCE
> $(call cmd,force_checksrc)
> $(call if_changed_rule,cc_o_c)
>
> diff --git a/scripts/sorttable.h b/scripts/sorttable.h
> index a2baa2fefb13..986aa3414cf6 100644
> --- a/scripts/sorttable.h
> +++ b/scripts/sorttable.h
> @@ -11,7 +11,7 @@
> * Some of code was taken out of arch/x86/kernel/unwind_orc.c, written by:
> * Copyright (C) 2017 Josh Poimboeuf <jpoimboe@...hat.com>
> *
> - * Some of this code was taken out of recordmcount.h written by:
> + * Some of this code was taken out of objtool mcount written by:
> *
> * Copyright 2009 John F. Reiser <jreiser@...Wagon.com>. All rights reserved.
> * Copyright 2010 Steven Rostedt <srostedt@...hat.com>, Red Hat Inc.
> diff --git a/tools/objtool/Build b/tools/objtool/Build
> index 4d399aff76de..f4f0515d4f91 100644
> --- a/tools/objtool/Build
> +++ b/tools/objtool/Build
> @@ -7,9 +7,11 @@ objtool-$(SUBCMD_CHECK) += special.o
> objtool-$(SUBCMD_ORC) += check.o
> objtool-$(SUBCMD_ORC) += orc_gen.o
> objtool-$(SUBCMD_ORC) += orc_dump.o
> +objtool-$(SUBCMD_MCOUNT) += recordmcount.o
>
> objtool-y += builtin-check.o
> objtool-y += builtin-orc.o
> +objtool-y += builtin-mcount.o
> objtool-y += elf.o
> objtool-y += objtool.o
>
> @@ -35,5 +37,3 @@ $(OUTPUT)str_error_r.o: ../lib/str_error_r.c FORCE
> $(OUTPUT)librbtree.o: ../lib/rbtree.c FORCE
> $(call rule_mkdir)
> $(call if_changed_dep,cc_o_c)
> -
> -recordmcount-y += recordmcount.o
> diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
> index 285474a77fe9..ffef73f7f47e 100644
> --- a/tools/objtool/Makefile
> +++ b/tools/objtool/Makefile
> @@ -31,12 +31,6 @@ OBJTOOL_IN := $(OBJTOOL)-in.o
> LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null)
> LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
>
> -RECORDMCOUNT := $(OUTPUT)recordmcount
> -RECORDMCOUNT_IN := $(RECORDMCOUNT)-in.o
> -ifeq ($(BUILD_C_RECORDMCOUNT),y)
> -all: $(RECORDMCOUNT)
> -endif
> -
> all: $(OBJTOOL)
>
> INCLUDES := -I$(srctree)/tools/include \
> @@ -55,13 +49,47 @@ AWK = awk
>
> SUBCMD_CHECK := n
> SUBCMD_ORC := n
> +SUBCMD_MCOUNT := n
>
> ifeq ($(SRCARCH),x86)
> SUBCMD_CHECK := y
> SUBCMD_ORC := y
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),arm)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),arm64)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),ia64)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),mips)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),powerpc)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),s390)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),sh)
> + SUBCMD_MCOUNT := y
> +endif
> +
> +ifeq ($(SRCARCH),sparc)
> + SUBCMD_MCOUNT := y
Is there some arch for which MCOUNT is not supported? If not you could
just have MCOUNT default to 'y' and avoid adding all those tests (or
maybe reduce the numbers and set to 'n' only for arches not supporting it).
> endif
>
> -export SUBCMD_CHECK SUBCMD_ORC
> +export SUBCMD_CHECK SUBCMD_ORC SUBCMD_MCOUNT
> export srctree OUTPUT CFLAGS SRCARCH AWK
> include $(srctree)/tools/build/Makefile.include
>
> @@ -69,20 +97,16 @@ $(OBJTOOL_IN): fixdep FORCE
> @$(CONFIG_SHELL) ./sync-check.sh
> @$(MAKE) $(build)=objtool
>
> -$(RECORDMCOUNT_IN): fixdep FORCE
> - @$(MAKE) $(build)=recordmcount
>
> $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
> $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
>
> -$(RECORDMCOUNT): $(RECORDMCOUNT_IN)
> - $(QUIET_LINK)$(CC) $(RECORDMCOUNT_IN) $(KBUILD_HOSTLDFLAGS) -o $@
>
> $(LIBSUBCMD): fixdep FORCE
> $(Q)$(MAKE) -C $(SUBCMD_SRCDIR) OUTPUT=$(LIBSUBCMD_OUTPUT)
>
> clean:
> - $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(RECORDMCOUNT)
> + $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL)
> $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> $(Q)$(RM) $(OUTPUT)arch/x86/inat-tables.c $(OUTPUT)fixdep
>
> diff --git a/tools/objtool/builtin-mcount.c b/tools/objtool/builtin-mcount.c
> new file mode 100644
> index 000000000000..4ffc105ab7bb
> --- /dev/null
> +++ b/tools/objtool/builtin-mcount.c
> @@ -0,0 +1,50 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +
> +/*
> + * objtool mcount:
> + *
> + * This command analyzes a .o file and constructs a table of the locations of
> + * calls to 'mcount' useful to ftrace. We can optionally append this table to
> + * the object file ("objtool mcount record foo.o") or output it separately
> + * ("objtool mcount show"). The latter can be used to compare the expected
> + * callers of mcount to those actually found.
> + */
> +
> +#include <string.h>
> +#include <subcmd/parse-options.h>
> +#include "builtin.h"
> +#include "objtool.h"
> +
> +static const char * const mcount_usage[] = {
> + "objtool mcount record [<options>] file.o [file2.o ...]",
> + NULL,
> +};
> +
> +bool warn_on_notrace_sect;
> +
> +const static struct option mcount_options[] = {
> + OPT_BOOLEAN('w', "warn-on-notrace-section", &warn_on_notrace_sect,
> + "Emit a warning when a section omitting mcount "
> + "(possibly due to \"notrace\" marking) is encountered"),
> + OPT_END(),
> +};
> +
> +int cmd_mcount(int argc, const char **argv)
> +{
> + argc--; argv++;
> + if (argc <= 0)
> + usage_with_options(mcount_usage, mcount_options);
> +
> + if (!strncmp(argv[0], "record", 6)) {
> + argc = parse_options(argc, argv,
> + mcount_options, mcount_usage, 0);
> + if (argc < 1)
> + usage_with_options(mcount_usage, mcount_options);
> +
> + return record_mcount(argc, argv);
> + }
> +
> + usage_with_options(mcount_usage, mcount_options);
> +
> + return 0;
> +}
> diff --git a/tools/objtool/builtin.h b/tools/objtool/builtin.h
> index 85c979caa367..9c7331592fa7 100644
> --- a/tools/objtool/builtin.h
> +++ b/tools/objtool/builtin.h
> @@ -12,5 +12,7 @@ extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,
>
> extern int cmd_check(int argc, const char **argv);
> extern int cmd_orc(int argc, const char **argv);
> +extern bool is_cmd_mcount_available(void);
This appears to be unused.
Cheers,
--
Julien Thierry
Powered by blists - more mailing lists