Skip to contentSkip to conversation

objtool: Add mcount sub-command

RFC PATCH In review Sathvika Vasireddy 8 participants 34 messages Mar 18, 2022 – May 23, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover objtool: Add mcount sub-command

This patchset adds support to implement 'objtool mcount' command.

Right now, objtool is built if CONFIG_STACK_VALIDATION is enabled. And, '__mcount_loc' section is generated by objtool when --mcount option is passed to check sub-command.

For architectures to be able to generate '__mcount_loc' section without having to do stack validation, introduce 'mcount' as a sub-command to objtool. This way, objtool is built for mcount if CONFIG_FTRACE_MCOUNT_USE_OBJTOOL is enabled. Additionally, architectures can select HAVE_NOP_MCOUNT to be able to nop out mcount call sites.

TODO: Enable "objtool mcount" for clang LTO builds.

Sathvika Vasireddy (3):
objtool: Move common code to utils.c
objtool: Enable and implement 'mcount' subcommand objtool/mcount: Add powerpc specific functions

 Makefile                                      |   6 +
 arch/powerpc/Kconfig                          |   1 +
 arch/x86/Kconfig                              |   3 +-
 scripts/Makefile.build                        |  12 +
 tools/objtool/Build                           |   3 +
 tools/objtool/Makefile                        |   8 +-
 tools/objtool/arch/powerpc/Build              |   1 +
 tools/objtool/arch/powerpc/decode.c           |  51 +++++
 .../arch/powerpc/include/arch/cfi_regs.h      |  37 +++
 tools/objtool/arch/powerpc/include/arch/elf.h |   8 +
 tools/objtool/builtin-mcount.c                |  74 ++++++
 tools/objtool/check.c                         | 178 +--------------
 tools/objtool/include/objtool/builtin.h       |   4 +-
 tools/objtool/include/objtool/check.h         |   2 -
 tools/objtool/include/objtool/objtool.h       |   1 +
 tools/objtool/include/objtool/utils.h         |  28 +++
 tools/objtool/mcount.c                        | 138 ++++++++++++
 tools/objtool/objtool.c                       |   1 +
 tools/objtool/orc_gen.c                       |   1 +
 tools/objtool/utils.c                         | 210 ++++++++++++++++++
 tools/objtool/weak.c                          |   5 +
 21 files changed, 590 insertions(+), 182 deletions(-)
 create mode 100644 tools/objtool/arch/powerpc/Build
 create mode 100644 tools/objtool/arch/powerpc/decode.c
 create mode 100644 tools/objtool/arch/powerpc/include/arch/cfi_regs.h
 create mode 100644 tools/objtool/arch/powerpc/include/arch/elf.h
 create mode 100644 tools/objtool/builtin-mcount.c
 create mode 100644 tools/objtool/include/objtool/utils.h
 create mode 100644 tools/objtool/mcount.c
 create mode 100644 tools/objtool/utils.c
Signature · 1 line
2.31.1
#1 lore raw

RFC PATCH 1/3 objtool: Move common code to utils.c

This patch moves common code to utils.c file. Code from this file will be reused across check.c and mcount.c (will be introduced in the coming patches). Also, ensure that this change works well with existing commands.

---
 tools/objtool/Build                   |   1 +
 tools/objtool/check.c                 | 178 +-----------------------
 tools/objtool/include/objtool/check.h |   2 -
 tools/objtool/include/objtool/utils.h |  28 ++++
 tools/objtool/orc_gen.c               |   1 +
 tools/objtool/utils.c                 | 192 ++++++++++++++++++++++++++
 6 files changed, 223 insertions(+), 179 deletions(-)
 create mode 100644 tools/objtool/include/objtool/utils.h
 create mode 100644 tools/objtool/utils.c
tools/objtool/Build +1 -0
index b7222d5cc7bc..161fd451241a 100644
@@ -12,6 +12,7 @@ objtool-y += builtin-check.o
 objtool-y += builtin-orc.o
 objtool-y += elf.o
 objtool-y += objtool.o
+objtool-y += utils.o
 
 objtool-y += libstring.o
 objtool-y += libctype.o
tools/objtool/check.c +1 -177

216 lines not on this page · raw message

tools/objtool/include/objtool/check.h +0 -2
index 6cfff078897f..d4e378c7aa30 100644
@@ -79,8 +79,6 @@ static inline bool is_jump(struct instruction *insn)
 	return is_static_jump(insn) || is_dynamic_jump(insn);
 }
 
-struct instruction *find_insn(struct objtool_file *file,
-			      struct section *sec, unsigned long offset);
 
 #define for_each_insn(file, insn)					\
 	list_for_each_entry(insn, &file->insn_list, list)
tools/objtool/include/objtool/utils.h new file +28 -0
new file mode 100644
index 000000000000..f808a66dd0a8
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2017 Josh Poimboeuf <[email protected]>
+ */
+
+#ifndef UTILS_H
+#define UTILS_H
+
+#include <stdbool.h>
+#include <objtool/cfi.h>
+#include <objtool/arch.h>
+
+int decode_instructions(struct objtool_file *file);
+struct reloc *insn_reloc(struct objtool_file *file, struct instruction *insn);
+void remove_insn_ops(struct instruction *insn);
+struct symbol *find_call_destination(struct section *sec, unsigned long offset);
+int create_mcount_loc_sections(struct objtool_file *file);
+struct instruction *find_insn(struct objtool_file *file,
+			      struct section *sec, unsigned long offset);
+
+#define sym_for_each_insn(file, sym, insn)                              \
+	for (insn = find_insn(file, sym->sec, sym->offset);             \
+	     insn && &insn->list != &file->insn_list &&                 \
+		insn->sec == sym->sec &&                                \
+		insn->offset < sym->offset + sym->len;                  \
+	     insn = list_next_entry(insn, list))
+
+#endif /* UTILS_H */
tools/objtool/orc_gen.c +1 -0
index dd3c64af9db2..383c5f2f0658 100644
@@ -10,6 +10,7 @@
 #include <asm/orc_types.h>
 
 #include <objtool/check.h>
+#include <objtool/utils.h>
 #include <objtool/warn.h>
 #include <objtool/endianness.h>
 
tools/objtool/utils.c new file +192 -0

192 lines not on this page · raw message

Signature · 1 line
2.31.1
#2 lore raw

Re: [RFC PATCH 1/3] objtool: Move common code to utils.c

tools/objtool/include/objtool/utils.h line 28

Quoted 8 lines
tools/objtool/include/objtool/utils.h new file +8 -0
+#define sym_for_each_insn(file, sym, insn)                              \
+	for (insn = find_insn(file, sym->sec, sym->offset);             \
+	     insn && &insn->list != &file->insn_list &&                 \
+		insn->sec == sym->sec &&                                \
+		insn->offset < sym->offset + sym->len;                  \
+	     insn = list_next_entry(insn, list))
+
+#endif /* UTILS_H */

Since you include <objtool/utils.h> in check.c, you can remove the definition of sym_for_each_insn() macro from check.c as well.

I wonder if it would make sense to move all these helper functions to utils.c and utils.h. Might be connected to what Josh wrote about his work on objtool interface.

Regards
Miroslav

#3 lore raw

RFC PATCH 2/3 objtool: Enable and implement 'mcount' subcommand

In reply to Sathvika Vasireddy

This patch adds 'mcount' as a subcommand to objtool, and enables the same for x86. objtool is built if CONFIG_FTRACE_MCOUNT_USE_OBJTOOL is selected. Additionally, architectures can select HAVE_NOP_MCOUNT if they choose to nop out mcount call sites. If that config option is selected, then --mnop is passed as an option to 'objtool mcount'

---
 Makefile                                |   6 ++
 arch/x86/Kconfig                        |   3 +-
 scripts/Makefile.build                  |  12 +++
 tools/objtool/Build                     |   2 +
 tools/objtool/Makefile                  |   4 +-
 tools/objtool/builtin-mcount.c          |  74 +++++++++++++
 tools/objtool/include/objtool/builtin.h |   4 +-
 tools/objtool/include/objtool/objtool.h |   1 +
 tools/objtool/mcount.c                  | 138 ++++++++++++++++++++++++
 tools/objtool/objtool.c                 |   1 +
 tools/objtool/weak.c                    |   5 +
 11 files changed, 247 insertions(+), 3 deletions(-)
 create mode 100644 tools/objtool/builtin-mcount.c
 create mode 100644 tools/objtool/mcount.c
Makefile +6 -0
index 55a30ca69350..316f7d08b30a 100644
@@ -846,7 +846,9 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_CC
   endif
 endif
 ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+ ifdef CONFIG_HAVE_NOP_MCOUNT
   CC_FLAGS_USING	+= -DCC_USING_NOP_MCOUNT
+ endif
 endif
 ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
   ifdef CONFIG_HAVE_C_RECORDMCOUNT
@@ -1303,6 +1305,10 @@ ifdef CONFIG_STACK_VALIDATION
 prepare: tools/objtool
 endif
 
+ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+prepare: tools/objtool
+endif
+
 ifdef CONFIG_BPF
 ifdef CONFIG_DEBUG_INFO_BTF
 prepare: tools/bpf/resolve_btfids
arch/x86/Kconfig +2 -1
index 9f5bd41bf660..eecfe588cd9f 100644
@@ -185,7 +185,8 @@ config X86
 	select HAVE_CONTEXT_TRACKING		if X86_64
 	select HAVE_CONTEXT_TRACKING_OFFSTACK	if HAVE_CONTEXT_TRACKING
 	select HAVE_C_RECORDMCOUNT
