Skip to contentSkip to conversation

Make check implementation arch agnostic

PATCH Superseded Julien Thierry 1 participant 3 messages Sep 4, 2020 objtool

lore
Share & tools
lore
#0 lore raw

v3 cover Make check implementation arch agnostic

Hi,

The current implementation of the check subcommand has various x86 bits here and there. In order to prepare objtool to provide check for other architectures, add some abstraction over the x86 specific bits, relying on objtool arch specific code to provide some necessary operations.

This is part of the effort to implement check for arm64, initiated [1] by Raphael. The series is based on top of the separation of check & orc subcommands series[2].

I've push both series base on top of tip/objtool/core at [3].

- The first two patches make it simpler for new arches to provide their list of kernel headers, without worrying about modifications in the x86 headers.
- Patch 3 Moves arch specific macros to more suitable location
- Patches 4 and 5 add abstraction to handle alternatives
- Patch 6 adds abstraction to handle jump table
- Patches 7-10 makes unwind hint definitions shared across architectures

Changes since v2 [4]:
- Rebased on v5.9-rc1
- Under tools/objtool/arch/x86/, rename arch_special.c to special.c
- Rename include/linux/frame.h to inclide/linux/objtool.h
- Share unwind hint types across architectures

[1] https://lkml.org/lkml/2019/8/16/400
[2] https://lkml.org/lkml/2020/6/4/675
[3] https://github.com/julien-thierry/linux/tree/arch-independent-check
[4] https://lkml.org/lkml/2020/7/30/424

Cheers,

Julien

-->

Julien Thierry (9):
objtool: Group headers to check in a single list
objtool: Make sync-check consider the target architecture
objtool: Move macros describing structures to arch-dependent code
objtool: Abstract alternative special case handling
objtool: Make relocation in alternative handling arch dependent
headers: Rename frame.h
objtool: Only include valid definitions depending on source file type
objtool: Make unwind hints definitions available to other
architectures
objtool: Decode unwind hint register depending on architecture

Raphael Gault (1):
objtool: Refactor switch-tables code to support other architectures

 arch/x86/include/asm/nospec-branch.h          |   2 +-
 arch/x86/include/asm/orc_types.h              |  34 ----
 arch/x86/include/asm/unwind_hints.h           |  50 +-----
 arch/x86/kernel/kprobes/core.c                |   2 +-
 arch/x86/kernel/kprobes/opt.c                 |   2 +-
 arch/x86/kernel/reboot.c                      |   2 +-
 arch/x86/kernel/unwind_orc.c                  |  11 +-
 arch/x86/kvm/svm/svm.c                        |   2 +-
 arch/x86/kvm/vmx/nested.c                     |   2 +-
 arch/x86/kvm/vmx/vmx.c                        |   2 +-
 arch/x86/xen/enlighten_pv.c                   |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c           |   3 +-
 include/linux/frame.h                         |  35 -----
 include/linux/objtool.h                       | 134 ++++++++++++++++
 kernel/bpf/core.c                             |   2 +-
 kernel/kexec_core.c                           |   2 +-
 tools/arch/x86/include/asm/orc_types.h        |  34 ----
 tools/include/linux/objtool.h                 | 134 ++++++++++++++++
 tools/objtool/Makefile                        |   2 +-
 tools/objtool/arch.h                          |   2 +
 tools/objtool/arch/x86/Build                  |   1 +
 tools/objtool/arch/x86/decode.c               |  37 +++++
 tools/objtool/arch/x86/include/arch_special.h |  20 +++
 tools/objtool/arch/x86/special.c              | 145 ++++++++++++++++++
 tools/objtool/check.c                         | 137 ++---------------
 tools/objtool/check.h                         |   7 +-
 tools/objtool/objtool.h                       |   2 +
 tools/objtool/orc_dump.c                      |   7 +-
 tools/objtool/orc_gen.c                       |   5 +-
 tools/objtool/special.c                       |  48 +-----
 tools/objtool/special.h                       |  10 ++
 tools/objtool/sync-check.sh                   |  27 ++--
 tools/objtool/weak.c                          |   2 -
 33 files changed, 561 insertions(+), 346 deletions(-)
 delete mode 100644 include/linux/frame.h
 create mode 100644 include/linux/objtool.h
 create mode 100644 tools/include/linux/objtool.h
 create mode 100644 tools/objtool/arch/x86/include/arch_special.h
 create mode 100644 tools/objtool/arch/x86/special.c

--
2.21.3

#1 lore raw

PATCH v3 1/10 objtool: Group headers to check in a single list

In order to support multiple architectures and potentially different sets of header to compare against their kernel equivalent, it is simpler to have all headers to check in a single list.

---
 tools/objtool/sync-check.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
tools/objtool/sync-check.sh +12 -9
index 2a1261bfbb62..c9674877419c 100755
@@ -1,13 +1,17 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
-FILES='
+FILES="
 arch/x86/include/asm/inat_types.h
 arch/x86/include/asm/orc_types.h
 arch/x86/include/asm/emulate_prefix.h
 arch/x86/lib/x86-opcode-map.txt
 arch/x86/tools/gen-insn-attr-x86.awk
