Skip to content

objtool: Enable and implement --mcount option on powerpc

Sathvika Vasireddy linuxppc-dev lkml 6 versions – Applied

Status from this message: Applied to powerpc/next (and topic/objtool).

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest16 patches 1 replyApplied
  2. v516 patches 6 repliesSuperseded
  3. v416 patches 11 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v3 posting 2/216 patches11 repliesSuperseded
v3 RFC posting 1/212 patches28 repliesSuperseded
v1 RFC4 patches20 repliesSuperseded

Changes in v6 from the cover letter

* Patch 06/16 - Add annotations to assembly files arch/powerpc/kernel/cpu_setup_e500.S and arch/powerpc/kernel/head_85xx.S
----

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/16powerpc: Fix __WARN_FLAGS() for use with Objtoolarch/powerpc/include/asm/bug.h+2 -10 replies
2/16powerpc: Override __ALIGN and __ALIGN_STR macrosarch/powerpc/include/asm/linkage.h+3 -00 replies
3/16powerpc: Fix objtool unannotated intra-function call warningsarch/powerpc/kernel/exceptions-64s.S arch/powerpc/kernel/head_64.S arch/powerpc/kernel/misc_64.S +3 more+32 -130 replies
4/16powerpc: Curb objtool unannotated intra-function call warningsarch/powerpc/kernel/entry_64.S arch/powerpc/kvm/book3s_hv_rmhandlers.S+5 -00 replies
5/16powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.odrivers/crypto/vmx/Makefile+2 -00 replies
6/16powerpc: Fix objtool unannotated intra-function call warnings on PPC32arch/powerpc/kernel/cpu_setup_6xx.S arch/powerpc/kernel/cpu_setup_e500.S arch/powerpc/kernel/entry_32.S +7 more+89 -350 replies
7/16powerpc: Skip objtool from running on VDSO filesarch/powerpc/kernel/vdso/Makefile+2 -00 replies
8/16objtool: Fix SEGFAULTtools/objtool/check.c+1 -10 replies
9/16objtool: Use target file endianness instead of a compiled constanttools/objtool/arch/x86/include/arch/endianness.h tools/objtool/check.c tools/objtool/include/objtool/endianness.h +3 more+30 -310 replies
10/16objtool: Use target file class size instead of a compiled constanttools/objtool/check.c tools/objtool/elf.c tools/objtool/include/objtool/elf.h+24 -100 replies
11/16objtool: Add --mnop as an option to --mcountMakefile arch/x86/Kconfig kernel/trace/Kconfig +4 more+39 -100 replies
12/16objtool: Read special sections with alts only when specific options are selectedtools/objtool/check.c+5 -30 replies
13/16objtool: Use macros to define arch specific reloc typestools/objtool/arch/x86/include/arch/elf.h tools/objtool/check.c+3 -10 replies
14/16objtool: Add arch specific function arch_ftrace_match()tools/objtool/arch/x86/decode.c tools/objtool/check.c tools/objtool/include/objtool/arch.h+8 -10 replies
15/16objtool/powerpc: Enable objtool to be built on ppcarch/powerpc/Kconfig arch/powerpc/include/asm/asm.h tools/objtool/arch/powerpc/Build +5 more+154 -00 replies
16/16objtool/powerpc: Add --mcount specific implementationarch/powerpc/Kconfig tools/objtool/arch/powerpc/decode.c tools/objtool/arch/powerpc/include/arch/elf.h+19 -00 replies

Reviews trailers per patch

All 16 patches have a Reviewed-by or Acked-by.

PatchNaveen N. RaoChristophe LeroyJosh PoimboeufPeter Zijlstra (Intel)
1/16T-b R-b R-b A-b
2/16T-b R-b R-b A-b
3/16T-b R-b R-b A-b
4/16T-b R-b R-b A-b
5/16T-b R-b R-b A-b
6/16T-b R-b A-b
7/16T-b R-b R-b A-b
8/16T-b R-b A-b A-b
9/16T-b R-b A-b A-b
10/16T-b R-b A-b A-b
11/16T-b R-b R-b A-b
12/16T-b R-b R-b A-b
13/16T-b R-b R-b A-b A-b
14/16T-b R-b R-b A-b
15/16T-b R-b A-b
16/16T-b R-b R-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v6 thread