-	select HAVE_OBJTOOL_MCOUNT		if STACK_VALIDATION
+	select HAVE_OBJTOOL_MCOUNT
+	select HAVE_NOP_MCOUNT			if HAVE_OBJTOOL_MCOUNT
 	select HAVE_BUILDTIME_MCOUNT_SORT
 	select HAVE_DEBUG_KMEMLEAK
 	select HAVE_DMA_CONTIGUOUS
scripts/Makefile.build +12 -0
index a4b89b757287..6a09b4ba14a1 100644
@@ -242,6 +242,18 @@ cmd_gen_objtooldep = $(if $(objtool-enabled), { echo ; echo '$@: $$(wildcard $(o
 
 endif # CONFIG_STACK_VALIDATION
 
+ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+
+objtool := $(objtree)/tools/objtool/objtool
+
+objtool_args := mcount
+objtool_args += $(if $(CONFIG_HAVE_NOP_MCOUNT), --mnop)
+
+cmd_objtool = $(if $(objtool-enabled), ; $(objtool) $(objtool_args) $@)
+cmd_gen_objtooldep = $(if $(objtool-enabled), { echo ; echo '$@: $$(wildcard $(objtool))' ; } >> $(dot-target).cmd)
+
+endif # CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+
 ifdef CONFIG_LTO_CLANG
 
 # Skip objtool for LLVM bitcode
tools/objtool/Build +2 -0
index 161fd451241a..0b9b8bd0ee92 100644
@@ -2,12 +2,14 @@ objtool-y += arch/$(SRCARCH)/
 
 objtool-y += weak.o
 
+objtool-$(SUBCMD_MCOUNT) += mcount.o
 objtool-$(SUBCMD_CHECK) += check.o
 objtool-$(SUBCMD_CHECK) += special.o
 objtool-$(SUBCMD_ORC) += check.o
 objtool-$(SUBCMD_ORC) += orc_gen.o
 objtool-$(SUBCMD_ORC) += orc_dump.o
 
+objtool-y += builtin-mcount.o
 objtool-y += builtin-check.o
 objtool-y += builtin-orc.o
 objtool-y += elf.o
tools/objtool/Makefile +3 -1
index 92ce4fce7bc7..8404cf696954 100644
@@ -41,13 +41,15 @@ AWK = awk
 
 SUBCMD_CHECK := n
 SUBCMD_ORC := n
+SUBCMD_MCOUNT := n
 
 ifeq ($(SRCARCH),x86)
 	SUBCMD_CHECK := y
 	SUBCMD_ORC := y
+	SUBCMD_MCOUNT := y
 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
 
tools/objtool/builtin-mcount.c new file +74 -0

74 lines not on this page · raw message

tools/objtool/include/objtool/builtin.h +3 -1
index 89ba869ed08f..d7ed6ff65729 100644
@@ -9,11 +9,13 @@
 
 extern const struct option check_options[];
 extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,
-            validate_dup, vmlinux, mcount, noinstr, backup, sls;
+	    validate_dup, vmlinux, mcount, noinstr, backup, sls, mnop;
 
 extern int cmd_parse_options(int argc, const char **argv, const char * const usage[]);
+extern int cmd_parse_options_mcount(int argc, const char **argv, const char * const usage[]);
 
 extern int cmd_check(int argc, const char **argv);
 extern int cmd_orc(int argc, const char **argv);
+extern int cmd_mcount(int argc, const char **argv);
 
 #endif /* _BUILTIN_H */
tools/objtool/include/objtool/objtool.h +1 -0
index f99fbc6078d5..edcf28d4407c 100644
@@ -41,5 +41,6 @@ void objtool_pv_add(struct objtool_file *file, int idx, struct symbol *func);
 int check(struct objtool_file *file);
 int orc_dump(const char *objname);
 int orc_create(struct objtool_file *file);
+int objtool_mcount(struct objtool_file *file);
 
 #endif /* _OBJTOOL_H */
tools/objtool/mcount.c new file +138 -0

138 lines not on this page · raw message

tools/objtool/objtool.c +1 -0
index bdf699f6552b..e19851813d5b 100644
@@ -37,6 +37,7 @@ static const char objtool_usage_string[] =
 
 static struct cmd_struct objtool_cmds[] = {
 	{"check",	cmd_check,	"Perform stack metadata validation on an object file" },
+	{"mcount",      cmd_mcount,    "Generate __mcount_loc section" },
 	{"orc",		cmd_orc,	"Generate in-place ORC unwind tables for an object file" },
 };
 
tools/objtool/weak.c +5 -0
index 8314e824db4a..19b2dfcacf2e 100644
@@ -29,3 +29,8 @@ int __weak orc_create(struct objtool_file *file)
 {
 	UNSUPPORTED("orc");
 }
+
+int __weak objtool_mcount(struct objtool_file *file)
+{
+	UNSUPPORTED("mcount subcommand");
+}
Signature · 1 line
2.31.1
#4 lore raw

Re: [RFC PATCH 2/3] objtool: Enable and implement 'mcount' subcommand

Le 18/03/2022 à 11:51, Sathvika Vasireddy a écrit :

Quoted 38 lines

This patch adds 'mcount' as a subcommand to objtool, and enables the same for x86. objtool is built if CONFIG_FTRACE_MCOUNT_USE_OBJTOOL is selected. Additionally, architectures can select HAVE_NOP_MCOUNT if they choose to nop out mcount call sites. If that config option is selected, then --mnop is passed as an option to 'objtool mcount'

---
  Makefile                                |   6 ++
  arch/x86/Kconfig                        |   3 +-
  scripts/Makefile.build                  |  12 +++
  tools/objtool/Build                     |   2 +
  tools/objtool/Makefile                  |   4 +-
  tools/objtool/builtin-mcount.c          |  74 +++++++++++++
  tools/objtool/include/objtool/builtin.h |   4 +-
  tools/objtool/include/objtool/objtool.h |   1 +
  tools/objtool/mcount.c                  | 138 ++++++++++++++++++++++++
  tools/objtool/objtool.c                 |   1 +
  tools/objtool/weak.c                    |   5 +
  11 files changed, 247 insertions(+), 3 deletions(-)

create mode 100644 tools/objtool/builtin-mcount.c create mode 100644 tools/objtool/mcount.c

Makefile +2 -0
index 55a30ca69350..316f7d08b30a 100644
@@ -846,7 +846,9 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_CC
    endif
  endif
  ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+ ifdef CONFIG_HAVE_NOP_MCOUNT
    CC_FLAGS_USING	+= -DCC_USING_NOP_MCOUNT
+ endif
  endif
  ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
    ifdef CONFIG_HAVE_C_RECORDMCOUNT

Makefile ifdef CONFIG_STACK_VALIDATION · line 1310

Quoted 6 lines
Makefile +3 -0
@@ -1303,6 +1305,10 @@ ifdef CONFIG_STACK_VALIDATION
  prepare: tools/objtool
  endif
 
+ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+prepare: tools/objtool
+endif

I don't think that will work for powerpc.

See arch/powerpc/Makefile

powerpc builds the VDSO under prepare: , and powerpc has CONFIG_HAVE_GENERIC_VDSO so there are some C files in that step that seem to use objtool, allthough that looks odd to me. Must be something to fix somewhere.

powerpc64-linux-gcc
-Wp,-MMD,arch/powerpc/kernel/vdso/.vgettimeofday-64.o.d -nostdinc -I./arch/powerpc/include -I./arch/powerpc/include/generated -I./include -I./arch/powerpc/include/uapi -I./arch/powerpc/include/generated/uapi -I./include/uapi -I./include/generated/uapi -include ./include/linux/compiler-version.h -include ./include/linux/kconfig.h -include ./include/linux/compiler_types.h -D__KERNEL__ -I ./arch/powerpc -DHAVE_AS_ATHIGH=1 -fmacro-prefix-map=./= -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE -Werror=implicit-function-declaration -Werror=implicit-int -Werror=return-type -Wno-format-security -std=gnu89 -mbig-endian -m64 -msoft-float -pipe -mtraceback=no -mabi=elfv1 -mcall-aixdesc -mcmodel=medium -mno-pointers-to-nested-functions -mtune=power7 -mcpu=power5 -mno-altivec -mno-vsx -fno-asynchronous-unwind-tables -mno-string -Wa,-maltivec -Wa,-mpower4 -Wa,-many -mabi=elfv1 -mcall-aixdesc -mbig-endian -mstack-protector-guard=tls -mstack-protector-guard-reg=r13 -fno-delete-null-pointer-checks -Wno-frame-address -Wno-format-truncation -Wno-format-overflow -Wno-address-of-packed-member -O2 -fno-allow-store-data-races -Wframe-larger-than=2048 -fstack-protector-strong -Wimplicit-fallthrough=5 -Wno-main -Wno-unused-but-set-variable -Wno-unused-const-variable -fno-stack-clash-protection -Wdeclaration-after-statement -Wvla -Wno-pointer-sign -Wcast-function-type -Wno-stringop-truncation -Wno-zero-length-bounds -Wno-array-bounds -Wno-stringop-overflow -Wno-restrict -Wno-maybe-uninitialized -Wno-alloc-size-larger-than -fno-strict-overflow -fno-stack-check -fconserve-stack -Werror=date-time -Werror=incompatible-pointer-types -Werror=designated-init -Wno-packed-not-aligned -mstack-protector-guard-offset=3200 -shared -fno-common -fno-builtin -nostdlib -Wl,--hash-style=both -include /home/chleroy/linux-powerpc/lib/vdso/gettimeofday.c -fno-stack-protector -DDISABLE_BRANCH_PROFILING -ffreestanding -fasynchronous-unwind-tables -ffixed-r30 -DKBUILD_MODFILE='"arch/powerpc/kernel/vdso/vgettimeofday-64"' -DKBUILD_BASENAME='"vgettimeofday_64"' -DKBUILD_MODNAME='"vgettimeofday_64"' -D__KBUILD_MODNAME=kmod_vgettimeofday_64 -c -o arch/powerpc/kernel/vdso/vgettimeofday-64.o arch/powerpc/kernel/vdso/vgettimeofday.c ; ./tools/objtool/objtool mcount arch/powerpc/kernel/vdso/vgettimeofday-64.o

Quoted 4 lines
Makefile +1 -0
+
  ifdef CONFIG_BPF
  ifdef CONFIG_DEBUG_INFO_BTF
  prepare: tools/bpf/resolve_btfids
#5 lore raw

Re: [RFC PATCH 2/3] objtool: Enable and implement 'mcount' subcommand

Quoted 92 lines · Christophe Leroy

Le 18/03/2022 à 11:51, Sathvika Vasireddy a écrit :

Quoted 38 lines

This patch adds 'mcount' as a subcommand to objtool, and enables the same for x86. objtool is built if CONFIG_FTRACE_MCOUNT_USE_OBJTOOL is selected. Additionally, architectures can select HAVE_NOP_MCOUNT if they choose to nop out mcount call sites. If that config option is selected, then --mnop is passed as an option to 'objtool mcount'

---
  Makefile                                |   6 ++
  arch/x86/Kconfig                        |   3 +-
  scripts/Makefile.build                  |  12 +++
  tools/objtool/Build                     |   2 +
  tools/objtool/Makefile                  |   4 +-
  tools/objtool/builtin-mcount.c          |  74 +++++++++++++
  tools/objtool/include/objtool/builtin.h |   4 +-
  tools/objtool/include/objtool/objtool.h |   1 +
  tools/objtool/mcount.c                  | 138 ++++++++++++++++++++++++
  tools/objtool/objtool.c                 |   1 +
  tools/objtool/weak.c                    |   5 +
  11 files changed, 247 insertions(+), 3 deletions(-)

create mode 100644 tools/objtool/builtin-mcount.c create mode 100644 tools/objtool/mcount.c

Makefile +2 -0
index 55a30ca69350..316f7d08b30a 100644
@@ -846,7 +846,9 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_CC
    endif
  endif
  ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+ ifdef CONFIG_HAVE_NOP_MCOUNT
    CC_FLAGS_USING	+= -DCC_USING_NOP_MCOUNT
+ endif
  endif
  ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
    ifdef CONFIG_HAVE_C_RECORDMCOUNT

Makefile ifdef CONFIG_STACK_VALIDATION · line 1310

Quoted 6 lines
Makefile +3 -0
@@ -1303,6 +1305,10 @@ ifdef CONFIG_STACK_VALIDATION
  prepare: tools/objtool
  endif
 
+ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+prepare: tools/objtool
+endif

I don't think that will work for powerpc.

See arch/powerpc/Makefile

powerpc builds the VDSO under prepare: , and powerpc has CONFIG_HAVE_GENERIC_VDSO so there are some C files in that step that seem to use objtool, allthough that looks odd to me. Must be something to fix somewhere.

powerpc64-linux-gcc

(quoted diff) +0 -4
-Wp,-MMD,arch/powerpc/kernel/vdso/.vgettimeofday-64.o.d -nostdinc 
-I./arch/powerpc/include -I./arch/powerpc/include/generated  -I./include 
-I./arch/powerpc/include/uapi -I./arch/powerpc/include/generated/uapi 
-I./include/uapi -I./include/generated/uapi -include 

./include/linux/compiler-version.h -include ./include/linux/kconfig.h

(quoted diff) +0 -25
-include ./include/linux/compiler_types.h -D__KERNEL__ -I ./arch/powerpc 
-DHAVE_AS_ATHIGH=1 -fmacro-prefix-map=./= -Wall -Wundef 
-Werror=strict-prototypes -Wno-trigraphs -fno-strict-aliasing 
-fno-common -fshort-wchar -fno-PIE -Werror=implicit-function-declaration 
-Werror=implicit-int -Werror=return-type -Wno-format-security -std=gnu89 
-mbig-endian -m64 -msoft-float -pipe -mtraceback=no -mabi=elfv1 
-mcall-aixdesc -mcmodel=medium -mno-pointers-to-nested-functions 
-mtune=power7 -mcpu=power5 -mno-altivec -mno-vsx 
-fno-asynchronous-unwind-tables -mno-string -Wa,-maltivec -Wa,-mpower4 
-Wa,-many -mabi=elfv1 -mcall-aixdesc -mbig-endian 
-mstack-protector-guard=tls -mstack-protector-guard-reg=r13 
-fno-delete-null-pointer-checks -Wno-frame-address 
-Wno-format-truncation -Wno-format-overflow 
-Wno-address-of-packed-member -O2 -fno-allow-store-data-races 
-Wframe-larger-than=2048 -fstack-protector-strong 
-Wimplicit-fallthrough=5 -Wno-main -Wno-unused-but-set-variable 
-Wno-unused-const-variable -fno-stack-clash-protection 
-Wdeclaration-after-statement -Wvla -Wno-pointer-sign 
-Wcast-function-type -Wno-stringop-truncation -Wno-zero-length-bounds 
-Wno-array-bounds -Wno-stringop-overflow -Wno-restrict 
-Wno-maybe-uninitialized -Wno-alloc-size-larger-than 
-fno-strict-overflow -fno-stack-check -fconserve-stack -Werror=date-time 
-Werror=incompatible-pointer-types -Werror=designated-init 
-Wno-packed-not-aligned -mstack-protector-guard-offset=3200 -shared 
-fno-common -fno-builtin -nostdlib -Wl,--hash-style=both -include 

/home/chleroy/linux-powerpc/lib/vdso/gettimeofday.c -fno-stack-protector

(quoted diff) +0 -6
-DDISABLE_BRANCH_PROFILING -ffreestanding -fasynchronous-unwind-tables 
-ffixed-r30 
-DKBUILD_MODFILE='"arch/powerpc/kernel/vdso/vgettimeofday-64"' 
-DKBUILD_BASENAME='"vgettimeofday_64"' 
-DKBUILD_MODNAME='"vgettimeofday_64"' 
-D__KBUILD_MODNAME=kmod_vgettimeofday_64 -c -o 
Quoted 1 line

arch/powerpc/kernel/vdso/vgettimeofday-64.o arch/powerpc/kernel/vdso/vgettimeofday.c ; ./tools/objtool/objtool mcount arch/powerpc/kernel/vdso/vgettimeofday-64.o

We don't enable ftrace for vdso, so I suspect objtool run above will be a no-op. This needs to be confirmed, of course.

- Naveen

#6 lore raw

Re: [RFC PATCH 2/3] objtool: Enable and implement 'mcount' subcommand

Le 21/03/2022 à 09:19, Naveen N. Rao a écrit :

Quoted 95 lines
Quoted 94 lines · Christophe Leroy

Le 18/03/2022 à 11:51, Sathvika Vasireddy a écrit :

Quoted 40 lines

This patch adds 'mcount' as a subcommand to objtool, and enables the same for x86. objtool is built if CONFIG_FTRACE_MCOUNT_USE_OBJTOOL is selected. Additionally, architectures can select HAVE_NOP_MCOUNT if they choose to nop out mcount call sites. If that config option is selected, then --mnop is passed as an option to 'objtool mcount'

---
  Makefile                                |   6 ++ arch/x86/Kconfig                        |   3 +- scripts/Makefile.build                  |  12 +++ tools/objtool/Build                     |   2 + tools/objtool/Makefile                  |   4 +- tools/objtool/builtin-mcount.c          |  74 +++++++++++++ tools/objtool/include/objtool/builtin.h |   4 +- tools/objtool/include/objtool/objtool.h |   1 + tools/objtool/mcount.c                  | 138 ++++++++++++++++++++++++ tools/objtool/objtool.c                 |   1 + tools/objtool/weak.c                    |   5 +

  11 files changed, 247 insertions(+), 3 deletions(-)

  create mode 100644 tools/objtool/builtin-mcount.c create mode 100644 tools/objtool/mcount.c

Makefile +0 -0
index 55a30ca69350..316f7d08b30a 100644
@@ -846,7 +846,9 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_CC

    endif
  endif
  ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+ ifdef CONFIG_HAVE_NOP_MCOUNT
    CC_FLAGS_USING    += -DCC_USING_NOP_MCOUNT
+ endif
  endif
  ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
    ifdef CONFIG_HAVE_C_RECORDMCOUNT

Makefile +0 -0
@@ -1303,6 +1305,10 @@ ifdef CONFIG_STACK_VALIDATION

  prepare: tools/objtool
  endif

Makefile ifdef CONFIG_STACK_VALIDATION · line 1310

Quoted 3 lines
Makefile +3 -0
+ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+prepare: tools/objtool
+endif

I don't think that will work for powerpc.

See arch/powerpc/Makefile

powerpc builds the VDSO under prepare: , and powerpc has CONFIG_HAVE_GENERIC_VDSO so there are some C files in that step that seem to use objtool, allthough that looks odd to me. Must be something to fix somewhere.

   powerpc64-linux-gcc

(quoted diff) +0 -6
-Wp,-MMD,arch/powerpc/kernel/vdso/.vgettimeofday-64.o.d -nostdinc 
-I./arch/powerpc/include -I./arch/powerpc/include/generated  
-I./include -I./arch/powerpc/include/uapi 
-I./arch/powerpc/include/generated/uapi -I./include/uapi 
-I./include/generated/uapi -include ./include/linux/compiler-version.h 
-include ./include/linux/kconfig.h -include 

./include/linux/compiler_types.h -D__KERNEL__ -I ./arch/powerpc

(quoted diff) +0 -25
-DHAVE_AS_ATHIGH=1 -fmacro-prefix-map=./= -Wall -Wundef 
-Werror=strict-prototypes -Wno-trigraphs -fno-strict-aliasing 
-fno-common -fshort-wchar -fno-PIE 
-Werror=implicit-function-declaration -Werror=implicit-int 
-Werror=return-type -Wno-format-security -std=gnu89 -mbig-endian -m64 
-msoft-float -pipe -mtraceback=no -mabi=elfv1 -mcall-aixdesc 
-mcmodel=medium -mno-pointers-to-nested-functions -mtune=power7 
-mcpu=power5 -mno-altivec -mno-vsx -fno-asynchronous-unwind-tables 
-mno-string -Wa,-maltivec -Wa,-mpower4 -Wa,-many -mabi=elfv1 
-mcall-aixdesc -mbig-endian -mstack-protector-guard=tls 
-mstack-protector-guard-reg=r13 -fno-delete-null-pointer-checks 
-Wno-frame-address -Wno-format-truncation -Wno-format-overflow 
-Wno-address-of-packed-member -O2 -fno-allow-store-data-races 
-Wframe-larger-than=2048 -fstack-protector-strong 
-Wimplicit-fallthrough=5 -Wno-main -Wno-unused-but-set-variable 
-Wno-unused-const-variable -fno-stack-clash-protection 
-Wdeclaration-after-statement -Wvla -Wno-pointer-sign 
-Wcast-function-type -Wno-stringop-truncation -Wno-zero-length-bounds 
-Wno-array-bounds -Wno-stringop-overflow -Wno-restrict 
-Wno-maybe-uninitialized -Wno-alloc-size-larger-than 
-fno-strict-overflow -fno-stack-check -fconserve-stack 
-Werror=date-time -Werror=incompatible-pointer-types 
-Werror=designated-init -Wno-packed-not-aligned 
-mstack-protector-guard-offset=3200 -shared -fno-common -fno-builtin 
-nostdlib -Wl,--hash-style=both -include 

/home/chleroy/linux-powerpc/lib/vdso/gettimeofday.c

(quoted diff) +0 -4
-fno-stack-protector -DDISABLE_BRANCH_PROFILING -ffreestanding 
-fasynchronous-unwind-tables -ffixed-r30 
-DKBUILD_MODFILE='"arch/powerpc/kernel/vdso/vgettimeofday-64"' 
-DKBUILD_BASENAME='"vgettimeofday_64"' 
Quoted 9 lines
Quoted 5 lines
(quoted diff) +0 -2
-DKBUILD_MODNAME='"vgettimeofday_64"' 
-D__KBUILD_MODNAME=kmod_vgettimeofday_64 -c -o 

arch/powerpc/kernel/vdso/vgettimeofday-64.o arch/powerpc/kernel/vdso/vgettimeofday.c  ; ./tools/objtool/objtool mcount arch/powerpc/kernel/vdso/vgettimeofday-64.o

We don't enable ftrace for vdso, so I suspect objtool run above will be a no-op. This needs to be confirmed, of course.

I just checked without the series: recordmcount isn't run for VDSO, so objtool shouldn't be run either when the series is applied.

Christophe

#7 lore raw

Re: [RFC PATCH 2/3] objtool: Enable and implement 'mcount' subcommand

Quoted 9 lines · Christophe Leroy

Le 21/03/2022 à 09:19, Naveen N. Rao a écrit :

Quoted 4 lines

Christophe Leroy wrote:

We don't enable ftrace for vdso, so I suspect objtool run above will be a no-op. This needs to be confirmed, of course.

I just checked without the series: recordmcount isn't run for VDSO, so objtool shouldn't be run either when the series is applied.

Agree. I was only pointing out that it would be harmless, but it is good to ensure objtool is skipped for files/directories where ftrace isn't enabled. recordmcount keys off the presence of CC_FLAGS_FTRACE, and we should do the same for 'objtool --mcount'.

- Naveen

#8 lore raw

RFC PATCH 3/3 objtool/mcount: Add powerpc specific functions

In reply to Sathvika Vasireddy

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

---
 arch/powerpc/Kconfig                          |  1 +
 tools/objtool/Makefile                        |  4 ++
 tools/objtool/arch/powerpc/Build              |  1 +
 tools/objtool/arch/powerpc/decode.c           | 51 +++++++++++++++++++
 .../arch/powerpc/include/arch/cfi_regs.h      | 37 ++++++++++++++
 tools/objtool/arch/powerpc/include/arch/elf.h |  8 +++
 tools/objtool/utils.c                         | 28 ++++++++--
 7 files changed, 125 insertions(+), 5 deletions(-)
 create mode 100644 tools/objtool/arch/powerpc/Build
 create mode 100644 tools/objtool/arch/powerpc/decode.c
 create mode 100644 tools/objtool/arch/powerpc/include/arch/cfi_regs.h
 create mode 100644 tools/objtool/arch/powerpc/include/arch/elf.h
arch/powerpc/Kconfig +1 -0
index b779603978e1..5ddafd3ce210 100644
@@ -225,6 +225,7 @@ config PPC
 	select HAVE_MOD_ARCH_SPECIFIC
 	select HAVE_NMI				if PERF_EVENTS || (PPC64 && PPC_BOOK3S)
 	select HAVE_OPTPROBES
+	select HAVE_OBJTOOL_MCOUNT
 	select HAVE_PERF_EVENTS
 	select HAVE_PERF_EVENTS_NMI		if PPC64
 	select HAVE_PERF_REGS
tools/objtool/Makefile +4 -0
index 8404cf696954..06a9fcb4a0a3 100644
@@ -49,6 +49,10 @@ ifeq ($(SRCARCH),x86)
 	SUBCMD_MCOUNT := y
 endif
 
+ifeq ($(SRCARCH),powerpc)
+        SUBCMD_MCOUNT := y
+endif
+
 export SUBCMD_CHECK SUBCMD_ORC SUBCMD_MCOUNT
 export srctree OUTPUT CFLAGS SRCARCH AWK
 include $(srctree)/tools/build/Makefile.include
tools/objtool/arch/powerpc/Build new file +1 -0
new file mode 100644
index 000000000000..3ff1f00c6a47
@@ -0,0 +1 @@
+objtool-y += decode.o
tools/objtool/arch/powerpc/decode.c new file +51 -0

51 lines not on this page · raw message

tools/objtool/arch/powerpc/include/arch/cfi_regs.h new file +37 -0
new file mode 100644
index 000000000000..1369176c8a94
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _OBJTOOL_CFI_REGS_H
+#define _OBJTOOL_CFI_REGS_H
+
+#define CFI_SP                  1
+#define CFI_TOC                 2
+#define CFI_R3                  3
+#define CFI_R4                  4
+#define CFI_R5                  5
+#define CFI_R6                  6
+#define CFI_R7                  7
+#define CFI_R8                  8
+#define CFI_R9                  9
+#define CFI_R10                 10
+#define CFI_R14                 14
+#define CFI_R15                 15
+#define CFI_R16                 16
+#define CFI_R17                 17
+#define CFI_R18                 18
+#define CFI_R19                 19
+#define CFI_R20                 20
+#define CFI_R21                 21
+#define CFI_R22                 22
+#define CFI_R23                 23
+#define CFI_R24                 24
+#define CFI_R25                 25
+#define CFI_R26                 26
+#define CFI_R27                 27
+#define CFI_R28                 28
+#define CFI_R29                 29
+#define CFI_R30                 30
+#define CFI_R31                 31
+#define CFI_LR                  32
+#define CFI_NUM_REGS            33
+
+#endif
tools/objtool/arch/powerpc/include/arch/elf.h new file +8 -0
new file mode 100644
index 000000000000..3c8ebb7d2a6b
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _OBJTOOL_ARCH_ELF
+#define _OBJTOOL_ARCH_ELF
+
+#define R_NONE R_PPC_NONE
+
+#endif /* _OBJTOOL_ARCH_ELF */
tools/objtool/utils.c +23 -5
index d1fc6a123a6e..c9c14fa0dfd7 100644
@@ -179,11 +179,29 @@ int create_mcount_loc_sections(struct objtool_file *file)
 		loc = (unsigned long *)sec->data->d_buf + idx;
 		memset(loc, 0, sizeof(unsigned long));
 
-		if (elf_add_reloc_to_insn(file->elf, sec,
-					  idx * sizeof(unsigned long),
-					  R_X86_64_64,
-					  insn->sec, insn->offset))
-			return -1;
+		if (file->elf->ehdr.e_machine == EM_X86_64) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_X86_64_64,
+						  insn->sec, insn->offset))
+				return -1;
+		}
+
+		if (file->elf->ehdr.e_machine == EM_PPC64) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_PPC64_ADDR64,
+						  insn->sec, insn->offset))
+				return -1;
+		}
+
+		if (file->elf->ehdr.e_machine == EM_PPC) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_PPC_ADDR32,
+						  insn->sec, insn->offset))
+				return -1;
+		}
 
 		idx++;
 	}