-'
+arch/x86/include/asm/inat.h     -I '^#include [\"<]\(asm/\)*inat_types.h[\">]'
+arch/x86/include/asm/insn.h     -I '^#include [\"<]\(asm/\)*inat.h[\">]'
+arch/x86/lib/inat.c             -I '^#include [\"<]\(../include/\)*asm/insn.h[\">]'
+arch/x86/lib/insn.c             -I '^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]' -I '^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]'
+"
 
 check_2 () {
   file1=$1
@@ -40,11 +44,10 @@ fi
 
 cd ../..
 
-for i in $FILES; do
-  check $i
-done
+while read -r file_entry; do
+    if [ -z "$file_entry" ]; then
+	continue
+    fi
 
-check arch/x86/include/asm/inat.h     '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"'
-check arch/x86/include/asm/insn.h     '-I "^#include [\"<]\(asm/\)*inat.h[\">]"'
-check arch/x86/lib/inat.c             '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"'
-check arch/x86/lib/insn.c             '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"'
+    check $file_entry
+done <<< "$FILES"
Signature · 1 line
2.21.3
#2 lore raw
In reply to Julien Thierry

Hi,

Apologies again about the duplicate. It seems like I have issues sending batched emails...

This thread can be ignored.

Quoted 96 lines · Julien Thierry

Hi,

The current implementation of the check subcommand has various x86 bits here and there. In order to prepare objtool to provide check for other architectures, add some abstraction over the x86 specific bits, relying on objtool arch specific code to provide some necessary operations.

This is part of the effort to implement check for arm64, initiated [1] by Raphael. The series is based on top of the separation of check & orc subcommands series[2].

I've push both series base on top of tip/objtool/core at [3].

- The first two patches make it simpler for new arches to provide their list of kernel headers, without worrying about modifications in the x86 headers.
- Patch 3 Moves arch specific macros to more suitable location
- Patches 4 and 5 add abstraction to handle alternatives
- Patch 6 adds abstraction to handle jump table
- Patches 7-10 makes unwind hint definitions shared across architectures

Changes since v2 [4]:
- Rebased on v5.9-rc1
- Under tools/objtool/arch/x86/, rename arch_special.c to special.c
- Rename include/linux/frame.h to inclide/linux/objtool.h
- Share unwind hint types across architectures

[1] https://lkml.org/lkml/2019/8/16/400
[2] https://lkml.org/lkml/2020/6/4/675
[3] https://github.com/julien-thierry/linux/tree/arch-independent-check
[4] https://lkml.org/lkml/2020/7/30/424

Cheers,

Julien

-->

Julien Thierry (9):
objtool: Group headers to check in a single list
objtool: Make sync-check consider the target architecture
objtool: Move macros describing structures to arch-dependent code
objtool: Abstract alternative special case handling
objtool: Make relocation in alternative handling arch dependent
headers: Rename frame.h
objtool: Only include valid definitions depending on source file type
objtool: Make unwind hints definitions available to other
architectures
objtool: Decode unwind hint register depending on architecture

Raphael Gault (1):
objtool: Refactor switch-tables code to support other architectures

  arch/x86/include/asm/nospec-branch.h          |   2 +-
  arch/x86/include/asm/orc_types.h              |  34 ----
  arch/x86/include/asm/unwind_hints.h           |  50 +-----
  arch/x86/kernel/kprobes/core.c                |   2 +-
  arch/x86/kernel/kprobes/opt.c                 |   2 +-
  arch/x86/kernel/reboot.c                      |   2 +-
  arch/x86/kernel/unwind_orc.c                  |  11 +-
  arch/x86/kvm/svm/svm.c                        |   2 +-
  arch/x86/kvm/vmx/nested.c                     |   2 +-
  arch/x86/kvm/vmx/vmx.c                        |   2 +-
  arch/x86/xen/enlighten_pv.c                   |   2 +-
  drivers/gpu/drm/vmwgfx/vmwgfx_msg.c           |   3 +-
  include/linux/frame.h                         |  35 -----
  include/linux/objtool.h                       | 134 ++++++++++++++++
  kernel/bpf/core.c                             |   2 +-
  kernel/kexec_core.c                           |   2 +-
  tools/arch/x86/include/asm/orc_types.h        |  34 ----
  tools/include/linux/objtool.h                 | 134 ++++++++++++++++
  tools/objtool/Makefile                        |   2 +-
  tools/objtool/arch.h                          |   2 +
  tools/objtool/arch/x86/Build                  |   1 +
  tools/objtool/arch/x86/decode.c               |  37 +++++
  tools/objtool/arch/x86/include/arch_special.h |  20 +++
  tools/objtool/arch/x86/special.c              | 145 ++++++++++++++++++
  tools/objtool/check.c                         | 137 ++---------------
  tools/objtool/check.h                         |   7 +-
  tools/objtool/objtool.h                       |   2 +
  tools/objtool/orc_dump.c                      |   7 +-
  tools/objtool/orc_gen.c                       |   5 +-
  tools/objtool/special.c                       |  48 +-----
  tools/objtool/special.h                       |  10 ++
  tools/objtool/sync-check.sh                   |  27 ++--
  tools/objtool/weak.c                          |   2 -
  33 files changed, 561 insertions(+), 346 deletions(-)

delete mode 100644 include/linux/frame.h
create mode 100644 include/linux/objtool.h
create mode 100644 tools/include/linux/objtool.h create mode 100644 tools/objtool/arch/x86/include/arch_special.h create mode 100644 tools/objtool/arch/x86/special.c

--
2.21.3

Signature · 1 line
Julien Thierry