objtool/arm64: Port klp-build to arm64
Status from this message: The following commit has been merged into the objtool/core branch of tip:
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest22 patches 14 repliesApplied
- v321 patches 21 repliesSuperseded
- v212 patches 4 repliesSuperseded
Changes in v4 from the cover letter
- Replace "objtool: Allow empty alternatives" with "arm64: Remove unnecessary empty alternatives" [Peter]
- Add "objtool/klp: Fix .kcfi_traps special section extraction" [Joe]
- Fix vmlinux.o objtool options leaking in from Makefile.lib [Sashiko]
- Tighten jump-to-end-of-function check [Sashiko]
- Drop unneeded linux/kconfig.h include [Sashiko]
- Fix bisectability issue with is_mapping_sym()/is_data_mapping_sym() [Sashiko]
- Add missing ALLOW_ERROR_INJECTION() to arm64 syscall macro [Sashiko]
Patches in v4 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/22 | objtool/klp: Fix .kcfi_traps special section extractiontools/ tools/ | +25 | 1 reply | |
| 2/22 | klp-build: Reject patches to init/*.cscripts/ | +1 | 0 replies | |
| 3/22 | arm64: Annotate intra-function callsarch/ arch/ | +9 | 0 replies | |
| 4/22 | arm64: Fix EFI linking with -fdata-sectionsarch/ | +1 | 0 replies | |
| 5/22 | arm64: Rename TRAMP_VALIAS -> TRAMP_VALIAS_ASM in asm-offsetsarch/ arch/ | +5 | 0 replies | |
| 6/22 | arm64: vdso: Discard .discard.* sectionsarch/ | +1 | 1 reply | |
| 7/22 | arm64: Annotate special section entriesarch/ arch/ arch/ +6 more | +62 | 0 replies | |
| 8/22 | arm64: Remove unnecessary empty alternativesarch/ | +2 | 0 replies | |
| 9/22 | crypto: arm64: Move data to .rodatalib/ | +12 | 0 replies | |
| 10/22 | objtool: Allow setting --mnop without --mcounttools/ | +0 | 0 replies | |
| 11/22 | kbuild: Only run objtool if there is at least one commandarch/ scripts/ scripts/ +1 more | +38 | 1 reply | |
| 12/22 | objtool: Ignore jumps to the end of the function for checksum runstools/ | +21 | 1 reply | |
| 13/22 | objtool: Refactor elf_add_data() to use a growable data buffertools/ tools/ | +71 | 1 reply | |
| 14/22 | objtool: Reuse string referencestools/ tools/ tools/ | +28 | 2 replies | |
| 15/22 | objtool: Prevent kCFI hashes from being decoded as instructionstools/ tools/ | +37 | 3 replies | |
| 16/22 | objtool/klp: Add arm64 support for prefix/PFE detectiontools/ tools/ tools/ +1 more | +172 | 0 replies | |
| 17/22 | objtool/klp: Filter arm64 mapping symbols in find_symbol_by_offset()tools/ | +1 | 0 replies | |
| 18/22 | objtool/klp: Don't correlate arm64 mapping symbolstools/ | +1 | 1 reply | |
| 19/22 | objtool/klp: Clone inline alternative replacementstools/ tools/ tools/ +1 more | +57 | 0 replies | |
| 20/22 | objtool/klp: Introduce objtool for arm64arch/ tools/ tools/ +5 more | +262 | 1 reply | |
| 21/22 | klp-build: Support cross-compilationscripts/ | +21 | 1 reply | |
| 22/22 | klp-build: Add arm64 syscall patching macroinclude/ | +20 | 1 reply |
Reviews trailers per patch
17 of 22 patches have a Reviewed-by or Acked-by.
| Patch | Song Liu | Miroslav Benes | Nathan Chancellor | Nicolas Schier |
|---|---|---|---|---|
| 1/22 | A-b | |||
| 2/22 | A-b | A-b | ||
| 3/22 | A-b | R-b | ||
| 4/22 | A-b | R-b | ||
| 5/22 | A-b | R-b | ||
| 6/22 | A-b | |||
| 7/22 | ||||
| 8/22 | ||||
| 9/22 | ||||
| 10/22 | A-b | |||
| 11/22 | A-b | R-b T-b | R-b | |
| 12/22 | A-b | |||
| 13/22 | A-b | |||
| 14/22 | A-b | |||
| 15/22 | A-b | |||
| 16/22 | ||||
| 17/22 | A-b | |||
| 18/22 | A-b | |||
| 19/22 | ||||
| 20/22 | A-b | |||
| 21/22 | A-b | |||
| 22/22 | 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.
Cover letter [PATCH v4 00/22] objtool/arm64: Port klp-build to arm64
Based on tip/objtool/core + the following fixes:
- https://lore.kernel.org/[email protected]
- https://lore.kernel.org/ed4fe1f95071897859ec7fbe9176246cbd4962bf.1786138806.git.jpoimboe@kernel.org
- https://lore.kernel.org/1b5ccfa8095bdb1277f84af1c2c2e2205aca03ae.1785992188.git.jpoimboe@kernel.org
The full set (including the above fixes) can be found on the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git klp-build-arm64
v4:
- Replace "objtool: Allow empty alternatives" with "arm64: Remove unnecessary empty alternatives" [Peter]
- Add "objtool/klp: Fix .kcfi_traps special section extraction" [Joe]
- Fix vmlinux.o objtool options leaking in from Makefile.lib [Sashiko]
- Tighten jump-to-end-of-function check [Sashiko]
- Drop unneeded linux/kconfig.h include [Sashiko]
- Fix bisectability issue with is_mapping_sym()/is_data_mapping_sym() [Sashiko]
- Add missing ALLOW_ERROR_INJECTION() to arm64 syscall macro [Sashiko]
v3: https://lore.kernel.org/[email protected]
- Too many changes to list. Did a lot of testing and fixed a bunch of issues (many of which have already been merged in tip/objtool/core).
v2: https://lore.kernel.org/[email protected]
- patches 1-2 were merged, rebase on tip/master
- improve commit message for "objtool: Extricate checksum calculation from validate_branch()"
- add review tags
v1: https://lore.kernel.org/[email protected]
Port objtool and the klp-build tooling (for building livepatch modules) to arm64.
Note this doesn't bring all the objtool bells and whistles to arm64, nor any of the CFG reverse engineering. This only adds the bare minimum needed for 'objtool --checksum'.
And note that objtool still doesn't get enabled at all for normal arm64 kernel builds, so this doesn't affect any users other than those running klp-build directly.
Josh Poimboeuf (22):
objtool/klp: Fix .kcfi_traps special section extraction
klp-build: Reject patches to init/*.c
arm64: Annotate intra-function calls
arm64: Fix EFI linking with -fdata-sections
arm64: Rename TRAMP_VALIAS -> TRAMP_VALIAS_ASM in asm-offsets
arm64: vdso: Discard .discard.* sections
arm64: Annotate special section entries
arm64: Remove unnecessary empty alternatives
crypto: arm64: Move data to .rodata
objtool: Allow setting --mnop without --mcount
kbuild: Only run objtool if there is at least one command
objtool: Ignore jumps to the end of the function for checksum runs
objtool: Refactor elf_add_data() to use a growable data buffer
objtool: Reuse string references
objtool: Prevent kCFI hashes from being decoded as instructions objtool/klp: Add arm64 support for prefix/PFE detection objtool/klp: Filter arm64 mapping symbols in find_symbol_by_offset() objtool/klp: Don't correlate arm64 mapping symbols objtool/klp: Clone inline alternative replacements objtool/klp: Introduce objtool for arm64
klp-build: Support cross-compilation
klp-build: Add arm64 syscall patching macro
arch/arm64/Kconfig | 2 + arch/arm64/include/asm/alternative-macros.h | 27 +- arch/arm64/include/asm/asm-bug.h | 2 + arch/arm64/include/asm/asm-extable.h | 21 +- arch/arm64/include/asm/assembler.h | 4 +- arch/arm64/include/asm/jump_label.h | 2 + arch/arm64/kernel/asm-offsets.c | 7 +- arch/arm64/kernel/entry.S | 10 +- arch/arm64/kernel/proton-pack.c | 12 +- arch/arm64/kernel/vdso/vdso.lds.S | 1 + arch/arm64/kernel/vmlinux.lds.S | 2 +- arch/x86/boot/startup/Makefile | 2 +- include/linux/annotate.h | 14 +- include/linux/livepatch_helpers.h | 20 ++ include/linux/objtool_types.h | 1 + lib/crypto/arm64/sha2-armv8.pl | 18 +- scripts/Makefile.build | 4 +- scripts/Makefile.lib | 52 ++-- scripts/Makefile.vmlinux_o | 18 +- scripts/livepatch/klp-build | 24 +- tools/include/linux/objtool_types.h | 1 + tools/objtool/Makefile | 4 + tools/objtool/arch/arm64/Build | 2 + tools/objtool/arch/arm64/decode.c | 177 ++++++++++++ .../arch/arm64/include/arch/cfi_regs.h | 11 + tools/objtool/arch/arm64/include/arch/elf.h | 15 ++ .../objtool/arch/arm64/include/arch/special.h | 21 ++ tools/objtool/arch/arm64/special.c | 30 +++ tools/objtool/arch/x86/include/arch/elf.h | 2 + tools/objtool/builtin-check.c | 5 - tools/objtool/check.c | 52 ++-- tools/objtool/elf.c | 170 +++++++----- tools/objtool/include/objtool/elf.h | 48 +++- tools/objtool/klp-diff.c | 254 ++++++++++++++++-- tools/objtool/klp-symid.c | 2 +- 35 files changed, 843 insertions(+), 194 deletions(-) create mode 100644 tools/objtool/arch/arm64/Build create mode 100644 tools/objtool/arch/arm64/decode.c create mode 100644 tools/objtool/arch/arm64/include/arch/cfi_regs.h create mode 100644 tools/objtool/arch/arm64/include/arch/elf.h create mode 100644 tools/objtool/arch/arm64/include/arch/special.h create mode 100644 tools/objtool/arch/arm64/special.c
Signature · 1 line
2.54.0