Skip to content

x86, objtool: several fixes/improvements

Josh Poimboeuf bpf lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest22 patches 15 repliesIn review
  2. v122 patches 27 repliesSuperseded

Changes in v2 from the cover letter

- Use ud2 instead of calling kvm_spurious_fault() in vmx_vmenter() [Paolo]
- Fix ____kvm_handle_fault_on_reboot() comment [Paolo]
- Tweak "switch jump table" comment [Peter]
- Add review tags

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22x86/paravirt: Fix callee-saved function ELF sizesarch/x86/include/asm/paravirt.h arch/x86/kernel/kvm.c+2 -00 replies
2/22x86/kvm: Fix fastop function ELF metadataarch/x86/kvm/emulate.c+31 -130 replies
3/22x86/kvm: Replace vmx_vmenter()'s call to kvm_spurious_fault() with UD2arch/x86/kvm/vmx/vmenter.S+3 -31 reply
4/22x86/kvm: Don't call kvm_spurious_fault() from .fixuparch/x86/include/asm/kvm_host.h+19 -156 replies
5/22x86/entry: Fix thunk function ELF sizesarch/x86/entry/thunk_64.S+2 -30 replies
6/22x86/head/64: Annotate start_cpu0() as non-callablearch/x86/kernel/head_64.S+2 -20 replies
7/22x86/uaccess: Remove ELF function annotation from copy_user_handle_tail()arch/x86/lib/copy_user_64.S+1 -10 replies
8/22x86/uaccess: Don't leak AC flag into fentry from mcsafe_handle_tail()arch/x86/lib/usercopy_64.c+1 -10 replies
9/22x86/uaccess: Remove redundant CLACs in getuser/putuser error pathsarch/x86/lib/getuser.S arch/x86/lib/putuser.S+26 -230 replies
10/22bpf: Disable GCC -fgcse optimization for ___bpf_prog_run()include/linux/compiler-gcc.h include/linux/compiler_types.h kernel/bpf/core.c+7 -18 replies
11/22objtool: Add mcsafe_handle_tail() to the uaccess safe listtools/objtool/check.c+1 -00 replies
12/22objtool: Track original function across branchestools/objtool/check.c+12 -160 replies
13/22objtool: Refactor function alias logictools/objtool/check.c tools/objtool/elf.c+10 -80 replies
14/22objtool: Warn on zero-length functionstools/objtool/check.c+6 -00 replies
15/22objtool: Change dead_end_function() to return booleantools/objtool/check.c+14 -220 replies
16/22objtool: Do frame pointer check before dead end checktools/objtool/check.c+9 -90 replies
17/22objtool: Refactor sibling call detection logictools/objtool/check.c+33 -320 replies
18/22objtool: Refactor jump table codetools/objtool/check.c tools/objtool/elf.c tools/objtool/elf.h+46 -400 replies
19/22objtool: Support repeated uses of the same C jump tabletools/objtool/check.c tools/objtool/check.h tools/objtool/elf.h+30 -250 replies
20/22objtool: Fix seg fault on bad switch table entrytools/objtool/check.c+1 -10 replies
21/22objtool: convert insn type to enumtools/objtool/arch.h tools/objtool/arch/x86/decode.c tools/objtool/check.c +1 more+20 -260 replies
22/22objtool: Support conditional retpolinestools/objtool/arch.h tools/objtool/check.c+11 -20 replies

Reviews trailers per patch

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

PatchJuergen GrossPeter Zijlstra (Intel)Paolo BonziniNick DesaulniersAlexei Starovoitov
1/22R-b A-b
2/22A-b A-b
3/22A-b A-b
4/22A-b A-b A-b
5/22A-b
6/22A-b
7/22A-b
8/22A-b
9/22A-b
10/22A-b A-b
11/22A-b T-b
12/22A-b T-b
13/22A-b T-b
14/22A-b T-b
15/22A-b T-b
16/22A-b T-b
17/22A-b T-b
18/22A-b T-b
19/22A-b T-b
20/22A-b T-b
21/22A-b T-b
22/22A-b T-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 5 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/22] x86, objtool: several fixes/improvements