Signature · 1 line
2.31.1
maintainer
#9 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 2 lines · Sathvika Vasireddy

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

Quoted 40 lines
tools/objtool/arch/powerpc/include/arch/elf.h new file +8 -0
new file mode 100644
index 000000000000..3c8ebb7d2a6b
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _OBJTOOL_ARCH_ELF
+#define _OBJTOOL_ARCH_ELF
+
+#define R_NONE R_PPC_NONE
+
+#endif /* _OBJTOOL_ARCH_ELF */
tools/objtool/utils.c +13 -5
index d1fc6a123a6e..c9c14fa0dfd7 100644
@@ -179,11 +179,29 @@ int create_mcount_loc_sections(struct objtool_file *file)
 		loc = (unsigned long *)sec->data->d_buf + idx;
 		memset(loc, 0, sizeof(unsigned long));
 
-		if (elf_add_reloc_to_insn(file->elf, sec,
-					  idx * sizeof(unsigned long),
-					  R_X86_64_64,
-					  insn->sec, insn->offset))
-			return -1;
+		if (file->elf->ehdr.e_machine == EM_X86_64) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_X86_64_64,
+						  insn->sec, insn->offset))
+				return -1;
+		}
+
+		if (file->elf->ehdr.e_machine == EM_PPC64) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_PPC64_ADDR64,
+						  insn->sec, insn->offset))