Cover letter [PATCH v6 00/16] objtool: Enable and implement --mcount option on powerpc

This patchset enables and implements objtool --mcount option on powerpc. This applies atop powerpc/merge branch.

Changelog:

----
v6:

* Patch 06/16 - Add annotations to assembly files arch/powerpc/kernel/cpu_setup_e500.S and arch/powerpc/kernel/head_85xx.S
----
v5:

* Patch 02/16 - Add Reviewed-by tag from Christophe Leroy

* Patch 03/16 - Fix merge conflicts with latest powerpc/merge branch

* Patch 06/16 - Files arch/powerpc/kernel/cpu_setup_fsl_booke.S and arch/powerpc/kernel/head_fsl_booke.S are not present today. Removed annotations in those assembly files.

* Patch 11/16 - Add Reviewed-by tag from Christophe Leroy
- Changed scripts/Makefile.lib file to make CONFIG_HAVE_OBJTOOL_NOP_MCOUNT depend on CONFIG_FTRACE_MCOUNT_USE_OBJTOOL.

* Patch 12/16 - Add Reviewed-by tag from Christophe Leroy

* Patch 16/16 - Add Reviewed-by tag from Christophe Leroy

* For this series - Add Acked-by tag from Josh Poimboeuf
- Add Tested-by tag from Naveen N. Rao
- Add Reviewed-by tag from Naveen N. Rao
----
v4:

* Patch 11/16 - Introduce a new config option CONFIG_HAVE_OBJTOOL_NOP_MCOUNT as a means for architectures to enable nop'ing ftrace locations.

- Remove Acked-by tag from Peter Zijlstra (Intel), and Reviewed-by tag from Christophe Leroy. [This is done because I reworked the patch to add a new config option to objtool. Please let me know if you want me to retain the tags. Thanks!]

* Patch 16/16 - Rework the patch to handle only 'bl' instruction decoding.

----
v3:

* Patch 01/16 - Rework patch subject.
- Rework changelog.
- Add Reviewed-by tag from Christophe Leroy.

* Patch 02/16 - Rework changelog to update details based on feedback from Nicholas Piggin and Michael Ellerman.
- Use quotes instead of __stringify macro, based on suggestion from Christophe Leroy.

* Patch 03/16 - Add Reviewed-by tag from Christophe Leroy.
- Based on Christophe's suggestion, keep all <linux/...> before <asm/...>.
- Rework changelog.

* Patch 04/16 - Add Reviewed-by tag from Christophe Leroy.

* Patch 05/16 - Add Reviewed-by tag from Christophe Leroy.

* Patch 06/16 - No change.

* Patch 07/16 - Add Reviewed-by tag from Christophe Leroy.

* Patch 08/16 - Add Acked-by tag from Peter Zijlstra.

* Patch 09/16 - Add Acked-by tag from Peter Zijlstra.

* Patch 10/16 - Reorder local variable declarations to use reverse xmas tree format.
- Add Signed-off-by tag from Sathvika Vasireddy indicating changes done.
- Add Acked-by tag from Peter Zijlstra.

* Patch 11/16 - Update changelog to indicate that powerpc kernel does not support nop'ed out ftrace locations.
- Add Acked-by tag from Peter Zijlstra.
- Add Reviewed-by tag from Christophe Leroy.

* Patch 12/16 - Per Christophe's comment, rework changelog.

* Patch 13/16 - Add Acked-by tag from Peter Zijlstra.
- Add Reviewed-by tag from Christophe Leroy.

* Patch 14/16 - Simplify arch_ftrace_match() function, based on Christophe's suggestion.
- Add Reviewed-by tag from Christophe Leroy.

* Patch 15/16 - Include code from Christophe Leroy to use local vars for type and imm, and to adapt len for prefixed instructions.

* Patch 16/16 - Based on suggestion from Christophe Leroy, setup immediate value calculation outside the check for specific instruction under case 18.
- Set instruction type to INSN_CALL for 'bla' instruction as well.

----
v2:

* Change subject of patch 01/16
* As suggested by Christophe Leroy, add barrier_before_unreachable() before __builtin_unreachable() to work around a gcc problem.
* Fix issues reported by Kernel Test Robot.
* Include suggestions from Christophe Leroy, and change commit messages for patches 01/16, 02/16, 03/16, 05/16.

----