v2:
- Use ud2 instead of calling kvm_spurious_fault() in vmx_vmenter() [Paolo]
- Fix ____kvm_handle_fault_on_reboot() comment [Paolo]
- Tweak "switch jump table" comment [Peter]
- Add review tags

Patches also available at:
git://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git objtool-many-fixes-v2

v1 was posted here:
https://lkml.kernel.org/r/[email protected]

-------------------

There have been a lot of objtool bug reports lately, mainly related to Clang and BPF. As part of fixing those bugs, I added some improvements to objtool which uncovered yet more bugs (some kernel, some objtool).

I've given these patches a lot of testing with both GCC and Clang. More compile testing of objtool would be appreciated, as the kbuild test robot doesn't seem to be paying much attention to my branches lately.

There are still at least three outstanding issues:

1) With clang I see:

     drivers/gpu/drm/i915/gem/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x88: redundant UACCESS disable

I haven't dug into it yet.

2) There's also an issue in clang where a large switch table had a bunch of unused (bad) entries. It's not a code correctness issue, but hopefully it can get fixed in clang anyway. See patch 20/22 for more details.

3) CONFIG_LIVEPATCH is causing some objtool "unreachable instruction" warnings due to the new -flive-patching flag. I have some fixes pending, but this patch set is already long enough.

Jann Horn (1):
objtool: Support repeated uses of the same C jump table

Josh Poimboeuf (21):
x86/paravirt: Fix callee-saved function ELF sizes
x86/kvm: Fix fastop function ELF metadata
x86/kvm: Replace vmx_vmenter()'s call to kvm_spurious_fault() with UD2 x86/kvm: Don't call kvm_spurious_fault() from .fixup x86/entry: Fix thunk function ELF sizes
x86/head/64: Annotate start_cpu0() as non-callable x86/uaccess: Remove ELF function annotation from
copy_user_handle_tail()
x86/uaccess: Don't leak AC flag into fentry from mcsafe_handle_tail() x86/uaccess: Remove redundant CLACs in getuser/putuser error paths
bpf: Disable GCC -fgcse optimization for ___bpf_prog_run()
objtool: Add mcsafe_handle_tail() to the uaccess safe list
objtool: Track original function across branches
objtool: Refactor function alias logic
objtool: Warn on zero-length functions
objtool: Change dead_end_function() to return boolean
objtool: Do frame pointer check before dead end check
objtool: Refactor sibling call detection logic
objtool: Refactor jump table code
objtool: Fix seg fault on bad switch table entry
objtool: convert insn type to enum
objtool: Support conditional retpolines

 arch/x86/entry/thunk_64.S       |   5 +-
 arch/x86/include/asm/kvm_host.h |  34 ++--
 arch/x86/include/asm/paravirt.h |   1 +
 arch/x86/kernel/head_64.S       |   4 +-
 arch/x86/kernel/kvm.c           |   1 +
 arch/x86/kvm/emulate.c          |  44 +++--
 arch/x86/kvm/vmx/vmenter.S      |   6 +-
 arch/x86/lib/copy_user_64.S     |   2 +-
 arch/x86/lib/getuser.S          |  20 +--
 arch/x86/lib/putuser.S          |  29 +--
 arch/x86/lib/usercopy_64.c      |   2 +-
 include/linux/compiler-gcc.h    |   2 +
 include/linux/compiler_types.h  |   4 +
 kernel/bpf/core.c               |   2 +-
 tools/objtool/arch.h            |  36 ++--
 tools/objtool/arch/x86/decode.c |   2 +-
 tools/objtool/check.c           | 308 ++++++++++++++++----------------
 tools/objtool/check.h           |   3 +-
 tools/objtool/elf.c             |   4 +-
 tools/objtool/elf.h             |   3 +-
 20 files changed, 278 insertions(+), 234 deletions(-)
Signature · 1 line
2.20.1