tools/objtool/utils.c int create_mcount_loc_sections(struct objtool_file *file) · line 204

Quoted 10 lines
tools/objtool/utils.c +10 -0
+				return -1;
+		}
+
+		if (file->elf->ehdr.e_machine == EM_PPC) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_PPC_ADDR32,
+						  insn->sec, insn->offset))
+				return -1;
+		}

It appears to me that repeating this code 3 times doesn't really scale well, how about we introduce a helper like:

int elf_reloc_type_long(struct elf *elf)

{
	switch (elf->ehdr.e_machine) {
	case EM_X86_64:
		return R_X86_64_64;
	case EM_PPC64:
		return R_PPC64_ADDR64;
	case EM_PPC:
		return R_PPC_ADDR32;
	default:
		WARN("unknown machine...")
		exit(-1);
	}
}
		if (elf_add_reloc_to_insn(file->elf, sec,
					  idx * sizeof(unsigned long),
					  elf_reloc_type_long(file->elf),
					  insn->sec, insn->offset))
			return -1;
#10 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Hi,

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Did you send it to linuxppc-dev list ? If not can you resend it there ?

Is your series a replacement of scripts/recordmcount.c ?

If so, is there anything common with the following RFC:

https://lore.kernel.org/lkml/[email protected]/

Thanks
Christophe

