objtool: Interface overhaul
Status from this message: The following commit has been merged into the x86/urgent branch of tip:
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest25 patches 18 repliesApplied
- v118 patches 22 repliesSuperseded
Changes in v2 from the cover letter
- extricate sls
- fix ibt regressions in v1
- fix issues found by improved ibt logic
- split '--hacks' into two
- add objdump-func script
- remove "()" in function address strings
- add '--sec-address' option
- add '--link'
Patches in v2 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/25 | objtool: Enable unreachable warnings for CLANG LTOscripts/ scripts/ | +2 | 0 replies | |
| 2/25 | libsubcmd: Fix OPTION_GROUP sortingtools/ | +14 | 0 replies | |
| 3/25 | x86/static_call: Add ANNOTATE_NOENDBR to static call trampolinearch/ | +1 | 0 replies | |
| 4/25 | x86/retpoline: Add ANNOTATE_ENDBR for retpolinesarch/ | +1 | 0 replies | |
| 5/25 | x86/uaccess: Add ENDBR to __put_user_nocheck*()arch/ | +4 | 0 replies | |
| 6/25 | x86/xen: Add ANNOTATE_ENDBR to startup_xen()arch/ | +1 | 6 replies | |
| 7/25 | objtool: Reorganize cmdline optionsscripts/ scripts/ tools/ +6 more | +108 | 0 replies | |
| 8/25 | objtool: Ditch subcommandsscripts/ scripts/ tools/ +7 more | +72 | 0 replies | |
| 9/25 | objtool: Don't print parentheses in function addressestools/ | +1 | 0 replies | |
| 10/25 | objtool: Print data address for "!ENDBR" data warningstools/ | +2 | 0 replies | |
| 11/25 | objtool: Use offstr() to print address of missing ENDBRtools/ | +2 | 0 replies | |
| 12/25 | objtool: Add option to print section addressestools/ tools/ tools/ | +19 | 0 replies | |
| 13/25 | scripts: Create objdump-func helper scriptscripts/ | +18 | 2 replies | |
| 14/25 | objtool: Make stack validation optionalscripts/ scripts/ tools/ +2 more | +23 | 0 replies | |
| 15/25 | objtool: Rework ibt and extricate from stack validationtools/ | +147 | 4 replies | |
| 16/25 | objtool: Extricate sls from stack validationtools/ | +43 | 0 replies | |
| 17/25 | objtool: Add CONFIG_OBJTOOLMakefile arch/ arch/ +14 more | +73 | 1 reply | |
| 18/25 | objtool: Make stack validation frame-pointer-specificscripts/ scripts/ tools/ +2 more | +3 | 0 replies | |
| 19/25 | objtool: Make static call annotation optionalscripts/ scripts/ tools/ +2 more | +14 | 0 replies | |
| 20/25 | objtool: Make jump label hack optionalarch/ arch/ arch/ +5 more | +44 | 0 replies | |
| 21/25 | objtool: Make noinstr hacks optionalarch/ arch/ lib/ +6 more | +23 | 0 replies | |
| 22/25 | objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"include/ lib/ scripts/ | +5 | 0 replies | |
| 23/25 | objtool: Add HAVE_NOINSTR_VALIDATIONarch/ arch/ lib/ | +5 | 0 replies | |
| 24/25 | objtool: Remove --lto and --vmlinux in favor of --linkscripts/ scripts/ tools/ +4 more | +70 | 1 reply | |
| 25/25 | objtool: Update documentationtools/ | +102 | 0 replies |
Reviews trailers per patch
2 of 25 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Peter Zijlstra | Lai Jiangshan | Kees Cook | Andrew Cooper | Miroslav Benes |
|---|---|---|---|---|---|
| Series | R-b | ||||
| 1/25 | |||||
| 2/25 | |||||
| 3/25 | |||||
| 4/25 | |||||
| 5/25 | |||||
| 6/25 | R-b R-b | ||||
| 7/25 | |||||
| 8/25 | |||||
| 9/25 | |||||
| 10/25 | |||||
| 11/25 | |||||
| 12/25 | |||||
| 13/25 | Originally-by | ||||
| 14/25 | |||||
| 15/25 | |||||
| 16/25 | |||||
| 17/25 | R-b | R-b | |||
| 18/25 | |||||
| 19/25 | |||||
| 20/25 | |||||
| 21/25 | |||||
| 22/25 | |||||
| 23/25 | |||||
| 24/25 | |||||
| 25/25 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.
Cover letter [PATCH v2 00/25] objtool: Interface overhaul
v2:
- extricate sls
- fix ibt regressions in v1
- fix issues found by improved ibt logic
- split '--hacks' into two
- add objdump-func script
- remove "()" in function address strings
- add '--sec-address' option
- add '--link'
Objtool's interface has some issues:
- Several features are done unconditionally, without any way to turn them off. Some of them might be surprising. This makes objtool tricky to use, and prevents porting individual features to other arches.
- The config dependencies are too coarse-grained. Objtool enablement is tied to CONFIG_STACK_VALIDATION, but it has several other features independent of that.
- The objtool subcmds ("check" and "orc") are clumsy: "check" is really a subset of "orc", so it has all the same options. The subcmd model has never really worked for objtool, as it only has a single purpose:
"do some combination of things on an object file".
- The '--lto' and '--vmlinux' options are nonsensical and have surprising behavior.
Overhaul the interface:
- get rid of subcmds
- make all features individually selectable
- remove and/or clarify confusing/obsolete options
- update the documentation
- fix some bugs found along the way
TODO: rename files...
$ tools/objtool/objtool --help
Usage: objtool <actions> [<options>] file.o
Actions:
-h, --hacks[=<jump_label,noinstr>]
patch toolchain bugs/limitations
-i, --ibt validate and annotate IBT
-l, --sls validate straight-line-speculation mitigations
-m, --mcount annotate mcount/fentry calls for ftrace
-n, --noinstr validate noinstr rules
-o, --orc generate ORC metadata
-r, --retpoline validate and annotate retpoline usage
-s, --stackval validate frame pointer rules
-t, --static-call annotate static calls
-u, --uaccess validate uaccess rules for SMAP
--dump[=<orc>] dump metadataOptions:
--backtrace unwind on error
--backup create .orig files before modification
--dry-run don't write modifications
--link object is a linked object
--module object is part of a kernel module
--no-unreachable skip 'unreachable instruction' warnings
--sec-address print section addresses in warnings
--stats print statisticsJosh Poimboeuf (25):
objtool: Enable unreachable warnings for CLANG LTO
libsubcmd: Fix OPTION_GROUP sorting
x86/static_call: Add ANNOTATE_NOENDBR to static call trampoline x86/retpoline: Add ANNOTATE_ENDBR for retpolines x86/uaccess: Add ENDBR to __put_user_nocheck*() x86/xen: Add ANNOTATE_ENDBR to startup_xen()
objtool: Reorganize cmdline options
objtool: Ditch subcommands
objtool: Don't print parentheses in function addresses
objtool: Print data address for "!ENDBR" data warnings
objtool: Use offstr() to print address of missing ENDBR
objtool: Add option to print section addresses
scripts: Create objdump-func helper script
objtool: Make stack validation optional
objtool: Rework ibt and extricate from stack validation
objtool: Extricate sls from stack validation
objtool: Add CONFIG_OBJTOOL
objtool: Make stack validation frame-pointer-specific
objtool: Make static call annotation optional
objtool: Make jump label hack optional
objtool: Make noinstr hacks optional
objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"
objtool: Add HAVE_NOINSTR_VALIDATION
objtool: Remove --lto and --vmlinux in favor of --link
objtool: Update documentation
Makefile | 2 +-
arch/Kconfig | 18 +-
arch/x86/Kconfig | 21 +-
arch/x86/Kconfig.debug | 2 +-
arch/x86/include/asm/jump_label.h | 6 +-
arch/x86/include/asm/static_call.h | 1 +
arch/x86/kernel/alternative.c | 6 +-
arch/x86/lib/putuser.S | 4 +
arch/x86/lib/retpoline.S | 2 +-
arch/x86/xen/xen-head.S | 1 +
include/linux/compiler.h | 6 +-
include/linux/instrumentation.h | 6 +-
include/linux/objtool.h | 6 +-
kernel/trace/Kconfig | 1 +
lib/Kconfig.debug | 22 +-
lib/Kconfig.kcsan | 4 +-
lib/Kconfig.ubsan | 2 +-
scripts/Makefile.build | 23 +-
scripts/link-vmlinux.sh | 66 ++-
scripts/objdump-func | 18 +
scripts/package/builddeb | 2 +-
tools/include/linux/objtool.h | 6 +-
tools/lib/subcmd/parse-options.c | 17 +-
tools/objtool/Build | 12 +-
.../{stack-validation.txt => objtool.txt} | 122 ++++-
tools/objtool/Makefile | 8 +-
tools/objtool/arch/x86/decode.c | 2 +-
tools/objtool/arch/x86/special.c | 2 +-
tools/objtool/builtin-check.c | 156 ++++--
tools/objtool/builtin-orc.c | 73 ---
tools/objtool/check.c | 456 ++++++++++--------
tools/objtool/elf.c | 11 +-
tools/objtool/include/objtool/builtin.h | 34 +-
tools/objtool/include/objtool/elf.h | 12 +-
tools/objtool/include/objtool/warn.h | 35 +-
tools/objtool/objtool.c | 103 +---
tools/objtool/weak.c | 9 +-
37 files changed, 719 insertions(+), 558 deletions(-)
create mode 100755 scripts/objdump-func
rename tools/objtool/Documentation/{stack-validation.txt => objtool.txt} (80%)
delete mode 100644 tools/objtool/builtin-orc.cSignature · 1 line
2.34.1