Christophe Leroy (4):
objtool: Fix SEGFAULT
objtool: Use target file endianness instead of a compiled constant
objtool: Use target file class size instead of a compiled constant
powerpc: Fix objtool unannotated intra-function call warnings on PPC32

Sathvika Vasireddy (12):
powerpc: Fix __WARN_FLAGS() for use with Objtool
powerpc: Override __ALIGN and __ALIGN_STR macros
powerpc: Fix objtool unannotated intra-function call warnings
powerpc: Curb objtool unannotated intra-function warnings
powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o
powerpc: Skip objtool from running on VDSO files
objtool: Add --mnop as an option to --mcount
objtool: Read special sections with alts only when specific options are selected
objtool: Use macros to define arch specific reloc types
objtool: Add arch specific function arch_ftrace_match() objtool/powerpc: Enable objtool to be built on ppc
objtool/powerpc: Add --mcount specific implementation

 Makefile                                      |   4 +-
 arch/powerpc/Kconfig                          |   2 +
 arch/powerpc/include/asm/asm.h                |   7 ++
 arch/powerpc/include/asm/bug.h                |   3 +-
 arch/powerpc/include/asm/linkage.h            |   3 +
 arch/powerpc/kernel/cpu_setup_6xx.S           |  26 +++--
 arch/powerpc/kernel/cpu_setup_e500.S          |   8 +-
 arch/powerpc/kernel/entry_32.S                |   9 +-
 arch/powerpc/kernel/entry_64.S                |   2 +
 arch/powerpc/kernel/exceptions-64s.S          |   4 +-
 arch/powerpc/kernel/head_40x.S                |   5 +-
 arch/powerpc/kernel/head_64.S                 |   7 +-
 arch/powerpc/kernel/head_85xx.S               |   5 +-
 arch/powerpc/kernel/head_8xx.S                |   5 +-
 arch/powerpc/kernel/head_book3s_32.S          |  29 +++--
 arch/powerpc/kernel/misc_64.S                 |   4 +-
 arch/powerpc/kernel/swsusp_32.S               |   5 +-
 arch/powerpc/kernel/vdso/Makefile             |   2 +
 arch/powerpc/kernel/vector.S                  |   4 +-
 arch/powerpc/kvm/book3s_hv_interrupts.S       |   4 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S       |  25 +++--
 arch/powerpc/kvm/fpu.S                        |  17 ++-
 arch/powerpc/platforms/52xx/lite5200_sleep.S  |  15 ++-
 arch/x86/Kconfig                              |   1 +
 drivers/crypto/vmx/Makefile                   |   2 +
 kernel/trace/Kconfig                          |   7 ++
 scripts/Makefile.lib                          |   3 +
 tools/objtool/arch/powerpc/Build              |   2 +
 tools/objtool/arch/powerpc/decode.c           | 101 ++++++++++++++++++
 .../arch/powerpc/include/arch/cfi_regs.h      |  11 ++
 tools/objtool/arch/powerpc/include/arch/elf.h |  10 ++
 .../arch/powerpc/include/arch/special.h       |  21 ++++
 tools/objtool/arch/powerpc/special.c          |  19 ++++
 tools/objtool/arch/x86/decode.c               |   5 +
 tools/objtool/arch/x86/include/arch/elf.h     |   2 +
 .../arch/x86/include/arch/endianness.h        |   9 --
 tools/objtool/builtin-check.c                 |  14 +++
 tools/objtool/check.c                         |  53 ++++-----
 tools/objtool/elf.c                           |   8 +-
 tools/objtool/include/objtool/arch.h          |   2 +
 tools/objtool/include/objtool/builtin.h       |   1 +
 tools/objtool/include/objtool/elf.h           |   8 ++
 tools/objtool/include/objtool/endianness.h    |  32 +++---
 tools/objtool/orc_dump.c                      |  11 +-
 tools/objtool/orc_gen.c                       |   4 +-
 tools/objtool/special.c                       |   3 +-
 46 files changed, 418 insertions(+), 106 deletions(-)
 create mode 100644 arch/powerpc/include/asm/asm.h
 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/arch/powerpc/include/arch/special.h
 create mode 100644 tools/objtool/arch/powerpc/special.c
 delete mode 100644 tools/objtool/arch/x86/include/arch/endianness.h
Signature · 1 line
2.31.1