#11 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 11 lines · Christophe Leroy

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=291129

There are some CI failures.

cheers

#12 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Le 21/03/2022 à 03:27, Michael Ellerman a écrit :

Quoted 6 lines
Quoted 5 lines · Christophe Leroy

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 4 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

Yes something must have gone wrong.

Peter's and myself's responses are not at
http://patchwork.ozlabs.org/project/linuxppc-dev/patch/[email protected]/
while yours and Naveen's ones are there.

Christophe

#13 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Michael Ellerman

Le 21/03/2022 à 03:27, Michael Ellerman a écrit :

Quoted 11 lines
Quoted 10 lines · Christophe Leroy

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Quoted 8 lines
Quoted 1 line

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=291129

There are some CI failures.

On PPC64 we randomly get:

/bin/sh: 1: ./tools/objtool/objtool: not found
make[2]: *** [arch/powerpc/kernel/vdso/vgettimeofday-64.o] Error 127 /linux/arch/powerpc/kernel/vdso/Makefile:77: recipe for target 'arch/powerpc/kernel/vdso/vgettimeofday-64.o' failed
make[2]: *** Deleting file 'arch/powerpc/kernel/vdso/vgettimeofday-64.o' make[1]: *** [vdso_prepare] Error 2
make[1]: *** Waiting for unfinished jobs.... /linux/arch/powerpc/Makefile:423: recipe for target 'vdso_prepare' failed
make: *** [__sub-make] Error 2
Makefile:219: recipe for target '__sub-make' failed

This is linkely because prepare: target depends on vdso_prepare and
prepare: target depends on objtool, but vdso_prepare: doesn't depend on objtool.

I'm not sure it is correct to run objtool mcount on VDSO as it is kind of useless. Only VDSO64 seems to call objtool, not VDSO32.

Christophe

#14 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Michael Ellerman

Le 21/03/2022 à 03:27, Michael Ellerman a écrit :

Quoted 11 lines
Quoted 10 lines · Christophe Leroy

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Quoted 8 lines
Quoted 1 line

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=291129

There are some CI failures.

On PPC32 I get :

[    0.000000] ftrace: No functions to be traced?

Without this series I get:

[    0.000000] ftrace: allocating 22508 entries in 17 pages
[    0.000000] ftrace: allocated 17 pages with 2 groups

Christophe

#15 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Le 21/03/2022 à 08:56, Christophe Leroy a écrit :

Quoted 23 lines

Le 21/03/2022 à 03:27, Michael Ellerman a écrit :

Quoted 11 lines
Quoted 10 lines · Christophe Leroy

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Quoted 8 lines
Quoted 1 line

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=291129

There are some CI failures.

Quoted 10 lines

On PPC32 I get :

[    0.000000] ftrace: No functions to be traced?

Without this series I get:

[    0.000000] ftrace: allocating 22508 entries in 17 pages [    0.000000] ftrace: allocated 17 pages with 2 groups

ppc64_defconfig on QEMU:

[    0.000000][    T0] ftrace: No functions to be traced?

Without your series:

[    0.000000][    T0] ftrace: allocating 38750 entries in 15 pages
[    0.000000][    T0] ftrace: allocated 15 pages with 4 groups
[    0.000000][    T0] trace event string verifier disabled
#16 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Le 21/03/2022 à 09:30, Christophe Leroy a écrit :

Quoted 40 lines

Le 21/03/2022 à 08:56, Christophe Leroy a écrit :

Quoted 23 lines

Le 21/03/2022 à 03:27, Michael Ellerman a écrit :

Quoted 11 lines
Quoted 10 lines · Christophe Leroy

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Quoted 8 lines
Quoted 1 line

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=291129

There are some CI failures.

Quoted 10 lines

On PPC32 I get :

[    0.000000] ftrace: No functions to be traced?

Without this series I get:

[    0.000000] ftrace: allocating 22508 entries in 17 pages [    0.000000] ftrace: allocated 17 pages with 2 groups

ppc64_defconfig on QEMU:

Quoted 8 lines

[    0.000000][    T0] ftrace: No functions to be traced?

Without your series:

[    0.000000][    T0] ftrace: allocating 38750 entries in 15 pages [    0.000000][    T0] ftrace: allocated 15 pages with 4 groups [    0.000000][    T0] trace event string verifier disabled

ppc64le_defconfig on QEMU:

[    0.000000][    T0] ftrace: allocating 37236 entries in 14 pages
[    0.000000][    T0] ftrace: allocated 14 pages with 3 groups

Without your series:

[    0.000000][    T0] ftrace: allocating 37236 entries in 14 pages
[    0.000000][    T0] ftrace: allocated 14 pages with 3 groups

So it seems it works only on Little Endian.
Works neither on PPC32 nor on PPC64 Big Endian

Christophe

#17 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Christophe Leroy

Le 21/03/2022 a 08:56, Christophe Leroy a ecrit :

Quoted 23 lines

Le 21/03/2022 a 03:27, Michael Ellerman a ecrit :

Quoted 11 lines
Quoted 10 lines · Christophe Leroy

Le 18/03/2022 a 13:26, Peter Zijlstra a ecrit :

Quoted 5 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I have not received this series and I can't see it on powerpc patchwork either (https://patchwork.ozlabs.org/project/linuxppc-dev/list/)

Quoted 8 lines
Quoted 1 line

Did you send it to linuxppc-dev list ? If not can you resend it there ?

It is there, might have been delayed?

http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=291129

There are some CI failures.

Quoted 9 lines

On PPC32 I get :

[    0.000000] ftrace: No functions to be traced?

Without this series I get:

[    0.000000] ftrace: allocating 22508 entries in 17 pages
[    0.000000] ftrace: allocated 17 pages with 2 groups

With the changes below I managed to get a working ftrace on a PPC32 target.

Christophe

---------
From: Christophe Leroy <[email protected]>
Subject: [PATCH] powerpc/objtool: Set to big endian and 32 bits

Small ack to crossbuild a PPC32 kernel with a x86_64 host.

---
 tools/objtool/arch/powerpc/decode.c                  |  3 ++-
 tools/objtool/arch/powerpc/include/arch/endianness.h |  9 +++++++++
 tools/objtool/elf.c                                  |  4 ++--
 tools/objtool/utils.c                                | 12 +++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 tools/objtool/arch/powerpc/include/arch/endianness.h
tools/objtool/arch/powerpc/decode.c +2 -1
index 58988f88b315..330af382e39f 100644
@@ -8,6 +8,7 @@
 #include <objtool/arch.h>
 #include <objtool/warn.h>
 #include <objtool/builtin.h>
+#include <objtool/endianness.h>
 
 int arch_decode_instruction(struct objtool_file *file, const struct section *sec,
 			    unsigned long offset, unsigned int maxlen,
@@ -20,7 +21,7 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec
 	u64 imm;
 
 	*immediate = imm = 0;
-	memcpy(&insn, sec->data->d_buf+offset, 4);
+	insn = bswap_if_needed(*(u32 *)(sec->data->d_buf + offset));
 	*len = 4;
 	*type = INSN_OTHER;
 
tools/objtool/arch/powerpc/include/arch/endianness.h new file +9 -0
new file mode 100644
index 000000000000..275087bfcc16
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef _ARCH_ENDIANNESS_H
+#define _ARCH_ENDIANNESS_H
+
+#include <endian.h>
+
+#define __TARGET_BYTE_ORDER __BIG_ENDIAN
+
+#endif /* _ARCH_ENDIANNESS_H */
tools/objtool/elf.c +2 -2
index 4b384c907027..433f0e327b68 100644
@@ -867,7 +867,7 @@ static struct section *elf_create_rela_reloc_section(struct elf *elf, struct sec
 	strcpy(relocname, ".rela");
 	strcat(relocname, base->name);
 
-	sec = elf_create_section(elf, relocname, 0, sizeof(GElf_Rela), 0);
+	sec = elf_create_section(elf, relocname, 0, sizeof(Elf32_Rela), 0);
 	free(relocname);
 	if (!sec)
 		return NULL;
@@ -876,7 +876,7 @@ static struct section *elf_create_rela_reloc_section(struct elf *elf, struct sec
 	sec->base = base;
 
 	sec->sh.sh_type = SHT_RELA;
-	sec->sh.sh_addralign = 8;
+	sec->sh.sh_addralign = 4;
 	sec->sh.sh_link = find_section_by_name(elf, ".symtab")->idx;
 	sec->sh.sh_info = base->idx;
 	sec->sh.sh_flags = SHF_INFO_LINK;
tools/objtool/utils.c +7 -5
index c9c14fa0dfd7..f77695c81386 100644
@@ -151,7 +151,7 @@ int decode_instructions(struct objtool_file *file)
 int create_mcount_loc_sections(struct objtool_file *file)
 {
 	struct section *sec;
-	unsigned long *loc;
+	unsigned int *loc;
 	struct instruction *insn;
 	int idx;
 
@@ -169,15 +169,17 @@ int create_mcount_loc_sections(struct objtool_file *file)
 	list_for_each_entry(insn, &file->mcount_loc_list, call_node)
 		idx++;
 
-	sec = elf_create_section(file->elf, "__mcount_loc", 0, sizeof(unsigned long), idx);
+	sec = elf_create_section(file->elf, "__mcount_loc", 0, sizeof(unsigned int), idx);
 	if (!sec)
 		return -1;
 
+	sec->sh.sh_addralign = 4;
+
 	idx = 0;
 	list_for_each_entry(insn, &file->mcount_loc_list, call_node) {
 
-		loc = (unsigned long *)sec->data->d_buf + idx;
-		memset(loc, 0, sizeof(unsigned long));
+		loc = (unsigned int *)sec->data->d_buf + idx;
+		memset(loc, 0, sizeof(unsigned int));
 
 		if (file->elf->ehdr.e_machine == EM_X86_64) {
 			if (elf_add_reloc_to_insn(file->elf, sec,
@@ -197,7 +199,7 @@ int create_mcount_loc_sections(struct objtool_file *file)
 
 		if (file->elf->ehdr.e_machine == EM_PPC) {
 			if (elf_add_reloc_to_insn(file->elf, sec,
-						  idx * sizeof(unsigned long),
+						  idx * sizeof(unsigned int),
 						  R_PPC_ADDR32,
 						  insn->sec, insn->offset))
 				return -1;
Signature · 1 line
2.35.1
#18 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Peter Zijlstra
Quoted 77 lines · Peter Zijlstra
Quoted 2 lines · Sathvika Vasireddy

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

Quoted 40 lines
tools/objtool/arch/powerpc/include/arch/elf.h new file +8 -0
new file mode 100644
index 000000000000..3c8ebb7d2a6b
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _OBJTOOL_ARCH_ELF
+#define _OBJTOOL_ARCH_ELF
+
+#define R_NONE R_PPC_NONE
+
+#endif /* _OBJTOOL_ARCH_ELF */
tools/objtool/utils.c +13 -5
index d1fc6a123a6e..c9c14fa0dfd7 100644
@@ -179,11 +179,29 @@ int create_mcount_loc_sections(struct objtool_file *file)
 		loc = (unsigned long *)sec->data->d_buf + idx;
 		memset(loc, 0, sizeof(unsigned long));
 
-		if (elf_add_reloc_to_insn(file->elf, sec,
-					  idx * sizeof(unsigned long),
-					  R_X86_64_64,
-					  insn->sec, insn->offset))
-			return -1;
+		if (file->elf->ehdr.e_machine == EM_X86_64) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_X86_64_64,
+						  insn->sec, insn->offset))
+				return -1;
+		}
+
+		if (file->elf->ehdr.e_machine == EM_PPC64) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_PPC64_ADDR64,
+						  insn->sec, insn->offset))

tools/objtool/utils.c int create_mcount_loc_sections(struct objtool_file *file) · line 204

Quoted 10 lines
tools/objtool/utils.c +10 -0
+				return -1;
+		}
+
+		if (file->elf->ehdr.e_machine == EM_PPC) {
+			if (elf_add_reloc_to_insn(file->elf, sec,
+						  idx * sizeof(unsigned long),
+						  R_PPC_ADDR32,
+						  insn->sec, insn->offset))
+				return -1;
+		}

It appears to me that repeating this code 3 times doesn't really scale well, how about we introduce a helper like:

int elf_reloc_type_long(struct elf *elf)

{
	switch (elf->ehdr.e_machine) {
	case EM_X86_64:
		return R_X86_64_64;
	case EM_PPC64:
		return R_PPC64_ADDR64;
	case EM_PPC:
		return R_PPC_ADDR32;
	default:
		WARN("unknown machine...")
		exit(-1);
	}
}
Quoted 5 lines
		if (elf_add_reloc_to_insn(file->elf, sec,
					  idx * sizeof(unsigned long),
					  elf_reloc_type_long(file->elf),
					  insn->sec, insn->offset))
			return -1;

Good point. I suppose we'll need a similar helper, say, elf_reloc_type_none(), to replace R_NONE usage if we want to have objtool work for cross-arch builds.

- Naveen

#19 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Peter Zijlstra

Hi Peter, Hi Josh

Le 18/03/2022 à 13:26, Peter Zijlstra a écrit :

Quoted 7 lines · Sathvika Vasireddy
Quoted 2 lines

This patch adds powerpc specific functions required for 'objtool mcount' to work, and enables mcount for ppc.

I would love to see more objtool enablement for Power :-)

I'm also very happy someone started to look at it.

I thought it would be more difficult to get it work on powerpc.

Iml looking forward to being able to use it and implement INLINE STATIC CALLs on PPC32 to start with.

I'm wondering what are the plans on your side and what we should wait for and what we could start with.

I could do the same as done by Sathvika for static calls, in extenso get it out of check.c into a standalone feature. On the other hand I understood that Josh is also working at making the different features of objtool independant, so should I wait for that ? Any idea of when it comes out ?

Second point is the endianess and 32/64 selection, especially when crossbuilding. There is already some stuff regarding endianess based on bswap_if_needed() but that's based on constant selection at build time and I couldn't find an easy way to set it conditionaly based on the target being built.

Regarding 32/64 selection, there is almost nothing, it's based on using type 'long' which means that at the time being the target and the build platform must both be 32 bits or 64 bits.

For both cases (endianess and 32/64) I think the solution should probably be to start with the fileformat of the object file being reworked by objtool.

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

Christophe

#20 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 6 lines · Christophe Leroy

Second point is the endianess and 32/64 selection, especially when crossbuilding. There is already some stuff regarding endianess based on bswap_if_needed() but that's based on constant selection at build time and I couldn't find an easy way to set it conditionaly based on the target being built.

Quoted 7 lines

Regarding 32/64 selection, there is almost nothing, it's based on using type 'long' which means that at the time being the target and the build platform must both be 32 bits or 64 bits.

For both cases (endianess and 32/64) I think the solution should probably be to start with the fileformat of the object file being reworked by objtool.

Do we really need to detect the endianness/bitness at runtime? Objtool is built with the kernel, why not just build-in the same target assumptions as the kernel itself?

Quoted 3 lines

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Contributions are welcome, with the understanding that you'll help maintain it ;-)

Some years ago Kamalesh Babulal had a prototype of objtool for ppc64le which did the full stack validation. I'm not sure what ever became of that.

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

Signature · 1 line
Josh
maintainer
#21 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 4 lines · Josh Poimboeuf

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Hit Linus' tree yesterday :-)

Quoted 3 lines

Some years ago Kamalesh Babulal had a prototype of objtool for ppc64le which did the full stack validation. I'm not sure what ever became of that.

I've also heard chatter about s390.

Quoted 6 lines

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

IIRC the major stumbling block for arm64 is the whole jump-table thing. Either they need to rely on compiler plugins to provide objtool that data (yuck, since we support at least 2 different compilers), disable jump-tables (yuck, for that limits code-gen just to please a tool) or use DWARF (yuck, because build times).

There was a little talk about an impromptu 'abi' to communicate jump-table details to objtool without going full on DWARF, but that seems to have hit a dead end again.

maintainer
#22 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

+arm64 people...

Quoted 31 lines · Peter Zijlstra
Quoted 4 lines · Josh Poimboeuf

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Hit Linus' tree yesterday :-)

Quoted 3 lines

Some years ago Kamalesh Babulal had a prototype of objtool for ppc64le which did the full stack validation. I'm not sure what ever became of that.

I've also heard chatter about s390.

Quoted 6 lines

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

IIRC the major stumbling block for arm64 is the whole jump-table thing. Either they need to rely on compiler plugins to provide objtool that data (yuck, since we support at least 2 different compilers), disable jump-tables (yuck, for that limits code-gen just to please a tool) or use DWARF (yuck, because build times).

There was a little talk about an impromptu 'abi' to communicate jump-table details to objtool without going full on DWARF, but that seems to have hit a dead end again.

#23 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Peter Zijlstra
Quoted 7 lines · Peter Zijlstra
Quoted 6 lines

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

Quoted 5 lines

IIRC the major stumbling block for arm64 is the whole jump-table thing. Either they need to rely on compiler plugins to provide objtool that data (yuck, since we support at least 2 different compilers), disable jump-tables (yuck, for that limits code-gen just to please a tool) or use DWARF (yuck, because build times).

Well yeah, that was indeed the main technical issue but I seem to remember some arm64 maintainers not really being sold on the value of objtool regardless.

Quoted 3 lines

There was a little talk about an impromptu 'abi' to communicate jump-table details to objtool without going full on DWARF, but that seems to have hit a dead end again.

Probably my fault, not enough hours in the day...

Signature · 1 line
Josh
#24 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Josh Poimboeuf
Quoted 11 lines · Josh Poimboeuf
Quoted 10 lines · Christophe Leroy

Second point is the endianess and 32/64 selection, especially when crossbuilding. There is already some stuff regarding endianess based on bswap_if_needed() but that's based on constant selection at build time and I couldn't find an easy way to set it conditionaly based on the target being built.

Regarding 32/64 selection, there is almost nothing, it's based on using type 'long' which means that at the time being the target and the build platform must both be 32 bits or 64 bits.

Quoted 7 lines
Quoted 3 lines

For both cases (endianess and 32/64) I think the solution should probably be to start with the fileformat of the object file being reworked by objtool.

Do we really need to detect the endianness/bitness at runtime? Objtool is built with the kernel, why not just build-in the same target assumptions as the kernel itself?

I don't think we need runtime detection. But it will need to support basically most combinations of objtool running as 32-bit/64-bit LE/BE while the kernel it's analysing is 32-bit/64-bit LE/BE.

Quoted 9 lines
Quoted 3 lines

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Quoted 6 lines

Contributions are welcome, with the understanding that you'll help maintain it ;-)

Some years ago Kamalesh Babulal had a prototype of objtool for ppc64le which did the full stack validation. I'm not sure what ever became of that.

From memory he was starting to clean the patches up in late 2019, but I guess that probably got derailed by COVID. AFAIK he never posted anything. Maybe someone at IBM has a copy internally (Naveen?).

Quoted 6 lines

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

I would like to have the stack validation, but I am also worried about the maintenance burden.

I guess we start with mcount, which looks pretty minimal judging by this series, and see how we go from there.

cheers

#25 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Le 29/03/2022 à 14:01, Michael Ellerman a écrit :

Quoted 16 lines
Quoted 15 lines · Josh Poimboeuf
Quoted 13 lines · Christophe Leroy

Second point is the endianess and 32/64 selection, especially when crossbuilding. There is already some stuff regarding endianess based on bswap_if_needed() but that's based on constant selection at build time and I couldn't find an easy way to set it conditionaly based on the target being built.

Regarding 32/64 selection, there is almost nothing, it's based on using type 'long' which means that at the time being the target and the build platform must both be 32 bits or 64 bits.

For both cases (endianess and 32/64) I think the solution should probably be to start with the fileformat of the object file being reworked by objtool.

Quoted 7 lines
Quoted 3 lines

Do we really need to detect the endianness/bitness at runtime? Objtool is built with the kernel, why not just build-in the same target assumptions as the kernel itself?

I don't think we need runtime detection. But it will need to support basically most combinations of objtool running as 32-bit/64-bit LE/BE while the kernel it's analysing is 32-bit/64-bit LE/BE.

Exactly, the way it is done today with a constant in objtool/endianness.h is too simple, we need to be able to select it based on kernel's config. Is there a way to get the CONFIG_ macros from the kernel ? If yes then we could use CONFIG_64BIT and CONFIG_CPU_LITTLE_ENDIAN to select the correct options in objtool.

Quoted 28 lines
Quoted 10 lines
Quoted 4 lines

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Quoted 6 lines

Contributions are welcome, with the understanding that you'll help maintain it ;-)

Some years ago Kamalesh Babulal had a prototype of objtool for ppc64le which did the full stack validation. I'm not sure what ever became of that.

From memory he was starting to clean the patches up in late 2019, but I
guess that probably got derailed by COVID. AFAIK he never posted anything. Maybe someone at IBM has a copy internally (Naveen?).

Quoted 6 lines

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

Quoted 6 lines

I would like to have the stack validation, but I am also worried about the maintenance burden.

I guess we start with mcount, which looks pretty minimal judging by this series, and see how we go from there.

I'm not sure mcount is really needed as we have recordmcount, but at least it is an easy one to start with and as we have recordmount we can easily compare the results and check it works as expected.

Then it should be straight forward to provide static calls.

Then I'd like to go with uaccess blocks checks as suggested by Christoph at
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/a94be61f008ab29c231b805e1a97e9dab35cb0cc.1629732940.git.christophe.leroy@csgroup.eu/,
thought it might be less easy.

Christophe

#26 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 27 lines · Christophe Leroy

Le 29/03/2022 à 14:01, Michael Ellerman a écrit :

Quoted 16 lines
Quoted 15 lines · Josh Poimboeuf
Quoted 13 lines · Christophe Leroy

Second point is the endianess and 32/64 selection, especially when crossbuilding. There is already some stuff regarding endianess based on bswap_if_needed() but that's based on constant selection at build time and I couldn't find an easy way to set it conditionaly based on the target being built.

Regarding 32/64 selection, there is almost nothing, it's based on using type 'long' which means that at the time being the target and the build platform must both be 32 bits or 64 bits.

For both cases (endianess and 32/64) I think the solution should probably be to start with the fileformat of the object file being reworked by objtool.

Quoted 7 lines
Quoted 3 lines

Do we really need to detect the endianness/bitness at runtime? Objtool is built with the kernel, why not just build-in the same target assumptions as the kernel itself?

I don't think we need runtime detection. But it will need to support basically most combinations of objtool running as 32-bit/64-bit LE/BE while the kernel it's analysing is 32-bit/64-bit LE/BE.

Quoted 5 lines

Exactly, the way it is done today with a constant in objtool/endianness.h is too simple, we need to be able to select it based on kernel's config. Is there a way to get the CONFIG_ macros from the kernel ? If yes then we could use CONFIG_64BIT and CONFIG_CPU_LITTLE_ENDIAN to select the correct options in objtool.

As of now, there's no good way to get CONFIG options from the kernel. That's pretty much by design, since objtool is meant to be a standalone tool. In fact there are people who've used objtool for other projects.

The objtool Makefile does at least have access to HOSTARCH/SRCARCH, but I guess that doesn't help here. We could maybe export the endian/bit details in env variables to the objtool build somehow.

But, I managed to forget that objtool can already be cross-compiled for a x86-64 target, from a 32-bit x86 LE host or a 64-bit powerpc BE host. There are some people out there doing x86 kernel builds on such systems who reported bugs, which were since fixed. And the fixes were pretty trivial, IIRC.

Libelf actually does a decent job of abstracting those details from objtool. So, forget what I said, it might be ok to just detect endian/bit (and possibly even arch) at runtime like you originally suggested.

For example bswap_if_needed() could be reworked to be a runtime check.

Signature · 1 line
Josh
#27 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Christophe Leroy
Quoted 24 lines · Christophe Leroy

Le 29/03/2022 à 14:01, Michael Ellerman a écrit :

Quoted 21 lines
Quoted 10 lines · Josh Poimboeuf
Quoted 3 lines · Christophe Leroy

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Quoted 6 lines

Contributions are welcome, with the understanding that you'll help maintain it ;-)

Some years ago Kamalesh Babulal had a prototype of objtool for ppc64le which did the full stack validation. I'm not sure what ever became of that.

From memory he was starting to clean the patches up in late 2019, but I
guess that probably got derailed by COVID. AFAIK he never posted anything. Maybe someone at IBM has a copy internally (Naveen?).

Kamalesh had a WIP series to enable stack validation on powerpc. From what I recall, he was waiting on and/or working with the arm64 folks around some of the common changes needed in objtool.

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

FWIW, there have been some objtool patches for arm64 stack validation, but the arm64 maintainers have been hesitant to get on board with objtool, as it brings a certain maintenance burden. Especially for the full stack validation and ORC unwinder. But if you only want inline static calls and/or mcount then it'd probably be much easier to maintain.

Quoted 8 lines
Quoted 6 lines

I would like to have the stack validation, but I am also worried about the maintenance burden.

I guess we start with mcount, which looks pretty minimal judging by this series, and see how we go from there.

I'm not sure mcount is really needed as we have recordmcount, but at least it is an easy one to start with and as we have recordmount we can easily compare the results and check it works as expected.

On the contrary, I think support for mcount in objtool is something we want to get going soon (hopefully, in time for v5.19) given the issues we are seeing with recordmcount:
- https://github.com/linuxppc/issues/issues/388
- https://lore.kernel.org/all/[email protected]/

- Naveen

#28 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

In reply to Josh Poimboeuf

Hi Josh,

Le 28/03/2022 à 21:59, Josh Poimboeuf a écrit :

Quoted 10 lines · Christophe Leroy
Quoted 3 lines

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Were you able to send out something ?

Thanks
Christophe

maintainer
#29 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 8 lines · Christophe Leroy

Hi Josh,

Le 28/03/2022 à 21:59, Josh Poimboeuf a écrit :

Quoted 5 lines · Christophe Leroy
Quoted 3 lines

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

Quoted 7 lines
Quoted 5 lines

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Were you able to send out something ?

Yes, the objtool rewrite is now in tip/objtool/core and linux-next.

Signature · 1 line
Josh
#30 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Le 12/05/2022 à 17:12, Josh Poimboeuf a écrit :

Quoted 15 lines · Christophe Leroy
Quoted 14 lines

Hi Josh,

Quoted 10 lines · Josh Poimboeuf
Quoted 3 lines · Christophe Leroy

What are current works in progress on objtool ? Should I wait Josh's changes before starting looking at all this ? Should I wait for anything else ?

I'm not making any major changes to the code, just shuffling things around to make the interface more modular. I hope to have something soon (this week). Peter recently added a big feature (Intel IBT) which is already in -next.

Quoted 3 lines
Quoted 1 line

Were you able to send out something ?

Yes, the objtool rewrite is now in tip/objtool/core and linux-next.

Nice.

I gave it a try this morning, I selected HAVE_OBJTOOL and HAVE_OBJTOOL_MCOUNT from arch/powerpc/Kconfig

Seems like there are still some x86 arch specific stuff in common common code and I get the following errors.

Also, is it normal to get those functions built allthough I have not selected HAVE_STACK_VALIDATION ?

CC /home/chleroy/linux-powerpc/tools/objtool/check.o
check.c: In function 'has_valid_stack_frame':
check.c:2369:30: error: 'CFI_BP' undeclared (first use in this function); did you mean 'CFI_SP'?

  2369 |         if (cfi->cfa.base == CFI_BP &&
       |                              ^~~~~~
       |                              CFI_SP

check.c:2369:30: note: each undeclared identifier is reported only once for each function it appears in
check.c:2371:44: error: 'CFI_RA' undeclared (first use in this function); did you mean 'CFI_R3'?
2371 | check_reg_frame_pos(&cfi->regs[CFI_RA],
-cfi->cfa.offset + 8))

       |                                            ^~~~~~
       |                                            CFI_R3

check.c: In function 'update_cfi_state':
check.c:2499:70: error: 'CFI_BP' undeclared (first use in this function); did you mean 'CFI_SP'?
2499 | if (op->src.reg == CFI_SP &&
op->dest.reg == CFI_BP &&

       | 
       ^~~~~~
       | 
       CFI_SP

make[3]: *** [/home/chleroy/linux-powerpc/tools/build/Makefile.build:97:
/home/chleroy/linux-powerpc/tools/objtool/check.o] Error 1 make[2]: *** [Makefile:54:
/home/chleroy/linux-powerpc/tools/objtool/objtool-in.o] Error 2 make[1]: *** [Makefile:69: objtool] Error 2
make: *** [Makefile:1337: tools/objtool] Error 2

What would be the best approach to fix that ?

Thanks
Christophe

maintainer
#31 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 6 lines · Christophe Leroy

I gave it a try this morning, I selected HAVE_OBJTOOL and HAVE_OBJTOOL_MCOUNT from arch/powerpc/Kconfig

Seems like there are still some x86 arch specific stuff in common common code and I get the following errors.

I'm assuming there's a metric ton of x86 specific stuff in there. That'll take a while to clean out.

Mostly Josh's rewrite was centered around splitting out the runtime options, but objtool is still always build with all options included, even the ones you're not using for your arch, which is what's triggering the problems you see here, I suppose...

Quoted 35 lines

Also, is it normal to get those functions built allthough I have not selected HAVE_STACK_VALIDATION ?

CC /home/chleroy/linux-powerpc/tools/objtool/check.o
check.c: In function 'has_valid_stack_frame':
check.c:2369:30: error: 'CFI_BP' undeclared (first use in this function); did you mean 'CFI_SP'?

  2369 |         if (cfi->cfa.base == CFI_BP &&
       |                              ^~~~~~
       |                              CFI_SP

check.c:2369:30: note: each undeclared identifier is reported only once for each function it appears in
check.c:2371:44: error: 'CFI_RA' undeclared (first use in this function); did you mean 'CFI_R3'?
2371 | check_reg_frame_pos(&cfi->regs[CFI_RA],
-cfi->cfa.offset + 8))

       |                                            ^~~~~~
       |                                            CFI_R3

check.c: In function 'update_cfi_state':
check.c:2499:70: error: 'CFI_BP' undeclared (first use in this function); did you mean 'CFI_SP'?
2499 | if (op->src.reg == CFI_SP &&
op->dest.reg == CFI_BP &&

       | 
       ^~~~~~
       | 
       CFI_SP

make[3]: *** [/home/chleroy/linux-powerpc/tools/build/Makefile.build:97:
/home/chleroy/linux-powerpc/tools/objtool/check.o] Error 1 make[2]: *** [Makefile:54:
/home/chleroy/linux-powerpc/tools/objtool/objtool-in.o] Error 2 make[1]: *** [Makefile:69: objtool] Error 2
make: *** [Makefile:1337: tools/objtool] Error 2

Quoted 1 line

What would be the best approach to fix that ?

Define CFI_BP to your frame register (r2, afaict) I suppose. If you're only using OBJTOOL_MCOUNT this code will never run, so all you have to ensure is that it compiles, not that it makes sense (-:

The very long and complicated way would be to propagate the various CONFIG_HAVE_* build time things to the objtool build and librally sprinkle a lot of #ifdef around.

#32 lore raw

Re: [RFC PATCH 3/3] objtool/mcount: Add powerpc specific functions

Quoted 43 lines · Peter Zijlstra
Quoted 4 lines · Christophe Leroy

I gave it a try this morning, I selected HAVE_OBJTOOL and HAVE_OBJTOOL_MCOUNT from arch/powerpc/Kconfig

Seems like there are still some x86 arch specific stuff in common common code and I get the following errors.

I'm assuming there's a metric ton of x86 specific stuff in there. That'll take a while to clean out.

Mostly Josh's rewrite was centered around splitting out the runtime options, but objtool is still always build with all options included, even the ones you're not using for your arch, which is what's triggering the problems you see here, I suppose...

Quoted 28 lines

Also, is it normal to get those functions built allthough I have not selected HAVE_STACK_VALIDATION ?

CC /home/chleroy/linux-powerpc/tools/objtool/check.o
check.c: In function 'has_valid_stack_frame':
check.c:2369:30: error: 'CFI_BP' undeclared (first use in this function); did you mean 'CFI_SP'?

  2369 |         if (cfi->cfa.base == CFI_BP &&
       |                              ^~~~~~
       |                              CFI_SP

check.c:2369:30: note: each undeclared identifier is reported only once for each function it appears in check.c:2371:44: error: 'CFI_RA' undeclared (first use in this function); did you mean 'CFI_R3'?
2371 | check_reg_frame_pos(&cfi->regs[CFI_RA],
-cfi->cfa.offset + 8))

       |                                            ^~~~~~
       |                                            CFI_R3

check.c: In function 'update_cfi_state':
check.c:2499:70: error: 'CFI_BP' undeclared (first use in this function); did you mean 'CFI_SP'?
2499 | if (op->src.reg == CFI_SP &&
op->dest.reg == CFI_BP &&

       | 
       ^~~~~~
       | 
       CFI_SP

make[3]: *** [/home/chleroy/linux-powerpc/tools/build/Makefile.build:97: /home/chleroy/linux-powerpc/tools/objtool/check.o] Error 1 make[2]: *** [Makefile:54: /home/chleroy/linux-powerpc/tools/objtool/objtool-in.o] Error 2
make[1]: *** [Makefile:69: objtool] Error 2
make: *** [Makefile:1337: tools/objtool] Error 2

Quoted 5 lines
Quoted 1 line

What would be the best approach to fix that ?

Define CFI_BP to your frame register (r2, afaict) I suppose. If you're only using OBJTOOL_MCOUNT this code will never run, so all you have to ensure is that it compiles, not that it makes sense (-:

Sathvika has been looking into this.

Quoted 4 lines

The very long and complicated way would be to propagate the various CONFIG_HAVE_* build time things to the objtool build and librally sprinkle a lot of #ifdef around.

I think there were just a couple of unrelated checks/warnings that were causing problems on powerpc. So, we likely won't need too many #ifdefs, at least for mcount purposes.

Sathvika,
Can you post what you have?

- Naveen

#33 lore raw
In reply to Sathvika Vasireddy
Quoted 13 lines · Sathvika Vasireddy

This patchset adds support to implement 'objtool mcount' command.

Right now, objtool is built if CONFIG_STACK_VALIDATION is enabled. And, '__mcount_loc' section is generated by objtool when --mcount option is passed to check sub-command.

For architectures to be able to generate '__mcount_loc' section without having to do stack validation, introduce 'mcount' as a sub-command to objtool. This way, objtool is built for mcount if CONFIG_FTRACE_MCOUNT_USE_OBJTOOL is enabled. Additionally, architectures can select HAVE_NOP_MCOUNT to be able to nop out mcount call sites.

Quoted 6 lines

TODO: Enable "objtool mcount" for clang LTO builds.

Sathvika Vasireddy (3):
objtool: Move common code to utils.c
objtool: Enable and implement 'mcount' subcommand objtool/mcount: Add powerpc specific functions

Hi Sathvika,

Thanks for the patches!

I have some other patches in progress which will rework the objtool interface by modularizing the cmdline options, so that each option can be specified either individually or in combination. Even stack validation itself will be its own separate option.

I think it will help your situation as well: "objtool run --mcount" will only do '__mcount_loc' generation and nothing else.

Something like so:

$ ./objtool run --help

Usage: objtool run [<options>] file.o

Commands (at least one required):

    -a, --uaccess         validate uaccess
    -c, --static-call     annotate static calls
    -i, --ibt             validate and annotate IBT
    -m, --mcount          generate '__mcount_loc' section
    -n, --noinstr         validate noinstr
    -o, --orc             generate ORC metadata
    -r, --retpoline       validate retpoline usage
    -S, --sls             validate straight-line-speculation mitigation
    -s, --stack-val       validate stack metadata

Options:

        --backtrace       unwind on error
        --backup          create .orig files before modification
        --dry-run         don't write the modifications
        --fp              object uses frame pointers
        --module          object will be part of a kernel module
        --no-unreachable  skip 'unreachable instruction' warnings
        --stats           print statistics
        --vmlinux         object is vmlinux.o

Hopefully I'll have the patches ready soon.

Signature · 1 line
Josh