objtool: Function validation tracing
v6 cover objtool: Function validation tracing
Hi,
These patches change objtool to disassemble code with libopcodes instead of running objdump. You will find below:
- Changes: list of changes made in this version
- Overview: overview of the changes
- Notes: description of some particular behavior
- Examples: output examples
Patches are now based on tip/master.
I am deferring the following changes to future patches:
- Josh: convert --disas option to subcommand
- David: provide branch distance for small branches
Thanks,
alex.
-----
Changes:
========
V6:
---
- Josh: fix commit comments (PATCH 22 and 23)
- Josh: update .gitignore (PATCH 03 and 26)
- clean feature discovery (PATCH 03)
V5:
---
- patches are now based on tip/master
- remove the resolution of direct/PV calls
(added in V4 but this needs more work)
- Josh: fix rname
- Josh: change names for jump tables and exception tables
- Josh: display header line for single-line alternatives
- Josh: make NOP<n> lowercase
- Josh: fix alternatives order
- Josh: trim trailing NOPs
- David: indicate the number of trailing NOPs (nop*<n>)
- David: provide compact output for alternatives disassembly. The compact output is now the default, and there is a --wide option to provide a wide output where alternatives are displayed side-by-side.
V4:
---
This version fixes a build issue when disassembly is not available. Compared with V3, this is addresses by changes in patch 14 (objtool: Improve tracing of alternative instructions). Other patches are similar to V3.
V3:
---
This version addresses comments from Josh and Peter, in particular:
- Josh: replace ERROR in disas_context_create with WARN
- Josh: do not change offstr() outside the disassembler
- Josh: duplicated "falls through to next function" warning
- Josh: validate_symbol() has extra newline before return
- Josh: "make -s" should be completely silent
- Josh: instructions with unwinding state changes are printing twice
- Josh: explain TRACE_INSN(insn, NULL): this prints an instruction with no additional message.
- Peter: display alternative on a single line
- Peter: display nop-like instruction as NOP<n>
- Peter: in alternative show differences between jmp.d8 and jmp.d32 (jmp/jmpq is used now)
- Peter: show alternative feature name and flags
- Peter: alternative jumps to altinstr_aux - see NOTE below:
Disassembly can show default alternative jumping to .altinstr_aux
- Peter: some jump label target seems wrong (jmp +0) - NOTE below:
Disassembly can show alternative jumping to the next instruction
Other improvements:
- An alternatives is displayed on single line if each alternative has a single instruction. Otherwise alternatives are dispayed side-by-side, with one column for each lternative. XXX option?
- Each alternative of a group alternative is displayed with its feature name and flags: <flags><feature-name>
<flags> is made of the following characters:
'!' : ALT_FLAG_NOT
'+' : ALT_FLAG_DIRECT_CALL
'?' : unknown flag (i.e. any other flags)- A jump table is displayed the same way as an alternative, with the default branch (or not) instruction, and the corresponding substitute instruction. It is identified with the "JUMP" name.
- An exception table is displayed the same way as an alternative, with the default instruction (which can cause an exception), and a "resume at <desc>" string which indicates where the execution resumes if there is an exception. It is identified with the "EXCEPTION" name.
- An exception table can be present for an instruction which also has an alternative. In that case, the exception table is displayed similarly as the different group alternatives for this instruction.
- Print the destination name of pv_ops calls when we can figure out if XENPV mode is used or not. If the PV mode can't be predicted then print the default pv_ops destination as a destination example. **REMOVED IN V5**
- If a group alternative is a direct call then print the corresponding pv_ops call. **REMOVED IN V5**
Overview:
=========
This provides the following changes to objtool.
- Disassemble code with libopcodes instead of running objdump
objtool executes the objdump command to disassemble code. In particular, if objtool fails to validate a function then it will use objdump to disassemble the entire file which is not very helpful when processing a large file (like vmlinux.o).
Using libopcodes provides more control about the disassembly scope and output, and it is possible to disassemble a single instruction or a single function. Now when objtool fails to validate a function it will disassemble that single function instead of disassembling the entire file.
- Add the --trace <function> option to trace function validation
Figuring out why a function validation has failed can be difficult because objtool checks all code flows (including alternatives) and maintains instructions states (in particular call frame information).
The trace option allows to follow the function validation done by objtool instruction per instruction, see what objtool is doing and get function validation information. An output example is shown below.
- Add the --disas <function> option to disassemble functions
Disassembly is done using libopcodes and it will show the different code alternatives.
Note: some changes are architecture specific (x86, powerpc, loongarch). Any feedback about the behavior on powerpc and loongarch is welcome.
Notes:
======
Disassembly can show default alternative jumping to .altinstr_aux
-----------------------------------------------------------------
Disassembly can show a default alternative jumping to .altinstr_aux. This happens when the _static_cpu_has() function is used. Its default code jumps to .altinstr_aux where a test sequence is executed (test; jnz; jmp).
At runtime, this sequence is not used because the _static_cpu_has() an alternative with the X86_FEATURE_ALWAYS feature.
debc: perf_get_x86_pmu_capability+0xc jmpq 0xdec1 <.altinstr_aux+0xfc> | NOP5 (X86_FEATURE_HYBRID_CPU) | jmpq 0x61a <perf_get_x86_pmu_capability+0x37> (X86_FEATURE_ALWAYS) # <alternative.debc> dec1: perf_get_x86_pmu_capability+0x11 ud2
Disassembly can show alternative jumping to the next instruction
----------------------------------------------------------------
The disassembly can show jump tables with an alternative which jumps to the next instruction.
For example:
def9: perf_get_x86_pmu_capability+0x49 NOP2 | jmp defb <perf_get_x86_pmu_capability+0x4b> (JUMP) # <alternative.def9> defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8>
This disassembly is correct. These instructions come from:
cap->num_counters_gp = x86_pmu_num_counters(NULL)):
which will end up executing this statement:
if (static_branch_unlikely(&perf_is_hybrid) && NULL) <do something>;
This statement is optimized to do nothing because the condition is always false. But static_branch_unlikely() is implemented with a jump table inside an "asm goto" statement, and "asm goto" statements are not optimized.
So basically the code is optimized like this:
if (static_branch_unlikely(&perf_is_hybrid)) ;
And this translates to the assembly code above.
Examples:
=========
Example 1 (--trace option): Trace the validation of the os_save() function
--------------------------------------------------------------------------
$ ./tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --orc --retpoline --rethunk --sls --static-call --uaccess --prefix=16 --link --trace os_xsave -v vmlinux.o os_xsave: validation begin 59be0: os_xsave+0x0 push %r12 - state: cfa=rsp+16 r12=(cfa-16) stack_size=16 59be2: os_xsave+0x2 mov 0x0(%rip),%eax # 0x59be8 <alternatives_patched> 59be8: os_xsave+0x8 push %rbp - state: cfa=rsp+24 rbp=(cfa-24) stack_size=24 59be9: os_xsave+0x9 mov %rdi,%rbp 59bec: os_xsave+0xc push %rbx - state: cfa=rsp+32 rbx=(cfa-32) stack_size=32 59bed: os_xsave+0xd mov 0x8(%rdi),%rbx 59bf1: os_xsave+0x11 mov %rbx,%r12 59bf4: os_xsave+0x14 shr $0x20,%r12 59bf8: os_xsave+0x18 test %eax,%eax 59bfa: os_xsave+0x1a je 0x59c22 <os_xsave+0x42> - jump taken 59c22: os_xsave+0x42 | ud2 59c24: os_xsave+0x44 | jmp 0x59bfc <os_xsave+0x1c> - unconditional jump 59bfc: os_xsave+0x1c | | xor %edx,%edx 59bfe: os_xsave+0x1e | | mov %rbx,%rsi 59c01: os_xsave+0x21 | | mov %rbp,%rdi 59c04: os_xsave+0x24 | | callq 0x59c09 <xfd_validate_state> - call 59c09: os_xsave+0x29 | | mov %ebx,%eax 59c0b: os_xsave+0x2b | | mov %r12d,%edx | | / <alternative.59c0e> X86_FEATURE_XSAVEOPT 1b29: .altinstr_replacement+0x1b29 | | | xsaveopt64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx 59c15: os_xsave+0x35 | | | test %ebx,%ebx 59c17: os_xsave+0x37 | | | jne 0x59c26 <os_xsave+0x46> - jump taken 59c26: os_xsave+0x46 | | | | ud2 59c28: os_xsave+0x48 | | | | pop %rbx - state: cfa=rsp+24 rbx=<undef> stack_size=24 59c29: os_xsave+0x49 | | | | pop %rbp - state: cfa=rsp+16 rbp=<undef> stack_size=16 59c2a: os_xsave+0x4a | | | | pop %r12 - state: cfa=rsp+8 r12=<undef> stack_size=8 59c2c: os_xsave+0x4c | | | | jmpq 0x59c31 <__x86_return_thunk> - return 59c17: os_xsave+0x37 | | | jne 0x59c26 <os_xsave+0x46> - jump not taken 59c19: os_xsave+0x39 | | | pop %rbx - state: cfa=rsp+24 rbx=<undef> stack_size=24 59c1a: os_xsave+0x3a | | | pop %rbp - state: cfa=rsp+16 rbp=<undef> stack_size=16 59c1b: os_xsave+0x3b | | | pop %r12 - state: cfa=rsp+8 r12=<undef> stack_size=8 59c1d: os_xsave+0x3d | | | jmpq 0x59c22 <__x86_return_thunk> - return | | \ <alternative.59c0e> X86_FEATURE_XSAVEOPT | | / <alternative.59c0e> X86_FEATURE_XSAVEC 1b2e: .altinstr_replacement+0x1b2e | | | xsavec64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx - already visited | | \ <alternative.59c0e> X86_FEATURE_XSAVEC | | / <alternative.59c0e> X86_FEATURE_XSAVES 1b33: .altinstr_replacement+0x1b33 | | | xsaves64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx - already visited | | \ <alternative.59c0e> X86_FEATURE_XSAVES | | / <alternative.59c0e> EXCEPTION for instruction at 0x59c0e <os_xsave+0x2e> 59c15: os_xsave+0x35 | | | test %ebx,%ebx - already visited | | \ <alternative.59c0e> EXCEPTION | | / <alternative.59c0e> DEFAULT 59c0e: os_xsave+0x2e | | xsave64 0x40(%rbp) 59c13: os_xsave+0x33 | | xor %ebx,%ebx - already visited 59bfa: os_xsave+0x1a je 0x59c22 <os_xsave+0x42> - jump not taken 59bfc: os_xsave+0x1c xor %edx,%edx - already visited os_xsave: validation end
Example 2 (--disas option): Single Instruction Alternatives
-----------------------------------------------------------
Compact Output (default):
Alternatives with single instructions are displayed each on one line, with the instruction and a description of the alternative.
$ ./tools/objtool/objtool --disas=perf_get_x86_pmu_capability --link vmlinux.o perf_get_x86_pmu_capability: deb0: perf_get_x86_pmu_capability+0x0 endbr64 deb4: perf_get_x86_pmu_capability+0x4 callq 0xdeb9 <__fentry__> deb9: perf_get_x86_pmu_capability+0x9 mov %rdi,%rdx debc: perf_get_x86_pmu_capability+0xc <alternative.debc> = jmpq 0xdec1 <.altinstr_aux+0xfc> (if DEFAULT) = jmpq 0x622 <perf_get_x86_pmu_capability+0x37> (if X86_FEATURE_ALWAYS) = nop5 (if X86_FEATURE_HYBRID_CPU) dec1: perf_get_x86_pmu_capability+0x11 ud2 dec3: perf_get_x86_pmu_capability+0x13 movq $0x0,(%rdx) deca: perf_get_x86_pmu_capability+0x1a movq $0x0,0x8(%rdx) ded2: perf_get_x86_pmu_capability+0x22 movq $0x0,0x10(%rdx) deda: perf_get_x86_pmu_capability+0x2a movq $0x0,0x18(%rdx) dee2: perf_get_x86_pmu_capability+0x32 jmpq 0xdee7 <__x86_return_thunk> dee7: perf_get_x86_pmu_capability+0x37 cmpq $0x0,0x0(%rip) # 0xdeef <x86_pmu+0x10> deef: perf_get_x86_pmu_capability+0x3f je 0xdec3 <perf_get_x86_pmu_capability+0x13> def1: perf_get_x86_pmu_capability+0x41 mov 0x0(%rip),%eax # 0xdef7 <x86_pmu+0x8> def7: perf_get_x86_pmu_capability+0x47 mov %eax,(%rdi) def9: perf_get_x86_pmu_capability+0x49 <jump_table.def9> = nop2 (if DEFAULT) = jmp defb <perf_get_x86_pmu_capability+0x4b> (if JUMP) defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8> df02: perf_get_x86_pmu_capability+0x52 <alternative.df02> = callq 0xdf07 <__sw_hweight64> (if DEFAULT) = popcnt %rdi,%rax (if X86_FEATURE_POPCNT) df07: perf_get_x86_pmu_capability+0x57 mov %eax,0x4(%rdx) df0a: perf_get_x86_pmu_capability+0x5a <jump_table.df0a> = nop2 (if DEFAULT) = jmp df0c <perf_get_x86_pmu_capability+0x5c> (if JUMP) df0c: perf_get_x86_pmu_capability+0x5c mov 0x0(%rip),%rdi # 0xdf13 <x86_pmu+0xe0> df13: perf_get_x86_pmu_capability+0x63 <alternative.df13> = callq 0xdf18 <__sw_hweight64> (if DEFAULT) = popcnt %rdi,%rax (if X86_FEATURE_POPCNT) df18: perf_get_x86_pmu_capability+0x68 mov %eax,0x8(%rdx) df1b: perf_get_x86_pmu_capability+0x6b mov 0x0(%rip),%eax # 0xdf21 <x86_pmu+0xf8> df21: perf_get_x86_pmu_capability+0x71 mov %eax,0xc(%rdx) df24: perf_get_x86_pmu_capability+0x74 mov %eax,0x10(%rdx) df27: perf_get_x86_pmu_capability+0x77 mov 0x0(%rip),%rax # 0xdf2e <x86_pmu+0x108> df2e: perf_get_x86_pmu_capability+0x7e mov %eax,0x14(%rdx) df31: perf_get_x86_pmu_capability+0x81 mov 0x0(%rip),%eax # 0xdf37 <x86_pmu+0x110> df37: perf_get_x86_pmu_capability+0x87 mov %eax,0x18(%rdx) df3a: perf_get_x86_pmu_capability+0x8a movzbl 0x0(%rip),%ecx # 0xdf41 <x86_pmu+0x1d1> df41: perf_get_x86_pmu_capability+0x91 movzbl 0x1c(%rdx),%eax df45: perf_get_x86_pmu_capability+0x95 shr %cl df47: perf_get_x86_pmu_capability+0x97 and $0x1,%ecx df4a: perf_get_x86_pmu_capability+0x9a and $0xfffffffe,%eax df4d: perf_get_x86_pmu_capability+0x9d or %ecx,%eax df4f: perf_get_x86_pmu_capability+0x9f mov %al,0x1c(%rdx) df52: perf_get_x86_pmu_capability+0xa2 jmpq 0xdf57 <__x86_return_thunk>
Wide Output (--wide option):
Alternatives with single instructions are displayed side-by-side, with an header.
$ ./tools/objtool/objtool --disas=perf_get_x86_pmu_capability --wide --link vmlinux.o perf_get_x86_pmu_capability: deb0: perf_get_x86_pmu_capability+0x0 endbr64 deb4: perf_get_x86_pmu_capability+0x4 callq 0xdeb9 <__fentry__> deb9: perf_get_x86_pmu_capability+0x9 mov %rdi,%rdx debc: perf_get_x86_pmu_capability+0xc | <alternative.debc> | X86_FEATURE_ALWAYS | X86_FEATURE_HYBRID_CPU debc: perf_get_x86_pmu_capability+0xc | jmpq 0xdec1 <.altinstr_aux+0xfc> | jmpq 0x622 <perf_get_x86_pmu_capability+0x37> | nop5 dec1: perf_get_x86_pmu_capability+0x11 ud2 dec3: perf_get_x86_pmu_capability+0x13 movq $0x0,(%rdx) deca: perf_get_x86_pmu_capability+0x1a movq $0x0,0x8(%rdx) ded2: perf_get_x86_pmu_capability+0x22 movq $0x0,0x10(%rdx) deda: perf_get_x86_pmu_capability+0x2a movq $0x0,0x18(%rdx) dee2: perf_get_x86_pmu_capability+0x32 jmpq 0xdee7 <__x86_return_thunk> dee7: perf_get_x86_pmu_capability+0x37 cmpq $0x0,0x0(%rip) # 0xdeef <x86_pmu+0x10> deef: perf_get_x86_pmu_capability+0x3f je 0xdec3 <perf_get_x86_pmu_capability+0x13> def1: perf_get_x86_pmu_capability+0x41 mov 0x0(%rip),%eax # 0xdef7 <x86_pmu+0x8> def7: perf_get_x86_pmu_capability+0x47 mov %eax,(%rdi) def9: perf_get_x86_pmu_capability+0x49 | <jump_table.def9> | JUMP def9: perf_get_x86_pmu_capability+0x49 | nop2 | jmp defb <perf_get_x86_pmu_capability+0x4b> defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8> df02: perf_get_x86_pmu_capability+0x52 | <alternative.df02> | X86_FEATURE_POPCNT df02: perf_get_x86_pmu_capability+0x52 | callq 0xdf07 <__sw_hweight64> | popcnt %rdi,%rax df07: perf_get_x86_pmu_capability+0x57 mov %eax,0x4(%rdx) df0a: perf_get_x86_pmu_capability+0x5a | <jump_table.df0a> | JUMP df0a: perf_get_x86_pmu_capability+0x5a | nop2 | jmp df0c <perf_get_x86_pmu_capability+0x5c> df0c: perf_get_x86_pmu_capability+0x5c mov 0x0(%rip),%rdi # 0xdf13 <x86_pmu+0xe0> df13: perf_get_x86_pmu_capability+0x63 | <alternative.df13> | X86_FEATURE_POPCNT df13: perf_get_x86_pmu_capability+0x63 | callq 0xdf18 <__sw_hweight64> | popcnt %rdi,%rax df18: perf_get_x86_pmu_capability+0x68 mov %eax,0x8(%rdx) df1b: perf_get_x86_pmu_capability+0x6b mov 0x0(%rip),%eax # 0xdf21 <x86_pmu+0xf8> df21: perf_get_x86_pmu_capability+0x71 mov %eax,0xc(%rdx) df24: perf_get_x86_pmu_capability+0x74 mov %eax,0x10(%rdx) df27: perf_get_x86_pmu_capability+0x77 mov 0x0(%rip),%rax # 0xdf2e <x86_pmu+0x108> df2e: perf_get_x86_pmu_capability+0x7e mov %eax,0x14(%rdx) df31: perf_get_x86_pmu_capability+0x81 mov 0x0(%rip),%eax # 0xdf37 <x86_pmu+0x110> df37: perf_get_x86_pmu_capability+0x87 mov %eax,0x18(%rdx) df3a: perf_get_x86_pmu_capability+0x8a movzbl 0x0(%rip),%ecx # 0xdf41 <x86_pmu+0x1d1> df41: perf_get_x86_pmu_capability+0x91 movzbl 0x1c(%rdx),%eax df45: perf_get_x86_pmu_capability+0x95 shr %cl df47: perf_get_x86_pmu_capability+0x97 and $0x1,%ecx df4a: perf_get_x86_pmu_capability+0x9a and $0xfffffffe,%eax df4d: perf_get_x86_pmu_capability+0x9d or %ecx,%eax df4f: perf_get_x86_pmu_capability+0x9f mov %al,0x1c(%rdx) df52: perf_get_x86_pmu_capability+0xa2 jmpq 0xdf57 <__x86_return_thunk>
Example 3 (--disas option): Alternatives with multiple instructions
-------------------------------------------------------------------
Compact Output (default):
Alternatives with multiple instructions are displayed one above the other, with an header describing the alternative.
$ ./tools/objtool/objtool --disas=__switch_to_asm --link vmlinux.o __switch_to_asm: 82c0: __switch_to_asm+0x0 push %rbp 82c1: __switch_to_asm+0x1 push %rbx 82c2: __switch_to_asm+0x2 push %r12 82c4: __switch_to_asm+0x4 push %r13 82c6: __switch_to_asm+0x6 push %r14 82c8: __switch_to_asm+0x8 push %r15 82ca: __switch_to_asm+0xa mov %rsp,0x1670(%rdi) 82d1: __switch_to_asm+0x11 mov 0x1670(%rsi),%rsp 82d8: __switch_to_asm+0x18 mov 0xad8(%rsi),%rbx 82df: __switch_to_asm+0x1f mov %rbx,%gs:0x0(%rip) # 0x82e7 <__stack_chk_guard> 82e7: __switch_to_asm+0x27 <alternative.82e7> = DEFAULT 82e7: __switch_to_asm+0x27 | jmp 0x8312 <__switch_to_asm+0x52> 82e9: __switch_to_asm+0x29 | nop*41 | = X86_FEATURE_RSB_CTXSW 82e7: __switch_to_asm+0x27 | mov $0x10,%r12 82ee: __switch_to_asm+0x2e | callq 0x82f4 <__switch_to_asm+0x34> 82f3: __switch_to_asm+0x33 | int3 82f4: __switch_to_asm+0x34 | callq 0x82fa <__switch_to_asm+0x3a> 82f9: __switch_to_asm+0x39 | int3 82fa: __switch_to_asm+0x3a | add $0x10,%rsp 82fe: __switch_to_asm+0x3e | dec %r12 8301: __switch_to_asm+0x41 | jne 0x82ee <__switch_to_asm+0x2e> 8303: __switch_to_asm+0x43 | lfence 8306: __switch_to_asm+0x46 | movq $0xffffffffffffffff,%gs:0x0(%rip) # 0x20b <__x86_call_depth> | = !X86_FEATURE_ALWAYS 82e7: __switch_to_asm+0x27 | nop1 82e8: __switch_to_asm+0x28 | nop1 82e9: __switch_to_asm+0x29 | callq 0x82ef <__switch_to_asm+0x2f> 82ee: __switch_to_asm+0x2e | int3 82ef: __switch_to_asm+0x2f | add $0x8,%rsp 82f3: __switch_to_asm+0x33 | lfence | 8312: __switch_to_asm+0x52 pop %r15 8314: __switch_to_asm+0x54 pop %r14 8316: __switch_to_asm+0x56 pop %r13 8318: __switch_to_asm+0x58 pop %r12 831a: __switch_to_asm+0x5a pop %rbx 831b: __switch_to_asm+0x5b pop %rbp 831c: __switch_to_asm+0x5c jmpq 0x8321 <__switch_to>
Wide Output (--wide option):
Alternatives with multiple instructions are displayed side-by-side, with an header describing the alternative. The code in the first column is the default code of the alternative.
$ ./tools/objtool/objtool --disas=__switch_to_asm --wide --link vmlinux.o __switch_to_asm: 82c0: __switch_to_asm+0x0 push %rbp 82c1: __switch_to_asm+0x1 push %rbx 82c2: __switch_to_asm+0x2 push %r12 82c4: __switch_to_asm+0x4 push %r13 82c6: __switch_to_asm+0x6 push %r14 82c8: __switch_to_asm+0x8 push %r15 82ca: __switch_to_asm+0xa mov %rsp,0x1670(%rdi) 82d1: __switch_to_asm+0x11 mov 0x1670(%rsi),%rsp 82d8: __switch_to_asm+0x18 mov 0xad8(%rsi),%rbx 82df: __switch_to_asm+0x1f mov %rbx,%gs:0x0(%rip) # 0x82e7 <__stack_chk_guard> 82e7: __switch_to_asm+0x27 | <alternative.82e7> | X86_FEATURE_RSB_CTXSW | !X86_FEATURE_ALWAYS 82e7: __switch_to_asm+0x27 | jmp 0x8312 <__switch_to_asm+0x52> | mov $0x10,%r12 | nop1 82e8: __switch_to_asm+0x28 | | | nop1 82e9: __switch_to_asm+0x29 | nop*41 | | callq 0x82ef <__switch_to_asm+0x2f> 82ee: __switch_to_asm+0x2e | | callq 0x82f4 <__switch_to_asm+0x34> | int3 82ef: __switch_to_asm+0x2f | | | add $0x8,%rsp 82f3: __switch_to_asm+0x33 | | int3 | lfence 82f4: __switch_to_asm+0x34 | | callq 0x82fa <__switch_to_asm+0x3a> | 82f9: __switch_to_asm+0x39 | | int3 | 82fa: __switch_to_asm+0x3a | | add $0x10,%rsp | 82fe: __switch_to_asm+0x3e | | dec %r12 | 8301: __switch_to_asm+0x41 | | jne 0x82ee <__switch_to_asm+0x2e> | 8303: __switch_to_asm+0x43 | | lfence | 8306: __switch_to_asm+0x46 | | movq $0xffffffffffffffff,%gs:0x0(%rip) # 0x20b <__x86_call_depth> | 8312: __switch_to_asm+0x52 pop %r15 8314: __switch_to_asm+0x54 pop %r14 8316: __switch_to_asm+0x56 pop %r13 8318: __switch_to_asm+0x58 pop %r12 831a: __switch_to_asm+0x5a pop %rbx 831b: __switch_to_asm+0x5b pop %rbp 831c: __switch_to_asm+0x5c jmpq 0x8321 <__switch_to>
-----
Alexandre Chartre (30):
objtool: Move disassembly functions to a separated file
objtool: Create disassembly context
objtool: Disassemble code with libopcodes instead of running objdump tool build: Remove annoying newline in build output
objtool: Print symbol during disassembly
objtool: Store instruction disassembly result
objtool: Disassemble instruction on warning or backtrace
objtool: Extract code to validate instruction from the validate branch
loop
objtool: Record symbol name max length
objtool: Add option to trace function validation
objtool: Trace instruction state changes during function validation
objtool: Improve register reporting during function validation
objtool: Identify the different types of alternatives
objtool: Add functions to better name alternatives
objtool: Improve tracing of alternative instructions
objtool: Do not validate IBT for .return_sites and .call_sites
objtool: Add the --disas=<function-pattern> action
objtool: Preserve alternatives order
objtool: Print headers for alternatives
objtool: Disassemble group alternatives
objtool: Print addresses with alternative instructions
objtool: Disassemble exception table alternatives
objtool: Disassemble jump table alternatives
objtool: Fix address references in alternatives
objtool: Provide access to feature and flags of group alternatives
objtool: Function to get the name of a CPU feature
objtool: Improve naming of group alternatives
objtool: Compact output for alternatives with one instruction
objtool: Add wide output for disassembly
objtool: Trim trailing NOPs in alternative
.../x86/tools/gen-cpu-feature-names-x86.awk | 33 + tools/build/Makefile.feature | 4 +- tools/objtool/.gitignore | 3 + tools/objtool/Build | 3 + tools/objtool/Makefile | 26 + tools/objtool/arch/loongarch/decode.c | 23 + tools/objtool/arch/loongarch/special.c | 5 + tools/objtool/arch/powerpc/decode.c | 24 + tools/objtool/arch/powerpc/special.c | 5 + tools/objtool/arch/x86/Build | 8 + tools/objtool/arch/x86/decode.c | 20 + tools/objtool/arch/x86/special.c | 10 + tools/objtool/builtin-check.c | 4 + tools/objtool/check.c | 648 +++++---- tools/objtool/disas.c | 1245 +++++++++++++++++ tools/objtool/include/objtool/arch.h | 11 + tools/objtool/include/objtool/builtin.h | 3 + tools/objtool/include/objtool/check.h | 35 +- tools/objtool/include/objtool/disas.h | 81 ++ tools/objtool/include/objtool/special.h | 4 +- tools/objtool/include/objtool/trace.h | 141 ++ tools/objtool/include/objtool/warn.h | 17 +- tools/objtool/special.c | 2 + tools/objtool/trace.c | 203 +++ 24 files changed, 2259 insertions(+), 299 deletions(-) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk create mode 100644 tools/objtool/disas.c create mode 100644 tools/objtool/include/objtool/disas.h create mode 100644 tools/objtool/include/objtool/trace.h create mode 100644 tools/objtool/trace.c
Signature · 1 line
2.43.5
PATCH v6 1/30 objtool: Move disassembly functions to a separated file
objtool disassembles functions which have warnings. Move the code to do that to a dedicated file. The code is just moved, it is not changed.
--- tools/objtool/Build | 1 + tools/objtool/check.c | 81 ---------------------- tools/objtool/disas.c | 90 +++++++++++++++++++++++++ tools/objtool/include/objtool/objtool.h | 2 + 4 files changed, 93 insertions(+), 81 deletions(-) create mode 100644 tools/objtool/disas.c
tools/objtool/Build +1 -0
@@ -7,6 +7,7 @@ objtool-y += special.o objtool-y += builtin-check.o objtool-y += elf.o objtool-y += objtool.o +objtool-y += disas.o objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o
tools/objtool/check.c +0 -81
87 lines not on this page · raw message
tools/objtool/disas.c new file +90 -0
90 lines not on this page · raw message
tools/objtool/include/objtool/objtool.h +2 -0
@@ -49,4 +49,6 @@ int check(struct objtool_file *file);int orc_dump (const char *objname);int orc_create (struct objtool_file *file); +void disas_warned_funcs (struct objtool_file *file); +#endif /* _OBJTOOL_H */
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Move disassembly functions to a separated file
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 55d2a473f317ab028d78a5c5ca69473643657c3d Gitweb: https://git.kernel.org/tip/55d2a473f317ab028d78a5c5ca69473643657c3d Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:11 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:06 +01:00
objtool: Move disassembly functions to a separated file
objtool disassembles functions which have warnings. Move the code to do that to a dedicated file. The code is just moved, it is not changed.
--- tools/objtool/Build | 1 +- tools/objtool/check.c | 81 +---------------------- tools/objtool/disas.c | 90 ++++++++++++++++++++++++- tools/objtool/include/objtool/objtool.h | 2 +- 4 files changed, 93 insertions(+), 81 deletions(-) create mode 100644 tools/objtool/disas.c
tools/objtool/Build +1 -0
@@ -7,6 +7,7 @@ objtool-y += special.o objtool-y += builtin-check.o objtool-y += elf.o objtool-y += objtool.o +objtool-y += disas.o objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o
tools/objtool/check.c +0 -81
87 lines not on this page · raw message
tools/objtool/disas.c new file +90 -0
90 lines not on this page · raw message
tools/objtool/include/objtool/objtool.h +2 -0
@@ -49,4 +49,6 @@ int check(struct objtool_file *file);int orc_dump (const char *objname);int orc_create (struct objtool_file *file); +void disas_warned_funcs (struct objtool_file *file); +#endif /* _OBJTOOL_H */
PATCH v6 2/30 objtool: Create disassembly context
In reply to Alexandre ChartreCreate a structure to store information for disassembling functions. For now, it is just a wrapper around an objtool file.
--- tools/objtool/check.c | 6 ++++- tools/objtool/disas.c | 32 +++++++++++++++++++++++-- tools/objtool/include/objtool/disas.h | 14 +++++++++++ tools/objtool/include/objtool/objtool.h | 2 -- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 tools/objtool/include/objtool/disas.h
tools/objtool/check.c +5 -1
@@ -12,6 +12,7 @@#include <objtool/builtin.h> #include <objtool/cfi.h> #include <objtool/arch.h> +#include <objtool/disas.h> #include <objtool/check.h> #include <objtool/special.h> #include <objtool/warn.h>
@@ -4854,6 +4855,7 @@ static void free_insns(struct objtool_file *file)int check (struct objtool_file *file) { +struct disas_context *disas_ctx;int ret =0 , warnings =0 ;arch_initial_func_cfi_state (&initial_func_cfi);
@@ -4997,7 +4999,9 @@ int check(struct objtool_file *file)if (opts.verbose) {if (opts.werror && warnings)WARN ("%d warning(s) upgraded to errors" , warnings); -disas_warned_funcs (file); + disas_ctx =disas_context_create (file); +disas_warned_funcs (disas_ctx); +disas_context_destroy (disas_ctx); }if (opts.backup &&make_backup ())
tools/objtool/disas.c +30 -2
@@ -4,10 +4,35 @@*/ #include <objtool/arch.h> +#include <objtool/disas.h> #include <objtool/warn.h> #include <linux/string.h> +struct disas_context { +struct objtool_file *file; +}; + +struct disas_context *disas_context_create (struct objtool_file *file) +{ +struct disas_context *dctx; + + dctx =malloc (sizeof (*dctx)); +if (!dctx) { +WARN ("failed to allocate disassembly context" ); +return NULL ; + } + + dctx->file = file; + +return dctx; +} + +void disas_context_destroy (struct disas_context *dctx) +{ +free (dctx); +} +/* 'funcs' is a space-separated list of function names */ static void disas_funcs (const char *funcs) {
@@ -58,12 +83,15 @@ static void disas_funcs(const char *funcs) } } -void disas_warned_funcs (struct objtool_file *file) +void disas_warned_funcs (struct disas_context *dctx) {struct symbol *sym;char *funcs =NULL , *tmp; -for_each_sym (file->elf, sym) { +if (!dctx) +return ; + +for_each_sym (dctx->file->elf, sym) {if (sym->warned) {if (!funcs) { funcs =malloc (strlen (sym->name) +1 );
tools/objtool/include/objtool/disas.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (c) 2025, Oracle and/or its affiliates. +*/ + +#ifndef _DISAS_H +#define _DISAS_H + +struct disas_context ; +struct disas_context *disas_context_create (struct objtool_file *file); +void disas_context_destroy (struct disas_context *dctx); +void disas_warned_funcs (struct disas_context *dctx); + +#endif /* _DISAS_H */
tools/objtool/include/objtool/objtool.h +0 -2
@@ -49,6 +49,4 @@ int check(struct objtool_file *file);int orc_dump (const char *objname);int orc_create (struct objtool_file *file); -void disas_warned_funcs (struct objtool_file *file); -#endif /* _OBJTOOL_H */
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Create disassembly context
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 1013f2e37bec39b1df5679e1c1e2572ece87c088 Gitweb: https://git.kernel.org/tip/1013f2e37bec39b1df5679e1c1e2572ece87c088 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:12 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:06 +01:00
objtool: Create disassembly context
Create a structure to store information for disassembling functions. For now, it is just a wrapper around an objtool file.
--- tools/objtool/check.c | 6 ++++- tools/objtool/disas.c | 32 ++++++++++++++++++++++-- tools/objtool/include/objtool/disas.h | 14 +++++++++++- tools/objtool/include/objtool/objtool.h | 2 +-- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 tools/objtool/include/objtool/disas.h
tools/objtool/check.c +5 -1
@@ -12,6 +12,7 @@#include <objtool/builtin.h> #include <objtool/cfi.h> #include <objtool/arch.h> +#include <objtool/disas.h> #include <objtool/check.h> #include <objtool/special.h> #include <objtool/warn.h>
@@ -4802,6 +4803,7 @@ static void free_insns(struct objtool_file *file)int check (struct objtool_file *file) { +struct disas_context *disas_ctx;int ret =0 , warnings =0 ;arch_initial_func_cfi_state (&initial_func_cfi);
@@ -4943,7 +4945,9 @@ out:if (opts.verbose) {if (opts.werror && warnings)WARN ("%d warning(s) upgraded to errors" , warnings); -disas_warned_funcs (file); + disas_ctx =disas_context_create (file); +disas_warned_funcs (disas_ctx); +disas_context_destroy (disas_ctx); }if (opts.backup &&make_backup ())
tools/objtool/disas.c +30 -2
@@ -4,10 +4,35 @@*/ #include <objtool/arch.h> +#include <objtool/disas.h> #include <objtool/warn.h> #include <linux/string.h> +struct disas_context { +struct objtool_file *file; +}; + +struct disas_context *disas_context_create (struct objtool_file *file) +{ +struct disas_context *dctx; + + dctx =malloc (sizeof (*dctx)); +if (!dctx) { +WARN ("failed to allocate disassembly context" ); +return NULL ; + } + + dctx->file = file; + +return dctx; +} + +void disas_context_destroy (struct disas_context *dctx) +{ +free (dctx); +} +/* 'funcs' is a space-separated list of function names */ static void disas_funcs (const char *funcs) {
@@ -58,12 +83,15 @@ static void disas_funcs(const char *funcs) } } -void disas_warned_funcs (struct objtool_file *file) +void disas_warned_funcs (struct disas_context *dctx) {struct symbol *sym;char *funcs =NULL , *tmp; -for_each_sym (file->elf, sym) { +if (!dctx) +return ; + +for_each_sym (dctx->file->elf, sym) {if (sym->warned) {if (!funcs) { funcs =malloc (strlen (sym->name) +1 );
tools/objtool/include/objtool/disas.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (c) 2025, Oracle and/or its affiliates. +*/ + +#ifndef _DISAS_H +#define _DISAS_H + +struct disas_context ; +struct disas_context *disas_context_create (struct objtool_file *file); +void disas_context_destroy (struct disas_context *dctx); +void disas_warned_funcs (struct disas_context *dctx); + +#endif /* _DISAS_H */
tools/objtool/include/objtool/objtool.h +0 -2
@@ -49,6 +49,4 @@ int check(struct objtool_file *file);int orc_dump (const char *objname);int orc_create (struct objtool_file *file); -void disas_warned_funcs (struct objtool_file *file); -#endif /* _OBJTOOL_H */
PATCH v6 3/30 objtool: Disassemble code with libopcodes instead of running objdump
In reply to Alexandre Chartreobjtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
--- tools/objtool/.gitignore | 2 + tools/objtool/Build | 3 +- tools/objtool/Makefile | 25 ++++ tools/objtool/arch/loongarch/decode.c | 12 ++ tools/objtool/arch/powerpc/decode.c | 12 ++ tools/objtool/arch/x86/decode.c | 12 ++ tools/objtool/check.c | 14 +- tools/objtool/disas.c | 187 +++++++++++++++++--------- tools/objtool/include/objtool/arch.h | 9 ++ tools/objtool/include/objtool/check.h | 5 + tools/objtool/include/objtool/disas.h | 29 ++++ 11 files changed, 238 insertions(+), 72 deletions(-)
tools/objtool/.gitignore +2 -0
@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only arch/x86/lib/inat-tables.c /objtool +feature +FEATURE-DUMP.objtool fixdep libsubcmd/
tools/objtool/Build +2 -1
@@ -7,7 +7,8 @@ objtool-y += special.o objtool-y += builtin-check.o objtool-y += elf.o objtool-y += objtool.o -objtool-y += disas.o + +objtool-$(BUILD_DISAS) += disas.o objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o
tools/objtool/Makefile +25 -0
@@ -70,6 +70,29 @@ OBJTOOL_CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) # Always want host compilation. HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" +# +# To support disassembly, objtool needs libopcodes which is provided +# with libbdf (binutils-dev or binutils-devel package). +# +FEATURE_USER = .objtool +FEATURE_TESTS = libbfd disassembler-init-styled +FEATURE_DISPLAY = +include $(srctree)/tools/build/Makefile.feature + +ifeq ($(feature-disassembler-init-styled), 1) + OBJTOOL_CFLAGS += -DDISASM_INIT_STYLED +endif + +BUILD_DISAS := n + +ifeq ($(feature-libbfd),1) + BUILD_DISAS := y + OBJTOOL_CFLAGS += -DDISAS + OBJTOOL_LDFLAGS += -lopcodes +endif + +export BUILD_DISAS + AWK = awk MKDIR = mkdir
@@ -103,6 +126,8 @@ clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep + $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool + $(Q)$(RM) -r -- $(OUTPUT)feature FORCE:
tools/objtool/arch/loongarch/decode.c +12 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-or-later #include <string.h> #include <objtool/check.h> +#include <objtool/disas.h> #include <objtool/warn.h> #include <asm/inst.h> #include <asm/orc_types.h>
@@ -414,3 +415,14 @@ unsigned long arch_jump_table_sym_offset(struct reloc *reloc, struct reloc *tablreturn reloc->sym->offset +reloc_addend (reloc); } } + +#ifdef DISAS + +int arch_disas_info_init (struct disassemble_info *dinfo) +{ +return disas_info_init (dinfo, bfd_arch_loongarch, + bfd_mach_loongarch32, bfd_mach_loongarch64, +NULL ); +} + +#endif /* DISAS */
tools/objtool/arch/powerpc/decode.c +12 -0
@@ -3,6 +3,7 @@#include <stdio.h> #include <stdlib.h> #include <objtool/check.h> +#include <objtool/disas.h> #include <objtool/elf.h> #include <objtool/arch.h> #include <objtool/warn.h>
@@ -127,3 +128,14 @@ unsigned int arch_reloc_size(struct reloc *reloc)return 8 ; } } + +#ifdef DISAS + +int arch_disas_info_init (struct disassemble_info *dinfo) +{ +return disas_info_init (dinfo, bfd_arch_powerpc, + bfd_mach_ppc, bfd_mach_ppc64, +NULL ); +} + +#endif /* DISAS */
tools/objtool/arch/x86/decode.c +12 -0
@@ -16,6 +16,7 @@#include <asm/orc_types.h> #include <objtool/check.h> +#include <objtool/disas.h> #include <objtool/elf.h> #include <objtool/arch.h> #include <objtool/warn.h>
@@ -949,3 +950,14 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc)return false; } } + +#ifdef DISAS + +int arch_disas_info_init (struct disassemble_info *dinfo) +{ +return disas_info_init (dinfo, bfd_arch_i386, + bfd_mach_i386_i386, bfd_mach_x86_64, +"att" ); +} + +#endif /* DISAS */
tools/objtool/check.c +9 -5
@@ -4980,8 +4980,6 @@ int check(struct objtool_file *file) goto out; } -free_insns (file); -if (opts.stats) {printf ("nr_insns_visited: %ld\n" , nr_insns_visited);printf ("nr_cfi: %ld\n" , nr_cfi);
@@ -4990,8 +4988,10 @@ int check(struct objtool_file *file) } out: -if (!ret && !warnings) +if (!ret && !warnings) { +free_insns (file);return 0 ; + }if (opts.werror && warnings) ret =1 ;
@@ -5000,10 +5000,14 @@ int check(struct objtool_file *file)if (opts.werror && warnings)WARN ("%d warning(s) upgraded to errors" , warnings); disas_ctx =disas_context_create (file); -disas_warned_funcs (disas_ctx); -disas_context_destroy (disas_ctx); +if (disas_ctx) { +disas_warned_funcs (disas_ctx); +disas_context_destroy (disas_ctx); + } } +free_insns (file); +if (opts.backup &&make_backup ())return 1 ;
tools/objtool/disas.c +121 -66
233 lines not on this page · raw message
tools/objtool/include/objtool/arch.h +9 -0
@@ -103,4 +103,13 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +#ifdef DISAS + +#include <bfd.h> +#include <dis-asm.h> + +int arch_disas_info_init (struct disassemble_info *dinfo); + +#endif /* DISAS */ +#endif /* _ARCH_H */
tools/objtool/include/objtool/check.h +5 -0
@@ -127,4 +127,9 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, struct instruc insn && insn->sec == _sec; \ insn = next_insn_same_sec(file, insn)) +#define sym_for_each_insn (file, sym, insn) \ + for (insn = find_insn(file, sym->sec, sym->offset); \ + insn && insn->offset < sym->offset + sym->len; \ + insn = next_insn_same_sec(file, insn)) +#endif /* _CHECK_H */
tools/objtool/include/objtool/disas.h +29 -0
@@ -7,8 +7,37 @@#define _DISAS_Hstruct disas_context ; +struct disassemble_info ; + +#ifdef DISAS +struct disas_context *disas_context_create (struct objtool_file *file);void disas_context_destroy (struct disas_context *dctx);void disas_warned_funcs (struct disas_context *dctx); +int disas_info_init (struct disassemble_info *dinfo, +int arch,int mach32,int mach64, +const char *options); + +#else /* DISAS */ + +#include <objtool/warn.h> + +static inline struct disas_context *disas_context_create (struct objtool_file *file) +{ +WARN ("Rebuild with libopcodes for disassembly support" ); +return NULL ; +} + +static inline void disas_context_destroy (struct disas_context *dctx) {} +static inline void disas_warned_funcs (struct disas_context *dctx) {} + +static inline int disas_info_init (struct disassemble_info *dinfo, +int arch,int mach32,int mach64, +const char *options) +{ +return -1 ; +} + +#endif /* DISAS */ #endif /* _DISAS_H */
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Disassemble code with libopcodes instead of running objdump
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 59953303827eceb06d486ba66cc0d71f55ded8ec Gitweb: https://git.kernel.org/tip/59953303827eceb06d486ba66cc0d71f55ded8ec Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:13 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:07 +01:00
objtool: Disassemble code with libopcodes instead of running objdump
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
--- tools/objtool/.gitignore | 2 +- tools/objtool/Build | 3 +- tools/objtool/Makefile | 25 +++- tools/objtool/arch/loongarch/decode.c | 12 ++- tools/objtool/arch/powerpc/decode.c | 12 ++- tools/objtool/arch/x86/decode.c | 12 ++- tools/objtool/check.c | 14 +- tools/objtool/disas.c | 187 ++++++++++++++++--------- tools/objtool/include/objtool/arch.h | 9 +- tools/objtool/include/objtool/check.h | 5 +- tools/objtool/include/objtool/disas.h | 29 ++++- 11 files changed, 238 insertions(+), 72 deletions(-)
tools/objtool/.gitignore +2 -0
@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only arch/x86/lib/inat-tables.c /objtool +feature +FEATURE-DUMP.objtool fixdep libsubcmd/
tools/objtool/Build +2 -1
@@ -7,7 +7,8 @@ objtool-y += special.o objtool-y += builtin-check.o objtool-y += elf.o objtool-y += objtool.o -objtool-y += disas.o + +objtool-$(BUILD_DISAS) += disas.o objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o
tools/objtool/Makefile +25 -0
@@ -70,6 +70,29 @@ OBJTOOL_CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) # Always want host compilation. HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" +# +# To support disassembly, objtool needs libopcodes which is provided +# with libbdf (binutils-dev or binutils-devel package). +# +FEATURE_USER = .objtool +FEATURE_TESTS = libbfd disassembler-init-styled +FEATURE_DISPLAY = +include $(srctree)/tools/build/Makefile.feature + +ifeq ($(feature-disassembler-init-styled), 1) + OBJTOOL_CFLAGS += -DDISASM_INIT_STYLED +endif + +BUILD_DISAS := n + +ifeq ($(feature-libbfd),1) + BUILD_DISAS := y + OBJTOOL_CFLAGS += -DDISAS + OBJTOOL_LDFLAGS += -lopcodes +endif + +export BUILD_DISAS + AWK = awk MKDIR = mkdir
@@ -103,6 +126,8 @@ clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep + $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool + $(Q)$(RM) -r -- $(OUTPUT)feature FORCE:
tools/objtool/arch/loongarch/decode.c +12 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-or-later #include <string.h> #include <objtool/check.h> +#include <objtool/disas.h> #include <objtool/warn.h> #include <asm/inst.h> #include <asm/orc_types.h>
@@ -414,3 +415,14 @@ unsigned long arch_jump_table_sym_offset(struct reloc *reloc, struct reloc *tablreturn reloc->sym->offset +reloc_addend (reloc); } } + +#ifdef DISAS + +int arch_disas_info_init (struct disassemble_info *dinfo) +{ +return disas_info_init (dinfo, bfd_arch_loongarch, + bfd_mach_loongarch32, bfd_mach_loongarch64, +NULL ); +} + +#endif /* DISAS */
tools/objtool/arch/powerpc/decode.c +12 -0
@@ -3,6 +3,7 @@#include <stdio.h> #include <stdlib.h> #include <objtool/check.h> +#include <objtool/disas.h> #include <objtool/elf.h> #include <objtool/arch.h> #include <objtool/warn.h>
@@ -127,3 +128,14 @@ unsigned int arch_reloc_size(struct reloc *reloc)return 8 ; } } + +#ifdef DISAS + +int arch_disas_info_init (struct disassemble_info *dinfo) +{ +return disas_info_init (dinfo, bfd_arch_powerpc, + bfd_mach_ppc, bfd_mach_ppc64, +NULL ); +} + +#endif /* DISAS */
tools/objtool/arch/x86/decode.c +12 -0
@@ -16,6 +16,7 @@#include <asm/orc_types.h> #include <objtool/check.h> +#include <objtool/disas.h> #include <objtool/elf.h> #include <objtool/arch.h> #include <objtool/warn.h>
@@ -949,3 +950,14 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc)return false; } } + +#ifdef DISAS + +int arch_disas_info_init (struct disassemble_info *dinfo) +{ +return disas_info_init (dinfo, bfd_arch_i386, + bfd_mach_i386_i386, bfd_mach_x86_64, +"att" ); +} + +#endif /* DISAS */
tools/objtool/check.c +9 -5
@@ -4926,8 +4926,6 @@ int check(struct objtool_file *file) goto out; } -free_insns (file); -if (opts.stats) {printf ("nr_insns_visited: %ld\n" , nr_insns_visited);printf ("nr_cfi: %ld\n" , nr_cfi);
@@ -4936,8 +4934,10 @@ int check(struct objtool_file *file) } out: -if (!ret && !warnings) +if (!ret && !warnings) { +free_insns (file);return 0 ; + }if (opts.werror && warnings) ret =1 ;
@@ -4946,10 +4946,14 @@ out:if (opts.werror && warnings)WARN ("%d warning(s) upgraded to errors" , warnings); disas_ctx =disas_context_create (file); -disas_warned_funcs (disas_ctx); -disas_context_destroy (disas_ctx); +if (disas_ctx) { +disas_warned_funcs (disas_ctx); +disas_context_destroy (disas_ctx); + } } +free_insns (file); +if (opts.backup &&make_backup ())return 1 ;
tools/objtool/disas.c +121 -66
233 lines not on this page · raw message
tools/objtool/include/objtool/arch.h +9 -0
@@ -103,4 +103,13 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +#ifdef DISAS + +#include <bfd.h> +#include <dis-asm.h> + +int arch_disas_info_init (struct disassemble_info *dinfo); + +#endif /* DISAS */ +#endif /* _ARCH_H */
tools/objtool/include/objtool/check.h +5 -0
@@ -127,4 +127,9 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, struct instruc insn && insn->sec == _sec; \ insn = next_insn_same_sec(file, insn)) +#define sym_for_each_insn (file, sym, insn) \ + for (insn = find_insn(file, sym->sec, sym->offset); \ + insn && insn->offset < sym->offset + sym->len; \ + insn = next_insn_same_sec(file, insn)) +#endif /* _CHECK_H */
tools/objtool/include/objtool/disas.h +29 -0
@@ -7,8 +7,37 @@#define _DISAS_Hstruct disas_context ; +struct disassemble_info ; + +#ifdef DISAS +struct disas_context *disas_context_create (struct objtool_file *file);void disas_context_destroy (struct disas_context *dctx);void disas_warned_funcs (struct disas_context *dctx); +int disas_info_init (struct disassemble_info *dinfo, +int arch,int mach32,int mach64, +const char *options); + +#else /* DISAS */ + +#include <objtool/warn.h> + +static inline struct disas_context *disas_context_create (struct objtool_file *file) +{ +WARN ("Rebuild with libopcodes for disassembly support" ); +return NULL ; +} + +static inline void disas_context_destroy (struct disas_context *dctx) {} +static inline void disas_warned_funcs (struct disas_context *dctx) {} + +static inline int disas_info_init (struct disassemble_info *dinfo, +int arch,int mach32,int mach64, +const char *options) +{ +return -1 ; +} + +#endif /* DISAS */ #endif /* _DISAS_H */
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
In reply to Alexandre ChartreHi Alexandre,
Quoted 6 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Signed-off-by Alexandre Chartre <[email protected]>
...
tools/objtool/include/objtool/arch.h bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc); · line 108
Quoted 11 lines
tools/objtool/include/objtool/arch.h +3
-0@@ -103,4 +103,13 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +#ifdef DISAS + +#include <bfd.h>
This include of bfd.h breaks the build for me:
$ make -skj"$(nproc)" ARCH=x86_64 CROSS_COMPILE=x86_64-linux- clean defconfig bzImage
In file included from tools/objtool/include/objtool/arch.h:108,
from check.c:14:
/usr/include/bfd.h:35:2: error: #error config.h must be included before this header
35 | #error config.h must be included before this header
| ^~~~~
...where my bfd.h has:
#ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__
/* PR 14072: Ensure that config.h is included first. */ #if !defined PACKAGE && !defined PACKAGE_VERSION #error config.h must be included before this header #endif
Something like this cures it for me but I am not sure if that is a proper fix or not since I see config.h in my binutils build folder has many other defines.
Cheers,
Nathan
tools/objtool/Makefile +1 -1
@@ -87,7 +87,7 @@ BUILD_DISAS := n ifeq ($(feature-libbfd),1) BUILD_DISAS := y - OBJTOOL_CFLAGS += -DDISAS + OBJTOOL_CFLAGS += -DDISAS -DPACKAGE="objtool-disas" OBJTOOL_LDFLAGS += -lopcodes endif
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 34 lines · Nathan Chancellor
Hi Alexandre,
Quoted 6 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Signed-off-by Alexandre Chartre <[email protected]>...
tools/objtool/include/objtool/arch.h bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc); · line 108
Quoted 11 lines
tools/objtool/include/objtool/arch.h +3
-0@@ -103,4 +103,13 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +#ifdef DISAS + +#include <bfd.h> This include of
bfd.hbreaks the build for me:$ make -skj"$(nproc)" ARCH=x86_64 CROSS_COMPILE=x86_64-linux- clean defconfig bzImage In file included from tools/objtool/include/objtool/arch.h:108, from check.c:14: /usr/include/bfd.h:35:2: error: #error config.h must be included before this header 35 | #error config.h must be included before this header | ^~~~~ ...where my
bfd.hhas:
Quoted 7 lines
#ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__/* PR 14072: Ensure that config.h is included first. */ #if !defined PACKAGE && !defined PACKAGE_VERSION #error config.h must be included before this header #endif
This check is effectively present in the bfd.h file generated from the binutils source code. However it is not present in the bfd.h file provided by the binutils RPM. I think this explained why we haven't seen this issue so far.
For history, this was introduced in 2012 for bug 14072. Then there was complaints reported in bug 14243 and 15920. But it was decided not to remove this change, and the suggested fix was to define PACKAGE when including bfd.h.
https://sourceware.org/bugzilla/show_bug.cgi?id=14072
https://sourceware.org/bugzilla/show_bug.cgi?id=14243
https://sourceware.org/bugzilla/show_bug.cgi?id=15920
And Redhat has fixed the issue for the binutils RPM by removing this test:
https://sourceware.org/bugzilla/show_bug.cgi?id=14243
Quoted 12 lines
Something like this cures it for me but I am not sure if that is a proper fix or not since I see
config.hin my binutils build folder has many other defines.Cheers,
Nathantools/objtool/Makefile +0
-0
tools/objtool/Makefile BUILD_DISAS := n · line 93
Quoted 8 lines
tools/objtool/Makefile +1
-1@@ -87,7 +87,7 @@ BUILD_DISAS := n ifeq ($(feature-libbfd),1) BUILD_DISAS := y - OBJTOOL_CFLAGS += -DDISAS + OBJTOOL_CFLAGS += -DDISAS -DPACKAGE="objtool-disas" OBJTOOL_LDFLAGS += -lopcodes endif
This is the proper fix (as indicated in the binutils bugs), and this is what the other kernel tools using bfd.h (bpf and perf) do. I will create a patch with your suggestion.
Thanks,
alex.
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 75 lines · On Wed, 26 Nov 2025 10:00:36 +0100 Alexandre Chartre…
Quoted 34 lines · Nathan Chancellor
Hi Alexandre,
Quoted 6 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Signed-off-by Alexandre Chartre <[email protected]>...
tools/objtool/include/objtool/arch.h bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc); · line 108
Quoted 11 lines
tools/objtool/include/objtool/arch.h +3
-0@@ -103,4 +103,13 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +#ifdef DISAS + +#include <bfd.h> This include of
bfd.hbreaks the build for me:$ make -skj"$(nproc)" ARCH=x86_64 CROSS_COMPILE=x86_64-linux- clean defconfig bzImage In file included from tools/objtool/include/objtool/arch.h:108, from check.c:14: /usr/include/bfd.h:35:2: error: #error config.h must be included before this header 35 | #error config.h must be included before this header | ^~~~~ ...where my
bfd.hhas:Quoted 7 lines
#ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__/* PR 14072: Ensure that config.h is included first. */ #if !defined PACKAGE && !defined PACKAGE_VERSION #error config.h must be included before this header #endifThis check is effectively present in the
bfd.hfile generated from the binutils source code. However it is not present in thebfd.hfile provided by the binutils RPM. I think this explained why we haven't seen this issue so far.For history, this was introduced in 2012 for bug 14072. Then there was complaints reported in bug 14243 and 15920. But it was decided not to remove this change, and the suggested fix was to define PACKAGE when including
bfd.h.https://sourceware.org/bugzilla/show_bug.cgi?id=14072
https://sourceware.org/bugzilla/show_bug.cgi?id=14243
https://sourceware.org/bugzilla/show_bug.cgi?id=15920And Redhat has fixed the issue for the binutils RPM by removing this test:
https://sourceware.org/bugzilla/show_bug.cgi?id=14243
Quoted 13 lines
Something like this cures it for me but I am not sure if that is a proper fix or not since I see
config.hin my binutils build folder has many other defines.Cheers,
Nathantools/objtool/Makefile +0
-0@@ -87,7 +87,7 @@ BUILD_DISAS := n
Quoted 11 lines
tools/objtool/Makefile BUILD_DISAS := n · line 93
Quoted 7 lines
tools/objtool/Makefile +1
-1ifeq ($(feature-libbfd),1) BUILD_DISAS := y - OBJTOOL_CFLAGS += -DDISAS + OBJTOOL_CFLAGS += -DDISAS -DPACKAGE="objtool-disas" OBJTOOL_LDFLAGS += -lopcodes endifThis is the proper fix (as indicated in the binutils bugs), and this is what the other kernel tools using
bfd.h(bpf and perf) do. I will create a patch with your suggestion.
ISTM that defining it just before including bfd.h is cleaner and more obvious.
David
Quoted 6 lines
Thanks,
alex.
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 90 lines · David Laight
Quoted 75 lines · On Wed, 26 Nov 2025 10:00:36 +0100 Alexandre Chartre…
Quoted 34 lines · Nathan Chancellor
Hi Alexandre,
Quoted 6 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Signed-off-by Alexandre Chartre <[email protected]>...
tools/objtool/include/objtool/arch.h bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc); · line 108
Quoted 11 lines
tools/objtool/include/objtool/arch.h +3
-0@@ -103,4 +103,13 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +#ifdef DISAS + +#include <bfd.h> This include of
bfd.hbreaks the build for me:$ make -skj"$(nproc)" ARCH=x86_64 CROSS_COMPILE=x86_64-linux- clean defconfig bzImage In file included from tools/objtool/include/objtool/arch.h:108, from check.c:14: /usr/include/bfd.h:35:2: error: #error config.h must be included before this header 35 | #error config.h must be included before this header | ^~~~~ ...where my
bfd.hhas:Quoted 7 lines
#ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__ /* PR 14072: Ensure that config.h is included first. */ #if !defined PACKAGE && !defined PACKAGE_VERSION #error config.h must be included before this header #endifThis check is effectively present in the
bfd.hfile generated from the binutils source code. However it is not present in thebfd.hfile provided by the binutils RPM. I think this explained why we haven't seen this issue so far.For history, this was introduced in 2012 for bug 14072. Then there was complaints reported in bug 14243 and 15920. But it was decided not to remove this change, and the suggested fix was to define PACKAGE when including
bfd.h.https://sourceware.org/bugzilla/show_bug.cgi?id=14072
https://sourceware.org/bugzilla/show_bug.cgi?id=14243
https://sourceware.org/bugzilla/show_bug.cgi?id=15920And Redhat has fixed the issue for the binutils RPM by removing this test:
https://sourceware.org/bugzilla/show_bug.cgi?id=14243
Quoted 13 lines
Something like this cures it for me but I am not sure if that is a proper fix or not since I see
config.hin my binutils build folder has many other defines.Cheers,
Nathantools/objtool/Makefile +0
-0@@ -87,7 +87,7 @@ BUILD_DISAS := nQuoted 11 lines
tools/objtool/Makefile BUILD_DISAS := n · line 93
Quoted 7 lines
tools/objtool/Makefile +1
-1ifeq ($(feature-libbfd),1) BUILD_DISAS := y - OBJTOOL_CFLAGS += -DDISAS + OBJTOOL_CFLAGS += -DDISAS -DPACKAGE="objtool-disas" OBJTOOL_LDFLAGS += -lopcodes endifThis is the proper fix (as indicated in the binutils bugs), and this is what the other kernel tools using
bfd.h(bpf and perf) do. I will create a patch with your suggestion.
Quoted 2 lines
ISTM that defining it just before including
bfd.his cleaner and more obvious.
bfd.h is included at two different places: in arch.h and disas.c (and disas.c includes arch.h). So we would need to ensure that PACKAGE always has the same definition otherwise we will have a redefine error.
So I think it is simpler to have a global definition with -DPACKAGE. Similarly, bpf has multiple includes and uses -DPACKAGE=bpf, while perf has a single include and use a single define before the include.
alex.
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
In reply to Alexandre ChartreHi,
Quoted 6 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Signed-off-by Alexandre Chartre <[email protected]>
With this patch in mainline, I get the following build error when trying to build x86_64:defconfig (and other configurations).
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
Guenter
---
Building x86_64:defconfig ... failed
--------------
Error log:
In file included from disas.c:17:tools/include/tools/dis-asm-compat.h:19:39: error: ‘enum disassembler_style’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
19 | enum disassembler_style style,
| ^~~~~~~~~~~~~~~~~~
tools/include/tools/dis-asm-compat.h:19:58: error: parameter 2 (‘style’) has incomplete type
19 | enum disassembler_style style,
| ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
tools/include/tools/dis-asm-compat.h:42:49: error: unknown type name ‘fprintf_styled_ftype’; did you mean ‘fprintf_ftype’?
42 | fprintf_styled_ftype styled_func)
| ^~~~~~~~~~~~~~~~~~~~
| fprintf_ftype
disas.c:152:38: error: ‘enum disassembler_style’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
152 | enum disassembler_style style,
| ^~~~~~~~~~~~~~~~~~
disas.c:152:57: error: parameter 2 (‘style’) has incomplete type
152 | enum disassembler_style style,
| ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
disas.c: In function ‘disas_context_create’:
disas.c:367:9: error: implicit declaration of function ‘init_disassemble_info_compat’; did you mean ‘init_disassemble_info’? [-Werror=implicit-function-declaration]
367 | init_disassemble_info_compat(dinfo, dctx,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| init_disassemble_info
In file included from tools/include/linux/kernel.h:5,
from tools/include/linux/list.h:7,
from tools/objtool/include/objtool/arch.h:10,
from disas.c:9:
disas.c: In function ‘disas_fprintf_styled’:
disas.c:158:9: error: ‘va_start’ used in function with fixed arguments
158 | va_start(arg, fmt);
| ^~~~~~~~cc1: all warnings being treated as errors
---
Bisect:
# bad: [cb015814f8b6eebcbb8e46e111d108892c5e6821] Merge tag 'f2fs-for-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
# good: [7d0a66e4bb9081d75c82ec4957c50034cb0ea449] Linux 6.18
git bisect start 'HEAD' 'v6.18'
# bad: [6dfafbd0299a60bfb5d5e277fdf100037c7ded07] Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
git bisect bad 6dfafbd0299a60bfb5d5e277fdf100037c7ded07
# bad: [8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88] Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
git bisect bad 8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88
# bad: [4a4e0199378f309fa7259132e1443efe56c1e276] Merge tag 'lkmm.2025.12.01a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
git bisect bad 4a4e0199378f309fa7259132e1443efe56c1e276
# bad: [a61288200e8b6f42bff116508dc72ebcc206f10a] Merge tag 'ras_core_for_v6.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
git bisect bad a61288200e8b6f42bff116508dc72ebcc206f10a
# good: [1b5dd29869b1e63f7e5c37d7552e2dcf22de3c26] Merge tag 'vfs-6.19-rc1.fd_prepare.fs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
git bisect good 1b5dd29869b1e63f7e5c37d7552e2dcf22de3c26
# bad: [dcd8637edb873bd940e6aa82417dfb33ae980778] Merge tag 'x86-core-2025-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
git bisect bad dcd8637edb873bd940e6aa82417dfb33ae980778
# bad: [7e017720aae87dc2ca2471ac295e34e2b240e5f5] objtool: Disassemble jump table alternatives
git bisect bad 7e017720aae87dc2ca2471ac295e34e2b240e5f5
# good: [164c9201e1dad8d5c0c38f583dba81e4b6da9cc7] objtool: Add base objtool support for livepatch modules
git bisect good 164c9201e1dad8d5c0c38f583dba81e4b6da9cc7
# good: [9205a322cf96f16a49e412dfa3f09431f3e02fc5] objtool: Return canonical symbol when aliases exist in symbol finding helpers git bisect good 9205a322cf96f16a49e412dfa3f09431f3e02fc5
# bad: [0bb080ba6469a573bc85122153d931334d10a173] objtool: Disassemble instruction on warning or backtrace
git bisect bad 0bb080ba6469a573bc85122153d931334d10a173
# good: [93863f3f859a626347ce2ec18947b11357b4ca14] kbuild: Check for functions with ambiguous -ffunction-sections section names git bisect good 93863f3f859a626347ce2ec18947b11357b4ca14
# bad: [59953303827eceb06d486ba66cc0d71f55ded8ec] objtool: Disassemble code with libopcodes instead of running objdump
git bisect bad 59953303827eceb06d486ba66cc0d71f55ded8ec
# good: [55d2a473f317ab028d78a5c5ca69473643657c3d] objtool: Move disassembly functions to a separated file
git bisect good 55d2a473f317ab028d78a5c5ca69473643657c3d
# good: [1013f2e37bec39b1df5679e1c1e2572ece87c088] objtool: Create disassembly context
git bisect good 1013f2e37bec39b1df5679e1c1e2572ece87c088
# first bad commit: [59953303827eceb06d486ba66cc0d71f55ded8ec] objtool: Disassemble code with libopcodes instead of running objdump
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 8 lines · Guenter Roeck
Hi,
Quoted 5 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Quoted 8 lines
Quoted 1 line
Signed-off-by Alexandre Chartre <[email protected]>With this patch in mainline, I get the following build error when trying to build x86_64:defconfig (and other configurations).
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of DISASM_INIT_STYLED (although that's supposed to be automatically configured by tools/objtool/Makefile).
Which binutils-devel version are you using?
Thanks,
alex.
Quoted 71 lines
Building x86_64:defconfig ... failed
--------------
Error log:
In file included from disas.c:17:tools/include/tools/dis-asm-compat.h:19:39: error: ‘enum disassembler_style’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
19 | enumdisassembler_stylestyle,
| ^~~~~~~~~~~~~~~~~~tools/include/tools/dis-asm-compat.h:19:58: error: parameter 2 (‘style’) has incomplete type19 | enum disassembler_style style, | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ tools/include/tools/dis-asm-compat.h:42:49: error: unknown type name ‘fprintf_styled_ftype’; did you mean ‘fprintf_ftype’? 42 | fprintf_styled_ftype styled_func) | ^~~~~~~~~~~~~~~~~~~~ | fprintf_ftype disas.c:152:38: error: ‘enum disassembler_style’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] 152 | enum disassembler_style style, | ^~~~~~~~~~~~~~~~~~ disas.c:152:57: error: parameter 2 (‘style’) has incomplete type 152 | enum disassembler_style style, | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ disas.c: In function ‘disas_context_create’: disas.c:367:9: error: implicit declaration of function ‘init_disassemble_info_compat’; did you mean ‘init_disassemble_info’? [-Werror=implicit-function-declaration] 367 | init_disassemble_info_compat(dinfo, dctx, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ | init_disassemble_info In file included from tools/include/linux/kernel.h:5, from tools/include/linux/list.h:7, from tools/objtool/include/objtool/arch.h:10, from disas.c:9: disas.c: In function ‘disas_fprintf_styled’: disas.c:158:9: error: ‘va_start’ used in function with fixed arguments 158 | va_start(arg, fmt); | ^~~~~~~~cc1: all warnings being treated as errors
---
Bisect:# bad: [
cb015814f8b6eebcbb8e46e111d108892c5e6821] Merge tag 'f2fs-for-6.19-rc1' ofgit://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
# good: [7d0a66e4bb9081d75c82ec4957c50034cb0ea449] Linux 6.18
git bisect start 'HEAD' 'v6.18'
# bad: [6dfafbd0299a60bfb5d5e277fdf100037c7ded07] Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
git bisect bad6dfafbd0299a60bfb5d5e277fdf100037c7ded07
# bad: [8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88] Merge tag 'net-next-6.19' ofgit://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
git bisect bad8f7aa3d3c7323f4ca2768a9e74ebbe359c4f8f88
# bad: [4a4e0199378f309fa7259132e1443efe56c1e276] Merge tag 'lkmm.2025.12.01a' ofgit://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
git bisect bad4a4e0199378f309fa7259132e1443efe56c1e276
# bad: [a61288200e8b6f42bff116508dc72ebcc206f10a] Merge tag 'ras_core_for_v6.19_rc1' ofgit://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
git bisect bada61288200e8b6f42bff116508dc72ebcc206f10a
# good: [1b5dd29869b1e63f7e5c37d7552e2dcf22de3c26] Merge tag 'vfs-6.19-rc1.fd_prepare.fs' ofgit://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
git bisect good1b5dd29869b1e63f7e5c37d7552e2dcf22de3c26
# bad: [dcd8637edb873bd940e6aa82417dfb33ae980778] Merge tag 'x86-core-2025-12-01' ofgit://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
git bisect baddcd8637edb873bd940e6aa82417dfb33ae980778
# bad: [7e017720aae87dc2ca2471ac295e34e2b240e5f5] objtool: Disassemble jump table alternatives
git bisect bad7e017720aae87dc2ca2471ac295e34e2b240e5f5
# good: [164c9201e1dad8d5c0c38f583dba81e4b6da9cc7] objtool: Add base objtool support for livepatch modules
git bisect good164c9201e1dad8d5c0c38f583dba81e4b6da9cc7
# good: [9205a322cf96f16a49e412dfa3f09431f3e02fc5] objtool: Return canonical symbol when aliases exist in symbol finding helpers git bisect good9205a322cf96f16a49e412dfa3f09431f3e02fc5
# bad: [0bb080ba6469a573bc85122153d931334d10a173] objtool: Disassemble instruction on warning or backtrace
git bisect bad0bb080ba6469a573bc85122153d931334d10a173
# good: [93863f3f859a626347ce2ec18947b11357b4ca14] kbuild: Check for functions with ambiguous -ffunction-sections section names git bisect good93863f3f859a626347ce2ec18947b11357b4ca14
# bad: [59953303827eceb06d486ba66cc0d71f55ded8ec] objtool: Disassemble code with libopcodes instead of running objdump
git bisect bad59953303827eceb06d486ba66cc0d71f55ded8ec
# good: [55d2a473f317ab028d78a5c5ca69473643657c3d] objtool: Move disassembly functions to a separated file
git bisect good55d2a473f317ab028d78a5c5ca69473643657c3d
# good: [1013f2e37bec39b1df5679e1c1e2572ece87c088] objtool: Create disassembly context
git bisect good1013f2e37bec39b1df5679e1c1e2572ece87c088# first bad commit: [59953303827eceb06d486ba66cc0d71f55ded8ec] objtool: Disassemble code with libopcodes instead of running objdump
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 19 lines · Alexandre Chartre
Quoted 8 lines · Guenter Roeck
Hi,
Quoted 5 lines · Alexandre Chartre
objtool executes the objdump command to disassemble code. Use libopcodes instead to have more control about the disassembly scope and output. If libopcodes is not present then objtool is built without disassembly support.
Quoted 8 lines
Quoted 1 line
Signed-off-by Alexandre Chartre <[email protected]>With this patch in mainline, I get the following build error when trying to build x86_64:defconfig (and other configurations).
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
Quoted 6 lines
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).Which binutils-devel version are you using?
I tried 2.38 (with gcc 11.4), 2.42 (with gcc 13.3), and 2.44 (with gcc 14.3) in three different environments (Ubuntu 12.4, 14.4, and self-built tools).
Guenter
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
In reply to Alexandre ChartreQuoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).
I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that
binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Wouldn't it make sense to improve objdump instead so as to provide the
features required?
Also is it actually legal to link objtool and libopcodes together, given
that they are GPLv2 and GPLv3 respectively?
FWIW asking as one of the binutils contributors and port maintainers.
Maciej
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 15 lines · Maciej W. Rozycki
Quoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that
binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Quoted 8 lines
Wouldn't it make sense to improve objdump instead so as to provide the
features required?Also is it actually legal to link objtool and libopcodes together, given
that they are GPLv2 and GPLv3 respectively?FWIW asking as one of the binutils contributors and port maintainers.
After some more digging I found that the version of binutils installed in the system determines if the build error is seen or not. So I can have a toolchain with the latest binutils version, but the build still fails if the binutils version installed in the system is too old. 2.38 (as in Ubuntu 22.04) is too old since it does not define 'enum disassembler_style' in dis-asm.h. As far as I can see that enum was only introduced with binutils 2.39.
Now the problem is that DISASM_INIT_STYLED is evaluated with tools/build/feature/test-disassembler-init-styled.c, which checks for the existence of struct disassemble_info (not the enum). AFAICS that structure was introduced with binutils-2_18.
Unless my analysis is wrong that means that Linux will now fail to build on systems with binutils 2.18 ... 2.38 installed.
Guenter
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 33 lines · Guenter Roeck
Quoted 15 lines · Maciej W. Rozycki
Quoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Quoted 8 lines
Wouldn't it make sense to improve objdump instead so as to provide the features required?
Also is it actually legal to link objtool and libopcodes together, given that they are GPLv2 and GPLv3 respectively?
FWIW asking as one of the binutils contributors and port maintainers.
After some more digging I found that the version of binutils installed in the system determines if the build error is seen or not. So I can have a toolchain with the latest binutils version, but the build still fails if the binutils version installed in the system is too old. 2.38 (as in Ubuntu 22.04) is too old since it does not define 'enum
disassembler_style' indis-asm.h. As far as I can see that enum was only introduced with binutils 2.39.
Quoted 7 lines
Now the problem is that
DISASM_INIT_STYLEDis evaluated withtools/build/feature/test-disassembler-init-styled.c, which checks for the existence of structdisassemble_info(not the enum). AFAICS that structure was introduced with binutils-2_18.Unless my analysis is wrong that means that Linux will now fail to build on systems with binutils 2.18 ... 2.38 installed.
test-disassembler-init-styled.c tests that init_disassemble_info() has four arguments. If this fails then this means that it has only three args and in that case enum disassembler_style is not defined, and the build should be done without defining DISASM_INIT_STYLED.
init_disassemble_info() was changed from 3 args to 4 args by the following binutils change, and enum disassembler_style was introduced at the same time:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
This change has caused the Linux build to fail, and this was fixed by commit a45b3d6926231 ("tools include: add dis-asm-compat.h to handle version differences") which introduced dis-asm-compat.h
Can you check that init_disassemble_info() is declared with only 3 arguments in your dis-asm.h file? (/usr/include/dis-asm.h).
dis-asm.h should either:
- declare init_disassemble_info() with 3 args and not define enum disassembler_style
or
- declare init_disassemble_info() with 4 args and define enum disassembler_style
alex.
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 62 lines · Alexandre Chartre
Quoted 33 lines · Guenter Roeck
Quoted 15 lines · Maciej W. Rozycki
Quoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Quoted 8 lines
Wouldn't it make sense to improve objdump instead so as to provide the features required?
Also is it actually legal to link objtool and libopcodes together, given that they are GPLv2 and GPLv3 respectively?
FWIW asking as one of the binutils contributors and port maintainers.
After some more digging I found that the version of binutils installed in the system determines if the build error is seen or not. So I can have a toolchain with the latest binutils version, but the build still fails if the binutils version installed in the system is too old. 2.38 (as in Ubuntu 22.04) is too old since it does not define 'enum
disassembler_style' indis-asm.h. As far as I can see that enum was only introduced with binutils 2.39.Quoted 7 lines
Now the problem is that
DISASM_INIT_STYLEDis evaluated withtools/build/feature/test-disassembler-init-styled.c, which checks for the existence of structdisassemble_info(not the enum). AFAICS that structure was introduced with binutils-2_18.Unless my analysis is wrong that means that Linux will now fail to build on systems with binutils 2.18 ... 2.38 installed.
test-disassembler-init-styled.ctests thatinit_disassemble_info()has four arguments. If this fails then this means that it has only three args and in that case enumdisassembler_styleis not defined, and the build should be done without definingDISASM_INIT_STYLED.
init_disassemble_info()was changed from 3 args to 4 args by the following binutils change, and enumdisassembler_stylewas introduced at the same time:https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
This change has caused the Linux build to fail, and this was fixed by commit
a45b3d6926231("tools include: adddis-asm-compat.hto handle version differences") which introduceddis-asm-compat.hCan you check that
init_disassemble_info()is declared with only 3 arguments in yourdis-asm.hfile? (/usr/include/dis-asm.h).
Quoted 8 lines
dis-asm.hshould either:- declare
init_disassemble_info()with 3 args and not define enumdisassembler_styleor
- declare
init_disassemble_info()with 4 args and define enumdisassembler_style
Thanks for the clarification.
Here is the declaration:
/* Method to initialize a disassemble_info struct. This should be
called by all applications creating such a struct. */
extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
fprintf_ftype fprintf_func);
So it has three arguments, but DISASM_INIT_STYLED is defined anyway.
I think I found the problem: not even "make mrproper" or "make distclean" deletes ./tools/objtool/feature/test-disassembler-init-styled.bin, and the file existed in my tree. So DISASM_INIT_STYLED just ended up being defined until I deleted the file manually.
This condition also happens in my build system. I have not been able to re-create the situation where the .bin file exists but shouldn't, but it somehow does happen.
Guenter
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 83 lines · Guenter Roeck
Quoted 62 lines · Alexandre Chartre
Quoted 33 lines · Guenter Roeck
Quoted 15 lines · Maciej W. Rozycki
Quoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Quoted 8 lines
Wouldn't it make sense to improve objdump instead so as to provide the features required?
Also is it actually legal to link objtool and libopcodes together, given that they are GPLv2 and GPLv3 respectively?
FWIW asking as one of the binutils contributors and port maintainers.
After some more digging I found that the version of binutils installed in the system determines if the build error is seen or not. So I can have a toolchain with the latest binutils version, but the build still fails if the binutils version installed in the system is too old. 2.38 (as in Ubuntu 22.04) is too old since it does not define 'enum
disassembler_style' indis-asm.h. As far as I can see that enum was only introduced with binutils 2.39.Quoted 7 lines
Now the problem is that
DISASM_INIT_STYLEDis evaluated withtools/build/feature/test-disassembler-init-styled.c, which checks for the existence of structdisassemble_info(not the enum). AFAICS that structure was introduced with binutils-2_18.Unless my analysis is wrong that means that Linux will now fail to build on systems with binutils 2.18 ... 2.38 installed.
test-disassembler-init-styled.ctests thatinit_disassemble_info()has four arguments. If this fails then this means that it has only three args and in that case enumdisassembler_styleis not defined, and the build should be done without definingDISASM_INIT_STYLED.
init_disassemble_info()was changed from 3 args to 4 args by the following binutils change, and enumdisassembler_stylewas introduced at the same time:https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
This change has caused the Linux build to fail, and this was fixed by commit
a45b3d6926231("tools include: adddis-asm-compat.hto handle version differences") which introduceddis-asm-compat.hCan you check that
init_disassemble_info()is declared with only 3 arguments in yourdis-asm.hfile? (/usr/include/dis-asm.h).Quoted 8 lines
dis-asm.hshould either:- declare
init_disassemble_info()with 3 args and not define enumdisassembler_styleor
- declare
init_disassemble_info()with 4 args and define enumdisassembler_styleThanks for the clarification.
Here is the declaration:
/* Method to initialize a
disassemble_infostruct. This should be
called by all applications creating such a struct. */
extern voidinit_disassemble_info(structdisassemble_info*dinfo, void *stream,
fprintf_ftypefprintf_func);So it has three arguments, but
DISASM_INIT_STYLEDis defined anyway.
Quoted 8 lines
I think I found the problem: not even "make mrproper" or "make distclean" deletes
./tools/objtool/feature/test-disassembler-init-styled.bin, and the file existed in my tree. SoDISASM_INIT_STYLEDjust ended up being defined until I deleted the file manually.This condition also happens in my build system. I have not been able to re-create the situation where the .bin file exists but shouldn't, but it somehow does happen.
That's weird because the "clean" rule in tools/objtool/Makefile should remove the entire tools/objtool/feature directory:
$ cat tools/objtool/Makefile ... clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)feature
see $(Q)$(RM) -r -- $(OUTPUT)feature
alex.
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 108 lines · Alexandre Chartre
Quoted 83 lines · Guenter Roeck
Quoted 62 lines · Alexandre Chartre
Quoted 33 lines · Guenter Roeck
Quoted 15 lines · Maciej W. Rozycki
Quoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Quoted 8 lines
Wouldn't it make sense to improve objdump instead so as to provide the features required?
Also is it actually legal to link objtool and libopcodes together, given that they are GPLv2 and GPLv3 respectively?
FWIW asking as one of the binutils contributors and port maintainers.
After some more digging I found that the version of binutils installed in the system determines if the build error is seen or not. So I can have a toolchain with the latest binutils version, but the build still fails if the binutils version installed in the system is too old. 2.38 (as in Ubuntu 22.04) is too old since it does not define 'enum
disassembler_style' indis-asm.h. As far as I can see that enum was only introduced with binutils 2.39.Quoted 7 lines
Now the problem is that
DISASM_INIT_STYLEDis evaluated withtools/build/feature/test-disassembler-init-styled.c, which checks for the existence of structdisassemble_info(not the enum). AFAICS that structure was introduced with binutils-2_18.Unless my analysis is wrong that means that Linux will now fail to build on systems with binutils 2.18 ... 2.38 installed.
test-disassembler-init-styled.ctests thatinit_disassemble_info()has four arguments. If this fails then this means that it has only three args and in that case enumdisassembler_styleis not defined, and the build should be done without definingDISASM_INIT_STYLED.
init_disassemble_info()was changed from 3 args to 4 args by the following binutils change, and enumdisassembler_stylewas introduced at the same time:https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
This change has caused the Linux build to fail, and this was fixed by commit
a45b3d6926231("tools include: adddis-asm-compat.hto handle version differences") which introduceddis-asm-compat.hCan you check that
init_disassemble_info()is declared with only 3 arguments in yourdis-asm.hfile? (/usr/include/dis-asm.h).Quoted 8 lines
dis-asm.hshould either:- declare
init_disassemble_info()with 3 args and not define enumdisassembler_styleor
- declare
init_disassemble_info()with 4 args and define enumdisassembler_styleThanks for the clarification.
Here is the declaration:
/* Method to initialize a
disassemble_infostruct. This should be called by all applications creating such a struct. */
extern voidinit_disassemble_info(structdisassemble_info*dinfo, void *stream,fprintf_ftypefprintf_func);So it has three arguments, but
DISASM_INIT_STYLEDis defined anyway.Quoted 8 lines
I think I found the problem: not even "make mrproper" or "make distclean" deletes
./tools/objtool/feature/test-disassembler-init-styled.bin, and the file existed in my tree. SoDISASM_INIT_STYLEDjust ended up being defined until I deleted the file manually.This condition also happens in my build system. I have not been able to re-create the situation where the .bin file exists but shouldn't, but it somehow does happen.
That's weird because the "clean" rule in
tools/objtool/Makefileshould remove the entiretools/objtool/featuredirectory:$ cat tools/objtool/Makefile ... clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)feature
Quoted 2 lines
see $(Q)$(RM) -r -- $(OUTPUT)feature
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make clean CLEAN arch/x86/lib CLEAN certs CLEAN arch/x86/entry/vdso CLEAN init CLEAN lib/crc CLEAN arch/x86/tools CLEAN arch/x86/realmode/rm CLEAN security/selinux CLEAN usr CLEAN . $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $
"make clean" does not execute the cleanup in tools/objtool. I have to run "make -C tools/objtool clean". "make mrproper" doesn't clean tools either.
I guess that is on purpose ?
Anyway, even "make -C tools/objtool clean" doesn't solve my problem if I build with an out-of-tree toolchain. Turns out that, in this case, test-disassembler-init-styled is build with binutils from the toolchain (which succeeds because its binutils version is more recent). Later on, the actual build of disas.c fails because it uses the system toolchain.
Guenter
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
On 12/10/25 10:42, Guenter Roeck wrote:
...
Quoted 40 lines
Quoted 13 lines
That's weird because the "clean" rule in
tools/objtool/Makefileshould remove the entiretools/objtool/featuredirectory:$ cat tools/objtool/Makefile ... clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)featureQuoted 2 lines
see $(Q)$(RM) -r -- $(OUTPUT)feature
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make clean CLEAN arch/x86/lib CLEAN certs CLEAN arch/x86/entry/vdso CLEAN init CLEAN lib/crc CLEAN arch/x86/tools CLEAN arch/x86/realmode/rm CLEAN security/selinux CLEAN usr CLEAN . $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $"make clean" does not execute the cleanup in
tools/objtool. I have to run "make -Ctools/objtoolclean". "make mrproper" doesn't clean tools either.
Quoted 8 lines
I guess that is on purpose ?
Anyway, even "make -C
tools/objtoolclean" doesn't solve my problem if I build with an out-of-tree toolchain. Turns out that, in this case, test-disassembler-init-styled is build with binutils from the toolchain (which succeeds because its binutils version is more recent). Later on, the actual build ofdisas.cfails because it uses the system toolchain.
This is actually even worse than I thought.
$ git clean -d -x -f -q $ make defconfig $ make -j40 $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make -C tools/objtool/ clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.d $ rm -f ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.d $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c $ make -C tools/objtool/ clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.d
Repeated with local toolchain:
$ git clean -d -x -f -q $ make-x86 defconfig $ make-x86 -j40 (fails) $ make-x86 -C tools/objtool clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.bin ./tools/objtool/feature/test-disassembler-init-styled.d
So the "make clean" command actually (re-)creates the .bin file. Worse, if I now run
$ make -C tools/objtool clean
with the system toolchain, the .bin file is not removed.
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.bin ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.d
The local toolchain used in this example is gcc 13.3.0 with binutils 2.42.
Guenter
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 93 lines · Guenter Roeck
On 12/10/25 10:42, Guenter Roeck wrote:
...Quoted 40 lines
Quoted 13 lines
That's weird because the "clean" rule in
tools/objtool/Makefileshould remove the entiretools/objtool/featuredirectory:$ cat tools/objtool/Makefile ... clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)featureQuoted 2 lines
see $(Q)$(RM) -r -- $(OUTPUT)feature
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make clean CLEAN arch/x86/lib CLEAN certs CLEAN arch/x86/entry/vdso CLEAN init CLEAN lib/crc CLEAN arch/x86/tools CLEAN arch/x86/realmode/rm CLEAN security/selinux CLEAN usr CLEAN . $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $"make clean" does not execute the cleanup in
tools/objtool. I have to run "make -Ctools/objtoolclean". "make mrproper" doesn't clean tools either.Quoted 8 lines
I guess that is on purpose ?
Anyway, even "make -C
tools/objtoolclean" doesn't solve my problem if I build with an out-of-tree toolchain. Turns out that, in this case, test-disassembler-init-styled is build with binutils from the toolchain (which succeeds because its binutils version is more recent). Later on, the actual build ofdisas.cfails because it uses the system toolchain.This is actually even worse than I thought.
$ git clean -d -x -f -q $ make defconfig $ make -j40 $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make -C tools/objtool/ clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.d $ rm -f ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.d $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c $ make -C tools/objtool/ clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.dRepeated with local toolchain:
$ git clean -d -x -f -q $ make-x86 defconfig $ make-x86 -j40 (fails) $ make-x86 -C tools/objtool clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.bin ./tools/objtool/feature/test-disassembler-init-styled.dSo the "make clean" command actually (re-)creates the .bin file. Worse, if I now run
$ make -C tools/objtool cleanwith the system toolchain, the .bin file is not removed.
Quoted 8 lines
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.bin ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.dThe local toolchain used in this example is gcc 13.3.0 with binutils 2.42.
I think I've found the issue. The problem is that the feature check for objtool is also run for the "clean" target, and this creates the tools/build/feature/test-disassembler-init-styled.* files.
The change below should fix this problem. I will prepare a patch. Note that you will still need to run "make -C tools/objtool clean" (I don't know the reason for "make clean" not to cleanup tools/objtool).
Thanks,
alex.
-----
tools/objtool/Makefile +15 -0
@@ -77,7 +77,22 @@ HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" FEATURE_USER = .objtool FEATURE_TESTS = libbfd disassembler-init-styled FEATURE_DISPLAY = + +check_feat := 1 +NON_CHECK_FEAT_TARGETS := clean uninstall doc doc-clean doc-install doc-uninstall +ifdef MAKECMDGOALS +ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),) + check_feat := 0 +endif +endif + +ifeq ($(check_feat),1) +ifeq ($(FEATURES_DUMP),) include $(srctree)/tools/build/Makefile.feature +else +include $(FEATURES_DUMP) +endif +endif ifeq ($(feature-disassembler-init-styled), 1) OBJTOOL_CFLAGS += -DDISASM_INIT_STYLED
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 104 lines · Alexandre Chartre
Quoted 93 lines · Guenter Roeck
On 12/10/25 10:42, Guenter Roeck wrote:
...Quoted 40 lines
Quoted 13 lines
That's weird because the "clean" rule in
tools/objtool/Makefileshould remove the entiretools/objtool/featuredirectory:$ cat tools/objtool/Makefile ... clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)featureQuoted 2 lines
see $(Q)$(RM) -r -- $(OUTPUT)feature
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make clean CLEAN arch/x86/lib CLEAN certs CLEAN arch/x86/entry/vdso CLEAN init CLEAN lib/crc CLEAN arch/x86/tools CLEAN arch/x86/realmode/rm CLEAN security/selinux CLEAN usr CLEAN . $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $"make clean" does not execute the cleanup in
tools/objtool. I have to run "make -Ctools/objtoolclean". "make mrproper" doesn't clean tools either.Quoted 8 lines
I guess that is on purpose ?
Anyway, even "make -C
tools/objtoolclean" doesn't solve my problem if I build with an out-of-tree toolchain. Turns out that, in this case, test-disassembler-init-styled is build with binutils from the toolchain (which succeeds because its binutils version is more recent). Later on, the actual build ofdisas.cfails because it uses the system toolchain.This is actually even worse than I thought.
$ git clean -d -x -f -q $ make defconfig $ make -j40 $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.d $ make -C tools/objtool/ clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.d $ rm -f ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.d $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c $ make -C tools/objtool/ clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.dRepeated with local toolchain:
$ git clean -d -x -f -q $ make-x86 defconfig $ make-x86 -j40 (fails) $ make-x86 -C tools/objtool clean $ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.c ./tools/objtool/feature/test-disassembler-init-styled.make.output ./tools/objtool/feature/test-disassembler-init-styled.bin ./tools/objtool/feature/test-disassembler-init-styled.dSo the "make clean" command actually (re-)creates the .bin file. Worse, if I now run
$ make -C tools/objtool cleanwith the system toolchain, the .bin file is not removed.
Quoted 8 lines
$ find . -name test-disassembler-init-styled* ./tools/build/feature/test-disassembler-init-styled.make.output ./tools/build/feature/test-disassembler-init-styled.bin ./tools/build/feature/test-disassembler-init-styled.c ./tools/build/feature/test-disassembler-init-styled.dThe local toolchain used in this example is gcc 13.3.0 with binutils 2.42.
Quoted 8 lines
I think I've found the issue. The problem is that the feature check for objtool is also run for the "clean" target, and this creates the
tools/build/feature/test-disassembler-init-styled.*files.The change below should fix this problem. I will prepare a patch. Note that you will still need to run "make -C
tools/objtoolclean" (I don't know the reason for "make clean" not to cleanuptools/objtool).
My workaround was to install Ubuntu 24.04 instead of 22.04 on all affected systems, so I won't see the problem anymore (and obviously that also means that I am unable to test potential fixes).
Guenter
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
In reply to Maciej W. RozyckiQuoted 9 lines · Maciej W. Rozycki
Quoted 6 lines · Alexandre Chartre
Quoted 2 lines
Bisect log is attached. I see the problem with gcc 11.4.0, 13.3.0, and 14.3.0. I tried with both Ubuntu 22.04 and 24.04.
This sounds like a configuration issue depending on the binutils version; in particular the setting of
DISASM_INIT_STYLED(although that's supposed to be automatically configured bytools/objtool/Makefile).
Quoted 5 lines
I only came across these patches now.
As attractive as it may seem how is this stuff supposed to fly given that
binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.
Note that bpf (tools/bpf) is also using libbfd and libopcodes.
Quoted 2 lines
Wouldn't it make sense to improve objdump instead so as to provide the
features required?
Some disassembly features of objtool can certainly make sense in objdump (like the support for disassembling alternatives).
But the primary goal was to provide a disassembly tracing option (--trace) to help troubleshoot objtool validation failures. But this is specific to the kernel build workflow, so this part would probably not make sense in objdump.
alex.
Quoted 6 lines
Also is it actually legal to link objtool and libopcodes together, given
that they are GPLv2 and GPLv3 respectively?FWIW asking as one of the binutils contributors and port maintainers.
Maciej
Peter Zijlstra
maintainerRe: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 5 lines · Alexandre Chartre
Quoted 3 lines
As attractive as it may seem how is this stuff supposed to fly given that
binutils internal libraries promise no stable API to out-of-tree software. The interfaces can change anytime, just as it is with our internals.Note that bpf (
tools/bpf) is also using libbfd and libopcodes.
OTOH tools/perf opted to use libcapstone instead.
Peter Zijlstra
maintainerRe: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
In reply to Maciej W. RozyckiQuoted 2 lines · Maciej W. Rozycki
Wouldn't it make sense to improve objdump instead so as to provide the
features required?
I don't think objdump wants to know about our very Linux kernel specific sections - which are somewhat subject to change as well.
Re: [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump
Quoted 5 lines · Peter Zijlstra
Quoted 2 lines
Wouldn't it make sense to improve objdump instead so as to provide the
features required?I don't think objdump wants to know about our very Linux kernel specific sections - which are somewhat subject to change as well.
Is it something that needs to be embedded in the code itself rather than
being supplied via the command line?
Maciej
PATCH v6 4/30 tool build: Remove annoying newline in build output
In reply to Alexandre ChartreRemove the newline which is printed during feature discovery when nothing else is printed.
--- tools/build/Makefile.feature | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/build/Makefile.feature +3 -1
@@ -315,5 +315,7 @@ endef ifeq ($(FEATURE_DISPLAY_DEFERRED),) $(call feature_display_entries) - $(info ) + ifeq ($(feature_display),1) + $(info ) + endif endif
Signature · 1 line
2.43.5
[tip: objtool/core] tool build: Remove annoying newline in build output
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: f348a44c103aac04fc9420d993afa4ab5cf5e3e2 Gitweb: https://git.kernel.org/tip/f348a44c103aac04fc9420d993afa4ab5cf5e3e2 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:14 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:07 +01:00
tool build: Remove annoying newline in build output
Remove the newline which is printed during feature discovery when nothing else is printed.
--- tools/build/Makefile.feature | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/build/Makefile.feature +3 -1
@@ -315,5 +315,7 @@ endef ifeq ($(FEATURE_DISPLAY_DEFERRED),) $(call feature_display_entries) - $(info ) + ifeq ($(feature_display),1) + $(info ) + endif endif
PATCH v6 5/30 objtool: Print symbol during disassembly
In reply to Alexandre ChartrePrint symbols referenced during disassembly instead of just printing raw addresses. Also handle address relocation.
--- tools/objtool/check.c | 9 -- tools/objtool/disas.c | 134 ++++++++++++++++++++++++++ tools/objtool/include/objtool/check.h | 9 ++ 3 files changed, 143 insertions(+), 9 deletions(-)
tools/objtool/check.c +0 -9
@@ -134,15 +134,6 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file,for (insn =next_insn_same_sec (file, insn); insn; \ insn =next_insn_same_sec (file, insn)) -static inline struct symbol *insn_call_dest(struct instruction *insn) -{ -if (insn->type ==INSN_JUMP_DYNAMIC || - insn->type ==INSN_CALL_DYNAMIC ) -return NULL ; - -return insn->_call_dest; -} - static inline struct reloc *insn_jump_table(struct instruction *insn) { if (insn->type == INSN_JUMP_DYNAMIC ||
tools/objtool/disas.c +134 -0
159 lines not on this page · raw message
tools/objtool/include/objtool/check.h +9 -0
@@ -117,6 +117,15 @@ static inline bool is_jump(struct instruction *insn)return is_static_jump (insn) ||is_dynamic_jump (insn); } +static inline struct symbol *insn_call_dest (struct instruction *insn) +{ +if (insn->type ==INSN_JUMP_DYNAMIC || + insn->type ==INSN_CALL_DYNAMIC ) +return NULL ; + +return insn->_call_dest; +} +struct instruction *find_insn (struct objtool_file *file,struct section *sec,unsigned long offset);
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Print symbol during disassembly
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 5d859dff266f7e57664dc6bcf80ef2c66547c58a Gitweb: https://git.kernel.org/tip/5d859dff266f7e57664dc6bcf80ef2c66547c58a Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:15 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:07 +01:00
objtool: Print symbol during disassembly
Print symbols referenced during disassembly instead of just printing raw addresses. Also handle address relocation.
--- tools/objtool/check.c | 9 +-- tools/objtool/disas.c | 134 +++++++++++++++++++++++++- tools/objtool/include/objtool/check.h | 9 ++- 3 files changed, 143 insertions(+), 9 deletions(-)
tools/objtool/check.c +0 -9
@@ -134,15 +134,6 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file,for (insn =next_insn_same_sec (file, insn); insn; \ insn =next_insn_same_sec (file, insn)) -static inline struct symbol *insn_call_dest(struct instruction *insn) -{ -if (insn->type ==INSN_JUMP_DYNAMIC || - insn->type ==INSN_CALL_DYNAMIC ) -return NULL ; - -return insn->_call_dest; -} - static inline struct reloc *insn_jump_table(struct instruction *insn) { if (insn->type == INSN_JUMP_DYNAMIC ||
tools/objtool/disas.c +134 -0
159 lines not on this page · raw message
tools/objtool/include/objtool/check.h +9 -0
@@ -117,6 +117,15 @@ static inline bool is_jump(struct instruction *insn)return is_static_jump (insn) ||is_dynamic_jump (insn); } +static inline struct symbol *insn_call_dest (struct instruction *insn) +{ +if (insn->type ==INSN_JUMP_DYNAMIC || + insn->type ==INSN_CALL_DYNAMIC ) +return NULL ; + +return insn->_call_dest; +} +struct instruction *find_insn (struct objtool_file *file,struct section *sec,unsigned long offset);
PATCH v6 6/30 objtool: Store instruction disassembly result
In reply to Alexandre ChartreWhen disassembling an instruction store the result instead of directly printing it.
--- tools/objtool/disas.c | 77 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 6 deletions(-)
tools/objtool/disas.c +71 -6
@@ -12,9 +12,16 @@#include <linux/string.h> #include <tools/dis-asm-compat.h> +/* +* Size of the buffer for storing the result of disassembling +* a single instruction. +*/ +#define DISAS_RESULT_SIZE 1024 +struct disas_context {struct objtool_file *file;struct instruction *insn; +char result[DISAS_RESULT_SIZE ];disassembler_ftype disassembler;struct disassemble_info info; };
@@ -34,6 +41,59 @@ static int sprint_name(char *str, const char *name, unsigned long offset)#define DINFO_FPRINTF (dinfo, ...) \ ((*(dinfo)->fprintf_func)((dinfo)->stream, __VA_ARGS__)) +static int disas_result_fprintf (struct disas_context *dctx, +const char *fmt,va_list ap) +{ +char *buf = dctx->result; +int avail, len; + + len =strlen (buf); +if (len >=DISAS_RESULT_SIZE -1 ) { +WARN_FUNC (dctx->insn->sec, dctx->insn->offset, +"disassembly buffer is full" ); +return -1 ; + } + avail =DISAS_RESULT_SIZE - len; + + len =vsnprintf (buf + len, avail, fmt, ap); +if (len <0 || len >= avail) { +WARN_FUNC (dctx->insn->sec, dctx->insn->offset, +"disassembly buffer is truncated" ); +return -1 ; + } + +return 0 ; +} + +static int disas_fprintf (void *stream,const char *fmt, ...) +{ +va_list arg; +int rv; + +va_start (arg, fmt); + rv =disas_result_fprintf (stream, fmt, arg); +va_end (arg); + +return rv; +} + +/* +* For init_disassemble_info_compat(). +*/ +static int disas_fprintf_styled (void *stream, +enum disassembler_style style, +const char *fmt, ...) +{ +va_list arg; +int rv; + +va_start (arg, fmt); + rv =disas_result_fprintf (stream, fmt, arg); +va_end (arg); + +return rv; +} +static void disas_print_addr_sym (struct section *sec,struct symbol *sym,bfd_vma addr,struct disassemble_info *dinfo) {
@@ -195,9 +255,8 @@ struct disas_context *disas_context_create(struct objtool_file *file) dctx->file = file; dinfo = &dctx->info; -init_disassemble_info_compat (dinfo, stdout, - (fprintf_ftype )fprintf, - fprintf_styled); +init_disassemble_info_compat (dinfo, dctx, + disas_fprintf, disas_fprintf_styled); dinfo->read_memory_func = buffer_read_memory; dinfo->print_address_func = disas_print_address;
@@ -244,6 +303,11 @@ void disas_context_destroy(struct disas_context *dctx)free (dctx); } +static char *disas_result (struct disas_context *dctx) +{ +return dctx->result; +} +/* * Disassemble a single instruction. Return the size of the instruction. */
@@ -254,6 +318,7 @@ static size_t disas_insn(struct disas_context *dctx,struct disassemble_info *dinfo = &dctx->info; dctx->insn = insn; + dctx->result[0 ] ='\0' ;if (insn->type ==INSN_NOP ) {DINFO_FPRINTF (dinfo,"nop%d" , insn->len);
@@ -282,10 +347,10 @@ static void disas_func(struct disas_context *dctx, struct symbol *func)printf ("%s:\n" , func->name);sym_for_each_insn (dctx->file, func, insn) { addr = insn->offset; -printf (" %6lx: %s+0x%-6lx " , - addr, func->name, addr - func->offset);disas_insn (dctx, insn); -printf ("\n" ); +printf (" %6lx: %s+0x%-6lx %s\n" , + addr, func->name, addr - func->offset, +disas_result (dctx)); }printf ("\n" ); }
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Store instruction disassembly result
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: d4e13c21497d0cde73694163908f89d7168c1243 Gitweb: https://git.kernel.org/tip/d4e13c21497d0cde73694163908f89d7168c1243 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:16 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:08 +01:00
objtool: Store instruction disassembly result
When disassembling an instruction store the result instead of directly printing it.
--- tools/objtool/disas.c | 77 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 6 deletions(-)
tools/objtool/disas.c +71 -6
@@ -12,9 +12,16 @@#include <linux/string.h> #include <tools/dis-asm-compat.h> +/* +* Size of the buffer for storing the result of disassembling +* a single instruction. +*/ +#define DISAS_RESULT_SIZE 1024 +struct disas_context {struct objtool_file *file;struct instruction *insn; +char result[DISAS_RESULT_SIZE ];disassembler_ftype disassembler;struct disassemble_info info; };
@@ -34,6 +41,59 @@ static int sprint_name(char *str, const char *name, unsigned long offset)#define DINFO_FPRINTF (dinfo, ...) \ ((*(dinfo)->fprintf_func)((dinfo)->stream, __VA_ARGS__)) +static int disas_result_fprintf (struct disas_context *dctx, +const char *fmt,va_list ap) +{ +char *buf = dctx->result; +int avail, len; + + len =strlen (buf); +if (len >=DISAS_RESULT_SIZE -1 ) { +WARN_FUNC (dctx->insn->sec, dctx->insn->offset, +"disassembly buffer is full" ); +return -1 ; + } + avail =DISAS_RESULT_SIZE - len; + + len =vsnprintf (buf + len, avail, fmt, ap); +if (len <0 || len >= avail) { +WARN_FUNC (dctx->insn->sec, dctx->insn->offset, +"disassembly buffer is truncated" ); +return -1 ; + } + +return 0 ; +} + +static int disas_fprintf (void *stream,const char *fmt, ...) +{ +va_list arg; +int rv; + +va_start (arg, fmt); + rv =disas_result_fprintf (stream, fmt, arg); +va_end (arg); + +return rv; +} + +/* +* For init_disassemble_info_compat(). +*/ +static int disas_fprintf_styled (void *stream, +enum disassembler_style style, +const char *fmt, ...) +{ +va_list arg; +int rv; + +va_start (arg, fmt); + rv =disas_result_fprintf (stream, fmt, arg); +va_end (arg); + +return rv; +} +static void disas_print_addr_sym (struct section *sec,struct symbol *sym,bfd_vma addr,struct disassemble_info *dinfo) {
@@ -195,9 +255,8 @@ struct disas_context *disas_context_create(struct objtool_file *file) dctx->file = file; dinfo = &dctx->info; -init_disassemble_info_compat (dinfo, stdout, - (fprintf_ftype )fprintf, - fprintf_styled); +init_disassemble_info_compat (dinfo, dctx, + disas_fprintf, disas_fprintf_styled); dinfo->read_memory_func = buffer_read_memory; dinfo->print_address_func = disas_print_address;
@@ -244,6 +303,11 @@ void disas_context_destroy(struct disas_context *dctx)free (dctx); } +static char *disas_result (struct disas_context *dctx) +{ +return dctx->result; +} +/* * Disassemble a single instruction. Return the size of the instruction. */
@@ -254,6 +318,7 @@ static size_t disas_insn(struct disas_context *dctx,struct disassemble_info *dinfo = &dctx->info; dctx->insn = insn; + dctx->result[0 ] ='\0' ;if (insn->type ==INSN_NOP ) {DINFO_FPRINTF (dinfo,"nop%d" , insn->len);
@@ -282,10 +347,10 @@ static void disas_func(struct disas_context *dctx, struct symbol *func)printf ("%s:\n" , func->name);sym_for_each_insn (dctx->file, func, insn) { addr = insn->offset; -printf (" %6lx: %s+0x%-6lx " , - addr, func->name, addr - func->offset);disas_insn (dctx, insn); -printf ("\n" ); +printf (" %6lx: %s+0x%-6lx %s\n" , + addr, func->name, addr - func->offset, +disas_result (dctx)); }printf ("\n" ); }
PATCH v6 7/30 objtool: Disassemble instruction on warning or backtrace
In reply to Alexandre ChartreWhen an instruction warning (WARN_INSN) or backtrace (BT_INSN) is issued, disassemble the instruction to provide more context.
--- tools/objtool/check.c | 36 ++++++++++++++++++++++----- tools/objtool/disas.c | 5 ++-- tools/objtool/include/objtool/check.h | 2 ++ tools/objtool/include/objtool/disas.h | 13 ++++++++++ tools/objtool/include/objtool/warn.h | 16 ++++++++---- 5 files changed, 58 insertions(+), 14 deletions(-)
tools/objtool/check.c +30 -6
@@ -4844,11 +4844,34 @@ static void free_insns(struct objtool_file *file)free (chunk->addr); } +static struct disas_context *objtool_disas_ctx; + +const char *objtool_disas_insn (struct instruction *insn) +{ +struct disas_context *dctx = objtool_disas_ctx; + +if (!dctx) +return "" ; + +disas_insn (dctx, insn); +return disas_result (dctx); +} +int check (struct objtool_file *file) { -struct disas_context *disas_ctx; +struct disas_context *disas_ctx =NULL ;int ret =0 , warnings =0 ; +/* +* If the verbose or backtrace option is used then we need a +* disassembly context to disassemble instruction or function +* on warning or backtrace. +*/ +if (opts.verbose || opts.backtrace) { + disas_ctx =disas_context_create (file); + objtool_disas_ctx = disas_ctx; + } +arch_initial_func_cfi_state (&initial_func_cfi);init_cfi_state (&init_cfi);init_cfi_state (&func_cfi);
@@ -4990,11 +5013,12 @@ int check(struct objtool_file *file)if (opts.verbose) {if (opts.werror && warnings)WARN ("%d warning(s) upgraded to errors" , warnings); - disas_ctx =disas_context_create (file); -if (disas_ctx) { -disas_warned_funcs (disas_ctx); -disas_context_destroy (disas_ctx); - } +disas_warned_funcs (disas_ctx); + } + +if (disas_ctx) { +disas_context_destroy (disas_ctx); + objtool_disas_ctx =NULL ; }free_insns (file);
tools/objtool/disas.c +2 -3
@@ -303,7 +303,7 @@ void disas_context_destroy(struct disas_context *dctx)free (dctx); } -static char *disas_result (struct disas_context *dctx) +char *disas_result (struct disas_context *dctx) {return dctx->result; }
@@ -311,8 +311,7 @@ static char *disas_result(struct disas_context *dctx)/* * Disassemble a single instruction. Return the size of the instruction. */ -static size_t disas_insn (struct disas_context *dctx, -struct instruction *insn) +size_t disas_insn (struct disas_context *dctx,struct instruction *insn) {disassembler_ftype disasm = dctx->disassembler;struct disassemble_info *dinfo = &dctx->info;
tools/objtool/include/objtool/check.h +2 -0
@@ -141,4 +141,6 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, struct instruc insn && insn->offset < sym->offset + sym->len; \ insn = next_insn_same_sec(file, insn)) +const char *objtool_disas_insn (struct instruction *insn); +#endif /* _CHECK_H */
tools/objtool/include/objtool/disas.h +13 -0
@@ -17,6 +17,8 @@ void disas_warned_funcs(struct disas_context *dctx);int disas_info_init (struct disassemble_info *dinfo,int arch,int mach32,int mach64,const char *options); +size_t disas_insn (struct disas_context *dctx,struct instruction *insn); +char *disas_result (struct disas_context *dctx);#else /* DISAS */
@@ -38,6 +40,17 @@ static inline int disas_info_init(struct disassemble_info *dinfo,return -1 ; } +static inline size_t disas_insn (struct disas_context *dctx, +struct instruction *insn) +{ +return -1 ; +} + +static inline char *disas_result (struct disas_context *dctx) +{ +return NULL ; +} +#endif /* DISAS */ #endif /* _DISAS_H */
tools/objtool/include/objtool/warn.h +11 -5
@@ -77,9 +77,11 @@ static inline char *offstr(struct section *sec, unsigned long offset)#define WARN_INSN (insn, format, ...) \ ({ \ struct instruction *_insn = (insn); \ - if (!_insn->sym || !_insn->sym->warned) \ + if (!_insn->sym || !_insn->sym->warned) { \ WARN_FUNC(_insn->sec, _insn->offset, format, \ ##__VA_ARGS__); \ + BT_INSN(_insn, ""); \ + } \ if (_insn->sym) \ _insn->sym->warned = 1; \ })
@@ -87,10 +89,14 @@ static inline char *offstr(struct section *sec, unsigned long offset)#define BT_INSN (insn, format, ...) \ ({ \ if (opts.verbose || opts.backtrace) { \ - struct instruction *_insn = (insn); \ - char *_str = offstr(_insn->sec, _insn->offset); \ - WARN(" %s: " format, _str, ##__VA_ARGS__); \ - free(_str); \ + struct instruction *__insn = (insn); \ + char *_str = offstr(__insn->sec, __insn->offset); \ + const char *_istr = objtool_disas_insn(__insn); \ + int _len; \ + _len = snprintf(NULL, 0, " %s: " format, _str, ##__VA_ARGS__); \ + _len = (_len < 50) ? 50 - _len : 0; \ + WARN(" %s: " format " %*s%s", _str, ##__VA_ARGS__, _len, "", _istr); \ + free(_str); \ } \ })
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Disassemble instruction on warning or backtrace
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 0bb080ba6469a573bc85122153d931334d10a173 Gitweb: https://git.kernel.org/tip/0bb080ba6469a573bc85122153d931334d10a173 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:17 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:08 +01:00
objtool: Disassemble instruction on warning or backtrace
When an instruction warning (WARN_INSN) or backtrace (BT_INSN) is issued, disassemble the instruction to provide more context.
--- tools/objtool/check.c | 36 +++++++++++++++++++++----- tools/objtool/disas.c | 5 +--- tools/objtool/include/objtool/check.h | 2 +- tools/objtool/include/objtool/disas.h | 13 +++++++++- tools/objtool/include/objtool/warn.h | 16 ++++++++---- 5 files changed, 58 insertions(+), 14 deletions(-)
tools/objtool/check.c +30 -6
@@ -4792,11 +4792,34 @@ static void free_insns(struct objtool_file *file)free (chunk->addr); } +static struct disas_context *objtool_disas_ctx; + +const char *objtool_disas_insn (struct instruction *insn) +{ +struct disas_context *dctx = objtool_disas_ctx; + +if (!dctx) +return "" ; + +disas_insn (dctx, insn); +return disas_result (dctx); +} +int check (struct objtool_file *file) { -struct disas_context *disas_ctx; +struct disas_context *disas_ctx =NULL ;int ret =0 , warnings =0 ; +/* +* If the verbose or backtrace option is used then we need a +* disassembly context to disassemble instruction or function +* on warning or backtrace. +*/ +if (opts.verbose || opts.backtrace) { + disas_ctx =disas_context_create (file); + objtool_disas_ctx = disas_ctx; + } +arch_initial_func_cfi_state (&initial_func_cfi);init_cfi_state (&init_cfi);init_cfi_state (&func_cfi);
@@ -4936,11 +4959,12 @@ out:if (opts.verbose) {if (opts.werror && warnings)WARN ("%d warning(s) upgraded to errors" , warnings); - disas_ctx =disas_context_create (file); -if (disas_ctx) { -disas_warned_funcs (disas_ctx); -disas_context_destroy (disas_ctx); - } +disas_warned_funcs (disas_ctx); + } + +if (disas_ctx) { +disas_context_destroy (disas_ctx); + objtool_disas_ctx =NULL ; }free_insns (file);
tools/objtool/disas.c +2 -3
@@ -303,7 +303,7 @@ void disas_context_destroy(struct disas_context *dctx)free (dctx); } -static char *disas_result (struct disas_context *dctx) +char *disas_result (struct disas_context *dctx) {return dctx->result; }
@@ -311,8 +311,7 @@ static char *disas_result(struct disas_context *dctx)/* * Disassemble a single instruction. Return the size of the instruction. */ -static size_t disas_insn (struct disas_context *dctx, -struct instruction *insn) +size_t disas_insn (struct disas_context *dctx,struct instruction *insn) {disassembler_ftype disasm = dctx->disassembler;struct disassemble_info *dinfo = &dctx->info;
tools/objtool/include/objtool/check.h +2 -0
@@ -141,4 +141,6 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, struct instruc insn && insn->offset < sym->offset + sym->len; \ insn = next_insn_same_sec(file, insn)) +const char *objtool_disas_insn (struct instruction *insn); +#endif /* _CHECK_H */
tools/objtool/include/objtool/disas.h +13 -0
@@ -17,6 +17,8 @@ void disas_warned_funcs(struct disas_context *dctx);int disas_info_init (struct disassemble_info *dinfo,int arch,int mach32,int mach64,const char *options); +size_t disas_insn (struct disas_context *dctx,struct instruction *insn); +char *disas_result (struct disas_context *dctx);#else /* DISAS */
@@ -38,6 +40,17 @@ static inline int disas_info_init(struct disassemble_info *dinfo,return -1 ; } +static inline size_t disas_insn (struct disas_context *dctx, +struct instruction *insn) +{ +return -1 ; +} + +static inline char *disas_result (struct disas_context *dctx) +{ +return NULL ; +} +#endif /* DISAS */ #endif /* _DISAS_H */
tools/objtool/include/objtool/warn.h +11 -5
@@ -77,9 +77,11 @@ static inline char *offstr(struct section *sec, unsigned long offset)#define WARN_INSN (insn, format, ...) \ ({ \ struct instruction *_insn = (insn); \ - if (!_insn->sym || !_insn->sym->warned) \ + if (!_insn->sym || !_insn->sym->warned) { \ WARN_FUNC(_insn->sec, _insn->offset, format, \ ##__VA_ARGS__); \ + BT_INSN(_insn, ""); \ + } \ if (_insn->sym) \ _insn->sym->warned = 1; \ })
@@ -87,10 +89,14 @@ static inline char *offstr(struct section *sec, unsigned long offset)#define BT_INSN (insn, format, ...) \ ({ \ if (opts.verbose || opts.backtrace) { \ - struct instruction *_insn = (insn); \ - char *_str = offstr(_insn->sec, _insn->offset); \ - WARN(" %s: " format, _str, ##__VA_ARGS__); \ - free(_str); \ + struct instruction *__insn = (insn); \ + char *_str = offstr(__insn->sec, __insn->offset); \ + const char *_istr = objtool_disas_insn(__insn); \ + int _len; \ + _len = snprintf(NULL, 0, " %s: " format, _str, ##__VA_ARGS__); \ + _len = (_len < 50) ? 50 - _len : 0; \ + WARN(" %s: " format " %*s%s", _str, ##__VA_ARGS__, _len, "", _istr); \ + free(_str); \ } \ })
PATCH v6 8/30 objtool: Extract code to validate instruction from the validate branch loop
In reply to Alexandre ChartreThe code to validate a branch loops through all instructions of the branch and validate each instruction. Move the code to validate an instruction to a separated function.
--- tools/objtool/check.c | 386 ++++++++++++++++++++++-------------------- 1 file changed, 205 insertions(+), 181 deletions(-)
tools/objtool/check.c +205 -181
@@ -3706,253 +3706,277 @@ static void checksum_update_insn(struct objtool_file *file, struct symbol *func,checksum_update (func, insn, &offset,sizeof (offset)); } -/* -* Follow the branch starting at the given instruction, and recursively follow -* any other branches (jumps). Meanwhile, track the frame pointer state at -* each instruction and validate all the rules described in -* tools/objtool/Documentation/objtool.txt. -*/ static int validate_branch (struct objtool_file *file,struct symbol *func, -struct instruction *insn,struct insn_state state) +struct instruction *insn,struct insn_state state); + +static int validate_insn (struct objtool_file *file,struct symbol *func, +struct instruction *insn,struct insn_state *statep, +struct instruction *prev_insn,struct instruction *next_insn, +bool *dead_end) {struct alternative *alt; -struct instruction *next_insn, *prev_insn =NULL ;u8 visited;int ret; -if (func && func->ignore) -return 0 ; +/* +* Any returns before the end of this function are effectively dead +* ends, i.e. validate_branch() has reached the end of the branch. +*/ + *dead_end = true; -while (1 ) { - next_insn =next_insn_to_validate (file, insn); + visited =VISITED_BRANCH << statep->uaccess; +if (insn->visited &VISITED_BRANCH_MASK ) { +if (!insn->hint && !insn_cfi_match (insn, &statep->cfi)) +return 1 ; -if (opts.checksum && func && insn->sec) -checksum_update_insn (file, func, insn); +if (insn->visited & visited) +return 0 ; + }else { + nr_insns_visited++; + } -if (func &&insn_func (insn) && func !=insn_func (insn)->pfunc) { -/* Ignore KCFI type preambles, which always fall through */ -if (is_prefix_func (func)) -return 0 ; +if (statep->noinstr) + statep->instr += insn->instr; -if (file->ignore_unreachables) -return 0 ; +if (insn->hint) { +if (insn->restore) { +struct instruction *save_insn, *i; -WARN ("%s() falls through to next function %s()" , - func->name,insn_func (insn)->name); - func->warned =1 ; + i = insn; + save_insn =NULL ; -return 1 ; - } +sym_for_each_insn_continue_reverse (file, func, i) { +if (i->save) { + save_insn = i; +break ; + } + } - visited =VISITED_BRANCH << state.uaccess; -if (insn->visited &VISITED_BRANCH_MASK ) { -if (!insn->hint && !insn_cfi_match (insn, &state.cfi)) +if (!save_insn) { +WARN_INSN (insn,"no corresponding CFI save for CFI restore" );return 1 ; + } -if (insn->visited & visited) -return 0 ; - }else { - nr_insns_visited++; +if (!save_insn->visited) { +/* +* If the restore hint insn is at the +* beginning of a basic block and was +* branched to from elsewhere, and the +* save insn hasn't been visited yet, +* defer following this branch for now. +* It will be seen later via the +* straight-line path. +*/ +if (!prev_insn) +return 0 ; + +WARN_INSN (insn,"objtool isn't smart enough to handle this CFI save/restore combo" ); +return 1 ; + } + + insn->cfi = save_insn->cfi; + nr_cfi_reused++; } -if (state.noinstr) - state.instr += insn->instr; + statep->cfi = *insn->cfi; + }else { +/* XXX track if we actually changed statep->cfi */ -if (insn->hint) { -if (insn->restore) { -struct instruction *save_insn, *i; +if (prev_insn && !cficmp (prev_insn->cfi, &statep->cfi)) { + insn->cfi = prev_insn->cfi; + nr_cfi_reused++; + }else { + insn->cfi =cfi_hash_find_or_add (&statep->cfi); + } + } - i = insn; - save_insn =NULL ; + insn->visited |= visited; -sym_for_each_insn_continue_reverse (file, func, i) { -if (i->save) { - save_insn = i; -break ; - } - } +if (propagate_alt_cfi (file, insn)) +return 1 ; -if (!save_insn) { -WARN_INSN (insn,"no corresponding CFI save for CFI restore" ); -return 1 ; - } +if (insn->alts) { +for (alt = insn->alts; alt; alt = alt->next) { + ret =validate_branch (file, func, alt->insn, *statep); +if (ret) { +BT_INSN (insn,"(alt)" ); +return ret; + } + } + } -if (!save_insn->visited) { -/* -* If the restore hint insn is at the -* beginning of a basic block and was -* branched to from elsewhere, and the -* save insn hasn't been visited yet, -* defer following this branch for now. -* It will be seen later via the -* straight-line path. -*/ -if (!prev_insn) -return 0 ; +if (skip_alt_group (insn)) +return 0 ; -WARN_INSN (insn,"objtool isn't smart enough to handle this CFI save/restore combo" ); -return 1 ; - } +if (handle_insn_ops (insn, next_insn, statep)) +return 1 ; - insn->cfi = save_insn->cfi; - nr_cfi_reused++; - } +switch (insn->type) { - state.cfi = *insn->cfi; - }else { -/* XXX track if we actually changed state.cfi */ +case INSN_RETURN : +return validate_return (func, insn, statep); -if (prev_insn && !cficmp (prev_insn->cfi, &state.cfi)) { - insn->cfi = prev_insn->cfi; - nr_cfi_reused++; - }else { - insn->cfi =cfi_hash_find_or_add (&state.cfi); - } +case INSN_CALL : +case INSN_CALL_DYNAMIC : + ret =validate_call (file, insn, statep); +if (ret) +return ret; + +if (opts.stackval && func && !is_special_call (insn) && + !has_valid_stack_frame (statep)) { +WARN_INSN (insn,"call without frame pointer save/setup" ); +return 1 ; } - insn->visited |= visited; +break ; -if (propagate_alt_cfi (file, insn)) -return 1 ; +case INSN_JUMP_CONDITIONAL : +case INSN_JUMP_UNCONDITIONAL : +if (is_sibling_call (insn)) { + ret =validate_sibling_call (file, insn, statep); +if (ret) +return ret; -if (insn->alts) { -for (alt = insn->alts; alt; alt = alt->next) { - ret =validate_branch (file, func, alt->insn, state); -if (ret) { -BT_INSN (insn,"(alt)" ); -return ret; - } + }else if (insn->jump_dest) { + ret =validate_branch (file, func, + insn->jump_dest, *statep); +if (ret) { +BT_INSN (insn,"(branch)" ); +return ret; } } -if (skip_alt_group (insn)) +if (insn->type ==INSN_JUMP_UNCONDITIONAL )return 0 ; -if (handle_insn_ops (insn, next_insn, &state)) -return 1 ; - -switch (insn->type) { - -case INSN_RETURN : -return validate_return (func, insn, &state); +break ; -case INSN_CALL : -case INSN_CALL_DYNAMIC : - ret =validate_call (file, insn, &state); +case INSN_JUMP_DYNAMIC : +case INSN_JUMP_DYNAMIC_CONDITIONAL : +if (is_sibling_call (insn)) { + ret =validate_sibling_call (file, insn, statep);if (ret)return ret; + } -if (opts.stackval && func && !is_special_call (insn) && - !has_valid_stack_frame (&state)) { -WARN_INSN (insn,"call without frame pointer save/setup" ); -return 1 ; - } +if (insn->type ==INSN_JUMP_DYNAMIC ) +return 0 ; -break ; +break ; -case INSN_JUMP_CONDITIONAL : -case INSN_JUMP_UNCONDITIONAL : -if (is_sibling_call (insn)) { - ret =validate_sibling_call (file, insn, &state); -if (ret) -return ret; +case INSN_SYSCALL : +if (func && (!next_insn || !next_insn->hint)) { +WARN_INSN (insn,"unsupported instruction in callable function" ); +return 1 ; + } - }else if (insn->jump_dest) { - ret =validate_branch (file, func, - insn->jump_dest, state); -if (ret) { -BT_INSN (insn,"(branch)" ); -return ret; - } - } +break ; -if (insn->type ==INSN_JUMP_UNCONDITIONAL ) -return 0 ; +case INSN_SYSRET : +if (func && (!next_insn || !next_insn->hint)) { +WARN_INSN (insn,"unsupported instruction in callable function" ); +return 1 ; + } + +return 0 ; +case INSN_STAC : +if (!opts.uaccess)break ; -case INSN_JUMP_DYNAMIC : -case INSN_JUMP_DYNAMIC_CONDITIONAL : -if (is_sibling_call (insn)) { - ret =validate_sibling_call (file, insn, &state); -if (ret) -return ret; - } +if (statep->uaccess) { +WARN_INSN (insn,"recursive UACCESS enable" ); +return 1 ; + } -if (insn->type ==INSN_JUMP_DYNAMIC ) -return 0 ; + statep->uaccess = true; +break ; +case INSN_CLAC : +if (!opts.uaccess)break ; -case INSN_SYSCALL : -if (func && (!next_insn || !next_insn->hint)) { -WARN_INSN (insn,"unsupported instruction in callable function" ); -return 1 ; - } +if (!statep->uaccess && func) { +WARN_INSN (insn,"redundant UACCESS disable" ); +return 1 ; + } -break ; +if (func_uaccess_safe (func) && !statep->uaccess_stack) { +WARN_INSN (insn,"UACCESS-safe disables UACCESS" ); +return 1 ; + } -case INSN_SYSRET : -if (func && (!next_insn || !next_insn->hint)) { -WARN_INSN (insn,"unsupported instruction in callable function" ); -return 1 ; - } + statep->uaccess = false; +break ; -return 0 ; +case INSN_STD : +if (statep->df) { +WARN_INSN (insn,"recursive STD" ); +return 1 ; + } -case INSN_STAC : -if (!opts.uaccess) -break ; + statep->df = true; +break ; -if (state.uaccess) { -WARN_INSN (insn,"recursive UACCESS enable" ); -return 1 ; - } +case INSN_CLD : +if (!statep->df && func) { +WARN_INSN (insn,"redundant CLD" ); +return 1 ; + } - state.uaccess = true; -break ; + statep->df = false; +break ; -case INSN_CLAC : -if (!opts.uaccess) -break ; +default : +break ; + } -if (!state.uaccess && func) { -WARN_INSN (insn,"redundant UACCESS disable" ); -return 1 ; - } + *dead_end = insn->dead_end; -if (func_uaccess_safe (func) && !state.uaccess_stack) { -WARN_INSN (insn,"UACCESS-safe disables UACCESS" ); -return 1 ; - } +return 0 ; +} - state.uaccess = false; -break ; +/* +* Follow the branch starting at the given instruction, and recursively follow +* any other branches (jumps). Meanwhile, track the frame pointer state at +* each instruction and validate all the rules described in +* tools/objtool/Documentation/objtool.txt. +*/ +static int validate_branch (struct objtool_file *file,struct symbol *func, +struct instruction *insn,struct insn_state state) +{ +struct instruction *next_insn, *prev_insn =NULL ; +bool dead_end; +int ret; -case INSN_STD : -if (state.df) { -WARN_INSN (insn,"recursive STD" ); -return 1 ; - } +if (func && func->ignore) +return 0 ; - state.df = true; -break ; +while (1 ) { + next_insn =next_insn_to_validate (file, insn); -case INSN_CLD : -if (!state.df && func) { -WARN_INSN (insn,"redundant CLD" ); -return 1 ; - } +if (opts.checksum && func && insn->sec) +checksum_update_insn (file, func, insn); - state.df = false; -break ; +if (func &&insn_func (insn) && func !=insn_func (insn)->pfunc) { +/* Ignore KCFI type preambles, which always fall through */ +if (is_prefix_func (func)) +return 0 ; -default : -break ; +if (file->ignore_unreachables) +return 0 ; + +WARN ("%s() falls through to next function %s()" , + func->name,insn_func (insn)->name); + func->warned =1 ; + +return 1 ; } -if (insn->dead_end) -return 0 ; + ret =validate_insn (file, func, insn, &state, prev_insn, next_insn, + &dead_end); +if (dead_end) +break ;if (!next_insn) {if (state.cfi.cfa.base ==CFI_UNDEFINED )
@@ -3970,7 +3994,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, insn = next_insn; } -return 0 ; +return ret; } static int validate_unwind_hint(struct objtool_file *file,
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Extract code to validate instruction from the validate branch loop
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: a0e5bf9fd6a048a8dc65f672e625674cd167d172 Gitweb: https://git.kernel.org/tip/a0e5bf9fd6a048a8dc65f672e625674cd167d172 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:18 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:08 +01:00
objtool: Extract code to validate instruction from the validate branch loop
The code to validate a branch loops through all instructions of the branch and validate each instruction. Move the code to validate an instruction to a separated function.
--- tools/objtool/check.c | 386 +++++++++++++++++++++-------------------- 1 file changed, 205 insertions(+), 181 deletions(-)
tools/objtool/check.c +205 -181
@@ -3654,253 +3654,277 @@ static void checksum_update_insn(struct objtool_file *file, struct symbol *func,checksum_update (func, insn, &offset,sizeof (offset)); } -/* -* Follow the branch starting at the given instruction, and recursively follow -* any other branches (jumps). Meanwhile, track the frame pointer state at -* each instruction and validate all the rules described in -* tools/objtool/Documentation/objtool.txt. -*/ static int validate_branch (struct objtool_file *file,struct symbol *func, -struct instruction *insn,struct insn_state state) +struct instruction *insn,struct insn_state state); + +static int validate_insn (struct objtool_file *file,struct symbol *func, +struct instruction *insn,struct insn_state *statep, +struct instruction *prev_insn,struct instruction *next_insn, +bool *dead_end) {struct alternative *alt; -struct instruction *next_insn, *prev_insn =NULL ;u8 visited;int ret; -if (func && func->ignore) -return 0 ; +/* +* Any returns before the end of this function are effectively dead +* ends, i.e. validate_branch() has reached the end of the branch. +*/ + *dead_end = true; -while (1 ) { - next_insn =next_insn_to_validate (file, insn); + visited =VISITED_BRANCH << statep->uaccess; +if (insn->visited &VISITED_BRANCH_MASK ) { +if (!insn->hint && !insn_cfi_match (insn, &statep->cfi)) +return 1 ; -if (opts.checksum && func && insn->sec) -checksum_update_insn (file, func, insn); +if (insn->visited & visited) +return 0 ; + }else { + nr_insns_visited++; + } -if (func &&insn_func (insn) && func !=insn_func (insn)->pfunc) { -/* Ignore KCFI type preambles, which always fall through */ -if (is_prefix_func (func)) -return 0 ; +if (statep->noinstr) + statep->instr += insn->instr; -if (file->ignore_unreachables) -return 0 ; +if (insn->hint) { +if (insn->restore) { +struct instruction *save_insn, *i; -WARN ("%s() falls through to next function %s()" , - func->name,insn_func (insn)->name); - func->warned =1 ; + i = insn; + save_insn =NULL ; -return 1 ; - } +sym_for_each_insn_continue_reverse (file, func, i) { +if (i->save) { + save_insn = i; +break ; + } + } - visited =VISITED_BRANCH << state.uaccess; -if (insn->visited &VISITED_BRANCH_MASK ) { -if (!insn->hint && !insn_cfi_match (insn, &state.cfi)) +if (!save_insn) { +WARN_INSN (insn,"no corresponding CFI save for CFI restore" );return 1 ; + } -if (insn->visited & visited) -return 0 ; - }else { - nr_insns_visited++; +if (!save_insn->visited) { +/* +* If the restore hint insn is at the +* beginning of a basic block and was +* branched to from elsewhere, and the +* save insn hasn't been visited yet, +* defer following this branch for now. +* It will be seen later via the +* straight-line path. +*/ +if (!prev_insn) +return 0 ; + +WARN_INSN (insn,"objtool isn't smart enough to handle this CFI save/restore combo" ); +return 1 ; + } + + insn->cfi = save_insn->cfi; + nr_cfi_reused++; } -if (state.noinstr) - state.instr += insn->instr; + statep->cfi = *insn->cfi; + }else { +/* XXX track if we actually changed statep->cfi */ -if (insn->hint) { -if (insn->restore) { -struct instruction *save_insn, *i; +if (prev_insn && !cficmp (prev_insn->cfi, &statep->cfi)) { + insn->cfi = prev_insn->cfi; + nr_cfi_reused++; + }else { + insn->cfi =cfi_hash_find_or_add (&statep->cfi); + } + } - i = insn; - save_insn =NULL ; + insn->visited |= visited; -sym_for_each_insn_continue_reverse (file, func, i) { -if (i->save) { - save_insn = i; -break ; - } - } +if (propagate_alt_cfi (file, insn)) +return 1 ; -if (!save_insn) { -WARN_INSN (insn,"no corresponding CFI save for CFI restore" ); -return 1 ; - } +if (insn->alts) { +for (alt = insn->alts; alt; alt = alt->next) { + ret =validate_branch (file, func, alt->insn, *statep); +if (ret) { +BT_INSN (insn,"(alt)" ); +return ret; + } + } + } -if (!save_insn->visited) { -/* -* If the restore hint insn is at the -* beginning of a basic block and was -* branched to from elsewhere, and the -* save insn hasn't been visited yet, -* defer following this branch for now. -* It will be seen later via the -* straight-line path. -*/ -if (!prev_insn) -return 0 ; +if (skip_alt_group (insn)) +return 0 ; -WARN_INSN (insn,"objtool isn't smart enough to handle this CFI save/restore combo" ); -return 1 ; - } +if (handle_insn_ops (insn, next_insn, statep)) +return 1 ; - insn->cfi = save_insn->cfi; - nr_cfi_reused++; - } +switch (insn->type) { - state.cfi = *insn->cfi; - }else { -/* XXX track if we actually changed state.cfi */ +case INSN_RETURN : +return validate_return (func, insn, statep); -if (prev_insn && !cficmp (prev_insn->cfi, &state.cfi)) { - insn->cfi = prev_insn->cfi; - nr_cfi_reused++; - }else { - insn->cfi =cfi_hash_find_or_add (&state.cfi); - } +case INSN_CALL : +case INSN_CALL_DYNAMIC : + ret =validate_call (file, insn, statep); +if (ret) +return ret; + +if (opts.stackval && func && !is_special_call (insn) && + !has_valid_stack_frame (statep)) { +WARN_INSN (insn,"call without frame pointer save/setup" ); +return 1 ; } - insn->visited |= visited; +break ; -if (propagate_alt_cfi (file, insn)) -return 1 ; +case INSN_JUMP_CONDITIONAL : +case INSN_JUMP_UNCONDITIONAL : +if (is_sibling_call (insn)) { + ret =validate_sibling_call (file, insn, statep); +if (ret) +return ret; -if (insn->alts) { -for (alt = insn->alts; alt; alt = alt->next) { - ret =validate_branch (file, func, alt->insn, state); -if (ret) { -BT_INSN (insn,"(alt)" ); -return ret; - } + }else if (insn->jump_dest) { + ret =validate_branch (file, func, + insn->jump_dest, *statep); +if (ret) { +BT_INSN (insn,"(branch)" ); +return ret; } } -if (skip_alt_group (insn)) +if (insn->type ==INSN_JUMP_UNCONDITIONAL )return 0 ; -if (handle_insn_ops (insn, next_insn, &state)) -return 1 ; - -switch (insn->type) { - -case INSN_RETURN : -return validate_return (func, insn, &state); +break ; -case INSN_CALL : -case INSN_CALL_DYNAMIC : - ret =validate_call (file, insn, &state); +case INSN_JUMP_DYNAMIC : +case INSN_JUMP_DYNAMIC_CONDITIONAL : +if (is_sibling_call (insn)) { + ret =validate_sibling_call (file, insn, statep);if (ret)return ret; + } -if (opts.stackval && func && !is_special_call (insn) && - !has_valid_stack_frame (&state)) { -WARN_INSN (insn,"call without frame pointer save/setup" ); -return 1 ; - } +if (insn->type ==INSN_JUMP_DYNAMIC ) +return 0 ; -break ; +break ; -case INSN_JUMP_CONDITIONAL : -case INSN_JUMP_UNCONDITIONAL : -if (is_sibling_call (insn)) { - ret =validate_sibling_call (file, insn, &state); -if (ret) -return ret; +case INSN_SYSCALL : +if (func && (!next_insn || !next_insn->hint)) { +WARN_INSN (insn,"unsupported instruction in callable function" ); +return 1 ; + } - }else if (insn->jump_dest) { - ret =validate_branch (file, func, - insn->jump_dest, state); -if (ret) { -BT_INSN (insn,"(branch)" ); -return ret; - } - } +break ; -if (insn->type ==INSN_JUMP_UNCONDITIONAL ) -return 0 ; +case INSN_SYSRET : +if (func && (!next_insn || !next_insn->hint)) { +WARN_INSN (insn,"unsupported instruction in callable function" ); +return 1 ; + } + +return 0 ; +case INSN_STAC : +if (!opts.uaccess)break ; -case INSN_JUMP_DYNAMIC : -case INSN_JUMP_DYNAMIC_CONDITIONAL : -if (is_sibling_call (insn)) { - ret =validate_sibling_call (file, insn, &state); -if (ret) -return ret; - } +if (statep->uaccess) { +WARN_INSN (insn,"recursive UACCESS enable" ); +return 1 ; + } -if (insn->type ==INSN_JUMP_DYNAMIC ) -return 0 ; + statep->uaccess = true; +break ; +case INSN_CLAC : +if (!opts.uaccess)break ; -case INSN_SYSCALL : -if (func && (!next_insn || !next_insn->hint)) { -WARN_INSN (insn,"unsupported instruction in callable function" ); -return 1 ; - } +if (!statep->uaccess && func) { +WARN_INSN (insn,"redundant UACCESS disable" ); +return 1 ; + } -break ; +if (func_uaccess_safe (func) && !statep->uaccess_stack) { +WARN_INSN (insn,"UACCESS-safe disables UACCESS" ); +return 1 ; + } -case INSN_SYSRET : -if (func && (!next_insn || !next_insn->hint)) { -WARN_INSN (insn,"unsupported instruction in callable function" ); -return 1 ; - } + statep->uaccess = false; +break ; -return 0 ; +case INSN_STD : +if (statep->df) { +WARN_INSN (insn,"recursive STD" ); +return 1 ; + } -case INSN_STAC : -if (!opts.uaccess) -break ; + statep->df = true; +break ; -if (state.uaccess) { -WARN_INSN (insn,"recursive UACCESS enable" ); -return 1 ; - } +case INSN_CLD : +if (!statep->df && func) { +WARN_INSN (insn,"redundant CLD" ); +return 1 ; + } - state.uaccess = true; -break ; + statep->df = false; +break ; -case INSN_CLAC : -if (!opts.uaccess) -break ; +default : +break ; + } -if (!state.uaccess && func) { -WARN_INSN (insn,"redundant UACCESS disable" ); -return 1 ; - } + *dead_end = insn->dead_end; -if (func_uaccess_safe (func) && !state.uaccess_stack) { -WARN_INSN (insn,"UACCESS-safe disables UACCESS" ); -return 1 ; - } +return 0 ; +} - state.uaccess = false; -break ; +/* +* Follow the branch starting at the given instruction, and recursively follow +* any other branches (jumps). Meanwhile, track the frame pointer state at +* each instruction and validate all the rules described in +* tools/objtool/Documentation/objtool.txt. +*/ +static int validate_branch (struct objtool_file *file,struct symbol *func, +struct instruction *insn,struct insn_state state) +{ +struct instruction *next_insn, *prev_insn =NULL ; +bool dead_end; +int ret; -case INSN_STD : -if (state.df) { -WARN_INSN (insn,"recursive STD" ); -return 1 ; - } +if (func && func->ignore) +return 0 ; - state.df = true; -break ; +while (1 ) { + next_insn =next_insn_to_validate (file, insn); -case INSN_CLD : -if (!state.df && func) { -WARN_INSN (insn,"redundant CLD" ); -return 1 ; - } +if (opts.checksum && func && insn->sec) +checksum_update_insn (file, func, insn); - state.df = false; -break ; +if (func &&insn_func (insn) && func !=insn_func (insn)->pfunc) { +/* Ignore KCFI type preambles, which always fall through */ +if (is_prefix_func (func)) +return 0 ; -default : -break ; +if (file->ignore_unreachables) +return 0 ; + +WARN ("%s() falls through to next function %s()" , + func->name,insn_func (insn)->name); + func->warned =1 ; + +return 1 ; } -if (insn->dead_end) -return 0 ; + ret =validate_insn (file, func, insn, &state, prev_insn, next_insn, + &dead_end); +if (dead_end) +break ;if (!next_insn) {if (state.cfi.cfa.base ==CFI_UNDEFINED )
@@ -3918,7 +3942,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, insn = next_insn; } -return 0 ; +return ret; } static int validate_unwind_hint(struct objtool_file *file,
PATCH v6 9/30 objtool: Record symbol name max length
In reply to Alexandre ChartreKeep track of the maximum length of symbol names. This will help formatting the code flow between different functions.
--- tools/objtool/check.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/objtool/check.c +7 -0
@@ -37,6 +37,8 @@ static struct cfi_state init_cfi;static struct cfi_state func_cfi;static struct cfi_state force_undefined_cfi; +static size_t sym_name_max_len; +struct instruction *find_insn (struct objtool_file *file,struct section *sec,unsigned long offset) {
@@ -2484,6 +2486,7 @@ static bool is_profiling_func(const char *name)static int classify_symbols (struct objtool_file *file) {struct symbol *func; +size_t len;for_each_sym (file->elf, func) {if (is_notype_sym (func) &&strstarts (func->name,".L" ))
@@ -2510,6 +2513,10 @@ static int classify_symbols(struct objtool_file *file)if (is_profiling_func (func->name)) func->profiling_func = true; + + len =strlen (func->name); +if (len > sym_name_max_len) + sym_name_max_len = len; }return 0 ;
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Record symbol name max length
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: de0248fbbf999d0fd3ca2aa5ba515ab78703d129 Gitweb: https://git.kernel.org/tip/de0248fbbf999d0fd3ca2aa5ba515ab78703d129 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:19 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:09 +01:00
objtool: Record symbol name max length
Keep track of the maximum length of symbol names. This will help formatting the code flow between different functions.
--- tools/objtool/check.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/objtool/check.c +7 -0
@@ -37,6 +37,8 @@ static struct cfi_state init_cfi;static struct cfi_state func_cfi;static struct cfi_state force_undefined_cfi; +static size_t sym_name_max_len; +struct instruction *find_insn (struct objtool_file *file,struct section *sec,unsigned long offset) {
@@ -2463,6 +2465,7 @@ static bool is_profiling_func(const char *name)static int classify_symbols (struct objtool_file *file) {struct symbol *func; +size_t len;for_each_sym (file->elf, func) {if (is_notype_sym (func) &&strstarts (func->name,".L" ))
@@ -2489,6 +2492,10 @@ static int classify_symbols(struct objtool_file *file)if (is_profiling_func (func->name)) func->profiling_func = true; + + len =strlen (func->name); +if (len > sym_name_max_len) + sym_name_max_len = len; }return 0 ;
PATCH v6 10/30 objtool: Add option to trace function validation
In reply to Alexandre ChartreAdd an option to trace and have information during the validation of specified functions. Functions are specified with the --trace option which can be a single function name (e.g. --trace foo to trace the function with the name "foo"), or a shell wildcard pattern (e.g. --trace foo* to trace all functions with a name starting with "foo").
--- tools/objtool/Build | 1 + tools/objtool/builtin-check.c | 1 + tools/objtool/check.c | 104 +++++++++++++++++---- tools/objtool/disas.c | 115 ++++++++++++++++++++++++ tools/objtool/include/objtool/builtin.h | 1 + tools/objtool/include/objtool/check.h | 6 +- tools/objtool/include/objtool/disas.h | 11 +++ tools/objtool/include/objtool/trace.h | 68 ++++++++++++++ tools/objtool/include/objtool/warn.h | 1 + tools/objtool/trace.c | 9 ++ 10 files changed, 299 insertions(+), 18 deletions(-) create mode 100644 tools/objtool/include/objtool/trace.h create mode 100644 tools/objtool/trace.c
tools/objtool/Build +1 -0
@@ -9,6 +9,7 @@ objtool-y += elf.o objtool-y += objtool.o objtool-$(BUILD_DISAS) += disas.o +objtool-$(BUILD_DISAS) += trace.o objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o
tools/objtool/builtin-check.c +1 -0
@@ -103,6 +103,7 @@ static const struct option check_options[] = {OPT_STRING ('o' ,"output" , &opts.output,"file" ,"output file name" ),OPT_BOOLEAN (0 ,"sec-address" , &opts.sec_address,"print section addresses in warnings" ),OPT_BOOLEAN (0 ,"stats" , &opts.stats,"print statistics" ), +OPT_STRING (0 ,"trace" , &opts.trace,"func" ,"trace function validation" ),OPT_BOOLEAN ('v' ,"verbose" , &opts.verbose,"verbose warnings" ), OPT_BOOLEAN(0, "werror", &opts.werror, "return error on warnings"),
tools/objtool/check.c +87 -17
284 lines not on this page · raw message
tools/objtool/disas.c +115 -0
121 lines not on this page · raw message
tools/objtool/include/objtool/builtin.h +1 -0
@@ -41,6 +41,7 @@ struct opts {const char *output;bool sec_address;bool stats; +const char *trace;bool verbose;bool werror; };
tools/objtool/include/objtool/check.h +5 -1
@@ -66,7 +66,8 @@ struct instruction { visited : 4, no_reloc : 1, hole : 1, - fake : 1; + fake : 1, + trace : 1;/* 9 bit hole */ struct alt_group *alt_group;
@@ -143,4 +144,7 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, struct instrucconst char *objtool_disas_insn (struct instruction *insn); +extern size_t sym_name_max_len; +extern struct disas_context *objtool_disas_ctx; +#endif /* _CHECK_H */
tools/objtool/include/objtool/disas.h +11 -0
@@ -19,6 +19,11 @@ int disas_info_init(struct disassemble_info *dinfo, const char *options);size_t disas_insn (struct disas_context *dctx,struct instruction *insn);char *disas_result (struct disas_context *dctx); +void disas_print_info (FILE *stream,struct instruction *insn,int depth, +const char *format, ...); +void disas_print_insn (FILE *stream,struct disas_context *dctx, +struct instruction *insn,int depth, +const char *format, ...);#else /* DISAS */
@@ -51,6 +56,12 @@ static inline char *disas_result(struct disas_context *dctx)return NULL ; } +static inline void disas_print_info (FILE *stream,struct instruction *insn, +int depth,const char *format, ...) {} +static inline void disas_print_insn (FILE *stream,struct disas_context *dctx, +struct instruction *insn,int depth, +const char *format, ...) {} +#endif /* DISAS */ #endif /* _DISAS_H */
tools/objtool/include/objtool/trace.h new file +68 -0
68 lines not on this page · raw message
tools/objtool/include/objtool/warn.h +1 -0
@@ -97,6 +97,7 @@ static inline char *offstr(struct section *sec, unsigned long offset) _len = (_len <50 ) ?50 - _len :0 ; \ WARN(" %s: " format " %*s%s", _str, ##__VA_ARGS__, _len, "", _istr); \free (_str); \ + __insn->trace =1 ; \ } \ })
tools/objtool/trace.c new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025, Oracle and/or its affiliates. +*/ + +#include <objtool/trace.h> + +bool trace; +int trace_depth;
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Add option to trace function validation
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 70589843b36fee0c6e73632469da4e5fd11f0968 Gitweb: https://git.kernel.org/tip/70589843b36fee0c6e73632469da4e5fd11f0968 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:20 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:09 +01:00
objtool: Add option to trace function validation
Add an option to trace and have information during the validation of specified functions. Functions are specified with the --trace option which can be a single function name (e.g. --trace foo to trace the function with the name "foo"), or a shell wildcard pattern (e.g. --trace foo* to trace all functions with a name starting with "foo").
--- tools/objtool/Build | 1 +- tools/objtool/builtin-check.c | 1 +- tools/objtool/check.c | 104 +++++++++++++++++---- tools/objtool/disas.c | 115 +++++++++++++++++++++++- tools/objtool/include/objtool/builtin.h | 1 +- tools/objtool/include/objtool/check.h | 6 +- tools/objtool/include/objtool/disas.h | 11 ++- tools/objtool/include/objtool/trace.h | 68 ++++++++++++++- tools/objtool/include/objtool/warn.h | 1 +- tools/objtool/trace.c | 9 ++- 10 files changed, 299 insertions(+), 18 deletions(-) create mode 100644 tools/objtool/include/objtool/trace.h create mode 100644 tools/objtool/trace.c
tools/objtool/Build +1 -0
@@ -9,6 +9,7 @@ objtool-y += elf.o objtool-y += objtool.o objtool-$(BUILD_DISAS) += disas.o +objtool-$(BUILD_DISAS) += trace.o objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o
tools/objtool/builtin-check.c +1 -0
@@ -103,6 +103,7 @@ static const struct option check_options[] = {OPT_STRING ('o' ,"output" , &opts.output,"file" ,"output file name" ),OPT_BOOLEAN (0 ,"sec-address" , &opts.sec_address,"print section addresses in warnings" ),OPT_BOOLEAN (0 ,"stats" , &opts.stats,"print statistics" ), +OPT_STRING (0 ,"trace" , &opts.trace,"func" ,"trace function validation" ),OPT_BOOLEAN ('v' ,"verbose" , &opts.verbose,"verbose warnings" ), OPT_BOOLEAN(0, "werror", &opts.werror, "return error on warnings"),
tools/objtool/check.c +87 -17
284 lines not on this page · raw message
tools/objtool/disas.c +115 -0
121 lines not on this page · raw message
tools/objtool/include/objtool/builtin.h +1 -0
@@ -41,6 +41,7 @@ struct opts {const char *output;bool sec_address;bool stats; +const char *trace;bool verbose;bool werror; };
tools/objtool/include/objtool/check.h +5 -1
@@ -66,7 +66,8 @@ struct instruction { visited : 4, no_reloc : 1, hole : 1, - fake : 1; + fake : 1, + trace : 1;/* 9 bit hole */ struct alt_group *alt_group;
@@ -143,4 +144,7 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, struct instrucconst char *objtool_disas_insn (struct instruction *insn); +extern size_t sym_name_max_len; +extern struct disas_context *objtool_disas_ctx; +#endif /* _CHECK_H */
tools/objtool/include/objtool/disas.h +11 -0
@@ -19,6 +19,11 @@ int disas_info_init(struct disassemble_info *dinfo, const char *options);size_t disas_insn (struct disas_context *dctx,struct instruction *insn);char *disas_result (struct disas_context *dctx); +void disas_print_info (FILE *stream,struct instruction *insn,int depth, +const char *format, ...); +void disas_print_insn (FILE *stream,struct disas_context *dctx, +struct instruction *insn,int depth, +const char *format, ...);#else /* DISAS */
@@ -51,6 +56,12 @@ static inline char *disas_result(struct disas_context *dctx)return NULL ; } +static inline void disas_print_info (FILE *stream,struct instruction *insn, +int depth,const char *format, ...) {} +static inline void disas_print_insn (FILE *stream,struct disas_context *dctx, +struct instruction *insn,int depth, +const char *format, ...) {} +#endif /* DISAS */ #endif /* _DISAS_H */
tools/objtool/include/objtool/trace.h new file +68 -0
68 lines not on this page · raw message
tools/objtool/include/objtool/warn.h +1 -0
@@ -97,6 +97,7 @@ static inline char *offstr(struct section *sec, unsigned long offset) _len = (_len <50 ) ?50 - _len :0 ; \ WARN(" %s: " format " %*s%s", _str, ##__VA_ARGS__, _len, "", _istr); \free (_str); \ + __insn->trace =1 ; \ } \ })
tools/objtool/trace.c new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025, Oracle and/or its affiliates. +*/ + +#include <objtool/trace.h> + +bool trace; +int trace_depth;
PATCH v6 11/30 objtool: Trace instruction state changes during function validation
In reply to Alexandre ChartreDuring function validation, objtool maintains a per-instruction state, in particular to track call frame information. When tracing validation, print any instruction state changes.
--- tools/objtool/check.c | 8 +- tools/objtool/include/objtool/trace.h | 10 ++ tools/objtool/trace.c | 132 ++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 1 deletion(-)
tools/objtool/check.c +7 -1
@@ -3729,6 +3729,8 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, struct instruction *prev_insn, struct instruction *next_insn, bool *dead_end) { + /* prev_state is not used if there is no disassembly support */ + struct insn_state prev_state __maybe_unused;struct alternative *alt;u8 visited;int ret;
@@ -3837,7 +3839,11 @@ static int validate_insn(struct objtool_file *file, struct symbol *func,if (skip_alt_group (insn))return 0 ; -if (handle_insn_ops (insn, next_insn, statep)) + prev_state = *statep; + ret =handle_insn_ops (insn, next_insn, statep); +TRACE_INSN_STATE (insn, &prev_state, statep); + +if (ret)return 1 ;switch (insn->type) {
tools/objtool/include/objtool/trace.h +10 -0
@@ -30,6 +30,12 @@ extern int trace_depth; } \ }) +#define TRACE_INSN_STATE (insn, sprev, snext) \ +({ \ + if (trace) \ + trace_insn_state(insn, sprev, snext); \ +}) +static inline void trace_enable (void ) { trace = true;
@@ -53,10 +59,14 @@ static inline void trace_depth_dec(void) trace_depth--; } +void trace_insn_state (struct instruction *insn,struct insn_state *sprev, +struct insn_state *snext); +#else /* DISAS */ #define TRACE (fmt, ...) ({})#define TRACE_INSN (insn, fmt, ...) ({}) +#define TRACE_INSN_STATE (insn, sprev, snext) ({})static inline void trace_enable (void ) {}static inline void trace_disable (void ) {}
tools/objtool/trace.c +132 -0
135 lines not on this page · raw message
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Trace instruction state changes during function validation
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: fcb268b47a2f4a497fdb40ef24bb9e06488b7213 Gitweb: https://git.kernel.org/tip/fcb268b47a2f4a497fdb40ef24bb9e06488b7213 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:21 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:10 +01:00
objtool: Trace instruction state changes during function validation
During function validation, objtool maintains a per-instruction state, in particular to track call frame information. When tracing validation, print any instruction state changes.
--- tools/objtool/check.c | 8 +- tools/objtool/include/objtool/trace.h | 10 ++- tools/objtool/trace.c | 132 +++++++++++++++++++++++++- 3 files changed, 149 insertions(+), 1 deletion(-)
tools/objtool/check.c +7 -1
@@ -3677,6 +3677,8 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, struct instruction *prev_insn, struct instruction *next_insn, bool *dead_end) { + /* prev_state is not used if there is no disassembly support */ + struct insn_state prev_state __maybe_unused;struct alternative *alt;u8 visited;int ret;
@@ -3785,7 +3787,11 @@ static int validate_insn(struct objtool_file *file, struct symbol *func,if (skip_alt_group (insn))return 0 ; -if (handle_insn_ops (insn, next_insn, statep)) + prev_state = *statep; + ret =handle_insn_ops (insn, next_insn, statep); +TRACE_INSN_STATE (insn, &prev_state, statep); + +if (ret)return 1 ;switch (insn->type) {
tools/objtool/include/objtool/trace.h +10 -0
@@ -30,6 +30,12 @@ extern int trace_depth; } \ }) +#define TRACE_INSN_STATE (insn, sprev, snext) \ +({ \ + if (trace) \ + trace_insn_state(insn, sprev, snext); \ +}) +static inline void trace_enable (void ) { trace = true;
@@ -53,10 +59,14 @@ static inline void trace_depth_dec(void) trace_depth--; } +void trace_insn_state (struct instruction *insn,struct insn_state *sprev, +struct insn_state *snext); +#else /* DISAS */ #define TRACE (fmt, ...) ({})#define TRACE_INSN (insn, fmt, ...) ({}) +#define TRACE_INSN_STATE (insn, sprev, snext) ({})static inline void trace_enable (void ) {}static inline void trace_disable (void ) {}
tools/objtool/trace.c +132 -0
135 lines not on this page · raw message
Re: [PATCH v6 11/30] objtool: Trace instruction state changes during function validation
In reply to Alexandre ChartreHi Alexandre,
Quoted 5 lines · Alexandre Chartre
During function validation, objtool maintains a per-instruction state, in particular to track call frame information. When tracing validation, print any instruction state changes.
Signed-off-by Alexandre Chartre <[email protected]>
I am seeing a segfault after this change in -next as commit fcb268b47a2f ("objtool: Trace instruction state changes during function validation") when building allmodconfig with clang 21.1.6 [1] (I did not check earlier versions).
$ clang --version | head -1 ClangBuiltLinux clang version 21.1.6 (https://github.com/llvm/llvm-project.git a832a5222e489298337fbb5876f8dcaf072c5cca)
$ make -skj"$(nproc)" ARCH=x86_64 LLVM=1 clean allmodconfig drivers/scsi/qla2xxx/qla2xxx.o make[7]: *** [scripts/Makefile.build:503: drivers/scsi/qla2xxx/qla2xxx.o] Error 139 ...
$ ld.lld -m elf_x86_64 --fatal-warnings -z noexecstack -r -o drivers/scsi/qla2xxx/qla2xxx.o @drivers/scsi/qla2xxx/qla2xxx.mod
$ tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --cfi --mcount --mnop --orc --retpoline --rethunk --sls --static-call --uaccess --no-unreachable --link --module drivers/scsi/qla2xxx/qla2xxx.o fish: Job 1, 'tools/objtool/objtool --hacks=j…' terminated by signal SIGSEGV (Address boundary error)
If there is any other information I can provide or patches I can test, I am more than happy to do so.
[1]: https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-21.1.6-x86_64.tar.xz
Cheers,
Nathan
# bad: [95cb2fd6ce0ad61af54191fe5ef271d7177f9c3a] Add linux-next specific files for 20251201
# good: [e69c7c175115c51c7f95394fc55425a395b3af59] Merge tag 'timers_urgent_for_v6.18_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
git bisect start '95cb2fd6ce0ad61af54191fe5ef271d7177f9c3a' 'e69c7c175115c51c7f95394fc55425a395b3af59'
# good: [87d5c4addc7e535618586e7205191a7f402288ba] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
git bisect good 87d5c4addc7e535618586e7205191a7f402288ba
# good: [a4ad48eac682ccdc21e2f16b8f27abbf615d8d3d] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
git bisect good a4ad48eac682ccdc21e2f16b8f27abbf615d8d3d
# bad: [b99f4ac0a6c7ccf37be14f5ef61b160b1c8a74b0] Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
git bisect bad b99f4ac0a6c7ccf37be14f5ef61b160b1c8a74b0
# bad: [24cefd05bbf969c95fff3733da174e8a352c1cb2] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
git bisect bad 24cefd05bbf969c95fff3733da174e8a352c1cb2
# bad: [4fa1e8d3340bc660d72a21fc8d4c566045e488fc] Merge branch into tip/master: 'timers/clocksource'
git bisect bad 4fa1e8d3340bc660d72a21fc8d4c566045e488fc
# good: [51446852de95594c02d6b3b700e15b7c886534d6] Merge branch into tip/master: 'core/bugs'
git bisect good 51446852de95594c02d6b3b700e15b7c886534d6
# good: [b032713af9475274762fa664ca2705372b414215] Merge branch into tip/master: 'locking/core'
git bisect good b032713af9475274762fa664ca2705372b414215
# good: [9929dffce5ed7e2988e0274f4db98035508b16d9] perf/x86/intel: Fix and clean up intel_pmu_drain_arch_pebs() type use
git bisect good 9929dffce5ed7e2988e0274f4db98035508b16d9
# bad: [59bfa6408214b6533d8691715cf5459e89b45b89] objtool: Build with disassembly can fail when including bdf.h
git bisect bad 59bfa6408214b6533d8691715cf5459e89b45b89
# bad: [350c7ab8577a32c101a097f4c072220d9ce64f3b] objtool: Improve tracing of alternative instructions
git bisect bad 350c7ab8577a32c101a097f4c072220d9ce64f3b
# good: [0bb080ba6469a573bc85122153d931334d10a173] objtool: Disassemble instruction on warning or backtrace
git bisect good 0bb080ba6469a573bc85122153d931334d10a173
# bad: [fcb268b47a2f4a497fdb40ef24bb9e06488b7213] objtool: Trace instruction state changes during function validation
git bisect bad fcb268b47a2f4a497fdb40ef24bb9e06488b7213
# good: [de0248fbbf999d0fd3ca2aa5ba515ab78703d129] objtool: Record symbol name max length
git bisect good de0248fbbf999d0fd3ca2aa5ba515ab78703d129
# good: [70589843b36fee0c6e73632469da4e5fd11f0968] objtool: Add option to trace function validation
git bisect good 70589843b36fee0c6e73632469da4e5fd11f0968
# first bad commit: [fcb268b47a2f4a497fdb40ef24bb9e06488b7213] objtool: Trace instruction state changes during function validation
Josh Poimboeuf
maintainerRe: [PATCH v6 11/30] objtool: Trace instruction state changes during function validation
Quoted 23 lines · Nathan Chancellor
Hi Alexandre,
Quoted 5 lines · Alexandre Chartre
During function validation, objtool maintains a per-instruction state, in particular to track call frame information. When tracing validation, print any instruction state changes.
Signed-off-by Alexandre Chartre <[email protected]>I am seeing a segfault after this change in -next as commit
fcb268b47a2f("objtool: Trace instruction state changes during function validation") when building allmodconfig with clang 21.1.6 [1] (I did not check earlier versions).$ clang --version | head -1 ClangBuiltLinux clang version 21.1.6 (https://github.com/llvm/llvm-project.git a832a5222e489298337fbb5876f8dcaf072c5cca)$ make -skj"$(nproc)" ARCH=x86_64 LLVM=1 clean allmodconfig drivers/scsi/qla2xxx/qla2xxx.o make[7]: *** [scripts/Makefile.build:503: drivers/scsi/qla2xxx/qla2xxx.o] Error 139 ...$ ld.lld -m elf_x86_64 --fatal-warnings -z noexecstack -r -o drivers/scsi/qla2xxx/qla2xxx.o @drivers/scsi/qla2xxx/qla2xxx.mod
Quoted 7 lines
$ tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --cfi --mcount --mnop --orc --retpoline --rethunk --sls --static-call --uaccess --no-unreachable --link --module drivers/scsi/qla2xxx/qla2xxx.o fish: Job 1, 'tools/objtool/objtool --hacks=j…' terminated by signal SIGSEGV (Address boundary error)If there is any other information I can provide or patches I can test, I am more than happy to do so.
[1]: https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-21.1.6-x86_64.tar.xz
Objtool is overflowing the stack due to the large number of jumps it has to follow in that code, thanks to kasan. The above mentioned patch
fcb268b47a2f ("objtool: Trace instruction state changes during function validation")
added a 328-byte struct to the stack in validate_insn() which drastically increased the amount of stack size needed.
I suppose we could hack a fix by making it a static local variable, like below.
Or, objtool could setrlimit(RLIMIT_STACK) to 16MB?
tools/objtool/check.c +1 -1
@@ -3678,7 +3678,7 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, bool *dead_end) {/* prev_state is not used if there is no disassembly support */ -struct insn_state prev_state__maybe_unused ; +static struct insn_state prev_state__maybe_unused ;struct alternative *alt;u8 visited;int ret;
Alexandre Chartre
Reviewed-byRe: [PATCH v6 11/30] objtool: Trace instruction state changes during function validation
Quoted 50 lines · Josh Poimboeuf
Quoted 23 lines · Nathan Chancellor
Hi Alexandre,
Quoted 5 lines · Alexandre Chartre
During function validation, objtool maintains a per-instruction state, in particular to track call frame information. When tracing validation, print any instruction state changes.
Signed-off-by Alexandre Chartre <[email protected]>I am seeing a segfault after this change in -next as commit
fcb268b47a2f("objtool: Trace instruction state changes during function validation") when building allmodconfig with clang 21.1.6 [1] (I did not check earlier versions).$ clang --version | head -1 ClangBuiltLinux clang version 21.1.6 (https://github.com/llvm/llvm-project.git a832a5222e489298337fbb5876f8dcaf072c5cca)$ make -skj"$(nproc)" ARCH=x86_64 LLVM=1 clean allmodconfig drivers/scsi/qla2xxx/qla2xxx.o make[7]: *** [scripts/Makefile.build:503: drivers/scsi/qla2xxx/qla2xxx.o] Error 139 ...$ ld.lld -m elf_x86_64 --fatal-warnings -z noexecstack -r -o drivers/scsi/qla2xxx/qla2xxx.o @drivers/scsi/qla2xxx/qla2xxx.modQuoted 7 lines
$ tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --cfi --mcount --mnop --orc --retpoline --rethunk --sls --static-call --uaccess --no-unreachable --link --module drivers/scsi/qla2xxx/qla2xxx.o fish: Job 1, 'tools/objtool/objtool --hacks=j…' terminated by signal SIGSEGV (Address boundary error)If there is any other information I can provide or patches I can test, I am more than happy to do so.
[1]: https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-21.1.6-x86_64.tar.xz
Objtool is overflowing the stack due to the large number of jumps it has to follow in that code, thanks to kasan. The above mentioned patch
fcb268b47a2f("objtool: Trace instruction state changes during function validation")added a 328-byte struct to the stack in
validate_insn()which drastically increased the amount of stack size needed.I suppose we could hack a fix by making it a static local variable, like below.
Or, objtool could
setrlimit(RLIMIT_STACK)to 16MB?tools/objtool/check.c +0
-0
tools/objtool/check.c static int validate_insn(struct objtool_file *file, struct symbol *func, · line 3684
Quoted 8 lines
tools/objtool/check.c +1
-1@@ -3678,7 +3678,7 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, bool *dead_end) {/* prev_state is not used if there is no disassembly support */ -struct insn_state prev_state__maybe_unused ; +static struct insn_state prev_state__maybe_unused ;struct alternative *alt;u8 visited;int ret;
static looks good enough to me.
Thanks,
alex.
Josh Poimboeuf
maintainerRe: [PATCH v6 11/30] objtool: Trace instruction state changes during function validation
Quoted 63 lines · Alexandre Chartre
Quoted 50 lines · Josh Poimboeuf
Quoted 23 lines · Nathan Chancellor
Hi Alexandre,
Quoted 5 lines · Alexandre Chartre
During function validation, objtool maintains a per-instruction state, in particular to track call frame information. When tracing validation, print any instruction state changes.
Signed-off-by Alexandre Chartre <[email protected]>I am seeing a segfault after this change in -next as commit
fcb268b47a2f("objtool: Trace instruction state changes during function validation") when building allmodconfig with clang 21.1.6 [1] (I did not check earlier versions).$ clang --version | head -1 ClangBuiltLinux clang version 21.1.6 (https://github.com/llvm/llvm-project.git a832a5222e489298337fbb5876f8dcaf072c5cca)$ make -skj"$(nproc)" ARCH=x86_64 LLVM=1 clean allmodconfig drivers/scsi/qla2xxx/qla2xxx.o make[7]: *** [scripts/Makefile.build:503: drivers/scsi/qla2xxx/qla2xxx.o] Error 139 ...$ ld.lld -m elf_x86_64 --fatal-warnings -z noexecstack -r -o drivers/scsi/qla2xxx/qla2xxx.o @drivers/scsi/qla2xxx/qla2xxx.modQuoted 7 lines
$ tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --cfi --mcount --mnop --orc --retpoline --rethunk --sls --static-call --uaccess --no-unreachable --link --module drivers/scsi/qla2xxx/qla2xxx.o fish: Job 1, 'tools/objtool/objtool --hacks=j…' terminated by signal SIGSEGV (Address boundary error)If there is any other information I can provide or patches I can test, I am more than happy to do so.
[1]: https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-21.1.6-x86_64.tar.xz
Objtool is overflowing the stack due to the large number of jumps it has to follow in that code, thanks to kasan. The above mentioned patch
fcb268b47a2f("objtool: Trace instruction state changes during function validation")added a 328-byte struct to the stack in
validate_insn()which drastically increased the amount of stack size needed.I suppose we could hack a fix by making it a static local variable, like below.
Or, objtool could
setrlimit(RLIMIT_STACK)to 16MB?tools/objtool/check.c +0
-0tools/objtool/check.c static int validate_insn(struct objtool_file *file, struct symbol *func, · line 3684
Quoted 8 lines
tools/objtool/check.c +1
-1@@ -3678,7 +3678,7 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, bool *dead_end) {/* prev_state is not used if there is no disassembly support */ -struct insn_state prev_state__maybe_unused ; +static struct insn_state prev_state__maybe_unused ;struct alternative *alt;u8 visited;int ret;static looks good enough to me.
Quoted 3 lines
Reviewed-by Alexandre Chartre <[email protected]>Thanks,
The static local bothered me, I went with a different approach to move that variable (and its usage) to handle_insn_ops(). Will post shortly.
Signature · 1 line
Josh
Re: [PATCH v6 11/30] objtool: Trace instruction state changes during function validation
On Tue, 2 Dec 2025 08:13:21 -0800
Josh Poimboeuf <[email protected]> wrote:
...
Quoted 3 lines
The static local bothered me, I went with a different approach to move that variable (and its usage) to
handle_insn_ops(). Will post shortly.
Does look a little wrong inside a recursively called function.
How does the code get on for 32bit builds?
I'd guess they have a lot less stack available?
David
PATCH v6 12/30 objtool: Improve register reporting during function validation
In reply to Alexandre ChartreWhen tracing function validation, instruction state changes can report changes involving registers. These registers are reported with the name "r<num>" (e.g. "r3"). Print the CPU specific register name instead of a generic name (e.g. print "rbx" instead of "r3" on x86).
--- tools/objtool/arch/loongarch/decode.c | 11 +++++++++++ tools/objtool/arch/powerpc/decode.c | 12 ++++++++++++ tools/objtool/arch/x86/decode.c | 8 ++++++++ tools/objtool/include/objtool/arch.h | 2 ++ tools/objtool/trace.c | 7 +++++++ 5 files changed, 40 insertions(+)
tools/objtool/arch/loongarch/decode.c +11 -0
@@ -8,6 +8,17 @@#include <linux/objtool_types.h> #include <arch/elf.h> +const char *arch_reg_name[CFI_NUM_REGS ] = { +"zero" ,"ra" ,"tp" ,"sp" , +"a0" ,"a1" ,"a2" ,"a3" , +"a4" ,"a5" ,"a6" ,"a7" , +"t0" ,"t1" ,"t2" ,"t3" , +"t4" ,"t5" ,"t6" ,"t7" , +"t8" ,"u0" ,"fp" ,"s0" , +"s1" ,"s2" ,"s3" ,"s4" , +"s5" ,"s6" ,"s7" ,"s8" +}; +int arch_ftrace_match (const char *name) {return !strcmp (name,"_mcount" );
tools/objtool/arch/powerpc/decode.c +12 -0
@@ -9,6 +9,18 @@#include <objtool/warn.h> #include <objtool/builtin.h> +const char *arch_reg_name[CFI_NUM_REGS ] = { +"r0" ,"sp" ,"r2" ,"r3" , +"r4" ,"r5" ,"r6" ,"r7" , +"r8" ,"r9" ,"r10" ,"r11" , +"r12" ,"r13" ,"r14" ,"r15" , +"r16" ,"r17" ,"r18" ,"r19" , +"r20" ,"r21" ,"r22" ,"r23" , +"r24" ,"r25" ,"r26" ,"r27" , +"r28" ,"r29" ,"r30" ,"r31" , +"ra" +}; +int arch_ftrace_match (const char *name) {return !strcmp (name,"_mcount" );
tools/objtool/arch/x86/decode.c +8 -0
@@ -23,6 +23,14 @@#include <objtool/builtin.h> #include <arch/elf.h> +const char *arch_reg_name[CFI_NUM_REGS ] = { +"rax" ,"rcx" ,"rdx" ,"rbx" , +"rsp" ,"rbp" ,"rsi" ,"rdi" , +"r8" ,"r9" ,"r10" ,"r11" , +"r12" ,"r13" ,"r14" ,"r15" , +"ra" +}; +int arch_ftrace_match (const char *name) {return !strcmp (name,"__fentry__" );
tools/objtool/include/objtool/arch.h +2 -0
@@ -103,6 +103,8 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +extern const char *arch_reg_name[CFI_NUM_REGS ]; +#ifdef DISAS #include <bfd.h>
tools/objtool/trace.c +7 -0
@@ -34,6 +34,7 @@ int trace_depth;static const char *cfi_reg_name (unsigned int reg) {static char rname_buffer[CFI_REG_NAME_MAXLEN ]; +const char *rname;switch (reg) {case CFI_UNDEFINED :
@@ -46,6 +47,12 @@ static const char *cfi_reg_name(unsigned int reg)return "(bp)" ; } +if (reg <CFI_NUM_REGS ) { + rname = arch_reg_name[reg]; +if (rname) +return rname; + } +if (snprintf (rname_buffer,CFI_REG_NAME_MAXLEN ,"r%d" , reg) ==-1 )return "<error>" ;
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Improve register reporting during function validation
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 26a453fb5637907a538d6ea5ef23651142811e15 Gitweb: https://git.kernel.org/tip/26a453fb5637907a538d6ea5ef23651142811e15 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:22 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:10 +01:00
objtool: Improve register reporting during function validation
When tracing function validation, instruction state changes can report changes involving registers. These registers are reported with the name "r<num>" (e.g. "r3"). Print the CPU specific register name instead of a generic name (e.g. print "rbx" instead of "r3" on x86).
--- tools/objtool/arch/loongarch/decode.c | 11 +++++++++++ tools/objtool/arch/powerpc/decode.c | 12 ++++++++++++ tools/objtool/arch/x86/decode.c | 8 ++++++++ tools/objtool/include/objtool/arch.h | 2 ++ tools/objtool/trace.c | 7 +++++++ 5 files changed, 40 insertions(+)
tools/objtool/arch/loongarch/decode.c +11 -0
@@ -8,6 +8,17 @@#include <linux/objtool_types.h> #include <arch/elf.h> +const char *arch_reg_name[CFI_NUM_REGS ] = { +"zero" ,"ra" ,"tp" ,"sp" , +"a0" ,"a1" ,"a2" ,"a3" , +"a4" ,"a5" ,"a6" ,"a7" , +"t0" ,"t1" ,"t2" ,"t3" , +"t4" ,"t5" ,"t6" ,"t7" , +"t8" ,"u0" ,"fp" ,"s0" , +"s1" ,"s2" ,"s3" ,"s4" , +"s5" ,"s6" ,"s7" ,"s8" +}; +int arch_ftrace_match (const char *name) {return !strcmp (name,"_mcount" );
tools/objtool/arch/powerpc/decode.c +12 -0
@@ -9,6 +9,18 @@#include <objtool/warn.h> #include <objtool/builtin.h> +const char *arch_reg_name[CFI_NUM_REGS ] = { +"r0" ,"sp" ,"r2" ,"r3" , +"r4" ,"r5" ,"r6" ,"r7" , +"r8" ,"r9" ,"r10" ,"r11" , +"r12" ,"r13" ,"r14" ,"r15" , +"r16" ,"r17" ,"r18" ,"r19" , +"r20" ,"r21" ,"r22" ,"r23" , +"r24" ,"r25" ,"r26" ,"r27" , +"r28" ,"r29" ,"r30" ,"r31" , +"ra" +}; +int arch_ftrace_match (const char *name) {return !strcmp (name,"_mcount" );
tools/objtool/arch/x86/decode.c +8 -0
@@ -23,6 +23,14 @@#include <objtool/builtin.h> #include <arch/elf.h> +const char *arch_reg_name[CFI_NUM_REGS ] = { +"rax" ,"rcx" ,"rdx" ,"rbx" , +"rsp" ,"rbp" ,"rsi" ,"rdi" , +"r8" ,"r9" ,"r10" ,"r11" , +"r12" ,"r13" ,"r14" ,"r15" , +"ra" +}; +int arch_ftrace_match (const char *name) {return !strcmp (name,"__fentry__" );
tools/objtool/include/objtool/arch.h +2 -0
@@ -103,6 +103,8 @@ bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc);unsigned int arch_reloc_size (struct reloc *reloc);unsigned long arch_jump_table_sym_offset (struct reloc *reloc,struct reloc *table); +extern const char *arch_reg_name[CFI_NUM_REGS ]; +#ifdef DISAS #include <bfd.h>
tools/objtool/trace.c +7 -0
@@ -34,6 +34,7 @@ int trace_depth;static const char *cfi_reg_name (unsigned int reg) {static char rname_buffer[CFI_REG_NAME_MAXLEN ]; +const char *rname;switch (reg) {case CFI_UNDEFINED :
@@ -46,6 +47,12 @@ static const char *cfi_reg_name(unsigned int reg)return "(bp)" ; } +if (reg <CFI_NUM_REGS ) { + rname = arch_reg_name[reg]; +if (rname) +return rname; + } +if (snprintf (rname_buffer,CFI_REG_NAME_MAXLEN ,"r%d" , reg) ==-1 )return "<error>" ;
PATCH v6 13/30 objtool: Identify the different types of alternatives
In reply to Alexandre ChartreAlternative code, including jump table and exception table, is represented with the same struct alternative structure. But there is no obvious way to identify whether the struct represents alternative instructions, a jump table or an exception table.
So add a type to struct alternative to clearly identify the type of alternative.
--- tools/objtool/check.c | 13 ++++++++----- tools/objtool/include/objtool/check.h | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-)
tools/objtool/check.c +8 -5
@@ -27,11 +27,6 @@#include <linux/static_call_types.h> #include <linux/string.h> -struct alternative { -struct alternative *next; -struct instruction *insn; -}; -static unsigned long nr_cfi, nr_cfi_reused, nr_cfi_cache;static struct cfi_init_state initial_func_cfi;
@@ -1945,6 +1940,7 @@ static int add_special_section_alts(struct objtool_file *file)struct list_head special_alts;struct instruction *orig_insn, *new_insn;struct special_alt *special_alt, *tmp; +enum alternative_type alt_type;struct alternative *alt;if (special_get_alts (file->elf, &special_alts))
@@ -1980,9 +1976,15 @@ static int add_special_section_alts(struct objtool_file *file)if (handle_group_alt (file, special_alt, orig_insn, &new_insn))return -1 ; + alt_type =ALT_TYPE_INSTRUCTIONS ; + }else if (special_alt->jump_or_nop) {if (handle_jump_alt (file, special_alt, orig_insn, &new_insn))return -1 ; + + alt_type =ALT_TYPE_JUMP_TABLE ; + }else { + alt_type =ALT_TYPE_EX_TABLE ; } alt =calloc (1 ,sizeof (*alt));
@@ -1993,6 +1995,7 @@ static int add_special_section_alts(struct objtool_file *file) alt->insn = new_insn; alt->next = orig_insn->alts; + alt->type = alt_type; orig_insn->alts = alt;list_del (&special_alt->list);
tools/objtool/include/objtool/check.h +12 -0
@@ -38,6 +38,18 @@ struct alt_group {bool ignore; }; +enum alternative_type { +ALT_TYPE_INSTRUCTIONS , +ALT_TYPE_JUMP_TABLE , +ALT_TYPE_EX_TABLE , +}; + +struct alternative { +struct alternative *next; +struct instruction *insn; +enum alternative_type type; +}; +#define INSN_CHUNK_BITS 8#define INSN_CHUNK_SIZE (1 << INSN_CHUNK_BITS)#define INSN_CHUNK_MAX (INSN_CHUNK_SIZE - 1)
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Identify the different types of alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: d490aa21973fe66ec35ad825c19f88ac7f7abb27 Gitweb: https://git.kernel.org/tip/d490aa21973fe66ec35ad825c19f88ac7f7abb27 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:23 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:11 +01:00
objtool: Identify the different types of alternatives
Alternative code, including jump table and exception table, is represented with the same struct alternative structure. But there is no obvious way to identify whether the struct represents alternative instructions, a jump table or an exception table.
So add a type to struct alternative to clearly identify the type of alternative.
--- tools/objtool/check.c | 13 ++++++++----- tools/objtool/include/objtool/check.h | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-)
tools/objtool/check.c +8 -5
@@ -27,11 +27,6 @@#include <linux/static_call_types.h> #include <linux/string.h> -struct alternative { -struct alternative *next; -struct instruction *insn; -}; -static unsigned long nr_cfi, nr_cfi_reused, nr_cfi_cache;static struct cfi_init_state initial_func_cfi;
@@ -1924,6 +1919,7 @@ static int add_special_section_alts(struct objtool_file *file)struct list_head special_alts;struct instruction *orig_insn, *new_insn;struct special_alt *special_alt, *tmp; +enum alternative_type alt_type;struct alternative *alt;if (special_get_alts (file->elf, &special_alts))
@@ -1959,9 +1955,15 @@ static int add_special_section_alts(struct objtool_file *file)if (handle_group_alt (file, special_alt, orig_insn, &new_insn))return -1 ; + alt_type =ALT_TYPE_INSTRUCTIONS ; + }else if (special_alt->jump_or_nop) {if (handle_jump_alt (file, special_alt, orig_insn, &new_insn))return -1 ; + + alt_type =ALT_TYPE_JUMP_TABLE ; + }else { + alt_type =ALT_TYPE_EX_TABLE ; } alt =calloc (1 ,sizeof (*alt));
@@ -1972,6 +1974,7 @@ static int add_special_section_alts(struct objtool_file *file) alt->insn = new_insn; alt->next = orig_insn->alts; + alt->type = alt_type; orig_insn->alts = alt;list_del (&special_alt->list);
tools/objtool/include/objtool/check.h +12 -0
@@ -38,6 +38,18 @@ struct alt_group {bool ignore; }; +enum alternative_type { +ALT_TYPE_INSTRUCTIONS , +ALT_TYPE_JUMP_TABLE , +ALT_TYPE_EX_TABLE , +}; + +struct alternative { +struct alternative *next; +struct instruction *insn; +enum alternative_type type; +}; +#define INSN_CHUNK_BITS 8#define INSN_CHUNK_SIZE (1 << INSN_CHUNK_BITS)#define INSN_CHUNK_MAX (INSN_CHUNK_SIZE - 1)
PATCH v6 14/30 objtool: Add functions to better name alternatives
In reply to Alexandre ChartreAdd the disas_alt_name() and disas_alt_type_name() to provide a name and a type name for an alternative. This will be used to better name alternatives when tracing their execution.
--- tools/objtool/disas.c | 72 +++++++++++++++++++++++++++ tools/objtool/include/objtool/disas.h | 12 +++++ 2 files changed, 84 insertions(+)
tools/objtool/disas.c +72 -0
@@ -3,6 +3,8 @@* Copyright (C) 2015-2017 Josh Poimboeuf <[email protected]> */ +#define _GNU_SOURCE +#include <objtool/arch.h> #include <objtool/check.h> #include <objtool/disas.h>
@@ -450,6 +452,76 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn)return disasm (insn->offset, &dctx->info); } +/* +* Provide a name for the type of alternatives present at the +* specified instruction. +* +* An instruction can have alternatives with different types, for +* example alternative instructions and an exception table. In that +* case the name for the alternative instructions type is used. +* +* Return NULL if the instruction as no alternative. +*/ +const char *disas_alt_type_name (struct instruction *insn) +{ +struct alternative *alt; +const char *name; + + name =NULL ; +for (alt = insn->alts; alt; alt = alt->next) { +if (alt->type ==ALT_TYPE_INSTRUCTIONS ) { + name ="alternative" ; +break ; + } + +switch (alt->type) { +case ALT_TYPE_EX_TABLE : + name ="ex_table" ; +break ; +case ALT_TYPE_JUMP_TABLE : + name ="jump_table" ; +break ; +default : + name ="unknown" ; +break ; + } + } + +return name; +} + +/* +* Provide a name for an alternative. +*/ +char *disas_alt_name (struct alternative *alt) +{ +char *str =NULL ; + +switch (alt->type) { + +case ALT_TYPE_EX_TABLE : + str =strdup ("EXCEPTION" ); +break ; + +case ALT_TYPE_JUMP_TABLE : + str =strdup ("JUMP" ); +break ; + +case ALT_TYPE_INSTRUCTIONS : +/* +* This is a non-default group alternative. Create a unique +* name using the offset of the first original and alternative +* instructions. +*/ +asprintf (&str,"ALTERNATIVE %lx.%lx" , + alt->insn->alt_group->orig_group->first_insn->offset, + alt->insn->alt_group->first_insn->offset); +break ; + } + +return str; +} +/* * Disassemble a function. */
tools/objtool/include/objtool/disas.h +12 -0
@@ -6,6 +6,7 @@#ifndef _DISAS_H#define _DISAS_H +struct alternative ;struct disas_context ;struct disassemble_info ;
@@ -24,6 +25,8 @@ void disas_print_info(FILE *stream, struct instruction *insn, int depth,void disas_print_insn (FILE *stream,struct disas_context *dctx,struct instruction *insn,int depth,const char *format, ...); +char *disas_alt_name (struct alternative *alt); +const char *disas_alt_type_name (struct instruction *insn);#else /* DISAS */
@@ -61,6 +64,15 @@ static inline void disas_print_info(FILE *stream, struct instruction *insn,static inline void disas_print_insn (FILE *stream,struct disas_context *dctx,struct instruction *insn,int depth,const char *format, ...) {} +static inline char *disas_alt_name (struct alternative *alt) +{ +return NULL ; +} + +static inline const char *disas_alt_type_name (struct instruction *insn) +{ +return NULL ; +}#endif /* DISAS */
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Add functions to better name alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 9b580accac003767a461bf52d738ad1ab4e8ccfa Gitweb: https://git.kernel.org/tip/9b580accac003767a461bf52d738ad1ab4e8ccfa Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:24 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:11 +01:00
objtool: Add functions to better name alternatives
Add the disas_alt_name() and disas_alt_type_name() to provide a name and a type name for an alternative. This will be used to better name alternatives when tracing their execution.
--- tools/objtool/disas.c | 72 ++++++++++++++++++++++++++- tools/objtool/include/objtool/disas.h | 12 ++++- 2 files changed, 84 insertions(+)
tools/objtool/disas.c +72 -0
@@ -3,6 +3,8 @@* Copyright (C) 2015-2017 Josh Poimboeuf <[email protected]> */ +#define _GNU_SOURCE +#include <objtool/arch.h> #include <objtool/check.h> #include <objtool/disas.h>
@@ -451,6 +453,76 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn) }/* +* Provide a name for the type of alternatives present at the +* specified instruction. +* +* An instruction can have alternatives with different types, for +* example alternative instructions and an exception table. In that +* case the name for the alternative instructions type is used. +* +* Return NULL if the instruction as no alternative. +*/ +const char *disas_alt_type_name (struct instruction *insn) +{ +struct alternative *alt; +const char *name; + + name =NULL ; +for (alt = insn->alts; alt; alt = alt->next) { +if (alt->type ==ALT_TYPE_INSTRUCTIONS ) { + name ="alternative" ; +break ; + } + +switch (alt->type) { +case ALT_TYPE_EX_TABLE : + name ="ex_table" ; +break ; +case ALT_TYPE_JUMP_TABLE : + name ="jump_table" ; +break ; +default : + name ="unknown" ; +break ; + } + } + +return name; +} + +/* +* Provide a name for an alternative. +*/ +char *disas_alt_name (struct alternative *alt) +{ +char *str =NULL ; + +switch (alt->type) { + +case ALT_TYPE_EX_TABLE : + str =strdup ("EXCEPTION" ); +break ; + +case ALT_TYPE_JUMP_TABLE : + str =strdup ("JUMP" ); +break ; + +case ALT_TYPE_INSTRUCTIONS : +/* +* This is a non-default group alternative. Create a unique +* name using the offset of the first original and alternative +* instructions. +*/ +asprintf (&str,"ALTERNATIVE %lx.%lx" , + alt->insn->alt_group->orig_group->first_insn->offset, + alt->insn->alt_group->first_insn->offset); +break ; + } + +return str; +} + +/* * Disassemble a function. */ static void disas_func (struct disas_context *dctx,struct symbol *func)
tools/objtool/include/objtool/disas.h +12 -0
@@ -6,6 +6,7 @@#ifndef _DISAS_H#define _DISAS_H +struct alternative ;struct disas_context ;struct disassemble_info ;
@@ -24,6 +25,8 @@ void disas_print_info(FILE *stream, struct instruction *insn, int depth,void disas_print_insn (FILE *stream,struct disas_context *dctx,struct instruction *insn,int depth,const char *format, ...); +char *disas_alt_name (struct alternative *alt); +const char *disas_alt_type_name (struct instruction *insn);#else /* DISAS */
@@ -61,6 +64,15 @@ static inline void disas_print_info(FILE *stream, struct instruction *insn,static inline void disas_print_insn (FILE *stream,struct disas_context *dctx,struct instruction *insn,int depth,const char *format, ...) {} +static inline char *disas_alt_name (struct alternative *alt) +{ +return NULL ; +} + +static inline const char *disas_alt_type_name (struct instruction *insn) +{ +return NULL ; +}#endif /* DISAS */
PATCH v6 15/30 objtool: Improve tracing of alternative instructions
In reply to Alexandre ChartreWhen tracing function validation, improve the reporting of alternative instruction by more clearly showing the different alternatives beginning and end.
--- tools/objtool/check.c | 18 +++----- tools/objtool/include/objtool/trace.h | 65 ++++++++++++++++++++++++++- tools/objtool/trace.c | 55 +++++++++++++++++++++++ 3 files changed, 125 insertions(+), 13 deletions(-)
tools/objtool/check.c +6 -12
@@ -3616,7 +3616,7 @@ static bool skip_alt_group(struct instruction *insn)/* ANNOTATE_IGNORE_ALTERNATIVE */ if (insn->alt_group->ignore) { -TRACE_INSN (insn,"alt group ignored" ); +TRACE_ALT (insn,"alt group ignored" );return true; }
@@ -3732,8 +3732,9 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, struct instruction *prev_insn, struct instruction *next_insn, bool *dead_end) { - /* prev_state is not used if there is no disassembly support */ + /* prev_state and alt_name are not used if there is no disassembly support */ struct insn_state prev_state __maybe_unused; +char *alt_name__maybe_unused =NULL ;struct alternative *alt;u8 visited;int ret;
@@ -3820,23 +3821,16 @@ static int validate_insn(struct objtool_file *file, struct symbol *func,return 1 ;if (insn->alts) { -int i, num_alts; - - num_alts =0 ; -for (alt = insn->alts; alt; alt = alt->next) - num_alts++; - - i =1 ;for (alt = insn->alts; alt; alt = alt->next) { -TRACE_INSN (insn,"alternative %d/%d" , i, num_alts); +TRACE_ALT_BEGIN (insn, alt, alt_name); ret =validate_branch (file, func, alt->insn, *statep); +TRACE_ALT_END (insn, alt, alt_name);if (ret) {BT_INSN (insn,"(alt)" );return ret; } - i++; } -TRACE_INSN (insn,"alternative DEFAULT" ); +TRACE_ALT_INFO_NOADDR (insn,"/ " ,"DEFAULT" ); }if (skip_alt_group (insn))
tools/objtool/include/objtool/trace.h +64 -1
98 lines not on this page · raw message
tools/objtool/trace.c +55 -0
58 lines not on this page · raw message
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Improve tracing of alternative instructions
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 350c7ab8577a32c101a097f4c072220d9ce64f3b Gitweb: https://git.kernel.org/tip/350c7ab8577a32c101a097f4c072220d9ce64f3b Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:25 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:11 +01:00
objtool: Improve tracing of alternative instructions
When tracing function validation, improve the reporting of alternative instruction by more clearly showing the different alternatives beginning and end.
--- tools/objtool/check.c | 18 ++----- tools/objtool/include/objtool/trace.h | 65 +++++++++++++++++++++++++- tools/objtool/trace.c | 55 ++++++++++++++++++++++- 3 files changed, 125 insertions(+), 13 deletions(-)
tools/objtool/check.c +6 -12
@@ -3564,7 +3564,7 @@ static bool skip_alt_group(struct instruction *insn)/* ANNOTATE_IGNORE_ALTERNATIVE */ if (insn->alt_group->ignore) { -TRACE_INSN (insn,"alt group ignored" ); +TRACE_ALT (insn,"alt group ignored" );return true; }
@@ -3680,8 +3680,9 @@ static int validate_insn(struct objtool_file *file, struct symbol *func, struct instruction *prev_insn, struct instruction *next_insn, bool *dead_end) { - /* prev_state is not used if there is no disassembly support */ + /* prev_state and alt_name are not used if there is no disassembly support */ struct insn_state prev_state __maybe_unused; +char *alt_name__maybe_unused =NULL ;struct alternative *alt;u8 visited;int ret;
@@ -3768,23 +3769,16 @@ static int validate_insn(struct objtool_file *file, struct symbol *func,return 1 ;if (insn->alts) { -int i, num_alts; - - num_alts =0 ; -for (alt = insn->alts; alt; alt = alt->next) - num_alts++; - - i =1 ;for (alt = insn->alts; alt; alt = alt->next) { -TRACE_INSN (insn,"alternative %d/%d" , i, num_alts); +TRACE_ALT_BEGIN (insn, alt, alt_name); ret =validate_branch (file, func, alt->insn, *statep); +TRACE_ALT_END (insn, alt, alt_name);if (ret) {BT_INSN (insn,"(alt)" );return ret; } - i++; } -TRACE_INSN (insn,"alternative DEFAULT" ); +TRACE_ALT_INFO_NOADDR (insn,"/ " ,"DEFAULT" ); }if (skip_alt_group (insn))
tools/objtool/include/objtool/trace.h +64 -1
98 lines not on this page · raw message
tools/objtool/trace.c +55 -0
58 lines not on this page · raw message
PATCH v6 16/30 objtool: Do not validate IBT for .return_sites and .call_sites
In reply to Alexandre ChartreThe .return_sites and .call_sites sections reference text addresses, but not with the intent to indirect branch to them, so they don't need to be validated for IBT.
This is useful when running objtool on object files which already have .return_sites or .call_sites sections, for example to re-run objtool after it has reported an error or a warning.
--- tools/objtool/check.c | 2 ++ 1 file changed, 2 insertions(+)
tools/objtool/check.c +2 -0
@@ -4805,6 +4805,8 @@ static int validate_ibt(struct objtool_file *file) !strcmp (sec->name,".llvm.call-graph-profile" ) || !strcmp (sec->name,".llvm_bb_addr_map" ) || !strcmp (sec->name,"__tracepoints" ) || + !strcmp (sec->name,".return_sites" ) || + !strcmp (sec->name,".call_sites" ) || !strcmp(sec->name, "__patchable_function_entries")) continue;
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Do not validate IBT for .return_sites and .call_sites
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: c3b7d044fc5ac99a31ce9420431b90e21ed55503 Gitweb: https://git.kernel.org/tip/c3b7d044fc5ac99a31ce9420431b90e21ed55503 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:26 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:12 +01:00
objtool: Do not validate IBT for .return_sites and .call_sites
The .return_sites and .call_sites sections reference text addresses, but not with the intent to indirect branch to them, so they don't need to be validated for IBT.
This is useful when running objtool on object files which already have .return_sites or .call_sites sections, for example to re-run objtool after it has reported an error or a warning.
--- tools/objtool/check.c | 2 ++ 1 file changed, 2 insertions(+)
tools/objtool/check.c +2 -0
@@ -4753,6 +4753,8 @@ static int validate_ibt(struct objtool_file *file) !strcmp (sec->name,".llvm.call-graph-profile" ) || !strcmp (sec->name,".llvm_bb_addr_map" ) || !strcmp (sec->name,"__tracepoints" ) || + !strcmp (sec->name,".return_sites" ) || + !strcmp (sec->name,".call_sites" ) || !strcmp(sec->name, "__patchable_function_entries")) continue;
PATCH v6 17/30 objtool: Add the --disas=<function-pattern> action
In reply to Alexandre ChartreAdd the --disas=<function-pattern> actions to disassemble the specified functions. The function pattern can be a single function name (e.g. --disas foo to disassemble the function with the name "foo"), or a shell wildcard pattern (e.g. --disas foo* to disassemble all functions with a name starting with "foo").
--- tools/objtool/builtin-check.c | 2 ++ tools/objtool/check.c | 38 ++++++++++++++----------- tools/objtool/disas.c | 27 ++++++++++++++++++ tools/objtool/include/objtool/builtin.h | 1 + tools/objtool/include/objtool/disas.h | 2 ++ 5 files changed, 53 insertions(+), 17 deletions(-)
tools/objtool/builtin-check.c +2 -0
@@ -75,6 +75,7 @@ static const struct option check_options[] = {OPT_GROUP ("Actions:" ),OPT_BOOLEAN (0 ,"checksum" , &opts.checksum,"generate per-function checksums" ),OPT_BOOLEAN (0 ,"cfi" , &opts.cfi,"annotate kernel control flow integrity (kCFI) function preambles" ), +OPT_STRING_OPTARG ('d' ,"disas" , &opts.disas,"function-pattern" ,"disassemble functions" ,"*" ),OPT_CALLBACK_OPTARG ('h' ,"hacks" ,NULL ,NULL ,"jump_label,noinstr,skylake" ,"patch toolchain bugs/limitations" , parse_hacks),OPT_BOOLEAN ('i' ,"ibt" , &opts.ibt,"validate and annotate IBT" ), OPT_BOOLEAN('m', "mcount", &opts.mcount, "annotate mcount/fentry calls for ftrace"),
@@ -176,6 +177,7 @@ static bool opts_valid(void) } if (opts.checksum || + opts.disas || opts.hack_jump_label || opts.hack_noinstr || opts.ibt ||
tools/objtool/check.c +21 -17
@@ -2632,7 +2632,7 @@ static int decode_sections(struct objtool_file *file)* Must be before add_jump_destinations(), which depends on 'func' * being set for alternatives, to enable proper sibling call detection. */ -if (validate_branch_enabled () || opts.noinstr || opts.hack_jump_label) { +if (validate_branch_enabled () || opts.noinstr || opts.hack_jump_label || opts.disas) {if (add_special_section_alts (file))return -1 ; }
@@ -4967,14 +4967,15 @@ int check(struct objtool_file *file)int ret =0 , warnings =0 ;/* -* If the verbose or backtrace option is used then we need a -* disassembly context to disassemble instruction or function -* on warning or backtrace. +* Create a disassembly context if we might disassemble any +* instruction or function. */ -if (opts.verbose || opts.backtrace || opts.trace) { +if (opts.verbose || opts.backtrace || opts.trace || opts.disas) { disas_ctx =disas_context_create (file); -if (!disas_ctx) +if (!disas_ctx) { + opts.disas = false; opts.trace = false; + } objtool_disas_ctx = disas_ctx; }
@@ -5108,20 +5109,20 @@ int check(struct objtool_file *file) } out: -if (!ret && !warnings) { -free_insns (file); -return 0 ; - } - -if (opts.werror && warnings) - ret =1 ; - -if (opts.verbose) { +if (ret || warnings) {if (opts.werror && warnings) -WARN ("%d warning(s) upgraded to errors" , warnings); -disas_warned_funcs (disas_ctx); + ret =1 ; + +if (opts.verbose) { +if (opts.werror && warnings) +WARN ("%d warning(s) upgraded to errors" , warnings); +disas_warned_funcs (disas_ctx); + } } +if (opts.disas) +disas_funcs (disas_ctx); +if (disas_ctx) {disas_context_destroy (disas_ctx); objtool_disas_ctx =NULL ;
@@ -5129,6 +5130,9 @@ int check(struct objtool_file *file)free_insns (file); +if (!ret && !warnings) +return 0 ; +if (opts.backup &&make_backup ())return 1 ;
tools/objtool/disas.c +27 -0
@@ -4,6 +4,7 @@*/ #define _GNU_SOURCE +#include <fnmatch.h> #include <objtool/arch.h> #include <objtool/check.h>
@@ -556,3 +557,29 @@ void disas_warned_funcs(struct disas_context *dctx)disas_func (dctx, sym); } } + +void disas_funcs (struct disas_context *dctx) +{ +bool disas_all = !strcmp (opts.disas,"*" ); +struct section *sec; +struct symbol *sym; + +for_each_sec (dctx->file->elf, sec) { + +if (!(sec->sh.sh_flags &SHF_EXECINSTR )) +continue ; + +sec_for_each_sym (sec, sym) { +/* +* If the function had a warning and the verbose +* option is used then the function was already +* disassemble. +*/ +if (opts.verbose && sym->warned) +continue ; + +if (disas_all ||fnmatch (opts.disas, sym->name,0 ) ==0 ) +disas_func (dctx, sym); + } + } +}
tools/objtool/include/objtool/builtin.h +1 -0
@@ -28,6 +28,7 @@ struct opts {bool static_call;bool uaccess;int prefix; +const char *disas;/* options: */ bool backtrace;
tools/objtool/include/objtool/disas.h +2 -0
@@ -15,6 +15,7 @@ struct disassemble_info;struct disas_context *disas_context_create (struct objtool_file *file);void disas_context_destroy (struct disas_context *dctx);void disas_warned_funcs (struct disas_context *dctx); +void disas_funcs (struct disas_context *dctx);int disas_info_init (struct disassemble_info *dinfo,int arch,int mach32,int mach64,const char *options);
@@ -40,6 +41,7 @@ static inline struct disas_context *disas_context_create(struct objtool_file *fistatic inline void disas_context_destroy (struct disas_context *dctx) {}static inline void disas_warned_funcs (struct disas_context *dctx) {} +static inline void disas_funcs (struct disas_context *dctx) {} static inline int disas_info_init(struct disassemble_info *dinfo, int arch, int mach32, int mach64,
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Add the --disas=<function-pattern> action
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 5f326c88973691232c0e56ced83c199d53d86766 Gitweb: https://git.kernel.org/tip/5f326c88973691232c0e56ced83c199d53d86766 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:27 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:12 +01:00
objtool: Add the --disas=<function-pattern> action
Add the --disas=<function-pattern> actions to disassemble the specified functions. The function pattern can be a single function name (e.g. --disas foo to disassemble the function with the name "foo"), or a shell wildcard pattern (e.g. --disas foo* to disassemble all functions with a name starting with "foo").
--- tools/objtool/builtin-check.c | 2 +- tools/objtool/check.c | 38 +++++++++++++----------- tools/objtool/disas.c | 27 +++++++++++++++++- tools/objtool/include/objtool/builtin.h | 1 +- tools/objtool/include/objtool/disas.h | 2 +- 5 files changed, 53 insertions(+), 17 deletions(-)
tools/objtool/builtin-check.c +2 -0
@@ -75,6 +75,7 @@ static const struct option check_options[] = {OPT_GROUP ("Actions:" ),OPT_BOOLEAN (0 ,"checksum" , &opts.checksum,"generate per-function checksums" ),OPT_BOOLEAN (0 ,"cfi" , &opts.cfi,"annotate kernel control flow integrity (kCFI) function preambles" ), +OPT_STRING_OPTARG ('d' ,"disas" , &opts.disas,"function-pattern" ,"disassemble functions" ,"*" ),OPT_CALLBACK_OPTARG ('h' ,"hacks" ,NULL ,NULL ,"jump_label,noinstr,skylake" ,"patch toolchain bugs/limitations" , parse_hacks),OPT_BOOLEAN ('i' ,"ibt" , &opts.ibt,"validate and annotate IBT" ), OPT_BOOLEAN('m', "mcount", &opts.mcount, "annotate mcount/fentry calls for ftrace"),
@@ -176,6 +177,7 @@ static bool opts_valid(void) } if (opts.checksum || + opts.disas || opts.hack_jump_label || opts.hack_noinstr || opts.ibt ||
tools/objtool/check.c +21 -17
@@ -2611,7 +2611,7 @@ static int decode_sections(struct objtool_file *file)* Must be before add_jump_destinations(), which depends on 'func' * being set for alternatives, to enable proper sibling call detection. */ -if (validate_branch_enabled () || opts.noinstr || opts.hack_jump_label) { +if (validate_branch_enabled () || opts.noinstr || opts.hack_jump_label || opts.disas) {if (add_special_section_alts (file))return -1 ; }
@@ -4915,14 +4915,15 @@ int check(struct objtool_file *file)int ret =0 , warnings =0 ;/* -* If the verbose or backtrace option is used then we need a -* disassembly context to disassemble instruction or function -* on warning or backtrace. +* Create a disassembly context if we might disassemble any +* instruction or function. */ -if (opts.verbose || opts.backtrace || opts.trace) { +if (opts.verbose || opts.backtrace || opts.trace || opts.disas) { disas_ctx =disas_context_create (file); -if (!disas_ctx) +if (!disas_ctx) { + opts.disas = false; opts.trace = false; + } objtool_disas_ctx = disas_ctx; }
@@ -5054,20 +5055,20 @@ int check(struct objtool_file *file) } out: -if (!ret && !warnings) { -free_insns (file); -return 0 ; - } - -if (opts.werror && warnings) - ret =1 ; - -if (opts.verbose) { +if (ret || warnings) {if (opts.werror && warnings) -WARN ("%d warning(s) upgraded to errors" , warnings); -disas_warned_funcs (disas_ctx); + ret =1 ; + +if (opts.verbose) { +if (opts.werror && warnings) +WARN ("%d warning(s) upgraded to errors" , warnings); +disas_warned_funcs (disas_ctx); + } } +if (opts.disas) +disas_funcs (disas_ctx); +if (disas_ctx) {disas_context_destroy (disas_ctx); objtool_disas_ctx =NULL ;
@@ -5075,6 +5076,9 @@ out:free_insns (file); +if (!ret && !warnings) +return 0 ; +if (opts.backup &&make_backup ())return 1 ;
tools/objtool/disas.c +27 -0
@@ -4,6 +4,7 @@*/ #define _GNU_SOURCE +#include <fnmatch.h> #include <objtool/arch.h> #include <objtool/check.h>
@@ -556,3 +557,29 @@ void disas_warned_funcs(struct disas_context *dctx)disas_func (dctx, sym); } } + +void disas_funcs (struct disas_context *dctx) +{ +bool disas_all = !strcmp (opts.disas,"*" ); +struct section *sec; +struct symbol *sym; + +for_each_sec (dctx->file->elf, sec) { + +if (!(sec->sh.sh_flags &SHF_EXECINSTR )) +continue ; + +sec_for_each_sym (sec, sym) { +/* +* If the function had a warning and the verbose +* option is used then the function was already +* disassemble. +*/ +if (opts.verbose && sym->warned) +continue ; + +if (disas_all ||fnmatch (opts.disas, sym->name,0 ) ==0 ) +disas_func (dctx, sym); + } + } +}
tools/objtool/include/objtool/builtin.h +1 -0
@@ -28,6 +28,7 @@ struct opts {bool static_call;bool uaccess;int prefix; +const char *disas;/* options: */ bool backtrace;
tools/objtool/include/objtool/disas.h +2 -0
@@ -15,6 +15,7 @@ struct disassemble_info;struct disas_context *disas_context_create (struct objtool_file *file);void disas_context_destroy (struct disas_context *dctx);void disas_warned_funcs (struct disas_context *dctx); +void disas_funcs (struct disas_context *dctx);int disas_info_init (struct disassemble_info *dinfo,int arch,int mach32,int mach64,const char *options);
@@ -40,6 +41,7 @@ static inline struct disas_context *disas_context_create(struct objtool_file *fistatic inline void disas_context_destroy (struct disas_context *dctx) {}static inline void disas_warned_funcs (struct disas_context *dctx) {} +static inline void disas_funcs (struct disas_context *dctx) {} static inline int disas_info_init(struct disassemble_info *dinfo, int arch, int mach32, int mach64,
PATCH v6 18/30 objtool: Preserve alternatives order
In reply to Alexandre ChartrePreserve the order in which alternatives are defined. Currently objtool stores alternatives in a list in reverse order.
--- tools/objtool/check.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
tools/objtool/check.c +14 -2
@@ -1942,6 +1942,7 @@ static int add_special_section_alts(struct objtool_file *file)struct special_alt *special_alt, *tmp;enum alternative_type alt_type;struct alternative *alt; +struct alternative *a;if (special_get_alts (file->elf, &special_alts))return -1 ;
@@ -1994,9 +1995,20 @@ static int add_special_section_alts(struct objtool_file *file) } alt->insn = new_insn; - alt->next = orig_insn->alts; alt->type = alt_type; - orig_insn->alts = alt; + alt->next =NULL ; + +/* +* Store alternatives in the same order they have been +* defined. +*/ +if (!orig_insn->alts) { + orig_insn->alts = alt; + }else { +for (a = orig_insn->alts; a->next; a = a->next) + ; + a->next = alt; + }list_del (&special_alt->list);free (special_alt);
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Preserve alternatives order
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 7ad7a4a72050a74f8927719272075d07d2f7777f Gitweb: https://git.kernel.org/tip/7ad7a4a72050a74f8927719272075d07d2f7777f Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:28 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:12 +01:00
objtool: Preserve alternatives order
Preserve the order in which alternatives are defined. Currently objtool stores alternatives in a list in reverse order.
--- tools/objtool/check.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
tools/objtool/check.c +14 -2
@@ -1921,6 +1921,7 @@ static int add_special_section_alts(struct objtool_file *file)struct special_alt *special_alt, *tmp;enum alternative_type alt_type;struct alternative *alt; +struct alternative *a;if (special_get_alts (file->elf, &special_alts))return -1 ;
@@ -1973,9 +1974,20 @@ static int add_special_section_alts(struct objtool_file *file) } alt->insn = new_insn; - alt->next = orig_insn->alts; alt->type = alt_type; - orig_insn->alts = alt; + alt->next =NULL ; + +/* +* Store alternatives in the same order they have been +* defined. +*/ +if (!orig_insn->alts) { + orig_insn->alts = alt; + }else { +for (a = orig_insn->alts; a->next; a = a->next) + ; + a->next = alt; + }list_del (&special_alt->list);free (special_alt);
PATCH v6 19/30 objtool: Print headers for alternatives
In reply to Alexandre ChartreWhen using the --disas option, objtool doesn't currently disassemble any alternative. Print an header for each alternative. This identifies places where alternatives are present but alternative code is still not disassembled at the moment.
--- tools/objtool/disas.c | 188 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 182 insertions(+), 6 deletions(-)
tools/objtool/disas.c +182 -6
@@ -29,6 +29,43 @@ struct disas_context {struct disassemble_info info; }; +/* +* Maximum number of alternatives +*/ +#define DISAS_ALT_MAX 5 + +/* +* Maximum number of instructions per alternative +*/ +#define DISAS_ALT_INSN_MAX 50 + +/* +* Information to disassemble an alternative +*/ +struct disas_alt { +struct instruction *orig_insn;/* original instruction */ +struct alternative *alt;/* alternative or NULL if default code */ +char *name;/* name for this alternative */ +int width;/* formatting width */ +}; + +/* +* Wrapper around asprintf() to allocate and format a string. +* Return the allocated string or NULL on error. +*/ +static char *strfmt (const char *fmt, ...) +{ +va_list ap; +char *str; +int rv; + +va_start (ap, fmt); + rv =vasprintf (&str, fmt, ap); +va_end (ap); + +return rv ==-1 ?NULL : str; +} +static int sprint_name (char *str,const char *name,unsigned long offset) {int len;
@@ -314,6 +351,9 @@ char *disas_result(struct disas_context *dctx)#define DISAS_INSN_OFFSET_SPACE 10#define DISAS_INSN_SPACE 60 +#define DISAS_PRINSN (dctx, insn, depth) \ + disas_print_insn(stdout, dctx, insn, depth, "\n") +/* * Print a message in the instruction flow. If insn is not NULL then * the instruction address is printed in addition of the message,
@@ -354,6 +394,19 @@ static int disas_vprint(FILE *stream, struct section *sec, unsigned long offset,return n; } +static int disas_print (FILE *stream,struct section *sec,unsigned long offset, +int depth,const char *format, ...) +{ +va_list args; +int len; + +va_start (args, format); + len =disas_vprint (stream, sec, offset, depth, format, args); +va_end (args); + +return len; +} +/* * Print a message in the instruction flow. If insn is not NULL then * the instruction address is printed in addition of the message,
@@ -523,21 +576,144 @@ char *disas_alt_name(struct alternative *alt)return str; } +/* +* Initialize an alternative. The default alternative should be initialized +* with alt=NULL. +*/ +static int disas_alt_init (struct disas_alt *dalt, +struct instruction *orig_insn, +struct alternative *alt) +{ + dalt->orig_insn = orig_insn; + dalt->alt = alt; + dalt->name = alt ?disas_alt_name (alt) :strdup ("DEFAULT" ); +if (!dalt->name) +return -1 ; + dalt->width =strlen (dalt->name); + +return 0 ; +} + +/* +* Print all alternatives one above the other. +*/ +static void disas_alt_print_compact (char *alt_name,struct disas_alt *dalts, +int alt_count) +{ +struct instruction *orig_insn; +int len; +int i; + + orig_insn = dalts[0 ].orig_insn; + + len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL ); +printf ("%s\n" , alt_name); + +for (i =0 ; i < alt_count; i++) +printf ("%*s= %s\n" , len,"" , dalts[i].name); +} + +/* +* Disassemble an alternative. +* +* Return the last instruction in the default alternative so that +* disassembly can continue with the next instruction. Return NULL +* on error. +*/ +static void *disas_alt (struct disas_context *dctx, +struct instruction *orig_insn) +{ +struct disas_alt dalts[DISAS_ALT_MAX ] = {0 }; +struct alternative *alt; +int alt_count =0 ; +char *alt_name; +int err; +int i; + + alt_name =strfmt ("<%s.%lx>" ,disas_alt_type_name (orig_insn), + orig_insn->offset); +if (!alt_name) { +WARN ("Failed to define name for alternative at instruction 0x%lx" , + orig_insn->offset); + goto done; + } + +/* +* Initialize the default alternative. +*/ + err =disas_alt_init (&dalts[0 ], orig_insn,NULL ); +if (err) { +WARN ("%s: failed to initialize default alternative" , alt_name); + goto done; + } + +/* +* Initialize all other alternatives. +*/ + i =1 ; +for (alt = orig_insn->alts; alt; alt = alt->next) { +if (i >=DISAS_ALT_MAX ) { +WARN ("%s has more alternatives than supported" , alt_name); +break ; + } + err =disas_alt_init (&dalts[i], orig_insn, alt); +if (err) { +WARN ("%s: failed to disassemble alternative" , alt_name); + goto done; + } + + i++; + } + alt_count = i; + +/* +* Print default and non-default alternatives. +* +* At the moment, this just prints an header for each alternative. +*/ +disas_alt_print_compact (alt_name, dalts, alt_count); + +done: +for (i =0 ; i < alt_count; i++) +free (dalts[i].name); + +free (alt_name); + +/* +* Currently we are not disassembling any alternative but just +* printing alternative names. Return NULL to have disas_func() +* resume the disassembly with the default alternative. +*/ +return NULL ; +} +/* * Disassemble a function. */ static void disas_func (struct disas_context *dctx,struct symbol *func) { +struct instruction *insn_start;struct instruction *insn; -size_t addr;printf ("%s:\n" , func->name);sym_for_each_insn (dctx->file, func, insn) { - addr = insn->offset; -disas_insn (dctx, insn); -printf (" %6lx: %s+0x%-6lx %s\n" , - addr, func->name, addr - func->offset, -disas_result (dctx)); +if (insn->alts) { + insn_start = insn; + insn =disas_alt (dctx, insn); +if (insn) +continue ; +/* +* There was an error with disassembling +* the alternative. Resume disassembling +* at the current instruction, this will +* disassemble the default alternative +* only and continue with the code after +* the alternative. +*/ + insn = insn_start; + } + +DISAS_PRINSN (dctx, insn,0 ); }printf ("\n" ); }
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Print headers for alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 87343e664252198d2735c9719f711d3e922f3be5 Gitweb: https://git.kernel.org/tip/87343e664252198d2735c9719f711d3e922f3be5 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:29 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:13 +01:00
objtool: Print headers for alternatives
When using the --disas option, objtool doesn't currently disassemble any alternative. Print an header for each alternative. This identifies places where alternatives are present but alternative code is still not disassembled at the moment.
--- tools/objtool/disas.c | 188 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 182 insertions(+), 6 deletions(-)
tools/objtool/disas.c +182 -6
@@ -29,6 +29,43 @@ struct disas_context {struct disassemble_info info; }; +/* +* Maximum number of alternatives +*/ +#define DISAS_ALT_MAX 5 + +/* +* Maximum number of instructions per alternative +*/ +#define DISAS_ALT_INSN_MAX 50 + +/* +* Information to disassemble an alternative +*/ +struct disas_alt { +struct instruction *orig_insn;/* original instruction */ +struct alternative *alt;/* alternative or NULL if default code */ +char *name;/* name for this alternative */ +int width;/* formatting width */ +}; + +/* +* Wrapper around asprintf() to allocate and format a string. +* Return the allocated string or NULL on error. +*/ +static char *strfmt (const char *fmt, ...) +{ +va_list ap; +char *str; +int rv; + +va_start (ap, fmt); + rv =vasprintf (&str, fmt, ap); +va_end (ap); + +return rv ==-1 ?NULL : str; +} +static int sprint_name (char *str,const char *name,unsigned long offset) {int len;
@@ -314,6 +351,9 @@ char *disas_result(struct disas_context *dctx)#define DISAS_INSN_OFFSET_SPACE 10#define DISAS_INSN_SPACE 60 +#define DISAS_PRINSN (dctx, insn, depth) \ + disas_print_insn(stdout, dctx, insn, depth, "\n") +/* * Print a message in the instruction flow. If insn is not NULL then * the instruction address is printed in addition of the message,
@@ -354,6 +394,19 @@ static int disas_vprint(FILE *stream, struct section *sec, unsigned long offset,return n; } +static int disas_print (FILE *stream,struct section *sec,unsigned long offset, +int depth,const char *format, ...) +{ +va_list args; +int len; + +va_start (args, format); + len =disas_vprint (stream, sec, offset, depth, format, args); +va_end (args); + +return len; +} +/* * Print a message in the instruction flow. If insn is not NULL then * the instruction address is printed in addition of the message,
@@ -524,20 +577,143 @@ char *disas_alt_name(struct alternative *alt) }/* +* Initialize an alternative. The default alternative should be initialized +* with alt=NULL. +*/ +static int disas_alt_init (struct disas_alt *dalt, +struct instruction *orig_insn, +struct alternative *alt) +{ + dalt->orig_insn = orig_insn; + dalt->alt = alt; + dalt->name = alt ?disas_alt_name (alt) :strdup ("DEFAULT" ); +if (!dalt->name) +return -1 ; + dalt->width =strlen (dalt->name); + +return 0 ; +} + +/* +* Print all alternatives one above the other. +*/ +static void disas_alt_print_compact (char *alt_name,struct disas_alt *dalts, +int alt_count) +{ +struct instruction *orig_insn; +int len; +int i; + + orig_insn = dalts[0 ].orig_insn; + + len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL ); +printf ("%s\n" , alt_name); + +for (i =0 ; i < alt_count; i++) +printf ("%*s= %s\n" , len,"" , dalts[i].name); +} + +/* +* Disassemble an alternative. +* +* Return the last instruction in the default alternative so that +* disassembly can continue with the next instruction. Return NULL +* on error. +*/ +static void *disas_alt (struct disas_context *dctx, +struct instruction *orig_insn) +{ +struct disas_alt dalts[DISAS_ALT_MAX ] = {0 }; +struct alternative *alt; +int alt_count =0 ; +char *alt_name; +int err; +int i; + + alt_name =strfmt ("<%s.%lx>" ,disas_alt_type_name (orig_insn), + orig_insn->offset); +if (!alt_name) { +WARN ("Failed to define name for alternative at instruction 0x%lx" , + orig_insn->offset); + goto done; + } + +/* +* Initialize the default alternative. +*/ + err =disas_alt_init (&dalts[0 ], orig_insn,NULL ); +if (err) { +WARN ("%s: failed to initialize default alternative" , alt_name); + goto done; + } + +/* +* Initialize all other alternatives. +*/ + i =1 ; +for (alt = orig_insn->alts; alt; alt = alt->next) { +if (i >=DISAS_ALT_MAX ) { +WARN ("%s has more alternatives than supported" , alt_name); +break ; + } + err =disas_alt_init (&dalts[i], orig_insn, alt); +if (err) { +WARN ("%s: failed to disassemble alternative" , alt_name); + goto done; + } + + i++; + } + alt_count = i; + +/* +* Print default and non-default alternatives. +* +* At the moment, this just prints an header for each alternative. +*/ +disas_alt_print_compact (alt_name, dalts, alt_count); + +done: +for (i =0 ; i < alt_count; i++) +free (dalts[i].name); + +free (alt_name); + +/* +* Currently we are not disassembling any alternative but just +* printing alternative names. Return NULL to have disas_func() +* resume the disassembly with the default alternative. +*/ +return NULL ; +} + +/* * Disassemble a function. */ static void disas_func (struct disas_context *dctx,struct symbol *func) { +struct instruction *insn_start;struct instruction *insn; -size_t addr;printf ("%s:\n" , func->name);sym_for_each_insn (dctx->file, func, insn) { - addr = insn->offset; -disas_insn (dctx, insn); -printf (" %6lx: %s+0x%-6lx %s\n" , - addr, func->name, addr - func->offset, -disas_result (dctx)); +if (insn->alts) { + insn_start = insn; + insn =disas_alt (dctx, insn); +if (insn) +continue ; +/* +* There was an error with disassembling +* the alternative. Resume disassembling +* at the current instruction, this will +* disassemble the default alternative +* only and continue with the code after +* the alternative. +*/ + insn = insn_start; + } + +DISAS_PRINSN (dctx, insn,0 ); }printf ("\n" ); }
PATCH v6 20/30 objtool: Disassemble group alternatives
In reply to Alexandre ChartreWhen using the --disas option, disassemble all group alternatives. Jump tables and exception tables (which are handled as alternatives) are not disassembled at the moment.
--- tools/objtool/disas.c | 166 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 17 deletions(-)
tools/objtool/disas.c +149 -17
@@ -47,8 +47,14 @@ struct disas_alt {struct alternative *alt;/* alternative or NULL if default code */ char *name;/* name for this alternative */ int width;/* formatting width */ +char *insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ }; +#define DALT_DEFAULT (dalt) (!(dalt)->alt) +#define DALT_INSN (dalt) (DALT_DEFAULT(dalt) ? (dalt)->orig_insn : (dalt)->alt->insn) +#define DALT_GROUP (dalt) (DALT_INSN(dalt)->alt_group) +#define DALT_ALTID (dalt) ((dalt)->orig_insn->offset) +/* * Wrapper around asprintf() to allocate and format a string. * Return the allocated string or NULL on error.
@@ -506,6 +512,21 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn)return disasm (insn->offset, &dctx->info); } +static struct instruction *next_insn_same_alt (struct objtool_file *file, +struct alt_group *alt_grp, +struct instruction *insn) +{ +if (alt_grp->last_insn == insn || alt_grp->nop == insn) +return NULL ; + +return next_insn_same_sec (file, insn); +} + +#define alt_for_each_insn (file, alt_grp, insn) \ + for (insn = alt_grp->first_insn; \ + insn; \ + insn = next_insn_same_alt(file, alt_grp, insn)) +/* * Provide a name for the type of alternatives present at the * specified instruction.
@@ -594,23 +615,107 @@ static int disas_alt_init(struct disas_alt *dalt,return 0 ; } +static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str) +{ +int len; + +if (index >=DISAS_ALT_INSN_MAX ) { +WARN ("Alternative %lx.%s has more instructions than supported" , +DALT_ALTID (dalt), dalt->name); +return -1 ; + } + + len =strlen (insn_str); + dalt->insn[index] = insn_str; +if (len > dalt->width) + dalt->width = len; + +return 0 ; +} + +/* +* Disassemble an alternative and store instructions in the disas_alt +* structure. Return the number of instructions in the alternative. +*/ +static int disas_alt_group (struct disas_context *dctx,struct disas_alt *dalt) +{ +struct objtool_file *file; +struct instruction *insn; +char *str; +int count; +int err; + + file = dctx->file; + count =0 ; + +alt_for_each_insn (file,DALT_GROUP (dalt), insn) { + +disas_insn (dctx, insn); + str =strdup (disas_result (dctx)); +if (!str) +return -1 ; + + err =disas_alt_add_insn (dalt, count, str); +if (err) +break ; + count++; + } + +return count; +} + +/* +* Disassemble the default alternative. +*/ +static int disas_alt_default (struct disas_context *dctx,struct disas_alt *dalt) +{ +char *str; +int err; + +if (DALT_GROUP (dalt)) +return disas_alt_group (dctx, dalt); + +/* +* Default alternative with no alt_group: this is the default +* code associated with either a jump table or an exception +* table and no other instruction alternatives. In that case +* the default alternative is made of a single instruction. +*/ +disas_insn (dctx, dalt->orig_insn); + str =strdup (disas_result (dctx)); +if (!str) +return -1 ; + err =disas_alt_add_insn (dalt,0 , str); +if (err) +return -1 ; + +return 1 ; +} +/* * Print all alternatives one above the other. */ static void disas_alt_print_compact (char *alt_name,struct disas_alt *dalts, -int alt_count) +int alt_count,int insn_count) {struct instruction *orig_insn; +int i, j;int len; -int i; orig_insn = dalts[0 ].orig_insn; len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL );printf ("%s\n" , alt_name); -for (i =0 ; i < alt_count; i++) +for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name); +for (j =0 ; j < insn_count; j++) { +if (!dalts[i].insn[j]) +break ; +printf ("%*s| %s\n" , len,"" , dalts[i].insn[j]); + } +printf ("%*s|\n" , len,"" ); + } }/*
@@ -624,11 +729,15 @@ static void *disas_alt(struct disas_context *dctx, struct instruction *orig_insn) {struct disas_alt dalts[DISAS_ALT_MAX ] = {0 }; +struct instruction *last_insn =NULL ;struct alternative *alt; +struct disas_alt *dalt; +int insn_count =0 ;int alt_count =0 ;char *alt_name; +int count; +int i, j;int err; -int i; alt_name =strfmt ("<%s.%lx>" ,disas_alt_type_name (orig_insn), orig_insn->offset);
@@ -639,7 +748,7 @@ static void *disas_alt(struct disas_context *dctx, }/* -* Initialize the default alternative. +* Initialize and disassemble the default alternative. */ err =disas_alt_init (&dalts[0 ], orig_insn,NULL );if (err) {
@@ -647,8 +756,14 @@ static void *disas_alt(struct disas_context *dctx, goto done; } + insn_count =disas_alt_default (dctx, &dalts[0 ]); +if (insn_count <0 ) { +WARN ("%s: failed to disassemble default alternative" , alt_name); + goto done; + } +/* -* Initialize all other alternatives. +* Initialize and disassemble all other alternatives. */ i =1 ;for (alt = orig_insn->alts; alt; alt = alt->next) {
@@ -656,35 +771,52 @@ static void *disas_alt(struct disas_context *dctx,WARN ("%s has more alternatives than supported" , alt_name);break ; } - err =disas_alt_init (&dalts[i], orig_insn, alt); + dalt = &dalts[i]; + err =disas_alt_init (dalt, orig_insn, alt);if (err) {WARN ("%s: failed to disassemble alternative" , alt_name); goto done; } +/* +* Only group alternatives are supported at the moment. +*/ +switch (dalt->alt->type) { +case ALT_TYPE_INSTRUCTIONS : + count =disas_alt_group (dctx, dalt); +break ; +default : + count =0 ; + } +if (count <0 ) { +WARN ("%s: failed to disassemble alternative %s" , + alt_name, dalt->name); + goto done; + } + + insn_count = count > insn_count ? count : insn_count; i++; } alt_count = i;/* * Print default and non-default alternatives. -* -* At the moment, this just prints an header for each alternative. */ -disas_alt_print_compact (alt_name, dalts, alt_count); +disas_alt_print_compact (alt_name, dalts, alt_count, insn_count); + + last_insn = orig_insn->alt_group ? orig_insn->alt_group->last_insn : + orig_insn; done: -for (i =0 ; i < alt_count; i++) +for (i =0 ; i < alt_count; i++) {free (dalts[i].name); +for (j =0 ; j < insn_count; j++) +free (dalts[i].insn[j]); + }free (alt_name); -/* -* Currently we are not disassembling any alternative but just -* printing alternative names. Return NULL to have disas_func() -* resume the disassembly with the default alternative. -*/ -return NULL ; +return last_insn; }/*
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Disassemble group alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: a4f1599672e7bf494d79928a38fd6aa873e2e50c Gitweb: https://git.kernel.org/tip/a4f1599672e7bf494d79928a38fd6aa873e2e50c Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:30 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:13 +01:00
objtool: Disassemble group alternatives
When using the --disas option, disassemble all group alternatives. Jump tables and exception tables (which are handled as alternatives) are not disassembled at the moment.
--- tools/objtool/disas.c | 166 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 17 deletions(-)
tools/objtool/disas.c +149 -17
@@ -47,8 +47,14 @@ struct disas_alt {struct alternative *alt;/* alternative or NULL if default code */ char *name;/* name for this alternative */ int width;/* formatting width */ +char *insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ }; +#define DALT_DEFAULT (dalt) (!(dalt)->alt) +#define DALT_INSN (dalt) (DALT_DEFAULT(dalt) ? (dalt)->orig_insn : (dalt)->alt->insn) +#define DALT_GROUP (dalt) (DALT_INSN(dalt)->alt_group) +#define DALT_ALTID (dalt) ((dalt)->orig_insn->offset) +/* * Wrapper around asprintf() to allocate and format a string. * Return the allocated string or NULL on error.
@@ -506,6 +512,21 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn)return disasm (insn->offset, &dctx->info); } +static struct instruction *next_insn_same_alt (struct objtool_file *file, +struct alt_group *alt_grp, +struct instruction *insn) +{ +if (alt_grp->last_insn == insn || alt_grp->nop == insn) +return NULL ; + +return next_insn_same_sec (file, insn); +} + +#define alt_for_each_insn (file, alt_grp, insn) \ + for (insn = alt_grp->first_insn; \ + insn; \ + insn = next_insn_same_alt(file, alt_grp, insn)) +/* * Provide a name for the type of alternatives present at the * specified instruction.
@@ -594,23 +615,107 @@ static int disas_alt_init(struct disas_alt *dalt,return 0 ; } +static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str) +{ +int len; + +if (index >=DISAS_ALT_INSN_MAX ) { +WARN ("Alternative %lx.%s has more instructions than supported" , +DALT_ALTID (dalt), dalt->name); +return -1 ; + } + + len =strlen (insn_str); + dalt->insn[index] = insn_str; +if (len > dalt->width) + dalt->width = len; + +return 0 ; +} + +/* +* Disassemble an alternative and store instructions in the disas_alt +* structure. Return the number of instructions in the alternative. +*/ +static int disas_alt_group (struct disas_context *dctx,struct disas_alt *dalt) +{ +struct objtool_file *file; +struct instruction *insn; +char *str; +int count; +int err; + + file = dctx->file; + count =0 ; + +alt_for_each_insn (file,DALT_GROUP (dalt), insn) { + +disas_insn (dctx, insn); + str =strdup (disas_result (dctx)); +if (!str) +return -1 ; + + err =disas_alt_add_insn (dalt, count, str); +if (err) +break ; + count++; + } + +return count; +} + +/* +* Disassemble the default alternative. +*/ +static int disas_alt_default (struct disas_context *dctx,struct disas_alt *dalt) +{ +char *str; +int err; + +if (DALT_GROUP (dalt)) +return disas_alt_group (dctx, dalt); + +/* +* Default alternative with no alt_group: this is the default +* code associated with either a jump table or an exception +* table and no other instruction alternatives. In that case +* the default alternative is made of a single instruction. +*/ +disas_insn (dctx, dalt->orig_insn); + str =strdup (disas_result (dctx)); +if (!str) +return -1 ; + err =disas_alt_add_insn (dalt,0 , str); +if (err) +return -1 ; + +return 1 ; +} +/* * Print all alternatives one above the other. */ static void disas_alt_print_compact (char *alt_name,struct disas_alt *dalts, -int alt_count) +int alt_count,int insn_count) {struct instruction *orig_insn; +int i, j;int len; -int i; orig_insn = dalts[0 ].orig_insn; len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL );printf ("%s\n" , alt_name); -for (i =0 ; i < alt_count; i++) +for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name); +for (j =0 ; j < insn_count; j++) { +if (!dalts[i].insn[j]) +break ; +printf ("%*s| %s\n" , len,"" , dalts[i].insn[j]); + } +printf ("%*s|\n" , len,"" ); + } }/*
@@ -624,11 +729,15 @@ static void *disas_alt(struct disas_context *dctx, struct instruction *orig_insn) {struct disas_alt dalts[DISAS_ALT_MAX ] = {0 }; +struct instruction *last_insn =NULL ;struct alternative *alt; +struct disas_alt *dalt; +int insn_count =0 ;int alt_count =0 ;char *alt_name; +int count; +int i, j;int err; -int i; alt_name =strfmt ("<%s.%lx>" ,disas_alt_type_name (orig_insn), orig_insn->offset);
@@ -639,7 +748,7 @@ static void *disas_alt(struct disas_context *dctx, }/* -* Initialize the default alternative. +* Initialize and disassemble the default alternative. */ err =disas_alt_init (&dalts[0 ], orig_insn,NULL );if (err) {
@@ -647,8 +756,14 @@ static void *disas_alt(struct disas_context *dctx, goto done; } + insn_count =disas_alt_default (dctx, &dalts[0 ]); +if (insn_count <0 ) { +WARN ("%s: failed to disassemble default alternative" , alt_name); + goto done; + } +/* -* Initialize all other alternatives. +* Initialize and disassemble all other alternatives. */ i =1 ;for (alt = orig_insn->alts; alt; alt = alt->next) {
@@ -656,35 +771,52 @@ static void *disas_alt(struct disas_context *dctx,WARN ("%s has more alternatives than supported" , alt_name);break ; } - err =disas_alt_init (&dalts[i], orig_insn, alt); + dalt = &dalts[i]; + err =disas_alt_init (dalt, orig_insn, alt);if (err) {WARN ("%s: failed to disassemble alternative" , alt_name); goto done; } +/* +* Only group alternatives are supported at the moment. +*/ +switch (dalt->alt->type) { +case ALT_TYPE_INSTRUCTIONS : + count =disas_alt_group (dctx, dalt); +break ; +default : + count =0 ; + } +if (count <0 ) { +WARN ("%s: failed to disassemble alternative %s" , + alt_name, dalt->name); + goto done; + } + + insn_count = count > insn_count ? count : insn_count; i++; } alt_count = i;/* * Print default and non-default alternatives. -* -* At the moment, this just prints an header for each alternative. */ -disas_alt_print_compact (alt_name, dalts, alt_count); +disas_alt_print_compact (alt_name, dalts, alt_count, insn_count); + + last_insn = orig_insn->alt_group ? orig_insn->alt_group->last_insn : + orig_insn; done: -for (i =0 ; i < alt_count; i++) +for (i =0 ; i < alt_count; i++) {free (dalts[i].name); +for (j =0 ; j < insn_count; j++) +free (dalts[i].insn[j]); + }free (alt_name); -/* -* Currently we are not disassembling any alternative but just -* printing alternative names. Return NULL to have disas_func() -* resume the disassembly with the default alternative. -*/ -return NULL ; +return last_insn; }/*
PATCH v6 21/30 objtool: Print addresses with alternative instructions
In reply to Alexandre ChartreAll alternatives are disassemble side-by-side when using the --disas option. However the address of each instruction is not printed because instructions from different alternatives are not necessarily aligned.
Change this behavior to print the address of each instruction. Spaces will appear between instructions from the same alternative when instructions from different alternatives do not have the same alignment.
--- tools/objtool/disas.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-)
tools/objtool/disas.c +23 -12
@@ -47,7 +47,11 @@ struct disas_alt {struct alternative *alt;/* alternative or NULL if default code */ char *name;/* name for this alternative */ int width;/* formatting width */ -char *insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ +struct { +char *str;/* instruction string */ +int offset;/* instruction offset */ + } insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ +int insn_idx;/* index of the next instruction to print */ };#define DALT_DEFAULT (dalt) (!(dalt)->alt)
@@ -361,10 +365,9 @@ char *disas_result(struct disas_context *dctx)disas_print_insn (stdout, dctx, insn, depth,"\n" )/* -* Print a message in the instruction flow. If insn is not NULL then -* the instruction address is printed in addition of the message, -* otherwise only the message is printed. In all cases, the instruction -* itself is not printed. +* Print a message in the instruction flow. If sec is not NULL then the +* address at the section offset is printed in addition of the message, +* otherwise only the message is printed. */static int disas_vprint (FILE *stream,struct section *sec,unsigned long offset,int depth,const char *format,va_list ap)
@@ -607,6 +610,7 @@ static int disas_alt_init(struct disas_alt *dalt, { dalt->orig_insn = orig_insn; dalt->alt = alt; + dalt->insn_idx =0 ; dalt->name = alt ?disas_alt_name (alt) :strdup ("DEFAULT" );if (!dalt->name)return -1 ;
@@ -615,7 +619,8 @@ static int disas_alt_init(struct disas_alt *dalt,return 0 ; } -static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str) +static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str, +int offset) {int len;
@@ -626,7 +631,8 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str) } len =strlen (insn_str); - dalt->insn[index] = insn_str; + dalt->insn[index].str = insn_str; + dalt->insn[index].offset = offset;if (len > dalt->width) dalt->width = len;
@@ -641,12 +647,14 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt) {struct objtool_file *file;struct instruction *insn; +int offset;char *str;int count;int err; file = dctx->file; count =0 ; + offset =0 ;alt_for_each_insn (file,DALT_GROUP (dalt), insn) {
@@ -655,9 +663,10 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)if (!str)return -1 ; - err =disas_alt_add_insn (dalt, count, str); + err =disas_alt_add_insn (dalt, count, str, offset);if (err)break ; + offset += insn->len; count++; }
@@ -685,7 +694,7 @@ static int disas_alt_default(struct disas_context *dctx, struct disas_alt *dalt) str =strdup (disas_result (dctx));if (!str)return -1 ; - err =disas_alt_add_insn (dalt,0 , str); + err =disas_alt_add_insn (dalt,0 , str,0 );if (err)return -1 ;
@@ -710,9 +719,11 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts,for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name);for (j =0 ; j < insn_count; j++) { -if (!dalts[i].insn[j]) +if (!dalts[i].insn[j].str)break ; -printf ("%*s| %s\n" , len,"" , dalts[i].insn[j]); +disas_print (stdout, orig_insn->sec, + orig_insn->offset + dalts[i].insn[j].offset,0 , +"| %s\n" , dalts[i].insn[j].str); }printf ("%*s|\n" , len,"" ); }
@@ -811,7 +822,7 @@ static void *disas_alt(struct disas_context *dctx,for (i =0 ; i < alt_count; i++) {free (dalts[i].name);for (j =0 ; j < insn_count; j++) -free (dalts[i].insn[j]); +free (dalts[i].insn[j].str); }free (alt_name);
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Print addresses with alternative instructions
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 15e7ad8667b9d1fd4b6bdf06472812416453b7b2 Gitweb: https://git.kernel.org/tip/15e7ad8667b9d1fd4b6bdf06472812416453b7b2 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:31 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:13 +01:00
objtool: Print addresses with alternative instructions
All alternatives are disassemble side-by-side when using the --disas option. However the address of each instruction is not printed because instructions from different alternatives are not necessarily aligned.
Change this behavior to print the address of each instruction. Spaces will appear between instructions from the same alternative when instructions from different alternatives do not have the same alignment.
--- tools/objtool/disas.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-)
tools/objtool/disas.c +23 -12
@@ -47,7 +47,11 @@ struct disas_alt {struct alternative *alt;/* alternative or NULL if default code */ char *name;/* name for this alternative */ int width;/* formatting width */ -char *insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ +struct { +char *str;/* instruction string */ +int offset;/* instruction offset */ + } insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ +int insn_idx;/* index of the next instruction to print */ };#define DALT_DEFAULT (dalt) (!(dalt)->alt)
@@ -361,10 +365,9 @@ char *disas_result(struct disas_context *dctx)disas_print_insn (stdout, dctx, insn, depth,"\n" )/* -* Print a message in the instruction flow. If insn is not NULL then -* the instruction address is printed in addition of the message, -* otherwise only the message is printed. In all cases, the instruction -* itself is not printed. +* Print a message in the instruction flow. If sec is not NULL then the +* address at the section offset is printed in addition of the message, +* otherwise only the message is printed. */static int disas_vprint (FILE *stream,struct section *sec,unsigned long offset,int depth,const char *format,va_list ap)
@@ -607,6 +610,7 @@ static int disas_alt_init(struct disas_alt *dalt, { dalt->orig_insn = orig_insn; dalt->alt = alt; + dalt->insn_idx =0 ; dalt->name = alt ?disas_alt_name (alt) :strdup ("DEFAULT" );if (!dalt->name)return -1 ;
@@ -615,7 +619,8 @@ static int disas_alt_init(struct disas_alt *dalt,return 0 ; } -static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str) +static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str, +int offset) {int len;
@@ -626,7 +631,8 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str) } len =strlen (insn_str); - dalt->insn[index] = insn_str; + dalt->insn[index].str = insn_str; + dalt->insn[index].offset = offset;if (len > dalt->width) dalt->width = len;
@@ -641,12 +647,14 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt) {struct objtool_file *file;struct instruction *insn; +int offset;char *str;int count;int err; file = dctx->file; count =0 ; + offset =0 ;alt_for_each_insn (file,DALT_GROUP (dalt), insn) {
@@ -655,9 +663,10 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)if (!str)return -1 ; - err =disas_alt_add_insn (dalt, count, str); + err =disas_alt_add_insn (dalt, count, str, offset);if (err)break ; + offset += insn->len; count++; }
@@ -685,7 +694,7 @@ static int disas_alt_default(struct disas_context *dctx, struct disas_alt *dalt) str =strdup (disas_result (dctx));if (!str)return -1 ; - err =disas_alt_add_insn (dalt,0 , str); + err =disas_alt_add_insn (dalt,0 , str,0 );if (err)return -1 ;
@@ -710,9 +719,11 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts,for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name);for (j =0 ; j < insn_count; j++) { -if (!dalts[i].insn[j]) +if (!dalts[i].insn[j].str)break ; -printf ("%*s| %s\n" , len,"" , dalts[i].insn[j]); +disas_print (stdout, orig_insn->sec, + orig_insn->offset + dalts[i].insn[j].offset,0 , +"| %s\n" , dalts[i].insn[j].str); }printf ("%*s|\n" , len,"" ); }
@@ -811,7 +822,7 @@ done:for (i =0 ; i < alt_count; i++) {free (dalts[i].name);for (j =0 ; j < insn_count; j++) -free (dalts[i].insn[j]); +free (dalts[i].insn[j].str); }free (alt_name);
PATCH v6 22/30 objtool: Disassemble exception table alternatives
In reply to Alexandre ChartreWhen using the --disas option, also disassemble exception tables (EX_TABLE).
--- tools/objtool/disas.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
tools/objtool/disas.c +25 -1
@@ -639,6 +639,26 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str,return 0 ; } +/* +* Disassemble an exception table alternative. +*/ +static int disas_alt_extable (struct disas_alt *dalt) +{ +struct instruction *alt_insn; +char *str; + + alt_insn = dalt->alt->insn; + str =strfmt ("resume at 0x%lx <%s+0x%lx>" , + alt_insn->offset, alt_insn->sym->name, + alt_insn->offset - alt_insn->sym->offset); +if (!str) +return -1 ; + +disas_alt_add_insn (dalt,0 , str,0 ); + +return 1 ; +} +/* * Disassemble an alternative and store instructions in the disas_alt * structure. Return the number of instructions in the alternative.
@@ -790,12 +810,16 @@ static void *disas_alt(struct disas_context *dctx, }/* -* Only group alternatives are supported at the moment. +* Only group alternatives and exception tables are +* supported at the moment. */ switch (dalt->alt->type) {case ALT_TYPE_INSTRUCTIONS : count =disas_alt_group (dctx, dalt);break ; +case ALT_TYPE_EX_TABLE : + count =disas_alt_extable (dalt); +break ;default : count =0 ; }
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Disassemble exception table alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 78df4590c568731cfa12de9ecb888b3b0c141db2 Gitweb: https://git.kernel.org/tip/78df4590c568731cfa12de9ecb888b3b0c141db2 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:32 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:14 +01:00
objtool: Disassemble exception table alternatives
When using the --disas option, also disassemble exception tables (EX_TABLE).
--- tools/objtool/disas.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
tools/objtool/disas.c +25 -1
@@ -640,6 +640,26 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str, }/* +* Disassemble an exception table alternative. +*/ +static int disas_alt_extable (struct disas_alt *dalt) +{ +struct instruction *alt_insn; +char *str; + + alt_insn = dalt->alt->insn; + str =strfmt ("resume at 0x%lx <%s+0x%lx>" , + alt_insn->offset, alt_insn->sym->name, + alt_insn->offset - alt_insn->sym->offset); +if (!str) +return -1 ; + +disas_alt_add_insn (dalt,0 , str,0 ); + +return 1 ; +} + +/* * Disassemble an alternative and store instructions in the disas_alt * structure. Return the number of instructions in the alternative. */
@@ -790,12 +810,16 @@ static void *disas_alt(struct disas_context *dctx, }/* -* Only group alternatives are supported at the moment. +* Only group alternatives and exception tables are +* supported at the moment. */ switch (dalt->alt->type) {case ALT_TYPE_INSTRUCTIONS : count =disas_alt_group (dctx, dalt);break ; +case ALT_TYPE_EX_TABLE : + count =disas_alt_extable (dalt); +break ;default : count =0 ; }
PATCH v6 23/30 objtool: Disassemble jump table alternatives
In reply to Alexandre ChartreWhen using the --disas option, also disassemble jump tables.
--- tools/objtool/disas.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)
tools/objtool/disas.c +32 -6
@@ -639,6 +639,34 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str,return 0 ; } +static int disas_alt_jump (struct disas_alt *dalt) +{ +struct instruction *orig_insn; +struct instruction *dest_insn; +char suffix[2 ] = {0 }; +char *str; + + orig_insn = dalt->orig_insn; + dest_insn = dalt->alt->insn; + +if (orig_insn->type ==INSN_NOP ) { +if (orig_insn->len ==5 ) + suffix[0 ] ='q' ; + str =strfmt ("jmp%-3s %lx <%s+0x%lx>" , suffix, + dest_insn->offset, dest_insn->sym->name, + dest_insn->offset - dest_insn->sym->offset); + }else { + str =strfmt ("nop%d" , orig_insn->len); + } + +if (!str) +return -1 ; + +disas_alt_add_insn (dalt,0 , str,0 ); + +return 1 ; +} +/* * Disassemble an exception table alternative. */
@@ -809,10 +837,7 @@ static void *disas_alt(struct disas_context *dctx, goto done; } -/* -* Only group alternatives and exception tables are -* supported at the moment. -*/ + count =-1 ;switch (dalt->alt->type) {case ALT_TYPE_INSTRUCTIONS : count =disas_alt_group (dctx, dalt);
@@ -820,8 +845,9 @@ static void *disas_alt(struct disas_context *dctx,case ALT_TYPE_EX_TABLE : count =disas_alt_extable (dalt);break ; -default : - count =0 ; +case ALT_TYPE_JUMP_TABLE : + count =disas_alt_jump (dalt); +break ; }if (count <0 ) { WARN("%s: failed to disassemble alternative %s",
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Disassemble jump table alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 7e017720aae87dc2ca2471ac295e34e2b240e5f5 Gitweb: https://git.kernel.org/tip/7e017720aae87dc2ca2471ac295e34e2b240e5f5 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:33 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:14 +01:00
objtool: Disassemble jump table alternatives
When using the --disas option, also disassemble jump tables.
--- tools/objtool/disas.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)
tools/objtool/disas.c +32 -6
@@ -639,6 +639,34 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str,return 0 ; } +static int disas_alt_jump (struct disas_alt *dalt) +{ +struct instruction *orig_insn; +struct instruction *dest_insn; +char suffix[2 ] = {0 }; +char *str; + + orig_insn = dalt->orig_insn; + dest_insn = dalt->alt->insn; + +if (orig_insn->type ==INSN_NOP ) { +if (orig_insn->len ==5 ) + suffix[0 ] ='q' ; + str =strfmt ("jmp%-3s %lx <%s+0x%lx>" , suffix, + dest_insn->offset, dest_insn->sym->name, + dest_insn->offset - dest_insn->sym->offset); + }else { + str =strfmt ("nop%d" , orig_insn->len); + } + +if (!str) +return -1 ; + +disas_alt_add_insn (dalt,0 , str,0 ); + +return 1 ; +} +/* * Disassemble an exception table alternative. */
@@ -809,10 +837,7 @@ static void *disas_alt(struct disas_context *dctx, goto done; } -/* -* Only group alternatives and exception tables are -* supported at the moment. -*/ + count =-1 ;switch (dalt->alt->type) {case ALT_TYPE_INSTRUCTIONS : count =disas_alt_group (dctx, dalt);
@@ -820,8 +845,9 @@ static void *disas_alt(struct disas_context *dctx,case ALT_TYPE_EX_TABLE : count =disas_alt_extable (dalt);break ; -default : - count =0 ; +case ALT_TYPE_JUMP_TABLE : + count =disas_alt_jump (dalt); +break ; }if (count <0 ) { WARN("%s: failed to disassemble alternative %s",
PATCH v6 24/30 objtool: Fix address references in alternatives
In reply to Alexandre ChartreWhen using the --disas option, alternatives are disassembled but address references in non-default alternatives can be incorrect.
The problem is that alternatives are shown as if they were replacing the original code of the alternative. So if an alternative is referencing an address inside the alternative then the reference has to be adjusted to the location of the original code.
--- tools/objtool/disas.c | 70 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-)
tools/objtool/disas.c +66 -4
@@ -24,6 +24,7 @@struct disas_context {struct objtool_file *file;struct instruction *insn; +bool alt_applied;char result[DISAS_RESULT_SIZE ];disassembler_ftype disassembler;struct disassemble_info info;
@@ -160,6 +161,43 @@ static void disas_print_addr_sym(struct section *sec, struct symbol *sym, } } +static bool disas_print_addr_alt (bfd_vma addr,struct disassemble_info *dinfo) +{ +struct disas_context *dctx = dinfo->application_data; +struct instruction *orig_first_insn; +struct alt_group *alt_group; +unsigned long offset; +struct symbol *sym; + +/* +* Check if we are processing an alternative at the original +* instruction address (i.e. if alt_applied is true) and if +* we are referencing an address inside the alternative. +* +* For example, this happens if there is a branch inside an +* alternative. In that case, the address should be updated +* to a reference inside the original instruction flow. +*/ +if (!dctx->alt_applied) +return false; + + alt_group = dctx->insn->alt_group; +if (!alt_group || !alt_group->orig_group || + addr < alt_group->first_insn->offset || + addr > alt_group->last_insn->offset) +return false; + + orig_first_insn = alt_group->orig_group->first_insn; + offset = addr - alt_group->first_insn->offset; + + addr = orig_first_insn->offset + offset; + sym = orig_first_insn->sym; + +disas_print_addr_sym (orig_first_insn->sec, sym, addr, dinfo); + +return true; +} +static void disas_print_addr_noreloc (bfd_vma addr,struct disassemble_info *dinfo) {
@@ -167,6 +205,9 @@ static void disas_print_addr_noreloc(bfd_vma addr,struct instruction *insn = dctx->insn;struct symbol *sym =NULL ; +if (disas_print_addr_alt (addr, dinfo)) +return ; +if (insn->sym && addr >= insn->sym->offset && addr < insn->sym->offset + insn->sym->len) { sym = insn->sym;
@@ -232,8 +273,9 @@ static void disas_print_address(bfd_vma addr, struct disassemble_info *dinfo)*/ jump_dest = insn->jump_dest;if (jump_dest && jump_dest->sym && jump_dest->offset == addr) { -disas_print_addr_sym (jump_dest->sec, jump_dest->sym, - addr, dinfo); +if (!disas_print_addr_alt (addr, dinfo)) +disas_print_addr_sym (jump_dest->sec, jump_dest->sym, + addr, dinfo);return ; }
@@ -490,13 +532,22 @@ void disas_print_insn(FILE *stream, struct disas_context *dctx,/* * Disassemble a single instruction. Return the size of the instruction. +* +* If alt_applied is true then insn should be an instruction from of an +* alternative (i.e. insn->alt_group != NULL), and it is disassembled +* at the location of the original code it is replacing. When the +* instruction references any address inside the alternative then +* these references will be re-adjusted to replace the original code. */ -size_t disas_insn (struct disas_context *dctx,struct instruction *insn) +static size_t disas_insn_common (struct disas_context *dctx, +struct instruction *insn, +bool alt_applied) {disassembler_ftype disasm = dctx->disassembler;struct disassemble_info *dinfo = &dctx->info; dctx->insn = insn; + dctx->alt_applied = alt_applied; dctx->result[0 ] ='\0' ;if (insn->type ==INSN_NOP ) {
@@ -515,6 +566,17 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn)return disasm (insn->offset, &dctx->info); } +size_t disas_insn (struct disas_context *dctx,struct instruction *insn) +{ +return disas_insn_common (dctx, insn, false); +} + +static size_t disas_insn_alt (struct disas_context *dctx, +struct instruction *insn) +{ +return disas_insn_common (dctx, insn, true); +} +static struct instruction *next_insn_same_alt (struct objtool_file *file,struct alt_group *alt_grp,struct instruction *insn)
@@ -706,7 +768,7 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)alt_for_each_insn (file,DALT_GROUP (dalt), insn) { -disas_insn (dctx, insn); +disas_insn_alt (dctx, insn); str =strdup (disas_result (dctx));if (!str)return -1 ;
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Fix address references in alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 4aae0d3f77b1104e55847870d15c3749ca575fcf Gitweb: https://git.kernel.org/tip/4aae0d3f77b1104e55847870d15c3749ca575fcf Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:34 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:14 +01:00
objtool: Fix address references in alternatives
When using the --disas option, alternatives are disassembled but address references in non-default alternatives can be incorrect.
The problem is that alternatives are shown as if they were replacing the original code of the alternative. So if an alternative is referencing an address inside the alternative then the reference has to be adjusted to the location of the original code.
--- tools/objtool/disas.c | 70 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-)
tools/objtool/disas.c +66 -4
@@ -24,6 +24,7 @@struct disas_context {struct objtool_file *file;struct instruction *insn; +bool alt_applied;char result[DISAS_RESULT_SIZE ];disassembler_ftype disassembler;struct disassemble_info info;
@@ -160,6 +161,43 @@ static void disas_print_addr_sym(struct section *sec, struct symbol *sym, } } +static bool disas_print_addr_alt (bfd_vma addr,struct disassemble_info *dinfo) +{ +struct disas_context *dctx = dinfo->application_data; +struct instruction *orig_first_insn; +struct alt_group *alt_group; +unsigned long offset; +struct symbol *sym; + +/* +* Check if we are processing an alternative at the original +* instruction address (i.e. if alt_applied is true) and if +* we are referencing an address inside the alternative. +* +* For example, this happens if there is a branch inside an +* alternative. In that case, the address should be updated +* to a reference inside the original instruction flow. +*/ +if (!dctx->alt_applied) +return false; + + alt_group = dctx->insn->alt_group; +if (!alt_group || !alt_group->orig_group || + addr < alt_group->first_insn->offset || + addr > alt_group->last_insn->offset) +return false; + + orig_first_insn = alt_group->orig_group->first_insn; + offset = addr - alt_group->first_insn->offset; + + addr = orig_first_insn->offset + offset; + sym = orig_first_insn->sym; + +disas_print_addr_sym (orig_first_insn->sec, sym, addr, dinfo); + +return true; +} +static void disas_print_addr_noreloc (bfd_vma addr,struct disassemble_info *dinfo) {
@@ -167,6 +205,9 @@ static void disas_print_addr_noreloc(bfd_vma addr,struct instruction *insn = dctx->insn;struct symbol *sym =NULL ; +if (disas_print_addr_alt (addr, dinfo)) +return ; +if (insn->sym && addr >= insn->sym->offset && addr < insn->sym->offset + insn->sym->len) { sym = insn->sym;
@@ -232,8 +273,9 @@ static void disas_print_address(bfd_vma addr, struct disassemble_info *dinfo)*/ jump_dest = insn->jump_dest;if (jump_dest && jump_dest->sym && jump_dest->offset == addr) { -disas_print_addr_sym (jump_dest->sec, jump_dest->sym, - addr, dinfo); +if (!disas_print_addr_alt (addr, dinfo)) +disas_print_addr_sym (jump_dest->sec, jump_dest->sym, + addr, dinfo);return ; }
@@ -490,13 +532,22 @@ void disas_print_insn(FILE *stream, struct disas_context *dctx,/* * Disassemble a single instruction. Return the size of the instruction. +* +* If alt_applied is true then insn should be an instruction from of an +* alternative (i.e. insn->alt_group != NULL), and it is disassembled +* at the location of the original code it is replacing. When the +* instruction references any address inside the alternative then +* these references will be re-adjusted to replace the original code. */ -size_t disas_insn (struct disas_context *dctx,struct instruction *insn) +static size_t disas_insn_common (struct disas_context *dctx, +struct instruction *insn, +bool alt_applied) {disassembler_ftype disasm = dctx->disassembler;struct disassemble_info *dinfo = &dctx->info; dctx->insn = insn; + dctx->alt_applied = alt_applied; dctx->result[0 ] ='\0' ;if (insn->type ==INSN_NOP ) {
@@ -515,6 +566,17 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn)return disasm (insn->offset, &dctx->info); } +size_t disas_insn (struct disas_context *dctx,struct instruction *insn) +{ +return disas_insn_common (dctx, insn, false); +} + +static size_t disas_insn_alt (struct disas_context *dctx, +struct instruction *insn) +{ +return disas_insn_common (dctx, insn, true); +} +static struct instruction *next_insn_same_alt (struct objtool_file *file,struct alt_group *alt_grp,struct instruction *insn)
@@ -706,7 +768,7 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)alt_for_each_insn (file,DALT_GROUP (dalt), insn) { -disas_insn (dctx, insn); +disas_insn_alt (dctx, insn); str =strdup (disas_result (dctx));if (!str)return -1 ;
PATCH v6 25/30 objtool: Provide access to feature and flags of group alternatives
In reply to Alexandre ChartreEach alternative of a group alternative depends on a specific feature and flags. Provide access to the feature/flags for each alternative as an attribute (feature) in struct alt_group.
--- tools/objtool/check.c | 2 ++ tools/objtool/include/objtool/check.h | 1 + tools/objtool/include/objtool/special.h | 2 +- tools/objtool/special.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-)
tools/objtool/check.c +2 -0
@@ -1772,6 +1772,7 @@ static int handle_group_alt(struct objtool_file *file, orig_alt_group->last_insn = last_orig_insn; orig_alt_group->nop =NULL ; orig_alt_group->ignore = orig_insn->ignore_alts; + orig_alt_group->feature =0 ; }else {if (orig_alt_group->last_insn->offset + orig_alt_group->last_insn->len - orig_alt_group->first_insn->offset != special_alt->orig_len) {
@@ -1876,6 +1877,7 @@ static int handle_group_alt(struct objtool_file *file, new_alt_group->nop = nop; new_alt_group->ignore = (*new_insn)->ignore_alts; new_alt_group->cfi = orig_alt_group->cfi; + new_alt_group->feature = special_alt->feature;return 0 ; }
tools/objtool/include/objtool/check.h +1 -0
@@ -36,6 +36,7 @@ struct alt_group {struct cfi_state **cfi;bool ignore; +unsigned int feature; };enum alternative_type {
tools/objtool/include/objtool/special.h +1 -1
@@ -25,7 +25,7 @@ struct special_alt {struct section *new_sec;unsigned long new_off; -unsigned int orig_len, new_len;/* group only */ +unsigned int orig_len, new_len, feature;/* group only */ };int special_get_alts (struct elf *elf,struct list_head *alts);
tools/objtool/special.c +2 -0
@@ -81,6 +81,8 @@ static int get_alt_entry(struct elf *elf, const struct special_entry *entry, entry->orig_len); alt->new_len = *(unsigned char *)(sec->data->d_buf + offset + entry->new_len); + alt->feature = *(unsigned int *)(sec->data->d_buf + offset + + entry->feature); } orig_reloc =find_reloc_by_dest (elf, sec, offset + entry->orig);
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Provide access to feature and flags of group alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: be5ee60ac554c6189cda963e886c4b97d2cb978c Gitweb: https://git.kernel.org/tip/be5ee60ac554c6189cda963e886c4b97d2cb978c Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:35 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:14 +01:00
objtool: Provide access to feature and flags of group alternatives
Each alternative of a group alternative depends on a specific feature and flags. Provide access to the feature/flags for each alternative as an attribute (feature) in struct alt_group.
--- tools/objtool/check.c | 2 ++ tools/objtool/include/objtool/check.h | 1 + tools/objtool/include/objtool/special.h | 2 +- tools/objtool/special.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-)
tools/objtool/check.c +2 -0
@@ -1751,6 +1751,7 @@ static int handle_group_alt(struct objtool_file *file, orig_alt_group->last_insn = last_orig_insn; orig_alt_group->nop =NULL ; orig_alt_group->ignore = orig_insn->ignore_alts; + orig_alt_group->feature =0 ; }else {if (orig_alt_group->last_insn->offset + orig_alt_group->last_insn->len - orig_alt_group->first_insn->offset != special_alt->orig_len) {
@@ -1855,6 +1856,7 @@ end: new_alt_group->nop = nop; new_alt_group->ignore = (*new_insn)->ignore_alts; new_alt_group->cfi = orig_alt_group->cfi; + new_alt_group->feature = special_alt->feature;return 0 ; }
tools/objtool/include/objtool/check.h +1 -0
@@ -36,6 +36,7 @@ struct alt_group {struct cfi_state **cfi;bool ignore; +unsigned int feature; };enum alternative_type {
tools/objtool/include/objtool/special.h +1 -1
@@ -25,7 +25,7 @@ struct special_alt {struct section *new_sec;unsigned long new_off; -unsigned int orig_len, new_len;/* group only */ +unsigned int orig_len, new_len, feature;/* group only */ };int special_get_alts (struct elf *elf,struct list_head *alts);
tools/objtool/special.c +2 -0
@@ -81,6 +81,8 @@ static int get_alt_entry(struct elf *elf, const struct special_entry *entry, entry->orig_len); alt->new_len = *(unsigned char *)(sec->data->d_buf + offset + entry->new_len); + alt->feature = *(unsigned int *)(sec->data->d_buf + offset + + entry->feature); } orig_reloc =find_reloc_by_dest (elf, sec, offset + entry->orig);
PATCH v6 26/30 objtool: Function to get the name of a CPU feature
In reply to Alexandre ChartreAdd a function to get the name of a CPU feature. The function is architecture dependent and currently only implemented for x86. The feature names are automatically generated from the cpufeatures.h include file.
--- .../x86/tools/gen-cpu-feature-names-x86.awk | 33 +++++++++++++++++++ tools/objtool/.gitignore | 1 + tools/objtool/Makefile | 1 + tools/objtool/arch/loongarch/special.c | 5 +++ tools/objtool/arch/powerpc/special.c | 5 +++ tools/objtool/arch/x86/Build | 8 +++++ tools/objtool/arch/x86/special.c | 10 ++++++ tools/objtool/include/objtool/special.h | 2 ++ 8 files changed, 65 insertions(+) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk new file +33 -0
@@ -0,0 +1,33 @@ +#!/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2025, Oracle and/or its affiliates. +# +# Usage: awk -f gen-cpu-feature-names-x86.awk cpufeatures.h > cpu-feature-names.c +# + +BEGIN { + print "/* cpu feature name array generated from cpufeatures.h */" + print "/* Do not change this code. */" + print + print "static const char *cpu_feature_names[(NCAPINTS+NBUGINTS)*32] = {" + + feature_expr = "(X86_FEATURE_[A-Z0-9_]+)\\s+\\(([0-9*+ ]+)\\)" + debug_expr = "(X86_BUG_[A-Z0-9_]+)\\s+X86_BUG\\(([0-9*+ ]+)\\)" +} + +/^#define X86_FEATURE_/ { + if (match($0, feature_expr, m)) { + print "\t[" m[2] "] = \"" m[1] "\"," + } +} + +/^#define X86_BUG_/ { + if (match($0, debug_expr, m)) { + print "\t[NCAPINTS*32+(" m[2] ")] = \"" m[1] "\"," + } +} + +END { + print "};" +}
tools/objtool/.gitignore +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +arch/x86/lib/cpu-feature-names.c arch/x86/lib/inat-tables.c /objtool feature
tools/objtool/Makefile +1 -0
@@ -125,6 +125,7 @@ $(LIBSUBCMD)-clean: clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete + $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)feature
tools/objtool/arch/loongarch/special.c +5 -0
@@ -194,3 +194,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file,return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/powerpc/special.c +5 -0
@@ -18,3 +18,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, {exit (-1 ); } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/x86/Build +8 -0
@@ -11,4 +11,12 @@ $(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) $(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c +cpu_features = ../arch/x86/include/asm/cpufeatures.h +cpu_features_script = ../arch/x86/tools/gen-cpu-feature-names-x86.awk + +$(OUTPUT)arch/x86/lib/cpu-feature-names.c: $(cpu_features_script) $(cpu_features) + $(Q)$(call echo-cmd,gen)$(AWK) -f $(cpu_features_script) $(cpu_features) > $@ + +$(OUTPUT)arch/x86/special.o: $(OUTPUT)arch/x86/lib/cpu-feature-names.c + CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib
tools/objtool/arch/x86/special.c +10 -0
@@ -4,6 +4,10 @@#include <objtool/special.h> #include <objtool/builtin.h> #include <objtool/warn.h> +#include <asm/cpufeatures.h> + +/* cpu feature name array generated from cpufeatures.h */ +#include "lib/cpu-feature-names.c" void arch_handle_alternative (struct special_alt *alt) {
@@ -134,3 +138,9 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, *table_size =0 ;return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return (feature_number <ARRAY_SIZE (cpu_feature_names)) ? + cpu_feature_names[feature_number] :NULL ; +}
tools/objtool/include/objtool/special.h +2 -0
@@ -38,4 +38,6 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,struct reloc *arch_find_switch_table (struct objtool_file *file,struct instruction *insn,unsigned long *table_size); +const char *arch_cpu_feature_name (int feature_number); +#endif /* _SPECIAL_H */
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Function to get the name of a CPU feature
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: cf690efb96e1d4b1ccb0be767f253ff915f4236f Gitweb: https://git.kernel.org/tip/cf690efb96e1d4b1ccb0be767f253ff915f4236f Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:15 +01:00
objtool: Function to get the name of a CPU feature
Add a function to get the name of a CPU feature. The function is architecture dependent and currently only implemented for x86. The feature names are automatically generated from the cpufeatures.h include file.
--- tools/arch/x86/tools/gen-cpu-feature-names-x86.awk | 33 +++++++++++++- tools/objtool/.gitignore | 1 +- tools/objtool/Makefile | 1 +- tools/objtool/arch/loongarch/special.c | 5 ++- tools/objtool/arch/powerpc/special.c | 5 ++- tools/objtool/arch/x86/Build | 10 ++++- tools/objtool/arch/x86/special.c | 10 ++++- tools/objtool/include/objtool/special.h | 2 +- 8 files changed, 67 insertions(+) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk new file +33 -0
@@ -0,0 +1,33 @@ +#!/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2025, Oracle and/or its affiliates. +# +# Usage: awk -f gen-cpu-feature-names-x86.awk cpufeatures.h > cpu-feature-names.c +# + +BEGIN { + print "/* cpu feature name array generated from cpufeatures.h */" + print "/* Do not change this code. */" + print + print "static const char *cpu_feature_names[(NCAPINTS+NBUGINTS)*32] = {" + + feature_expr = "(X86_FEATURE_[A-Z0-9_]+)\\s+\\(([0-9*+ ]+)\\)" + debug_expr = "(X86_BUG_[A-Z0-9_]+)\\s+X86_BUG\\(([0-9*+ ]+)\\)" +} + +/^#define X86_FEATURE_/ { + if (match($0, feature_expr, m)) { + print "\t[" m[2] "] = \"" m[1] "\"," + } +} + +/^#define X86_BUG_/ { + if (match($0, debug_expr, m)) { + print "\t[NCAPINTS*32+(" m[2] ")] = \"" m[1] "\"," + } +} + +END { + print "};" +}
tools/objtool/.gitignore +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +arch/x86/lib/cpu-feature-names.c arch/x86/lib/inat-tables.c /objtool feature
tools/objtool/Makefile +1 -0
@@ -125,6 +125,7 @@ $(LIBSUBCMD)-clean: clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete + $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)feature
tools/objtool/arch/loongarch/special.c +5 -0
@@ -194,3 +194,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file,return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/powerpc/special.c +5 -0
@@ -18,3 +18,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, {exit (-1 ); } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/x86/Build +10 -0
@@ -12,3 +12,13 @@ $(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) $(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib + +cpu_features = ../arch/x86/include/asm/cpufeatures.h +cpu_features_script = ../arch/x86/tools/gen-cpu-feature-names-x86.awk + +$(OUTPUT)arch/x86/lib/cpu-feature-names.c: $(cpu_features_script) $(cpu_features) + $(Q)$(call echo-cmd,gen)$(AWK) -f $(cpu_features_script) $(cpu_features) > $@ + +$(OUTPUT)arch/x86/special.o: $(OUTPUT)arch/x86/lib/cpu-feature-names.c + +CFLAGS_special.o += -I$(OUTPUT)arch/x86/lib
tools/objtool/arch/x86/special.c +10 -0
@@ -4,6 +4,10 @@#include <objtool/special.h> #include <objtool/builtin.h> #include <objtool/warn.h> +#include <asm/cpufeatures.h> + +/* cpu feature name array generated from cpufeatures.h */ +#include "cpu-feature-names.c" void arch_handle_alternative (struct special_alt *alt) {
@@ -134,3 +138,9 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, *table_size =0 ;return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return (feature_number <ARRAY_SIZE (cpu_feature_names)) ? + cpu_feature_names[feature_number] :NULL ; +}
tools/objtool/include/objtool/special.h +2 -0
@@ -38,4 +38,6 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,struct reloc *arch_find_switch_table (struct objtool_file *file,struct instruction *insn,unsigned long *table_size); +const char *arch_cpu_feature_name (int feature_number); +#endif /* _SPECIAL_H */
[tip: objtool/core] objtool: Function to get the name of a CPU feature
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: afff4e5820e9a0d609740a83c366f3f0335db342 Gitweb: https://git.kernel.org/tip/afff4e5820e9a0d609740a83c366f3f0335db342 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:06 +01:00
objtool: Function to get the name of a CPU feature
Add a function to get the name of a CPU feature. The function is architecture dependent and currently only implemented for x86. The feature names are automatically generated from the cpufeatures.h include file.
--- tools/arch/x86/tools/gen-cpu-feature-names-x86.awk | 33 +++++++++++++- tools/objtool/.gitignore | 1 +- tools/objtool/Makefile | 1 +- tools/objtool/arch/loongarch/special.c | 5 ++- tools/objtool/arch/powerpc/special.c | 5 ++- tools/objtool/arch/x86/Build | 13 ++++- tools/objtool/arch/x86/special.c | 10 ++++- tools/objtool/include/objtool/special.h | 2 +- 8 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk new file +33 -0
@@ -0,0 +1,33 @@ +#!/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2025, Oracle and/or its affiliates. +# +# Usage: awk -f gen-cpu-feature-names-x86.awk cpufeatures.h > cpu-feature-names.c +# + +BEGIN { + print "/* cpu feature name array generated from cpufeatures.h */" + print "/* Do not change this code. */" + print + print "static const char *cpu_feature_names[(NCAPINTS+NBUGINTS)*32] = {" + + feature_expr = "(X86_FEATURE_[A-Z0-9_]+)\\s+\\(([0-9*+ ]+)\\)" + debug_expr = "(X86_BUG_[A-Z0-9_]+)\\s+X86_BUG\\(([0-9*+ ]+)\\)" +} + +/^#define X86_FEATURE_/ { + if (match($0, feature_expr, m)) { + print "\t[" m[2] "] = \"" m[1] "\"," + } +} + +/^#define X86_BUG_/ { + if (match($0, debug_expr, m)) { + print "\t[NCAPINTS*32+(" m[2] ")] = \"" m[1] "\"," + } +} + +END { + print "};" +}
tools/objtool/.gitignore +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +arch/x86/lib/cpu-feature-names.c arch/x86/lib/inat-tables.c /objtool feature
tools/objtool/Makefile +1 -0
@@ -125,6 +125,7 @@ $(LIBSUBCMD)-clean: clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete + $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)feature
tools/objtool/arch/loongarch/special.c +5 -0
@@ -194,3 +194,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file,return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/powerpc/special.c +5 -0
@@ -18,3 +18,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, {exit (-1 ); } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/x86/Build +12 -1
@@ -1,5 +1,5 @@ -objtool-y += special.o objtool-y += decode.o +objtool-y += special.o objtool-y += orc.o inat_tables_script = ../arch/x86/tools/gen-insn-attr-x86.awk
@@ -12,3 +12,14 @@ $(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) $(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib + +cpu_features = ../arch/x86/include/asm/cpufeatures.h +cpu_features_script = ../arch/x86/tools/gen-cpu-feature-names-x86.awk + +$(OUTPUT)arch/x86/lib/cpu-feature-names.c: $(cpu_features_script) $(cpu_features) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(AWK) -f $(cpu_features_script) $(cpu_features) > $@ + +$(OUTPUT)arch/x86/special.o: $(OUTPUT)arch/x86/lib/cpu-feature-names.c + +CFLAGS_special.o += -I$(OUTPUT)arch/x86/lib
tools/objtool/arch/x86/special.c +10 -0
@@ -4,6 +4,10 @@#include <objtool/special.h> #include <objtool/builtin.h> #include <objtool/warn.h> +#include <asm/cpufeatures.h> + +/* cpu feature name array generated from cpufeatures.h */ +#include "cpu-feature-names.c" void arch_handle_alternative (struct special_alt *alt) {
@@ -134,3 +138,9 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, *table_size =0 ;return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return (feature_number <ARRAY_SIZE (cpu_feature_names)) ? + cpu_feature_names[feature_number] :NULL ; +}
tools/objtool/include/objtool/special.h +2 -0
@@ -38,4 +38,6 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,struct reloc *arch_find_switch_table (struct objtool_file *file,struct instruction *insn,unsigned long *table_size); +const char *arch_cpu_feature_name (int feature_number); +#endif /* _SPECIAL_H */
Peter Zijlstra
maintainerRe: [tip: objtool/core] objtool: Function to get the name of a CPU feature
Quoted 61 lines · On Mon, Nov 24, 2025 at 10:44:01AM -0000, tip-bot2 for Alexandre Chartre wrote:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: afff4e5820e9a0d609740a83c366f3f0335db342 Gitweb: https://git.kernel.org/tip/afff4e5820e9a0d609740a83c366f3f0335db342 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:06 +01:00objtool: Function to get the name of a CPU feature
Add a function to get the name of a CPU feature. The function is architecture dependent and currently only implemented for x86. The feature names are automatically generated from the
cpufeatures.hinclude file.Signed-off-by Alexandre Chartre <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>Acked-by Josh Poimboeuf <[email protected]>--- tools/arch/x86/tools/gen-cpu-feature-names-x86.awk | 33 +++++++++++++- tools/objtool/.gitignore | 1 +- tools/objtool/Makefile | 1 +- tools/objtool/arch/loongarch/special.c | 5 ++- tools/objtool/arch/powerpc/special.c | 5 ++- tools/objtool/arch/x86/Build | 13 ++++- tools/objtool/arch/x86/special.c | 10 ++++- tools/objtool/include/objtool/special.h | 2 +- 8 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awktools/arch/x86/tools/gen-cpu-feature-names-x86.awk new file +23
-0@@ -0,0 +1,33 @@ +#!/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2025, Oracle and/or its affiliates. +# +# Usage: awk -f gen-cpu-feature-names-x86.awk cpufeatures.h > cpu-feature-names.c +# + +BEGIN { + print "/* cpu feature name array generated from cpufeatures.h */" + print "/* Do not change this code. */" + print + print "static const char *cpu_feature_names[(NCAPINTS+NBUGINTS)*32] = {" + + feature_expr = "(X86_FEATURE_[A-Z0-9_]+)\\s+\\(([0-9*+ ]+)\\)" + debug_expr = "(X86_BUG_[A-Z0-9_]+)\\s+X86_BUG\\(([0-9*+ ]+)\\)" +} + +/^#define X86_FEATURE_/ { + if (match($0, feature_expr, m)) { + print "\t[" m[2] "] = \"" m[1] "\"," + } +}
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk line 33
Quoted 10 lines
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk new file +10
-0+ +/^#define X86_BUG_/ { + if (match($0, debug_expr, m)) { + print "\t[NCAPINTS*32+(" m[2] ")] = \"" m[1] "\"," + } +} + +END { + print "};" +}
Boris just reported that this doesn't work on mawk, since it uses a GNU awk extension (3rd argument for match()).
Could you please look at writing this in strict POSIX awk?
Re: [tip: objtool/core] objtool: Function to get the name of a CPU feature
Quoted 11 lines · Peter Zijlstra
Quoted 10 lines · On Mon, Nov 24, 2025 at 10:44:01AM -0000, tip-bot2 for Alexandre Chartre wrote:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: afff4e5820e9a0d609740a83c366f3f0335db342 Gitweb: https://git.kernel.org/tip/afff4e5820e9a0d609740a83c366f3f0335db342 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:06 +01:00objtool: Function to get the name of a CPU feature
Also, this commit name needs a verb.
Quoted 4 lines
Boris just reported that this doesn't work on mawk, since it uses a GNU awk extension (3rd argument for
match()).Could you please look at writing this in strict POSIX awk?
The fail is:
awk: ../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 20: syntax error at or near ,
awk: ../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 23: syntax error at or near }
awk: ../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 26: syntax error at or near ,
awk: ../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 29: syntax error at or near } make[5]: *** [arch/x86/Build:21: /root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c] Error 2 make[5]: *** Deleting file '/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c' make[4]: *** [/root/kernel/linux/tools/build/Makefile.build:142: arch/x86] Error 2 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [Makefile:104: /root/kernel/linux/tools/objtool/objtool-in.o] Error 2 make[2]: *** [Makefile:73: objtool] Error 2
make[1]: *** [/root/kernel/linux/Makefile:1449: tools/objtool] Error 2
make: *** [Makefile:248: __sub-make] Error 2
ls -al /usr/bin/awk
lrwxrwxrwx 1 root root 21 Feb 19 2021 /usr/bin/awk -> /etc/alternatives/awk ls -al /etc/alternatives/awk
lrwxrwxrwx 1 root root 13 Feb 19 2021 /etc/alternatives/awk -> /usr/bin/mawk
That's debian.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [tip: objtool/core] objtool: Function to get the name of a CPU feature
Quoted 35 lines · Borislav Petkov
Quoted 11 lines · Peter Zijlstra
Quoted 10 lines · On Mon, Nov 24, 2025 at 10:44:01AM -0000, tip-bot2 for Alexandre Chartre wrote:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: afff4e5820e9a0d609740a83c366f3f0335db342 Gitweb: https://git.kernel.org/tip/afff4e5820e9a0d609740a83c366f3f0335db342 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:06 +01:00objtool: Function to get the name of a CPU feature
Also, this commit name needs a verb.
Quoted 4 lines
Boris just reported that this doesn't work on mawk, since it uses a GNU awk extension (3rd argument for
match()).Could you please look at writing this in strict POSIX awk?
The fail is:
awk:
../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 20: syntax error at or near ,
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 23: syntax error at or near }
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 26: syntax error at or near ,
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 29: syntax error at or near } make[5]: *** [arch/x86/Build:21:/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c] Error 2 make[5]: *** Deleting file '/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c' make[4]: *** [/root/kernel/linux/tools/build/Makefile.build:142:arch/x86] Error 2 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [Makefile:104:/root/kernel/linux/tools/objtool/objtool-in.o] Error 2 make[2]: *** [Makefile:73: objtool] Error 2
make[1]: *** [/root/kernel/linux/Makefile:1449:tools/objtool] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Quoted 7 lines
ls -al
/usr/bin/awk
lrwxrwxrwx 1 root root 21 Feb 19 2021/usr/bin/awk->/etc/alternatives/awkls -al/etc/alternatives/awk
lrwxrwxrwx 1 root root 13 Feb 19 2021/etc/alternatives/awk->/usr/bin/mawkThat's debian.
Ok. I am working on it.
alex.
Re: [tip: objtool/core] objtool: Function to get the name of a CPU feature
Quoted 41 lines · On Mon, 24 Nov 2025 13:40:47 +0100 Alexandre Chartre…
Quoted 40 lines · Borislav Petkov
Quoted 11 lines · Peter Zijlstra
Quoted 10 lines · On Mon, Nov 24, 2025 at 10:44:01AM -0000, tip-bot2 for Alexandre Chartre wrote:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: afff4e5820e9a0d609740a83c366f3f0335db342 Gitweb: https://git.kernel.org/tip/afff4e5820e9a0d609740a83c366f3f0335db342 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:06 +01:00objtool: Function to get the name of a CPU feature
Also, this commit name needs a verb.
Quoted 4 lines
Boris just reported that this doesn't work on mawk, since it uses a GNU awk extension (3rd argument for
match()).Could you please look at writing this in strict POSIX awk?
The fail is:
awk:
../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 20: syntax error at or near ,
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 23: syntax error at or near }
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 26: syntax error at or near ,
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 29: syntax error at or near } make[5]: *** [arch/x86/Build:21:/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c] Error 2 make[5]: *** Deleting file '/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c' make[4]: *** [/root/kernel/linux/tools/build/Makefile.build:142:arch/x86] Error 2 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [Makefile:104:/root/kernel/linux/tools/objtool/objtool-in.o] Error 2 make[2]: *** [Makefile:73: objtool] Error 2
make[1]: *** [/root/kernel/linux/Makefile:1449:tools/objtool] Error 2
make: *** [Makefile:248: __sub-make] Error 2ls -al
/usr/bin/awk
lrwxrwxrwx 1 root root 21 Feb 19 2021/usr/bin/awk->/etc/alternatives/awkls -al/etc/alternatives/awk
lrwxrwxrwx 1 root root 13 Feb 19 2021/etc/alternatives/awk->/usr/bin/mawk
Quoted 4 lines
Quoted 2 lines
That's debian.
Ok. I am working on it.
Can't you just use sed ?
There is no read need for the header or final }
Since you need the header file included for the array bounds you might as well use the names for the array index.
So something like (worked before I retyped it):
sed -n -E '/^#define (X86_(FEATURE|BUG)_([^ ]*)).*/s// [ \1 ] = "\1",/p'
(That is [^<space><tab>]* in the middle)
The final .* matches the rest of the line, you could add some 'pattern' to further verify the match.
It should be possible to just put that into the Makefile generating the include file in the object directory.
Getting the comments would be more 'interesting', the " would need escaping as well.
David
Re: [tip: objtool/core] objtool: Function to get the name of a CPU feature
In reply to Borislav PetkovQuoted 11 lines · Borislav Petkov
Quoted 10 lines · Peter Zijlstra
Quoted 9 lines · On Mon, Nov 24, 2025 at 10:44:01AM -0000, tip-bot2 for Alexandre Chartre wrote:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: afff4e5820e9a0d609740a83c366f3f0335db342 Gitweb: https://git.kernel.org/tip/afff4e5820e9a0d609740a83c366f3f0335db342 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:06 +01:00
Quoted 3 lines
Quoted 1 line
Quoted 1 line
objtool: Function to get the name of a CPU feature
Also, this commit name needs a verb.
Ok, then:
objtool: Add function to get the name of a CPU feature
Quoted 20 lines
Quoted 4 lines
Boris just reported that this doesn't work on mawk, since it uses a GNU awk extension (3rd argument for
match()).Could you please look at writing this in strict POSIX awk?
The fail is:
awk:
../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 20: syntax error at or near ,
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 23: syntax error at or near }
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 26: syntax error at or near ,
awk:../arch/x86/tools/gen-cpu-feature-names-x86.awk: line 29: syntax error at or near } make[5]: *** [arch/x86/Build:21:/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c] Error 2 make[5]: *** Deleting file '/root/kernel/linux/tools/objtool/arch/x86/lib/cpu-feature-names.c' make[4]: *** [/root/kernel/linux/tools/build/Makefile.build:142:arch/x86] Error 2 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [Makefile:104:/root/kernel/linux/tools/objtool/objtool-in.o] Error 2 make[2]: *** [Makefile:73: objtool] Error 2
make[1]: *** [/root/kernel/linux/Makefile:1449:tools/objtool] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Quoted 5 lines
ls -al
/usr/bin/awk
lrwxrwxrwx 1 root root 21 Feb 19 2021/usr/bin/awk->/etc/alternatives/awkls -al/etc/alternatives/awk
lrwxrwxrwx 1 root root 13 Feb 19 2021/etc/alternatives/awk->/usr/bin/mawk
Here is a fix. It works with gawk and mawk:
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk +7 -6
@@ -12,19 +12,20 @@ BEGIN { print print "static const char *cpu_feature_names[(NCAPINTS+NBUGINTS)*32] = {" - feature_expr = "(X86_FEATURE_[A-Z0-9_]+)\\s+\\(([0-9*+ ]+)\\)" - debug_expr = "(X86_BUG_[A-Z0-9_]+)\\s+X86_BUG\\(([0-9*+ ]+)\\)" + value_expr = "\\([0-9*+ ]+\\)" } /^#define X86_FEATURE_/ { - if (match($0, feature_expr, m)) { - print "\t[" m[2] "] = \"" m[1] "\"," + if (match($0, value_expr)) { + value = substr($0, RSTART + 1, RLENGTH - 2) + print "\t[" value "] = \"" $2 "\"," } } /^#define X86_BUG_/ { - if (match($0, debug_expr, m)) { - print "\t[NCAPINTS*32+(" m[2] ")] = \"" m[1] "\"," + if (match($0, value_expr)) { + value = substr($0, RSTART + 1, RLENGTH - 2) + print "\t[NCAPINTS*32+(" value ")] = \"" $2 "\"," } }
I am going to send the updated patch.
Rgds,
alex.
Borislav Petkov
Tested-byRe: [tip: objtool/core] objtool: Function to get the name of a CPU feature
Quoted 1 line · Alexandre Chartre
Here is a fix. It works with gawk and mawk:
Yap, works, thanks!
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette[tip: objtool/core] objtool: Add Function to get the name of a CPU feature
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 8308fd001927f5bdc37a9c9f9c413baec3fb7bbe Gitweb: https://git.kernel.org/tip/8308fd001927f5bdc37a9c9f9c413baec3fb7bbe Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:36 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 20:39:47 +01:00
objtool: Add Function to get the name of a CPU feature
Add a function to get the name of a CPU feature. The function is architecture dependent and currently only implemented for x86. The feature names are automatically generated from the cpufeatures.h include file.
--- tools/arch/x86/tools/gen-cpu-feature-names-x86.awk | 34 +++++++++++++- tools/objtool/.gitignore | 1 +- tools/objtool/Makefile | 1 +- tools/objtool/arch/loongarch/special.c | 5 ++- tools/objtool/arch/powerpc/special.c | 5 ++- tools/objtool/arch/x86/Build | 13 ++++- tools/objtool/arch/x86/special.c | 10 ++++- tools/objtool/include/objtool/special.h | 2 +- 8 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk
tools/arch/x86/tools/gen-cpu-feature-names-x86.awk new file +34 -0
@@ -0,0 +1,34 @@ +#!/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2025, Oracle and/or its affiliates. +# +# Usage: awk -f gen-cpu-feature-names-x86.awk cpufeatures.h > cpu-feature-names.c +# + +BEGIN { + print "/* cpu feature name array generated from cpufeatures.h */" + print "/* Do not change this code. */" + print + print "static const char *cpu_feature_names[(NCAPINTS+NBUGINTS)*32] = {" + + value_expr = "\\([0-9*+ ]+\\)" +} + +/^#define X86_FEATURE_/ { + if (match($0, value_expr)) { + value = substr($0, RSTART + 1, RLENGTH - 2) + print "\t[" value "] = \"" $2 "\"," + } +} + +/^#define X86_BUG_/ { + if (match($0, value_expr)) { + value = substr($0, RSTART + 1, RLENGTH - 2) + print "\t[NCAPINTS*32+(" value ")] = \"" $2 "\"," + } +} + +END { + print "};" +}
tools/objtool/.gitignore +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +arch/x86/lib/cpu-feature-names.c arch/x86/lib/inat-tables.c /objtool feature
tools/objtool/Makefile +1 -0
@@ -125,6 +125,7 @@ $(LIBSUBCMD)-clean: clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete + $(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool $(Q)$(RM) -r -- $(OUTPUT)feature
tools/objtool/arch/loongarch/special.c +5 -0
@@ -194,3 +194,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file,return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/powerpc/special.c +5 -0
@@ -18,3 +18,8 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, {exit (-1 ); } + +const char *arch_cpu_feature_name (int feature_number) +{ +return NULL ; +}
tools/objtool/arch/x86/Build +12 -1
@@ -1,5 +1,5 @@ -objtool-y += special.o objtool-y += decode.o +objtool-y += special.o objtool-y += orc.o inat_tables_script = ../arch/x86/tools/gen-insn-attr-x86.awk
@@ -12,3 +12,14 @@ $(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) $(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib + +cpu_features = ../arch/x86/include/asm/cpufeatures.h +cpu_features_script = ../arch/x86/tools/gen-cpu-feature-names-x86.awk + +$(OUTPUT)arch/x86/lib/cpu-feature-names.c: $(cpu_features_script) $(cpu_features) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(AWK) -f $(cpu_features_script) $(cpu_features) > $@ + +$(OUTPUT)arch/x86/special.o: $(OUTPUT)arch/x86/lib/cpu-feature-names.c + +CFLAGS_special.o += -I$(OUTPUT)arch/x86/lib
tools/objtool/arch/x86/special.c +10 -0
@@ -4,6 +4,10 @@#include <objtool/special.h> #include <objtool/builtin.h> #include <objtool/warn.h> +#include <asm/cpufeatures.h> + +/* cpu feature name array generated from cpufeatures.h */ +#include "cpu-feature-names.c" void arch_handle_alternative (struct special_alt *alt) {
@@ -134,3 +138,9 @@ struct reloc *arch_find_switch_table(struct objtool_file *file, *table_size =0 ;return rodata_reloc; } + +const char *arch_cpu_feature_name (int feature_number) +{ +return (feature_number <ARRAY_SIZE (cpu_feature_names)) ? + cpu_feature_names[feature_number] :NULL ; +}
tools/objtool/include/objtool/special.h +2 -0
@@ -38,4 +38,6 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,struct reloc *arch_find_switch_table (struct objtool_file *file,struct instruction *insn,unsigned long *table_size); +const char *arch_cpu_feature_name (int feature_number); +#endif /* _SPECIAL_H */
PATCH v6 27/30 objtool: Improve naming of group alternatives
In reply to Alexandre ChartreImprove the naming of group alternatives by showing the feature name and flags used by the alternative.
--- tools/objtool/disas.c | 58 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-)
tools/objtool/disas.c +52 -6
@@ -9,6 +9,7 @@#include <objtool/arch.h> #include <objtool/check.h> #include <objtool/disas.h> +#include <objtool/special.h> #include <objtool/warn.h> #include <bfd.h>
@@ -60,6 +61,21 @@ struct disas_alt {#define DALT_GROUP (dalt) (DALT_INSN(dalt)->alt_group)#define DALT_ALTID (dalt) ((dalt)->orig_insn->offset) +#define ALT_FLAGS_SHIFT 16 +#define ALT_FLAG_NOT (1 << 0) +#define ALT_FLAG_DIRECT_CALL (1 << 1) +#define ALT_FEATURE_MASK ((1 << ALT_FLAGS_SHIFT) - 1) + +static int alt_feature (unsigned int ft_flags) +{ +return (ft_flags &ALT_FEATURE_MASK ); +} + +static int alt_flags (unsigned int ft_flags) +{ +return (ft_flags >>ALT_FLAGS_SHIFT ); +} +/* * Wrapper around asprintf() to allocate and format a string. * Return the allocated string or NULL on error.
@@ -635,7 +651,12 @@ const char *disas_alt_type_name(struct instruction *insn)*/ char *disas_alt_name (struct alternative *alt) { +char pfx[4 ] = {0 };char *str =NULL ; +const char *name; +int feature; +int flags; +int num;switch (alt->type) {
@@ -649,13 +670,37 @@ char *disas_alt_name(struct alternative *alt)case ALT_TYPE_INSTRUCTIONS :/* -* This is a non-default group alternative. Create a unique -* name using the offset of the first original and alternative -* instructions. +* This is a non-default group alternative. Create a name +* based on the feature and flags associated with this +* alternative. Use either the feature name (it is available) +* or the feature number. And add a prefix to show the flags +* used. +* +* Prefix flags characters: +* +* '!' alternative used when feature not enabled +* '+' direct call alternative +* '?' unknown flag */ -asprintf (&str,"ALTERNATIVE %lx.%lx" , - alt->insn->alt_group->orig_group->first_insn->offset, - alt->insn->alt_group->first_insn->offset); + + feature = alt->insn->alt_group->feature; + num =alt_feature (feature); + flags =alt_flags (feature); + str = pfx; + +if (flags & ~(ALT_FLAG_NOT |ALT_FLAG_DIRECT_CALL )) + *str++ ='?' ; +if (flags &ALT_FLAG_DIRECT_CALL ) + *str++ ='+' ; +if (flags &ALT_FLAG_NOT ) + *str++ ='!' ; + + name =arch_cpu_feature_name (num); +if (!name) + str =strfmt ("%sFEATURE 0x%X" , pfx, num); +else + str =strfmt ("%s%s" , pfx, name); +break ; }
@@ -892,6 +937,7 @@ static void *disas_alt(struct disas_context *dctx,WARN ("%s has more alternatives than supported" , alt_name);break ; } + dalt = &dalts[i]; err =disas_alt_init (dalt, orig_insn, alt);if (err) {
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Improve naming of group alternatives
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: c8455e83c219740b4a0ac73b28db18023cd4c6a0 Gitweb: https://git.kernel.org/tip/c8455e83c219740b4a0ac73b28db18023cd4c6a0 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:37 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:15 +01:00
objtool: Improve naming of group alternatives
Improve the naming of group alternatives by showing the feature name and flags used by the alternative.
--- tools/objtool/disas.c | 58 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-)
tools/objtool/disas.c +52 -6
@@ -9,6 +9,7 @@#include <objtool/arch.h> #include <objtool/check.h> #include <objtool/disas.h> +#include <objtool/special.h> #include <objtool/warn.h> #include <bfd.h>
@@ -60,6 +61,21 @@ struct disas_alt {#define DALT_GROUP (dalt) (DALT_INSN(dalt)->alt_group)#define DALT_ALTID (dalt) ((dalt)->orig_insn->offset) +#define ALT_FLAGS_SHIFT 16 +#define ALT_FLAG_NOT (1 << 0) +#define ALT_FLAG_DIRECT_CALL (1 << 1) +#define ALT_FEATURE_MASK ((1 << ALT_FLAGS_SHIFT) - 1) + +static int alt_feature (unsigned int ft_flags) +{ +return (ft_flags &ALT_FEATURE_MASK ); +} + +static int alt_flags (unsigned int ft_flags) +{ +return (ft_flags >>ALT_FLAGS_SHIFT ); +} +/* * Wrapper around asprintf() to allocate and format a string. * Return the allocated string or NULL on error.
@@ -635,7 +651,12 @@ const char *disas_alt_type_name(struct instruction *insn)*/ char *disas_alt_name (struct alternative *alt) { +char pfx[4 ] = {0 };char *str =NULL ; +const char *name; +int feature; +int flags; +int num;switch (alt->type) {
@@ -649,13 +670,37 @@ char *disas_alt_name(struct alternative *alt)case ALT_TYPE_INSTRUCTIONS :/* -* This is a non-default group alternative. Create a unique -* name using the offset of the first original and alternative -* instructions. +* This is a non-default group alternative. Create a name +* based on the feature and flags associated with this +* alternative. Use either the feature name (it is available) +* or the feature number. And add a prefix to show the flags +* used. +* +* Prefix flags characters: +* +* '!' alternative used when feature not enabled +* '+' direct call alternative +* '?' unknown flag */ -asprintf (&str,"ALTERNATIVE %lx.%lx" , - alt->insn->alt_group->orig_group->first_insn->offset, - alt->insn->alt_group->first_insn->offset); + + feature = alt->insn->alt_group->feature; + num =alt_feature (feature); + flags =alt_flags (feature); + str = pfx; + +if (flags & ~(ALT_FLAG_NOT |ALT_FLAG_DIRECT_CALL )) + *str++ ='?' ; +if (flags &ALT_FLAG_DIRECT_CALL ) + *str++ ='+' ; +if (flags &ALT_FLAG_NOT ) + *str++ ='!' ; + + name =arch_cpu_feature_name (num); +if (!name) + str =strfmt ("%sFEATURE 0x%X" , pfx, num); +else + str =strfmt ("%s%s" , pfx, name); +break ; }
@@ -892,6 +937,7 @@ static void *disas_alt(struct disas_context *dctx,WARN ("%s has more alternatives than supported" , alt_name);break ; } + dalt = &dalts[i]; err =disas_alt_init (dalt, orig_insn, alt);if (err) {
[tip: objtool/core] objtool: Improve naming of group alternatives
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 47793c0677e11bef7eb546d90e73f1d51e6eb22b Gitweb: https://git.kernel.org/tip/47793c0677e11bef7eb546d90e73f1d51e6eb22b Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:37 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:16 +01:00
objtool: Improve naming of group alternatives
Improve the naming of group alternatives by showing the feature name and flags used by the alternative.
--- tools/objtool/disas.c | 58 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-)
tools/objtool/disas.c +52 -6
@@ -9,6 +9,7 @@#include <objtool/arch.h> #include <objtool/check.h> #include <objtool/disas.h> +#include <objtool/special.h> #include <objtool/warn.h> #include <bfd.h>
@@ -60,6 +61,21 @@ struct disas_alt {#define DALT_GROUP (dalt) (DALT_INSN(dalt)->alt_group)#define DALT_ALTID (dalt) ((dalt)->orig_insn->offset) +#define ALT_FLAGS_SHIFT 16 +#define ALT_FLAG_NOT (1 << 0) +#define ALT_FLAG_DIRECT_CALL (1 << 1) +#define ALT_FEATURE_MASK ((1 << ALT_FLAGS_SHIFT) - 1) + +static int alt_feature (unsigned int ft_flags) +{ +return (ft_flags &ALT_FEATURE_MASK ); +} + +static int alt_flags (unsigned int ft_flags) +{ +return (ft_flags >>ALT_FLAGS_SHIFT ); +} +/* * Wrapper around asprintf() to allocate and format a string. * Return the allocated string or NULL on error.
@@ -635,7 +651,12 @@ const char *disas_alt_type_name(struct instruction *insn)*/ char *disas_alt_name (struct alternative *alt) { +char pfx[4 ] = {0 };char *str =NULL ; +const char *name; +int feature; +int flags; +int num;switch (alt->type) {
@@ -649,13 +670,37 @@ char *disas_alt_name(struct alternative *alt)case ALT_TYPE_INSTRUCTIONS :/* -* This is a non-default group alternative. Create a unique -* name using the offset of the first original and alternative -* instructions. +* This is a non-default group alternative. Create a name +* based on the feature and flags associated with this +* alternative. Use either the feature name (it is available) +* or the feature number. And add a prefix to show the flags +* used. +* +* Prefix flags characters: +* +* '!' alternative used when feature not enabled +* '+' direct call alternative +* '?' unknown flag */ -asprintf (&str,"ALTERNATIVE %lx.%lx" , - alt->insn->alt_group->orig_group->first_insn->offset, - alt->insn->alt_group->first_insn->offset); + + feature = alt->insn->alt_group->feature; + num =alt_feature (feature); + flags =alt_flags (feature); + str = pfx; + +if (flags & ~(ALT_FLAG_NOT |ALT_FLAG_DIRECT_CALL )) + *str++ ='?' ; +if (flags &ALT_FLAG_DIRECT_CALL ) + *str++ ='+' ; +if (flags &ALT_FLAG_NOT ) + *str++ ='!' ; + + name =arch_cpu_feature_name (num); +if (!name) + str =strfmt ("%sFEATURE 0x%X" , pfx, num); +else + str =strfmt ("%s%s" , pfx, name); +break ; }
@@ -892,6 +937,7 @@ static void *disas_alt(struct disas_context *dctx,WARN ("%s has more alternatives than supported" , alt_name);break ; } + dalt = &dalts[i]; err =disas_alt_init (dalt, orig_insn, alt);if (err) {
[tip: objtool/core] objtool: Improve naming of group alternatives
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 56967b9a772298ad276858ddab5a655b1d167623 Gitweb: https://git.kernel.org/tip/56967b9a772298ad276858ddab5a655b1d167623 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:37 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 20:40:48 +01:00
objtool: Improve naming of group alternatives
Improve the naming of group alternatives by showing the feature name and flags used by the alternative.
--- tools/objtool/disas.c | 58 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-)
tools/objtool/disas.c +52 -6
@@ -9,6 +9,7 @@#include <objtool/arch.h> #include <objtool/check.h> #include <objtool/disas.h> +#include <objtool/special.h> #include <objtool/warn.h> #include <bfd.h>
@@ -60,6 +61,21 @@ struct disas_alt {#define DALT_GROUP (dalt) (DALT_INSN(dalt)->alt_group)#define DALT_ALTID (dalt) ((dalt)->orig_insn->offset) +#define ALT_FLAGS_SHIFT 16 +#define ALT_FLAG_NOT (1 << 0) +#define ALT_FLAG_DIRECT_CALL (1 << 1) +#define ALT_FEATURE_MASK ((1 << ALT_FLAGS_SHIFT) - 1) + +static int alt_feature (unsigned int ft_flags) +{ +return (ft_flags &ALT_FEATURE_MASK ); +} + +static int alt_flags (unsigned int ft_flags) +{ +return (ft_flags >>ALT_FLAGS_SHIFT ); +} +/* * Wrapper around asprintf() to allocate and format a string. * Return the allocated string or NULL on error.
@@ -635,7 +651,12 @@ const char *disas_alt_type_name(struct instruction *insn)*/ char *disas_alt_name (struct alternative *alt) { +char pfx[4 ] = {0 };char *str =NULL ; +const char *name; +int feature; +int flags; +int num;switch (alt->type) {
@@ -649,13 +670,37 @@ char *disas_alt_name(struct alternative *alt)case ALT_TYPE_INSTRUCTIONS :/* -* This is a non-default group alternative. Create a unique -* name using the offset of the first original and alternative -* instructions. +* This is a non-default group alternative. Create a name +* based on the feature and flags associated with this +* alternative. Use either the feature name (it is available) +* or the feature number. And add a prefix to show the flags +* used. +* +* Prefix flags characters: +* +* '!' alternative used when feature not enabled +* '+' direct call alternative +* '?' unknown flag */ -asprintf (&str,"ALTERNATIVE %lx.%lx" , - alt->insn->alt_group->orig_group->first_insn->offset, - alt->insn->alt_group->first_insn->offset); + + feature = alt->insn->alt_group->feature; + num =alt_feature (feature); + flags =alt_flags (feature); + str = pfx; + +if (flags & ~(ALT_FLAG_NOT |ALT_FLAG_DIRECT_CALL )) + *str++ ='?' ; +if (flags &ALT_FLAG_DIRECT_CALL ) + *str++ ='+' ; +if (flags &ALT_FLAG_NOT ) + *str++ ='!' ; + + name =arch_cpu_feature_name (num); +if (!name) + str =strfmt ("%sFEATURE 0x%X" , pfx, num); +else + str =strfmt ("%s%s" , pfx, name); +break ; }
@@ -892,6 +937,7 @@ static void *disas_alt(struct disas_context *dctx,WARN ("%s has more alternatives than supported" , alt_name);break ; } + dalt = &dalts[i]; err =disas_alt_init (dalt, orig_insn, alt);if (err) {
PATCH v6 28/30 objtool: Compact output for alternatives with one instruction
In reply to Alexandre ChartreWhen disassembling, if an instruction has alternatives which are all made of a single instruction then print each alternative on a single line (instruction + description) so that the output is more compact.
--- tools/objtool/disas.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/objtool/disas.c +22 -0
@@ -863,6 +863,7 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, int alt_count, int insn_count) {struct instruction *orig_insn; +int width;int i, j;int len;
@@ -871,6 +872,27 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL );printf ("%s\n" , alt_name); +/* +* If all alternatives have a single instruction then print each +* alternative on a single line. Otherwise, print alternatives +* one above the other with a clear separation. +*/ + +if (insn_count ==1 ) { + width =0 ; +for (i =0 ; i < alt_count; i++) { +if (dalts[i].width > width) + width = dalts[i].width; + } + +for (i =0 ; i < alt_count; i++) { +printf ("%*s= %-*s (if %s)\n" , len,"" , width, + dalts[i].insn[0 ].str, dalts[i].name); + } + +return ; + } +for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name);for (j =0 ; j < insn_count; j++) {
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Compact output for alternatives with one instruction
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 5b4d0034e8a56695d1c25b18d2ef29e199d8e5fa Gitweb: https://git.kernel.org/tip/5b4d0034e8a56695d1c25b18d2ef29e199d8e5fa Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:38 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:15 +01:00
objtool: Compact output for alternatives with one instruction
When disassembling, if an instruction has alternatives which are all made of a single instruction then print each alternative on a single line (instruction + description) so that the output is more compact.
--- tools/objtool/disas.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/objtool/disas.c +22 -0
@@ -863,6 +863,7 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, int alt_count, int insn_count) {struct instruction *orig_insn; +int width;int i, j;int len;
@@ -871,6 +872,27 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL );printf ("%s\n" , alt_name); +/* +* If all alternatives have a single instruction then print each +* alternative on a single line. Otherwise, print alternatives +* one above the other with a clear separation. +*/ + +if (insn_count ==1 ) { + width =0 ; +for (i =0 ; i < alt_count; i++) { +if (dalts[i].width > width) + width = dalts[i].width; + } + +for (i =0 ; i < alt_count; i++) { +printf ("%*s= %-*s (if %s)\n" , len,"" , width, + dalts[i].insn[0 ].str, dalts[i].name); + } + +return ; + } +for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name);for (j =0 ; j < insn_count; j++) {
[tip: objtool/core] objtool: Compact output for alternatives with one instruction
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 59736d6418ace7537e10aaf9b28b671a100abe45 Gitweb: https://git.kernel.org/tip/59736d6418ace7537e10aaf9b28b671a100abe45 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:38 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:16 +01:00
objtool: Compact output for alternatives with one instruction
When disassembling, if an instruction has alternatives which are all made of a single instruction then print each alternative on a single line (instruction + description) so that the output is more compact.
--- tools/objtool/disas.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/objtool/disas.c +22 -0
@@ -863,6 +863,7 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, int alt_count, int insn_count) {struct instruction *orig_insn; +int width;int i, j;int len;
@@ -871,6 +872,27 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL );printf ("%s\n" , alt_name); +/* +* If all alternatives have a single instruction then print each +* alternative on a single line. Otherwise, print alternatives +* one above the other with a clear separation. +*/ + +if (insn_count ==1 ) { + width =0 ; +for (i =0 ; i < alt_count; i++) { +if (dalts[i].width > width) + width = dalts[i].width; + } + +for (i =0 ; i < alt_count; i++) { +printf ("%*s= %-*s (if %s)\n" , len,"" , width, + dalts[i].insn[0 ].str, dalts[i].name); + } + +return ; + } +for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name);for (j =0 ; j < insn_count; j++) {
[tip: objtool/core] objtool: Compact output for alternatives with one instruction
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 07d70b271a6fc4f546b153081f3685931561be7b Gitweb: https://git.kernel.org/tip/07d70b271a6fc4f546b153081f3685931561be7b Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:38 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 20:40:48 +01:00
objtool: Compact output for alternatives with one instruction
When disassembling, if an instruction has alternatives which are all made of a single instruction then print each alternative on a single line (instruction + description) so that the output is more compact.
--- tools/objtool/disas.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/objtool/disas.c +22 -0
@@ -863,6 +863,7 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, int alt_count, int insn_count) {struct instruction *orig_insn; +int width;int i, j;int len;
@@ -871,6 +872,27 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, len =disas_print (stdout, orig_insn->sec, orig_insn->offset,0 ,NULL );printf ("%s\n" , alt_name); +/* +* If all alternatives have a single instruction then print each +* alternative on a single line. Otherwise, print alternatives +* one above the other with a clear separation. +*/ + +if (insn_count ==1 ) { + width =0 ; +for (i =0 ; i < alt_count; i++) { +if (dalts[i].width > width) + width = dalts[i].width; + } + +for (i =0 ; i < alt_count; i++) { +printf ("%*s= %-*s (if %s)\n" , len,"" , width, + dalts[i].insn[0 ].str, dalts[i].name); + } + +return ; + } +for (i =0 ; i < alt_count; i++) {printf ("%*s= %s\n" , len,"" , dalts[i].name);for (j =0 ; j < insn_count; j++) {
PATCH v6 29/30 objtool: Add wide output for disassembly
In reply to Alexandre ChartreAdd the --wide option to provide a wide output when disassembling. With this option, the disassembly of alternatives is displayed side-by-side instead of one above the other.
--- tools/objtool/builtin-check.c | 1 + tools/objtool/disas.c | 95 ++++++++++++++++++++++++- tools/objtool/include/objtool/builtin.h | 1 + 3 files changed, 96 insertions(+), 1 deletion(-)
tools/objtool/builtin-check.c +1 -0
@@ -107,6 +107,7 @@ static const struct option check_options[] = {OPT_STRING (0 ,"trace" , &opts.trace,"func" ,"trace function validation" ),OPT_BOOLEAN ('v' ,"verbose" , &opts.verbose,"verbose warnings" ),OPT_BOOLEAN (0 ,"werror" , &opts.werror,"return error on warnings" ), +OPT_BOOLEAN (0 ,"wide" , &opts.wide,"wide output" ), OPT_END(), };
tools/objtool/disas.c +94 -1
107 lines not on this page · raw message
tools/objtool/include/objtool/builtin.h +1 -0
@@ -45,6 +45,7 @@ struct opts {const char *trace;bool verbose;bool werror; +bool wide; };extern struct opts opts;
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Add wide output for disassembly
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 9979be81c0c2d4f71f6dc9793fa08db0261beac7 Gitweb: https://git.kernel.org/tip/9979be81c0c2d4f71f6dc9793fa08db0261beac7 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:39 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:15 +01:00
objtool: Add wide output for disassembly
Add the --wide option to provide a wide output when disassembling. With this option, the disassembly of alternatives is displayed side-by-side instead of one above the other.
--- tools/objtool/builtin-check.c | 1 +- tools/objtool/disas.c | 95 +++++++++++++++++++++++- tools/objtool/include/objtool/builtin.h | 1 +- 3 files changed, 96 insertions(+), 1 deletion(-)
tools/objtool/builtin-check.c +1 -0
@@ -107,6 +107,7 @@ static const struct option check_options[] = {OPT_STRING (0 ,"trace" , &opts.trace,"func" ,"trace function validation" ),OPT_BOOLEAN ('v' ,"verbose" , &opts.verbose,"verbose warnings" ),OPT_BOOLEAN (0 ,"werror" , &opts.werror,"return error on warnings" ), +OPT_BOOLEAN (0 ,"wide" , &opts.wide,"wide output" ), OPT_END(), };
tools/objtool/disas.c +94 -1
107 lines not on this page · raw message
tools/objtool/include/objtool/builtin.h +1 -0
@@ -45,6 +45,7 @@ struct opts {const char *trace;bool verbose;bool werror; +bool wide; };extern struct opts opts;
[tip: objtool/core] objtool: Add wide output for disassembly
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 5c2ae4f240fe1b3f6d96f54397d3a14f070c84c3 Gitweb: https://git.kernel.org/tip/5c2ae4f240fe1b3f6d96f54397d3a14f070c84c3 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:39 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:16 +01:00
objtool: Add wide output for disassembly
Add the --wide option to provide a wide output when disassembling. With this option, the disassembly of alternatives is displayed side-by-side instead of one above the other.
--- tools/objtool/builtin-check.c | 1 +- tools/objtool/disas.c | 95 +++++++++++++++++++++++- tools/objtool/include/objtool/builtin.h | 1 +- 3 files changed, 96 insertions(+), 1 deletion(-)
tools/objtool/builtin-check.c +1 -0
@@ -107,6 +107,7 @@ static const struct option check_options[] = {OPT_STRING (0 ,"trace" , &opts.trace,"func" ,"trace function validation" ),OPT_BOOLEAN ('v' ,"verbose" , &opts.verbose,"verbose warnings" ),OPT_BOOLEAN (0 ,"werror" , &opts.werror,"return error on warnings" ), +OPT_BOOLEAN (0 ,"wide" , &opts.wide,"wide output" ), OPT_END(), };
tools/objtool/disas.c +94 -1
107 lines not on this page · raw message
tools/objtool/include/objtool/builtin.h +1 -0
@@ -45,6 +45,7 @@ struct opts {const char *trace;bool verbose;bool werror; +bool wide; };extern struct opts opts;
[tip: objtool/core] objtool: Add wide output for disassembly
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: aff95e0d4e277c53fa274f4a5b6854849f3fc84d Gitweb: https://git.kernel.org/tip/aff95e0d4e277c53fa274f4a5b6854849f3fc84d Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:39 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 20:40:48 +01:00
objtool: Add wide output for disassembly
Add the --wide option to provide a wide output when disassembling. With this option, the disassembly of alternatives is displayed side-by-side instead of one above the other.
--- tools/objtool/builtin-check.c | 1 +- tools/objtool/disas.c | 95 +++++++++++++++++++++++- tools/objtool/include/objtool/builtin.h | 1 +- 3 files changed, 96 insertions(+), 1 deletion(-)
tools/objtool/builtin-check.c +1 -0
@@ -107,6 +107,7 @@ static const struct option check_options[] = {OPT_STRING (0 ,"trace" , &opts.trace,"func" ,"trace function validation" ),OPT_BOOLEAN ('v' ,"verbose" , &opts.verbose,"verbose warnings" ),OPT_BOOLEAN (0 ,"werror" , &opts.werror,"return error on warnings" ), +OPT_BOOLEAN (0 ,"wide" , &opts.wide,"wide output" ), OPT_END(), };
tools/objtool/disas.c +94 -1
107 lines not on this page · raw message
tools/objtool/include/objtool/builtin.h +1 -0
@@ -45,6 +45,7 @@ struct opts {const char *trace;bool verbose;bool werror; +bool wide; };extern struct opts opts;
PATCH v6 30/30 objtool: Trim trailing NOPs in alternative
In reply to Alexandre ChartreWhen disassembling alternatives replace trailing NOPs with a single indication of the number of bytes covered with NOPs.
--- tools/objtool/disas.c | 78 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-)
tools/objtool/disas.c +73 -5
@@ -52,6 +52,7 @@ struct disas_alt {struct {char *str;/* instruction string */ int offset;/* instruction offset */ +int nops;/* number of nops */ } insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ int insn_idx;/* index of the next instruction to print */ };
@@ -727,7 +728,7 @@ static int disas_alt_init(struct disas_alt *dalt, }static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str, -int offset) +int offset,int nops) {int len;
@@ -740,6 +741,7 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str, len =strlen (insn_str); dalt->insn[index].str = insn_str; dalt->insn[index].offset = offset; + dalt->insn[index].nops = nops;if (len > dalt->width) dalt->width = len;
@@ -752,6 +754,7 @@ static int disas_alt_jump(struct disas_alt *dalt)struct instruction *dest_insn;char suffix[2 ] = {0 };char *str; +int nops; orig_insn = dalt->orig_insn; dest_insn = dalt->alt->insn;
@@ -762,14 +765,16 @@ static int disas_alt_jump(struct disas_alt *dalt) str =strfmt ("jmp%-3s %lx <%s+0x%lx>" , suffix, dest_insn->offset, dest_insn->sym->name, dest_insn->offset - dest_insn->sym->offset); + nops =0 ; }else { str =strfmt ("nop%d" , orig_insn->len); + nops = orig_insn->len; }if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 , nops);return 1 ; }
@@ -789,7 +794,7 @@ static int disas_alt_extable(struct disas_alt *dalt)if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 ,0 );return 1 ; }
@@ -805,11 +810,13 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)int offset;char *str;int count; +int nops;int err; file = dctx->file; count =0 ; offset =0 ; + nops =0 ;alt_for_each_insn (file,DALT_GROUP (dalt), insn) {
@@ -818,7 +825,8 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)if (!str)return -1 ; - err =disas_alt_add_insn (dalt, count, str, offset); + nops = insn->type ==INSN_NOP ? insn->len :0 ; + err =disas_alt_add_insn (dalt, count, str, offset, nops);if (err)break ; offset += insn->len;
@@ -834,6 +842,7 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)static int disas_alt_default (struct disas_context *dctx,struct disas_alt *dalt) {char *str; +int nops;int err;if (DALT_GROUP (dalt))
@@ -849,7 +858,8 @@ static int disas_alt_default(struct disas_context *dctx, struct disas_alt *dalt) str =strdup (disas_result (dctx));if (!str)return -1 ; - err =disas_alt_add_insn (dalt,0 , str,0 ); + nops = dalt->orig_insn->type ==INSN_NOP ? dalt->orig_insn->len :0 ; + err =disas_alt_add_insn (dalt,0 , str,0 , nops);if (err)return -1 ;
@@ -995,6 +1005,62 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, } } +/* +* Trim NOPs in alternatives. This replaces trailing NOPs in alternatives +* with a single indication of the number of bytes covered with NOPs. +* +* Return the maximum numbers of instructions in all alternatives after +* trailing NOPs have been trimmed. +*/ +static int disas_alt_trim_nops (struct disas_alt *dalts,int alt_count, +int insn_count) +{ +struct disas_alt *dalt; +int nops_count; +const char *s; +int offset; +int count; +int nops; +int i, j; + + count =0 ; +for (i =0 ; i < alt_count; i++) { + offset =0 ; + nops =0 ; + nops_count =0 ; + dalt = &dalts[i]; +for (j = insn_count -1 ; j >=0 ; j--) { +if (!dalt->insn[j].str || !dalt->insn[j].nops) +break ; + offset = dalt->insn[j].offset; +free (dalt->insn[j].str); + dalt->insn[j].offset =0 ; + dalt->insn[j].str =NULL ; + nops += dalt->insn[j].nops; + nops_count++; + } + +/* +* All trailing NOPs have been removed. If there was a single +* NOP instruction then re-add it. If there was a block of +* NOPs then indicate the number of bytes than the block +* covers (nop*<number-of-bytes>). +*/ +if (nops_count) { + s = nops_count ==1 ?"" :"*" ; + dalt->insn[j +1 ].str =strfmt ("nop%s%d" , s, nops); + dalt->insn[j +1 ].offset = offset; + dalt->insn[j +1 ].nops = nops; + j++; + } + +if (j > count) + count = j; + } + +return count +1 ; +} +/* * Disassemble an alternative. *
@@ -1083,6 +1149,8 @@ static void *disas_alt(struct disas_context *dctx,* Print default and non-default alternatives. */ + insn_count =disas_alt_trim_nops (dalts, alt_count, insn_count); +if (opts.wide)disas_alt_print_wide (alt_name, dalts, alt_count, insn_count);else
Signature · 1 line
2.43.5
[tip: objtool/core] objtool: Trim trailing NOPs in alternative
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 5cabd49ced8a968e200397715477d7c563009d3e Gitweb: https://git.kernel.org/tip/5cabd49ced8a968e200397715477d7c563009d3e Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:40 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 21 Nov 2025 15:30:16 +01:00
objtool: Trim trailing NOPs in alternative
When disassembling alternatives replace trailing NOPs with a single indication of the number of bytes covered with NOPs.
--- tools/objtool/disas.c | 78 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-)
tools/objtool/disas.c +73 -5
@@ -52,6 +52,7 @@ struct disas_alt {struct {char *str;/* instruction string */ int offset;/* instruction offset */ +int nops;/* number of nops */ } insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ int insn_idx;/* index of the next instruction to print */ };
@@ -727,7 +728,7 @@ static int disas_alt_init(struct disas_alt *dalt, }static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str, -int offset) +int offset,int nops) {int len;
@@ -740,6 +741,7 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str, len =strlen (insn_str); dalt->insn[index].str = insn_str; dalt->insn[index].offset = offset; + dalt->insn[index].nops = nops;if (len > dalt->width) dalt->width = len;
@@ -752,6 +754,7 @@ static int disas_alt_jump(struct disas_alt *dalt)struct instruction *dest_insn;char suffix[2 ] = {0 };char *str; +int nops; orig_insn = dalt->orig_insn; dest_insn = dalt->alt->insn;
@@ -762,14 +765,16 @@ static int disas_alt_jump(struct disas_alt *dalt) str =strfmt ("jmp%-3s %lx <%s+0x%lx>" , suffix, dest_insn->offset, dest_insn->sym->name, dest_insn->offset - dest_insn->sym->offset); + nops =0 ; }else { str =strfmt ("nop%d" , orig_insn->len); + nops = orig_insn->len; }if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 , nops);return 1 ; }
@@ -789,7 +794,7 @@ static int disas_alt_extable(struct disas_alt *dalt)if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 ,0 );return 1 ; }
@@ -805,11 +810,13 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)int offset;char *str;int count; +int nops;int err; file = dctx->file; count =0 ; offset =0 ; + nops =0 ;alt_for_each_insn (file,DALT_GROUP (dalt), insn) {
@@ -818,7 +825,8 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)if (!str)return -1 ; - err =disas_alt_add_insn (dalt, count, str, offset); + nops = insn->type ==INSN_NOP ? insn->len :0 ; + err =disas_alt_add_insn (dalt, count, str, offset, nops);if (err)break ; offset += insn->len;
@@ -834,6 +842,7 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)static int disas_alt_default (struct disas_context *dctx,struct disas_alt *dalt) {char *str; +int nops;int err;if (DALT_GROUP (dalt))
@@ -849,7 +858,8 @@ static int disas_alt_default(struct disas_context *dctx, struct disas_alt *dalt) str =strdup (disas_result (dctx));if (!str)return -1 ; - err =disas_alt_add_insn (dalt,0 , str,0 ); + nops = dalt->orig_insn->type ==INSN_NOP ? dalt->orig_insn->len :0 ; + err =disas_alt_add_insn (dalt,0 , str,0 , nops);if (err)return -1 ;
@@ -996,6 +1006,62 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, }/* +* Trim NOPs in alternatives. This replaces trailing NOPs in alternatives +* with a single indication of the number of bytes covered with NOPs. +* +* Return the maximum numbers of instructions in all alternatives after +* trailing NOPs have been trimmed. +*/ +static int disas_alt_trim_nops (struct disas_alt *dalts,int alt_count, +int insn_count) +{ +struct disas_alt *dalt; +int nops_count; +const char *s; +int offset; +int count; +int nops; +int i, j; + + count =0 ; +for (i =0 ; i < alt_count; i++) { + offset =0 ; + nops =0 ; + nops_count =0 ; + dalt = &dalts[i]; +for (j = insn_count -1 ; j >=0 ; j--) { +if (!dalt->insn[j].str || !dalt->insn[j].nops) +break ; + offset = dalt->insn[j].offset; +free (dalt->insn[j].str); + dalt->insn[j].offset =0 ; + dalt->insn[j].str =NULL ; + nops += dalt->insn[j].nops; + nops_count++; + } + +/* +* All trailing NOPs have been removed. If there was a single +* NOP instruction then re-add it. If there was a block of +* NOPs then indicate the number of bytes than the block +* covers (nop*<number-of-bytes>). +*/ +if (nops_count) { + s = nops_count ==1 ?"" :"*" ; + dalt->insn[j +1 ].str =strfmt ("nop%s%d" , s, nops); + dalt->insn[j +1 ].offset = offset; + dalt->insn[j +1 ].nops = nops; + j++; + } + +if (j > count) + count = j; + } + +return count +1 ; +} + +/* * Disassemble an alternative. * * Return the last instruction in the default alternative so that
@@ -1083,6 +1149,8 @@ static void *disas_alt(struct disas_context *dctx,* Print default and non-default alternatives. */ + insn_count =disas_alt_trim_nops (dalts, alt_count, insn_count); +if (opts.wide)disas_alt_print_wide (alt_name, dalts, alt_count, insn_count);else
[tip: objtool/core] objtool: Trim trailing NOPs in alternative
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 81dbe4067f3c923b5771fd8c8d97cdcca62e401d Gitweb: https://git.kernel.org/tip/81dbe4067f3c923b5771fd8c8d97cdcca62e401d Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:40 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 11:35:17 +01:00
objtool: Trim trailing NOPs in alternative
When disassembling alternatives replace trailing NOPs with a single indication of the number of bytes covered with NOPs.
--- tools/objtool/disas.c | 78 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-)
tools/objtool/disas.c +73 -5
@@ -52,6 +52,7 @@ struct disas_alt {struct {char *str;/* instruction string */ int offset;/* instruction offset */ +int nops;/* number of nops */ } insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ int insn_idx;/* index of the next instruction to print */ };
@@ -727,7 +728,7 @@ static int disas_alt_init(struct disas_alt *dalt, }static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str, -int offset) +int offset,int nops) {int len;
@@ -740,6 +741,7 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str, len =strlen (insn_str); dalt->insn[index].str = insn_str; dalt->insn[index].offset = offset; + dalt->insn[index].nops = nops;if (len > dalt->width) dalt->width = len;
@@ -752,6 +754,7 @@ static int disas_alt_jump(struct disas_alt *dalt)struct instruction *dest_insn;char suffix[2 ] = {0 };char *str; +int nops; orig_insn = dalt->orig_insn; dest_insn = dalt->alt->insn;
@@ -762,14 +765,16 @@ static int disas_alt_jump(struct disas_alt *dalt) str =strfmt ("jmp%-3s %lx <%s+0x%lx>" , suffix, dest_insn->offset, dest_insn->sym->name, dest_insn->offset - dest_insn->sym->offset); + nops =0 ; }else { str =strfmt ("nop%d" , orig_insn->len); + nops = orig_insn->len; }if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 , nops);return 1 ; }
@@ -789,7 +794,7 @@ static int disas_alt_extable(struct disas_alt *dalt)if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 ,0 );return 1 ; }
@@ -805,11 +810,13 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)int offset;char *str;int count; +int nops;int err; file = dctx->file; count =0 ; offset =0 ; + nops =0 ;alt_for_each_insn (file,DALT_GROUP (dalt), insn) {
@@ -818,7 +825,8 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)if (!str)return -1 ; - err =disas_alt_add_insn (dalt, count, str, offset); + nops = insn->type ==INSN_NOP ? insn->len :0 ; + err =disas_alt_add_insn (dalt, count, str, offset, nops);if (err)break ; offset += insn->len;
@@ -834,6 +842,7 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)static int disas_alt_default (struct disas_context *dctx,struct disas_alt *dalt) {char *str; +int nops;int err;if (DALT_GROUP (dalt))
@@ -849,7 +858,8 @@ static int disas_alt_default(struct disas_context *dctx, struct disas_alt *dalt) str =strdup (disas_result (dctx));if (!str)return -1 ; - err =disas_alt_add_insn (dalt,0 , str,0 ); + nops = dalt->orig_insn->type ==INSN_NOP ? dalt->orig_insn->len :0 ; + err =disas_alt_add_insn (dalt,0 , str,0 , nops);if (err)return -1 ;
@@ -996,6 +1006,62 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, }/* +* Trim NOPs in alternatives. This replaces trailing NOPs in alternatives +* with a single indication of the number of bytes covered with NOPs. +* +* Return the maximum numbers of instructions in all alternatives after +* trailing NOPs have been trimmed. +*/ +static int disas_alt_trim_nops (struct disas_alt *dalts,int alt_count, +int insn_count) +{ +struct disas_alt *dalt; +int nops_count; +const char *s; +int offset; +int count; +int nops; +int i, j; + + count =0 ; +for (i =0 ; i < alt_count; i++) { + offset =0 ; + nops =0 ; + nops_count =0 ; + dalt = &dalts[i]; +for (j = insn_count -1 ; j >=0 ; j--) { +if (!dalt->insn[j].str || !dalt->insn[j].nops) +break ; + offset = dalt->insn[j].offset; +free (dalt->insn[j].str); + dalt->insn[j].offset =0 ; + dalt->insn[j].str =NULL ; + nops += dalt->insn[j].nops; + nops_count++; + } + +/* +* All trailing NOPs have been removed. If there was a single +* NOP instruction then re-add it. If there was a block of +* NOPs then indicate the number of bytes than the block +* covers (nop*<number-of-bytes>). +*/ +if (nops_count) { + s = nops_count ==1 ?"" :"*" ; + dalt->insn[j +1 ].str =strfmt ("nop%s%d" , s, nops); + dalt->insn[j +1 ].offset = offset; + dalt->insn[j +1 ].nops = nops; + j++; + } + +if (j > count) + count = j; + } + +return count +1 ; +} + +/* * Disassemble an alternative. * * Return the last instruction in the default alternative so that
@@ -1083,6 +1149,8 @@ static void *disas_alt(struct disas_context *dctx,* Print default and non-default alternatives. */ + insn_count =disas_alt_trim_nops (dalts, alt_count, insn_count); +if (opts.wide)disas_alt_print_wide (alt_name, dalts, alt_count, insn_count);else
[tip: objtool/core] objtool: Trim trailing NOPs in alternative
In reply to Alexandre ChartreThe following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: c0a67900dc129825c48d3638480297aa00f39c00 Gitweb: https://git.kernel.org/tip/c0a67900dc129825c48d3638480297aa00f39c00 Author: Alexandre Chartre <[email protected]> AuthorDate: Fri, 21 Nov 2025 10:53:40 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 24 Nov 2025 20:40:48 +01:00
objtool: Trim trailing NOPs in alternative
When disassembling alternatives replace trailing NOPs with a single indication of the number of bytes covered with NOPs.
--- tools/objtool/disas.c | 78 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-)
tools/objtool/disas.c +73 -5
@@ -52,6 +52,7 @@ struct disas_alt {struct {char *str;/* instruction string */ int offset;/* instruction offset */ +int nops;/* number of nops */ } insn[DISAS_ALT_INSN_MAX ];/* alternative instructions */ int insn_idx;/* index of the next instruction to print */ };
@@ -727,7 +728,7 @@ static int disas_alt_init(struct disas_alt *dalt, }static int disas_alt_add_insn (struct disas_alt *dalt,int index,char *insn_str, -int offset) +int offset,int nops) {int len;
@@ -740,6 +741,7 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str, len =strlen (insn_str); dalt->insn[index].str = insn_str; dalt->insn[index].offset = offset; + dalt->insn[index].nops = nops;if (len > dalt->width) dalt->width = len;
@@ -752,6 +754,7 @@ static int disas_alt_jump(struct disas_alt *dalt)struct instruction *dest_insn;char suffix[2 ] = {0 };char *str; +int nops; orig_insn = dalt->orig_insn; dest_insn = dalt->alt->insn;
@@ -762,14 +765,16 @@ static int disas_alt_jump(struct disas_alt *dalt) str =strfmt ("jmp%-3s %lx <%s+0x%lx>" , suffix, dest_insn->offset, dest_insn->sym->name, dest_insn->offset - dest_insn->sym->offset); + nops =0 ; }else { str =strfmt ("nop%d" , orig_insn->len); + nops = orig_insn->len; }if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 , nops);return 1 ; }
@@ -789,7 +794,7 @@ static int disas_alt_extable(struct disas_alt *dalt)if (!str)return -1 ; -disas_alt_add_insn (dalt,0 , str,0 ); +disas_alt_add_insn (dalt,0 , str,0 ,0 );return 1 ; }
@@ -805,11 +810,13 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)int offset;char *str;int count; +int nops;int err; file = dctx->file; count =0 ; offset =0 ; + nops =0 ;alt_for_each_insn (file,DALT_GROUP (dalt), insn) {
@@ -818,7 +825,8 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)if (!str)return -1 ; - err =disas_alt_add_insn (dalt, count, str, offset); + nops = insn->type ==INSN_NOP ? insn->len :0 ; + err =disas_alt_add_insn (dalt, count, str, offset, nops);if (err)break ; offset += insn->len;
@@ -834,6 +842,7 @@ static int disas_alt_group(struct disas_context *dctx, struct disas_alt *dalt)static int disas_alt_default (struct disas_context *dctx,struct disas_alt *dalt) {char *str; +int nops;int err;if (DALT_GROUP (dalt))
@@ -849,7 +858,8 @@ static int disas_alt_default(struct disas_context *dctx, struct disas_alt *dalt) str =strdup (disas_result (dctx));if (!str)return -1 ; - err =disas_alt_add_insn (dalt,0 , str,0 ); + nops = dalt->orig_insn->type ==INSN_NOP ? dalt->orig_insn->len :0 ; + err =disas_alt_add_insn (dalt,0 , str,0 , nops);if (err)return -1 ;
@@ -996,6 +1006,62 @@ static void disas_alt_print_compact(char *alt_name, struct disas_alt *dalts, }/* +* Trim NOPs in alternatives. This replaces trailing NOPs in alternatives +* with a single indication of the number of bytes covered with NOPs. +* +* Return the maximum numbers of instructions in all alternatives after +* trailing NOPs have been trimmed. +*/ +static int disas_alt_trim_nops (struct disas_alt *dalts,int alt_count, +int insn_count) +{ +struct disas_alt *dalt; +int nops_count; +const char *s; +int offset; +int count; +int nops; +int i, j; + + count =0 ; +for (i =0 ; i < alt_count; i++) { + offset =0 ; + nops =0 ; + nops_count =0 ; + dalt = &dalts[i]; +for (j = insn_count -1 ; j >=0 ; j--) { +if (!dalt->insn[j].str || !dalt->insn[j].nops) +break ; + offset = dalt->insn[j].offset; +free (dalt->insn[j].str); + dalt->insn[j].offset =0 ; + dalt->insn[j].str =NULL ; + nops += dalt->insn[j].nops; + nops_count++; + } + +/* +* All trailing NOPs have been removed. If there was a single +* NOP instruction then re-add it. If there was a block of +* NOPs then indicate the number of bytes than the block +* covers (nop*<number-of-bytes>). +*/ +if (nops_count) { + s = nops_count ==1 ?"" :"*" ; + dalt->insn[j +1 ].str =strfmt ("nop%s%d" , s, nops); + dalt->insn[j +1 ].offset = offset; + dalt->insn[j +1 ].nops = nops; + j++; + } + +if (j > count) + count = j; + } + +return count +1 ; +} + +/* * Disassemble an alternative. * * Return the last instruction in the default alternative so that
@@ -1083,6 +1149,8 @@ static void *disas_alt(struct disas_context *dctx,* Print default and non-default alternatives. */ + insn_count =disas_alt_trim_nops (dalts, alt_count, insn_count); +if (opts.wide)disas_alt_print_wide (alt_name, dalts, alt_count, insn_count);else
Peter Zijlstra
maintainerQuoted 24 lines · Alexandre Chartre
Alexandre Chartre (30):
objtool: Move disassembly functions to a separated file
objtool: Create disassembly context
objtool: Disassemble code with libopcodes instead of running objdump tool build: Remove annoying newline in build output
objtool: Print symbol during disassembly
objtool: Store instruction disassembly result
objtool: Disassemble instruction on warning or backtrace
objtool: Extract code to validate instruction from the validate branch
loop
objtool: Record symbol name max length
objtool: Add option to trace function validation
objtool: Trace instruction state changes during function validation
objtool: Improve register reporting during function validation
objtool: Identify the different types of alternatives
objtool: Add functions to better name alternatives
objtool: Improve tracing of alternative instructions
objtool: Do not validate IBT for .return_sites and .call_sites
objtool: Add the --disas=<function-pattern> action
objtool: Preserve alternatives order
objtool: Print headers for alternatives
objtool: Disassemble group alternatives
objtool: Print addresses with alternative instructions
objtool: Disassemble exception table alternatives
Quoted 8 lines
objtool: Disassemble jump table alternatives
objtool: Fix address references in alternatives
objtool: Provide access to feature and flags of group alternatives
objtool: Function to get the name of a CPU feature
objtool: Improve naming of group alternatives
objtool: Compact output for alternatives with one instruction
objtool: Add wide output for disassembly
objtool: Trim trailing NOPs in alternative
I've pushed out these patches to queue/objtool/core, however when building defconfig I get this:
CC /mnt/hirez/usr/src/linux-2.6/defconfig-build/tools/objtool/librbtree.oarch/x86/special.c:10:10: fatal error: lib/cpu-feature-names.c: No such file or directory
10 | #include "lib/cpu-feature-names.c"
| ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
:-(
Quoted 34 lines · Peter Zijlstra
Quoted 24 lines · Alexandre Chartre
Alexandre Chartre (30):
objtool: Move disassembly functions to a separated file
objtool: Create disassembly context
objtool: Disassemble code with libopcodes instead of running objdump tool build: Remove annoying newline in build output
objtool: Print symbol during disassembly
objtool: Store instruction disassembly result
objtool: Disassemble instruction on warning or backtrace
objtool: Extract code to validate instruction from the validate branch
loop
objtool: Record symbol name max length
objtool: Add option to trace function validation
objtool: Trace instruction state changes during function validation
objtool: Improve register reporting during function validation
objtool: Identify the different types of alternatives
objtool: Add functions to better name alternatives
objtool: Improve tracing of alternative instructions
objtool: Do not validate IBT for .return_sites and .call_sites
objtool: Add the --disas=<function-pattern> action
objtool: Preserve alternatives order
objtool: Print headers for alternatives
objtool: Disassemble group alternatives
objtool: Print addresses with alternative instructions
objtool: Disassemble exception table alternativesQuoted 8 lines
objtool: Disassemble jump table alternatives
objtool: Fix address references in alternatives
objtool: Provide access to feature and flags of group alternatives
objtool: Function to get the name of a CPU feature
objtool: Improve naming of group alternatives
objtool: Compact output for alternatives with one instruction
objtool: Add wide output for disassembly
objtool: Trim trailing NOPs in alternative
Quoted 9 lines
I've pushed out these patches to queue/objtool/core, however when building defconfig I get this:
CC
/mnt/hirez/usr/src/linux-2.6/defconfig-build/tools/objtool/librbtree.oarch/x86/special.c:10:10: fatal error:lib/cpu-feature-names.c: No such file or directory10 | #include "lib/cpu-feature-names.c" | ^~~~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
I having a look. The problem is when using the O=<something> option.
Sorry,
alex.
Quoted 39 lines · Alexandre Chartre
Quoted 37 lines · Peter Zijlstra
Quoted 24 lines · Alexandre Chartre
Alexandre Chartre (30):
objtool: Move disassembly functions to a separated file
objtool: Create disassembly context
objtool: Disassemble code with libopcodes instead of running objdump tool build: Remove annoying newline in build output
objtool: Print symbol during disassembly
objtool: Store instruction disassembly result
objtool: Disassemble instruction on warning or backtrace
objtool: Extract code to validate instruction from the validate branch loop
objtool: Record symbol name max length
objtool: Add option to trace function validation
objtool: Trace instruction state changes during function validation
objtool: Improve register reporting during function validation
objtool: Identify the different types of alternatives
objtool: Add functions to better name alternatives
objtool: Improve tracing of alternative instructions
objtool: Do not validate IBT for .return_sites and .call_sites
objtool: Add the --disas=<function-pattern> action
objtool: Preserve alternatives order
objtool: Print headers for alternatives
objtool: Disassemble group alternatives
objtool: Print addresses with alternative instructions
objtool: Disassemble exception table alternativesQuoted 8 lines
objtool: Disassemble jump table alternatives
objtool: Fix address references in alternatives
objtool: Provide access to feature and flags of group alternatives
objtool: Function to get the name of a CPU feature
objtool: Improve naming of group alternatives
objtool: Compact output for alternatives with one instruction
objtool: Add wide output for disassembly
objtool: Trim trailing NOPs in alternativeI've pushed out these patches to queue/objtool/core, however when building defconfig I get this:
Quoted 6 lines
Quoted 6 lines
CC
/mnt/hirez/usr/src/linux-2.6/defconfig-build/tools/objtool/librbtree.oarch/x86/special.c:10:10: fatal error:lib/cpu-feature-names.c: No such file or directory 10 | #include "lib/cpu-feature-names.c"
| ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
See fix below. This should be fold into patch 26 ("objtool: Function to get the name of a CPU feature"). I can resend this patch or the entire patchset if you want.
alex.
----
tools/objtool/arch/x86/Build +3 -1
@@ -11,6 +11,8 @@ $(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) $(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c +CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib + cpu_features = ../arch/x86/include/asm/cpufeatures.h cpu_features_script = ../arch/x86/tools/gen-cpu-feature-names-x86.awk
@@ -19,4 +21,4 @@ $(OUTPUT)arch/x86/lib/cpu-feature-names.c: $(cpu_features_script) $(cpu_features $(OUTPUT)arch/x86/special.o: $(OUTPUT)arch/x86/lib/cpu-feature-names.c -CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib +CFLAGS_special.o := -I$(OUTPUT)arch/x86/lib
tools/objtool/arch/x86/special.c +1 -1
@@ -7,7 +7,7 @@#include <asm/cpufeatures.h> /* cpu feature name array generated from cpufeatures.h */ -#include "lib/cpu-feature-names.c" +#include "cpu-feature-names.c" void arch_handle_alternative (struct special_alt *alt) {
Peter Zijlstra
maintainerQuoted 10 lines · Alexandre Chartre
Quoted 9 lines
Quoted 9 lines
I've pushed out these patches to queue/objtool/core, however when building defconfig I get this:
CC
/mnt/hirez/usr/src/linux-2.6/defconfig-build/tools/objtool/librbtree.oarch/x86/special.c:10:10: fatal error:lib/cpu-feature-names.c: No such file or directory 10 | #include "lib/cpu-feature-names.c"
| ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Quoted 2 lines
See fix below. This should be fold into patch 26 ("objtool: Function to get the name of a CPU feature"). I can resend this patch or the entire patchset if you want.
Folded and pushed out again. Local build succeeds, lets see if the robots like it.
Thanks!
Quoted 2 lines · Alexandre Chartre
Notes:
======
So those examples below look very useful and cool. Can you pls document them so that I can find the breadcrumbs next time and use them?
:-)
Thx.
Quoted 384 lines
Disassembly can show default alternative jumping to .altinstr_aux
-----------------------------------------------------------------
Disassembly can show a default alternative jumping to .altinstr_aux. This happens when the_static_cpu_has()function is used. Its default code jumps to .altinstr_aux where a test sequence is executed (test; jnz; jmp).At runtime, this sequence is not used because the
_static_cpu_has()an alternative with theX86_FEATURE_ALWAYSfeature.debc: perf_get_x86_pmu_capability+0xc jmpq 0xdec1 <.altinstr_aux+0xfc> | NOP5 (X86_FEATURE_HYBRID_CPU) | jmpq 0x61a <perf_get_x86_pmu_capability+0x37> (X86_FEATURE_ALWAYS) # <alternative.debc> dec1: perf_get_x86_pmu_capability+0x11 ud2Disassembly can show alternative jumping to the next instruction
----------------------------------------------------------------The disassembly can show jump tables with an alternative which jumps to the next instruction.
For example:
def9: perf_get_x86_pmu_capability+0x49 NOP2 | jmp defb <perf_get_x86_pmu_capability+0x4b> (JUMP) # <alternative.def9> defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8>This disassembly is correct. These instructions come from:
cap->num_counters_gp = x86_pmu_num_counters(NULL)):which will end up executing this statement:
if (static_branch_unlikely(&perf_is_hybrid) && NULL) <do something>;This statement is optimized to do nothing because the condition is always false. But
static_branch_unlikely()is implemented with a jump table inside an "asm goto" statement, and "asm goto" statements are not optimized.So basically the code is optimized like this:
if (static_branch_unlikely(&perf_is_hybrid)) ;And this translates to the assembly code above.
Examples:
=========Example 1 (--trace option): Trace the validation of the
os_save()function
--------------------------------------------------------------------------$ ./tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --orc --retpoline --rethunk --sls --static-call --uaccess --prefix=16 --link --trace os_xsave -v vmlinux.o os_xsave: validation begin 59be0: os_xsave+0x0 push %r12 - state: cfa=rsp+16 r12=(cfa-16) stack_size=16 59be2: os_xsave+0x2 mov 0x0(%rip),%eax # 0x59be8 <alternatives_patched> 59be8: os_xsave+0x8 push %rbp - state: cfa=rsp+24 rbp=(cfa-24) stack_size=24 59be9: os_xsave+0x9 mov %rdi,%rbp 59bec: os_xsave+0xc push %rbx - state: cfa=rsp+32 rbx=(cfa-32) stack_size=32 59bed: os_xsave+0xd mov 0x8(%rdi),%rbx 59bf1: os_xsave+0x11 mov %rbx,%r12 59bf4: os_xsave+0x14 shr $0x20,%r12 59bf8: os_xsave+0x18 test %eax,%eax 59bfa: os_xsave+0x1a je 0x59c22 <os_xsave+0x42> - jump taken 59c22: os_xsave+0x42 | ud2 59c24: os_xsave+0x44 | jmp 0x59bfc <os_xsave+0x1c> - unconditional jump 59bfc: os_xsave+0x1c | | xor %edx,%edx 59bfe: os_xsave+0x1e | | mov %rbx,%rsi 59c01: os_xsave+0x21 | | mov %rbp,%rdi 59c04: os_xsave+0x24 | | callq 0x59c09 <xfd_validate_state> - call 59c09: os_xsave+0x29 | | mov %ebx,%eax 59c0b: os_xsave+0x2b | | mov %r12d,%edx(quoted diff) +0
-0| | / <alternative.59c0e> X86_FEATURE_XSAVEOPT 1b29: .altinstr_replacement+0x1b29 | | | xsaveopt64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx 59c15: os_xsave+0x35 | | | test %ebx,%ebx 59c17: os_xsave+0x37 | | | jne 0x59c26 <os_xsave+0x46> - jump taken 59c26: os_xsave+0x46 | | | | ud2 59c28: os_xsave+0x48 | | | | pop %rbx - state: cfa=rsp+24 rbx=<undef> stack_size=24 59c29: os_xsave+0x49 | | | | pop %rbp - state: cfa=rsp+16 rbp=<undef> stack_size=16 59c2a: os_xsave+0x4a | | | | pop %r12 - state: cfa=rsp+8 r12=<undef> stack_size=8 59c2c: os_xsave+0x4c | | | | jmpq 0x59c31 <__x86_return_thunk> - return 59c17: os_xsave+0x37 | | | jne 0x59c26 <os_xsave+0x46> - jump not taken 59c19: os_xsave+0x39 | | | pop %rbx - state: cfa=rsp+24 rbx=<undef> stack_size=24 59c1a: os_xsave+0x3a | | | pop %rbp - state: cfa=rsp+16 rbp=<undef> stack_size=16 59c1b: os_xsave+0x3b | | | pop %r12 - state: cfa=rsp+8 r12=<undef> stack_size=8 59c1d: os_xsave+0x3d | | | jmpq 0x59c22 <__x86_return_thunk> - return | | \ <alternative.59c0e> X86_FEATURE_XSAVEOPT| | / <alternative.59c0e> X86_FEATURE_XSAVEC 1b2e: .altinstr_replacement+0x1b2e | | | xsavec64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx - already visited | | \ <alternative.59c0e> X86_FEATURE_XSAVEC | | / <alternative.59c0e> X86_FEATURE_XSAVES 1b33: .altinstr_replacement+0x1b33 | | | xsaves64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx - already visited | | \ <alternative.59c0e> X86_FEATURE_XSAVES | | / <alternative.59c0e> EXCEPTION for instruction at 0x59c0e <os_xsave+0x2e> 59c15: os_xsave+0x35 | | | test %ebx,%ebx - already visited | | \ <alternative.59c0e> EXCEPTION | | / <alternative.59c0e> DEFAULT 59c0e: os_xsave+0x2e | | xsave64 0x40(%rbp) 59c13: os_xsave+0x33 | | xor %ebx,%ebx - already visited 59bfa: os_xsave+0x1a je 0x59c22 <os_xsave+0x42> - jump not taken 59bfc: os_xsave+0x1c xor %edx,%edx - already visited
os_xsave: validation endExample 2 (--disas option): Single Instruction Alternatives
-----------------------------------------------------------Compact Output (default):
Alternatives with single instructions are displayed each on one line, with the instruction and a description of the alternative.
$ ./tools/objtool/objtool --disas=perf_get_x86_pmu_capability --link vmlinux.o perf_get_x86_pmu_capability: deb0: perf_get_x86_pmu_capability+0x0 endbr64 deb4: perf_get_x86_pmu_capability+0x4 callq 0xdeb9 <__fentry__> deb9: perf_get_x86_pmu_capability+0x9 mov %rdi,%rdx debc: perf_get_x86_pmu_capability+0xc <alternative.debc> = jmpq 0xdec1 <.altinstr_aux+0xfc> (if DEFAULT) = jmpq 0x622 <perf_get_x86_pmu_capability+0x37> (if X86_FEATURE_ALWAYS) = nop5 (if X86_FEATURE_HYBRID_CPU) dec1: perf_get_x86_pmu_capability+0x11 ud2 dec3: perf_get_x86_pmu_capability+0x13 movq $0x0,(%rdx) deca: perf_get_x86_pmu_capability+0x1a movq $0x0,0x8(%rdx) ded2: perf_get_x86_pmu_capability+0x22 movq $0x0,0x10(%rdx) deda: perf_get_x86_pmu_capability+0x2a movq $0x0,0x18(%rdx) dee2: perf_get_x86_pmu_capability+0x32 jmpq 0xdee7 <__x86_return_thunk> dee7: perf_get_x86_pmu_capability+0x37 cmpq $0x0,0x0(%rip) # 0xdeef <x86_pmu+0x10> deef: perf_get_x86_pmu_capability+0x3f je 0xdec3 <perf_get_x86_pmu_capability+0x13> def1: perf_get_x86_pmu_capability+0x41 mov 0x0(%rip),%eax # 0xdef7 <x86_pmu+0x8> def7: perf_get_x86_pmu_capability+0x47 mov %eax,(%rdi) def9: perf_get_x86_pmu_capability+0x49 <jump_table.def9> = nop2 (if DEFAULT) = jmp defb <perf_get_x86_pmu_capability+0x4b> (if JUMP) defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8> df02: perf_get_x86_pmu_capability+0x52 <alternative.df02> = callq 0xdf07 <__sw_hweight64> (if DEFAULT) = popcnt %rdi,%rax (if X86_FEATURE_POPCNT) df07: perf_get_x86_pmu_capability+0x57 mov %eax,0x4(%rdx) df0a: perf_get_x86_pmu_capability+0x5a <jump_table.df0a> = nop2 (if DEFAULT) = jmp df0c <perf_get_x86_pmu_capability+0x5c> (if JUMP) df0c: perf_get_x86_pmu_capability+0x5c mov 0x0(%rip),%rdi # 0xdf13 <x86_pmu+0xe0> df13: perf_get_x86_pmu_capability+0x63 <alternative.df13> = callq 0xdf18 <__sw_hweight64> (if DEFAULT) = popcnt %rdi,%rax (if X86_FEATURE_POPCNT) df18: perf_get_x86_pmu_capability+0x68 mov %eax,0x8(%rdx) df1b: perf_get_x86_pmu_capability+0x6b mov 0x0(%rip),%eax # 0xdf21 <x86_pmu+0xf8> df21: perf_get_x86_pmu_capability+0x71 mov %eax,0xc(%rdx) df24: perf_get_x86_pmu_capability+0x74 mov %eax,0x10(%rdx) df27: perf_get_x86_pmu_capability+0x77 mov 0x0(%rip),%rax # 0xdf2e <x86_pmu+0x108> df2e: perf_get_x86_pmu_capability+0x7e mov %eax,0x14(%rdx) df31: perf_get_x86_pmu_capability+0x81 mov 0x0(%rip),%eax # 0xdf37 <x86_pmu+0x110> df37: perf_get_x86_pmu_capability+0x87 mov %eax,0x18(%rdx) df3a: perf_get_x86_pmu_capability+0x8a movzbl 0x0(%rip),%ecx # 0xdf41 <x86_pmu+0x1d1> df41: perf_get_x86_pmu_capability+0x91 movzbl 0x1c(%rdx),%eax df45: perf_get_x86_pmu_capability+0x95 shr %cl df47: perf_get_x86_pmu_capability+0x97 and $0x1,%ecx df4a: perf_get_x86_pmu_capability+0x9a and $0xfffffffe,%eax df4d: perf_get_x86_pmu_capability+0x9d or %ecx,%eax df4f: perf_get_x86_pmu_capability+0x9f mov %al,0x1c(%rdx) df52: perf_get_x86_pmu_capability+0xa2 jmpq 0xdf57 <__x86_return_thunk>Wide Output (--wide option):
Alternatives with single instructions are displayed side-by-side, with an header.
$ ./tools/objtool/objtool --disas=perf_get_x86_pmu_capability --wide --link vmlinux.o perf_get_x86_pmu_capability: deb0: perf_get_x86_pmu_capability+0x0 endbr64 deb4: perf_get_x86_pmu_capability+0x4 callq 0xdeb9 <__fentry__> deb9: perf_get_x86_pmu_capability+0x9 mov %rdi,%rdx debc: perf_get_x86_pmu_capability+0xc | <alternative.debc> | X86_FEATURE_ALWAYS | X86_FEATURE_HYBRID_CPU debc: perf_get_x86_pmu_capability+0xc | jmpq 0xdec1 <.altinstr_aux+0xfc> | jmpq 0x622 <perf_get_x86_pmu_capability+0x37> | nop5 dec1: perf_get_x86_pmu_capability+0x11 ud2 dec3: perf_get_x86_pmu_capability+0x13 movq $0x0,(%rdx) deca: perf_get_x86_pmu_capability+0x1a movq $0x0,0x8(%rdx) ded2: perf_get_x86_pmu_capability+0x22 movq $0x0,0x10(%rdx) deda: perf_get_x86_pmu_capability+0x2a movq $0x0,0x18(%rdx) dee2: perf_get_x86_pmu_capability+0x32 jmpq 0xdee7 <__x86_return_thunk> dee7: perf_get_x86_pmu_capability+0x37 cmpq $0x0,0x0(%rip) # 0xdeef <x86_pmu+0x10> deef: perf_get_x86_pmu_capability+0x3f je 0xdec3 <perf_get_x86_pmu_capability+0x13> def1: perf_get_x86_pmu_capability+0x41 mov 0x0(%rip),%eax # 0xdef7 <x86_pmu+0x8> def7: perf_get_x86_pmu_capability+0x47 mov %eax,(%rdi) def9: perf_get_x86_pmu_capability+0x49 | <jump_table.def9> | JUMP def9: perf_get_x86_pmu_capability+0x49 | nop2 | jmp defb <perf_get_x86_pmu_capability+0x4b> defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8> df02: perf_get_x86_pmu_capability+0x52 | <alternative.df02> | X86_FEATURE_POPCNT df02: perf_get_x86_pmu_capability+0x52 | callq 0xdf07 <__sw_hweight64> | popcnt %rdi,%rax df07: perf_get_x86_pmu_capability+0x57 mov %eax,0x4(%rdx) df0a: perf_get_x86_pmu_capability+0x5a | <jump_table.df0a> | JUMP df0a: perf_get_x86_pmu_capability+0x5a | nop2 | jmp df0c <perf_get_x86_pmu_capability+0x5c> df0c: perf_get_x86_pmu_capability+0x5c mov 0x0(%rip),%rdi # 0xdf13 <x86_pmu+0xe0> df13: perf_get_x86_pmu_capability+0x63 | <alternative.df13> | X86_FEATURE_POPCNT df13: perf_get_x86_pmu_capability+0x63 | callq 0xdf18 <__sw_hweight64> | popcnt %rdi,%rax df18: perf_get_x86_pmu_capability+0x68 mov %eax,0x8(%rdx) df1b: perf_get_x86_pmu_capability+0x6b mov 0x0(%rip),%eax # 0xdf21 <x86_pmu+0xf8> df21: perf_get_x86_pmu_capability+0x71 mov %eax,0xc(%rdx) df24: perf_get_x86_pmu_capability+0x74 mov %eax,0x10(%rdx) df27: perf_get_x86_pmu_capability+0x77 mov 0x0(%rip),%rax # 0xdf2e <x86_pmu+0x108> df2e: perf_get_x86_pmu_capability+0x7e mov %eax,0x14(%rdx) df31: perf_get_x86_pmu_capability+0x81 mov 0x0(%rip),%eax # 0xdf37 <x86_pmu+0x110> df37: perf_get_x86_pmu_capability+0x87 mov %eax,0x18(%rdx) df3a: perf_get_x86_pmu_capability+0x8a movzbl 0x0(%rip),%ecx # 0xdf41 <x86_pmu+0x1d1> df41: perf_get_x86_pmu_capability+0x91 movzbl 0x1c(%rdx),%eax df45: perf_get_x86_pmu_capability+0x95 shr %cl df47: perf_get_x86_pmu_capability+0x97 and $0x1,%ecx df4a: perf_get_x86_pmu_capability+0x9a and $0xfffffffe,%eax df4d: perf_get_x86_pmu_capability+0x9d or %ecx,%eax df4f: perf_get_x86_pmu_capability+0x9f mov %al,0x1c(%rdx) df52: perf_get_x86_pmu_capability+0xa2 jmpq 0xdf57 <__x86_return_thunk>Example 3 (--disas option): Alternatives with multiple instructions
-------------------------------------------------------------------Compact Output (default):
Alternatives with multiple instructions are displayed one above the other, with an header describing the alternative.
$ ./tools/objtool/objtool --disas=__switch_to_asm --link vmlinux.o __switch_to_asm: 82c0: __switch_to_asm+0x0 push %rbp 82c1: __switch_to_asm+0x1 push %rbx 82c2: __switch_to_asm+0x2 push %r12 82c4: __switch_to_asm+0x4 push %r13 82c6: __switch_to_asm+0x6 push %r14 82c8: __switch_to_asm+0x8 push %r15 82ca: __switch_to_asm+0xa mov %rsp,0x1670(%rdi) 82d1: __switch_to_asm+0x11 mov 0x1670(%rsi),%rsp 82d8: __switch_to_asm+0x18 mov 0xad8(%rsi),%rbx 82df: __switch_to_asm+0x1f mov %rbx,%gs:0x0(%rip) # 0x82e7 <__stack_chk_guard> 82e7: __switch_to_asm+0x27 <alternative.82e7> = DEFAULT 82e7: __switch_to_asm+0x27 | jmp 0x8312 <__switch_to_asm+0x52> 82e9: __switch_to_asm+0x29 | nop*41 | = X86_FEATURE_RSB_CTXSW 82e7: __switch_to_asm+0x27 | mov $0x10,%r12 82ee: __switch_to_asm+0x2e | callq 0x82f4 <__switch_to_asm+0x34> 82f3: __switch_to_asm+0x33 | int3 82f4: __switch_to_asm+0x34 | callq 0x82fa <__switch_to_asm+0x3a> 82f9: __switch_to_asm+0x39 | int3 82fa: __switch_to_asm+0x3a | add $0x10,%rsp 82fe: __switch_to_asm+0x3e | dec %r12 8301: __switch_to_asm+0x41 | jne 0x82ee <__switch_to_asm+0x2e> 8303: __switch_to_asm+0x43 | lfence 8306: __switch_to_asm+0x46 | movq $0xffffffffffffffff,%gs:0x0(%rip) # 0x20b <__x86_call_depth> | = !X86_FEATURE_ALWAYS 82e7: __switch_to_asm+0x27 | nop1 82e8: __switch_to_asm+0x28 | nop1 82e9: __switch_to_asm+0x29 | callq 0x82ef <__switch_to_asm+0x2f> 82ee: __switch_to_asm+0x2e | int3 82ef: __switch_to_asm+0x2f | add $0x8,%rsp 82f3: __switch_to_asm+0x33 | lfence | 8312: __switch_to_asm+0x52 pop %r15 8314: __switch_to_asm+0x54 pop %r14 8316: __switch_to_asm+0x56 pop %r13 8318: __switch_to_asm+0x58 pop %r12 831a: __switch_to_asm+0x5a pop %rbx 831b: __switch_to_asm+0x5b pop %rbp 831c: __switch_to_asm+0x5c jmpq 0x8321 <__switch_to>Wide Output (--wide option):
Alternatives with multiple instructions are displayed side-by-side, with an header describing the alternative. The code in the first column is the default code of the alternative.
$ ./tools/objtool/objtool --disas=__switch_to_asm --wide --link vmlinux.o __switch_to_asm: 82c0: __switch_to_asm+0x0 push %rbp 82c1: __switch_to_asm+0x1 push %rbx 82c2: __switch_to_asm+0x2 push %r12 82c4: __switch_to_asm+0x4 push %r13 82c6: __switch_to_asm+0x6 push %r14 82c8: __switch_to_asm+0x8 push %r15 82ca: __switch_to_asm+0xa mov %rsp,0x1670(%rdi) 82d1: __switch_to_asm+0x11 mov 0x1670(%rsi),%rsp 82d8: __switch_to_asm+0x18 mov 0xad8(%rsi),%rbx 82df: __switch_to_asm+0x1f mov %rbx,%gs:0x0(%rip) # 0x82e7 <__stack_chk_guard> 82e7: __switch_to_asm+0x27 | <alternative.82e7> | X86_FEATURE_RSB_CTXSW | !X86_FEATURE_ALWAYS 82e7: __switch_to_asm+0x27 | jmp 0x8312 <__switch_to_asm+0x52> | mov $0x10,%r12 | nop1 82e8: __switch_to_asm+0x28 | | | nop1 82e9: __switch_to_asm+0x29 | nop*41 | | callq 0x82ef <__switch_to_asm+0x2f> 82ee: __switch_to_asm+0x2e | | callq 0x82f4 <__switch_to_asm+0x34> | int3 82ef: __switch_to_asm+0x2f | | | add $0x8,%rsp 82f3: __switch_to_asm+0x33 | | int3 | lfence 82f4: __switch_to_asm+0x34 | | callq 0x82fa <__switch_to_asm+0x3a> | 82f9: __switch_to_asm+0x39 | | int3 | 82fa: __switch_to_asm+0x3a | | add $0x10,%rsp | 82fe: __switch_to_asm+0x3e | | dec %r12 | 8301: __switch_to_asm+0x41 | | jne 0x82ee <__switch_to_asm+0x2e> | 8303: __switch_to_asm+0x43 | | lfence | 8306: __switch_to_asm+0x46 | | movq $0xffffffffffffffff,%gs:0x0(%rip) # 0x20b <__x86_call_depth> | 8312: __switch_to_asm+0x52 pop %r15 8314: __switch_to_asm+0x54 pop %r14 8316: __switch_to_asm+0x56 pop %r13 8318: __switch_to_asm+0x58 pop %r12 831a: __switch_to_asm+0x5a pop %rbx 831b: __switch_to_asm+0x5b pop %rbp 831c: __switch_to_asm+0x5c jmpq 0x8321 <__switch_to>-----
Alexandre Chartre (30):
objtool: Move disassembly functions to a separated file
objtool: Create disassembly context
objtool: Disassemble code with libopcodes instead of running objdump tool build: Remove annoying newline in build output
objtool: Print symbol during disassembly
objtool: Store instruction disassembly result
objtool: Disassemble instruction on warning or backtrace
objtool: Extract code to validate instruction from the validate branch
loop
objtool: Record symbol name max length
objtool: Add option to trace function validation
objtool: Trace instruction state changes during function validation
objtool: Improve register reporting during function validation
objtool: Identify the different types of alternatives
objtool: Add functions to better name alternatives
objtool: Improve tracing of alternative instructions
objtool: Do not validate IBT for .return_sites and .call_sites
objtool: Add the --disas=<function-pattern> action
objtool: Preserve alternatives order
objtool: Print headers for alternatives
objtool: Disassemble group alternatives
objtool: Print addresses with alternative instructions
objtool: Disassemble exception table alternatives
objtool: Disassemble jump table alternatives
objtool: Fix address references in alternatives
objtool: Provide access to feature and flags of group alternatives
objtool: Function to get the name of a CPU feature
objtool: Improve naming of group alternatives
objtool: Compact output for alternatives with one instruction
objtool: Add wide output for disassembly
objtool: Trim trailing NOPs in alternative.../x86/tools/gen-cpu-feature-names-x86.awk | 33 + tools/build/Makefile.feature | 4 +- tools/objtool/.gitignore | 3 + tools/objtool/Build | 3 + tools/objtool/Makefile | 26 + tools/objtool/arch/loongarch/decode.c | 23 + tools/objtool/arch/loongarch/special.c | 5 + tools/objtool/arch/powerpc/decode.c | 24 + tools/objtool/arch/powerpc/special.c | 5 + tools/objtool/arch/x86/Build | 8 + tools/objtool/arch/x86/decode.c | 20 + tools/objtool/arch/x86/special.c | 10 + tools/objtool/builtin-check.c | 4 + tools/objtool/check.c | 648 +++++---- tools/objtool/disas.c | 1245 +++++++++++++++++ tools/objtool/include/objtool/arch.h | 11 + tools/objtool/include/objtool/builtin.h | 3 + tools/objtool/include/objtool/check.h | 35 +- tools/objtool/include/objtool/disas.h | 81 ++ tools/objtool/include/objtool/special.h | 4 +- tools/objtool/include/objtool/trace.h | 141 ++ tools/objtool/include/objtool/warn.h | 17 +- tools/objtool/special.c | 2 + tools/objtool/trace.c | 203 +++ 24 files changed, 2259 insertions(+), 299 deletions(-) create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk create mode 100644 tools/objtool/disas.c create mode 100644 tools/objtool/include/objtool/disas.h create mode 100644 tools/objtool/include/objtool/trace.h create mode 100644 tools/objtool/trace.cSignature · 1 line
2.43.5
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 10 lines · Borislav Petkov
Quoted 2 lines · Alexandre Chartre
Notes:
======So those examples below look very useful and cool. Can you pls document them so that I can find the breadcrumbs next time and use them?
:-)
Thx.
Sure. I will add a doc in tools/objtool/Documentation/ in followup patches.
Rgds,
alex.
Quoted 386 lines
Quoted 385 lines
Disassembly can show default alternative jumping to .altinstr_aux
-----------------------------------------------------------------
Disassembly can show a default alternative jumping to .altinstr_aux. This happens when the_static_cpu_has()function is used. Its default code jumps to .altinstr_aux where a test sequence is executed (test; jnz; jmp).At runtime, this sequence is not used because the
_static_cpu_has()an alternative with theX86_FEATURE_ALWAYSfeature.debc: perf_get_x86_pmu_capability+0xc jmpq 0xdec1 <.altinstr_aux+0xfc> | NOP5 (X86_FEATURE_HYBRID_CPU) | jmpq 0x61a <perf_get_x86_pmu_capability+0x37> (X86_FEATURE_ALWAYS) # <alternative.debc> dec1: perf_get_x86_pmu_capability+0x11 ud2Disassembly can show alternative jumping to the next instruction
----------------------------------------------------------------The disassembly can show jump tables with an alternative which jumps to the next instruction.
For example:
def9: perf_get_x86_pmu_capability+0x49 NOP2 | jmp defb <perf_get_x86_pmu_capability+0x4b> (JUMP) # <alternative.def9> defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8>This disassembly is correct. These instructions come from:
cap->num_counters_gp = x86_pmu_num_counters(NULL)):which will end up executing this statement:
if (static_branch_unlikely(&perf_is_hybrid) && NULL) <do something>;This statement is optimized to do nothing because the condition is always false. But
static_branch_unlikely()is implemented with a jump table inside an "asm goto" statement, and "asm goto" statements are not optimized.So basically the code is optimized like this:
if (static_branch_unlikely(&perf_is_hybrid)) ;And this translates to the assembly code above.
Examples:
=========Example 1 (--trace option): Trace the validation of the
os_save()function
--------------------------------------------------------------------------$ ./tools/objtool/objtool --hacks=jump_label --hacks=noinstr --hacks=skylake --ibt --orc --retpoline --rethunk --sls --static-call --uaccess --prefix=16 --link --trace os_xsave -v vmlinux.o os_xsave: validation begin 59be0: os_xsave+0x0 push %r12 - state: cfa=rsp+16 r12=(cfa-16) stack_size=16 59be2: os_xsave+0x2 mov 0x0(%rip),%eax # 0x59be8 <alternatives_patched> 59be8: os_xsave+0x8 push %rbp - state: cfa=rsp+24 rbp=(cfa-24) stack_size=24 59be9: os_xsave+0x9 mov %rdi,%rbp 59bec: os_xsave+0xc push %rbx - state: cfa=rsp+32 rbx=(cfa-32) stack_size=32 59bed: os_xsave+0xd mov 0x8(%rdi),%rbx 59bf1: os_xsave+0x11 mov %rbx,%r12 59bf4: os_xsave+0x14 shr $0x20,%r12 59bf8: os_xsave+0x18 test %eax,%eax 59bfa: os_xsave+0x1a je 0x59c22 <os_xsave+0x42> - jump taken 59c22: os_xsave+0x42 | ud2 59c24: os_xsave+0x44 | jmp 0x59bfc <os_xsave+0x1c> - unconditional jump 59bfc: os_xsave+0x1c | | xor %edx,%edx 59bfe: os_xsave+0x1e | | mov %rbx,%rsi 59c01: os_xsave+0x21 | | mov %rbp,%rdi 59c04: os_xsave+0x24 | | callq 0x59c09 <xfd_validate_state> - call 59c09: os_xsave+0x29 | | mov %ebx,%eax 59c0b: os_xsave+0x2b | | mov %r12d,%edx | | / <alternative.59c0e> X86_FEATURE_XSAVEOPT 1b29: .altinstr_replacement+0x1b29 | | | xsaveopt64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx 59c15: os_xsave+0x35 | | | test %ebx,%ebx 59c17: os_xsave+0x37 | | | jne 0x59c26 <os_xsave+0x46> - jump taken 59c26: os_xsave+0x46 | | | | ud2 59c28: os_xsave+0x48 | | | | pop %rbx - state: cfa=rsp+24 rbx=<undef> stack_size=24 59c29: os_xsave+0x49 | | | | pop %rbp - state: cfa=rsp+16 rbp=<undef> stack_size=16 59c2a: os_xsave+0x4a | | | | pop %r12 - state: cfa=rsp+8 r12=<undef> stack_size=8 59c2c: os_xsave+0x4c | | | | jmpq 0x59c31 <__x86_return_thunk> - return 59c17: os_xsave+0x37 | | | jne 0x59c26 <os_xsave+0x46> - jump not taken 59c19: os_xsave+0x39 | | | pop %rbx - state: cfa=rsp+24 rbx=<undef> stack_size=24 59c1a: os_xsave+0x3a | | | pop %rbp - state: cfa=rsp+16 rbp=<undef> stack_size=16 59c1b: os_xsave+0x3b | | | pop %r12 - state: cfa=rsp+8 r12=<undef> stack_size=8 59c1d: os_xsave+0x3d | | | jmpq 0x59c22 <__x86_return_thunk> - return | | \ <alternative.59c0e> X86_FEATURE_XSAVEOPT | | / <alternative.59c0e> X86_FEATURE_XSAVEC 1b2e: .altinstr_replacement+0x1b2e | | | xsavec64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx - already visited | | \ <alternative.59c0e> X86_FEATURE_XSAVEC | | / <alternative.59c0e> X86_FEATURE_XSAVES 1b33: .altinstr_replacement+0x1b33 | | | xsaves64 0x40(%rbp) 59c13: os_xsave+0x33 | | | xor %ebx,%ebx - already visited | | \ <alternative.59c0e> X86_FEATURE_XSAVES | | / <alternative.59c0e> EXCEPTION for instruction at 0x59c0e <os_xsave+0x2e> 59c15: os_xsave+0x35 | | | test %ebx,%ebx - already visited | | \ <alternative.59c0e> EXCEPTION | | / <alternative.59c0e> DEFAULT 59c0e: os_xsave+0x2e | | xsave64 0x40(%rbp) 59c13: os_xsave+0x33 | | xor %ebx,%ebx - already visited 59bfa: os_xsave+0x1a je 0x59c22 <os_xsave+0x42> - jump not taken 59bfc: os_xsave+0x1c xor %edx,%edx - already visited os_xsave: validation endExample 2 (--disas option): Single Instruction Alternatives
-----------------------------------------------------------Compact Output (default):
Alternatives with single instructions are displayed each on one line, with the instruction and a description of the alternative.
$ ./tools/objtool/objtool --disas=perf_get_x86_pmu_capability --link vmlinux.o perf_get_x86_pmu_capability: deb0: perf_get_x86_pmu_capability+0x0 endbr64 deb4: perf_get_x86_pmu_capability+0x4 callq 0xdeb9 <__fentry__> deb9: perf_get_x86_pmu_capability+0x9 mov %rdi,%rdx debc: perf_get_x86_pmu_capability+0xc <alternative.debc> = jmpq 0xdec1 <.altinstr_aux+0xfc> (if DEFAULT) = jmpq 0x622 <perf_get_x86_pmu_capability+0x37> (if X86_FEATURE_ALWAYS) = nop5 (if X86_FEATURE_HYBRID_CPU) dec1: perf_get_x86_pmu_capability+0x11 ud2 dec3: perf_get_x86_pmu_capability+0x13 movq $0x0,(%rdx) deca: perf_get_x86_pmu_capability+0x1a movq $0x0,0x8(%rdx) ded2: perf_get_x86_pmu_capability+0x22 movq $0x0,0x10(%rdx) deda: perf_get_x86_pmu_capability+0x2a movq $0x0,0x18(%rdx) dee2: perf_get_x86_pmu_capability+0x32 jmpq 0xdee7 <__x86_return_thunk> dee7: perf_get_x86_pmu_capability+0x37 cmpq $0x0,0x0(%rip) # 0xdeef <x86_pmu+0x10> deef: perf_get_x86_pmu_capability+0x3f je 0xdec3 <perf_get_x86_pmu_capability+0x13> def1: perf_get_x86_pmu_capability+0x41 mov 0x0(%rip),%eax # 0xdef7 <x86_pmu+0x8> def7: perf_get_x86_pmu_capability+0x47 mov %eax,(%rdi) def9: perf_get_x86_pmu_capability+0x49 <jump_table.def9> = nop2 (if DEFAULT) = jmp defb <perf_get_x86_pmu_capability+0x4b> (if JUMP) defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8> df02: perf_get_x86_pmu_capability+0x52 <alternative.df02> = callq 0xdf07 <__sw_hweight64> (if DEFAULT) = popcnt %rdi,%rax (if X86_FEATURE_POPCNT) df07: perf_get_x86_pmu_capability+0x57 mov %eax,0x4(%rdx) df0a: perf_get_x86_pmu_capability+0x5a <jump_table.df0a> = nop2 (if DEFAULT) = jmp df0c <perf_get_x86_pmu_capability+0x5c> (if JUMP) df0c: perf_get_x86_pmu_capability+0x5c mov 0x0(%rip),%rdi # 0xdf13 <x86_pmu+0xe0> df13: perf_get_x86_pmu_capability+0x63 <alternative.df13> = callq 0xdf18 <__sw_hweight64> (if DEFAULT) = popcnt %rdi,%rax (if X86_FEATURE_POPCNT) df18: perf_get_x86_pmu_capability+0x68 mov %eax,0x8(%rdx) df1b: perf_get_x86_pmu_capability+0x6b mov 0x0(%rip),%eax # 0xdf21 <x86_pmu+0xf8> df21: perf_get_x86_pmu_capability+0x71 mov %eax,0xc(%rdx) df24: perf_get_x86_pmu_capability+0x74 mov %eax,0x10(%rdx) df27: perf_get_x86_pmu_capability+0x77 mov 0x0(%rip),%rax # 0xdf2e <x86_pmu+0x108> df2e: perf_get_x86_pmu_capability+0x7e mov %eax,0x14(%rdx) df31: perf_get_x86_pmu_capability+0x81 mov 0x0(%rip),%eax # 0xdf37 <x86_pmu+0x110> df37: perf_get_x86_pmu_capability+0x87 mov %eax,0x18(%rdx) df3a: perf_get_x86_pmu_capability+0x8a movzbl 0x0(%rip),%ecx # 0xdf41 <x86_pmu+0x1d1> df41: perf_get_x86_pmu_capability+0x91 movzbl 0x1c(%rdx),%eax df45: perf_get_x86_pmu_capability+0x95 shr %cl df47: perf_get_x86_pmu_capability+0x97 and $0x1,%ecx df4a: perf_get_x86_pmu_capability+0x9a and $0xfffffffe,%eax df4d: perf_get_x86_pmu_capability+0x9d or %ecx,%eax df4f: perf_get_x86_pmu_capability+0x9f mov %al,0x1c(%rdx) df52: perf_get_x86_pmu_capability+0xa2 jmpq 0xdf57 <__x86_return_thunk>Wide Output (--wide option):
Alternatives with single instructions are displayed side-by-side, with an header.
$ ./tools/objtool/objtool --disas=perf_get_x86_pmu_capability --wide --link vmlinux.o perf_get_x86_pmu_capability: deb0: perf_get_x86_pmu_capability+0x0 endbr64 deb4: perf_get_x86_pmu_capability+0x4 callq 0xdeb9 <__fentry__> deb9: perf_get_x86_pmu_capability+0x9 mov %rdi,%rdx debc: perf_get_x86_pmu_capability+0xc | <alternative.debc> | X86_FEATURE_ALWAYS | X86_FEATURE_HYBRID_CPU debc: perf_get_x86_pmu_capability+0xc | jmpq 0xdec1 <.altinstr_aux+0xfc> | jmpq 0x622 <perf_get_x86_pmu_capability+0x37> | nop5 dec1: perf_get_x86_pmu_capability+0x11 ud2 dec3: perf_get_x86_pmu_capability+0x13 movq $0x0,(%rdx) deca: perf_get_x86_pmu_capability+0x1a movq $0x0,0x8(%rdx) ded2: perf_get_x86_pmu_capability+0x22 movq $0x0,0x10(%rdx) deda: perf_get_x86_pmu_capability+0x2a movq $0x0,0x18(%rdx) dee2: perf_get_x86_pmu_capability+0x32 jmpq 0xdee7 <__x86_return_thunk> dee7: perf_get_x86_pmu_capability+0x37 cmpq $0x0,0x0(%rip) # 0xdeef <x86_pmu+0x10> deef: perf_get_x86_pmu_capability+0x3f je 0xdec3 <perf_get_x86_pmu_capability+0x13> def1: perf_get_x86_pmu_capability+0x41 mov 0x0(%rip),%eax # 0xdef7 <x86_pmu+0x8> def7: perf_get_x86_pmu_capability+0x47 mov %eax,(%rdi) def9: perf_get_x86_pmu_capability+0x49 | <jump_table.def9> | JUMP def9: perf_get_x86_pmu_capability+0x49 | nop2 | jmp defb <perf_get_x86_pmu_capability+0x4b> defb: perf_get_x86_pmu_capability+0x4b mov 0x0(%rip),%rdi # 0xdf02 <x86_pmu+0xd8> df02: perf_get_x86_pmu_capability+0x52 | <alternative.df02> | X86_FEATURE_POPCNT df02: perf_get_x86_pmu_capability+0x52 | callq 0xdf07 <__sw_hweight64> | popcnt %rdi,%rax df07: perf_get_x86_pmu_capability+0x57 mov %eax,0x4(%rdx) df0a: perf_get_x86_pmu_capability+0x5a | <jump_table.df0a> | JUMP df0a: perf_get_x86_pmu_capability+0x5a | nop2 | jmp df0c <perf_get_x86_pmu_capability+0x5c> df0c: perf_get_x86_pmu_capability+0x5c mov 0x0(%rip),%rdi # 0xdf13 <x86_pmu+0xe0> df13: perf_get_x86_pmu_capability+0x63 | <alternative.df13> | X86_FEATURE_POPCNT df13: perf_get_x86_pmu_capability+0x63 | callq 0xdf18 <__sw_hweight64> | popcnt %rdi,%rax df18: perf_get_x86_pmu_capability+0x68 mov %eax,0x8(%rdx) df1b: perf_get_x86_pmu_capability+0x6b mov 0x0(%rip),%eax # 0xdf21 <x86_pmu+0xf8> df21: perf_get_x86_pmu_capability+0x71 mov %eax,0xc(%rdx) df24: perf_get_x86_pmu_capability+0x74 mov %eax,0x10(%rdx) df27: perf_get_x86_pmu_capability+0x77 mov 0x0(%rip),%rax # 0xdf2e <x86_pmu+0x108> df2e: perf_get_x86_pmu_capability+0x7e mov %eax,0x14(%rdx) df31: perf_get_x86_pmu_capability+0x81 mov 0x0(%rip),%eax # 0xdf37 <x86_pmu+0x110> df37: perf_get_x86_pmu_capability+0x87 mov %eax,0x18(%rdx) df3a: perf_get_x86_pmu_capability+0x8a movzbl 0x0(%rip),%ecx # 0xdf41 <x86_pmu+0x1d1> df41: perf_get_x86_pmu_capability+0x91 movzbl 0x1c(%rdx),%eax df45: perf_get_x86_pmu_capability+0x95 shr %cl df47: perf_get_x86_pmu_capability+0x97 and $0x1,%ecx df4a: perf_get_x86_pmu_capability+0x9a and $0xfffffffe,%eax df4d: perf_get_x86_pmu_capability+0x9d or %ecx,%eax df4f: perf_get_x86_pmu_capability+0x9f mov %al,0x1c(%rdx) df52: perf_get_x86_pmu_capability+0xa2 jmpq 0xdf57 <__x86_return_thunk>Example 3 (--disas option): Alternatives with multiple instructions
-------------------------------------------------------------------Compact Output (default):
Alternatives with multiple instructions are displayed one above the other, with an header describing the alternative.
$ ./tools/objtool/objtool --disas=__switch_to_asm --link vmlinux.o __switch_to_asm: 82c0: __switch_to_asm+0x0 push %rbp 82c1: __switch_to_asm+0x1 push %rbx 82c2: __switch_to_asm+0x2 push %r12 82c4: __switch_to_asm+0x4 push %r13 82c6: __switch_to_asm+0x6 push %r14 82c8: __switch_to_asm+0x8 push %r15 82ca: __switch_to_asm+0xa mov %rsp,0x1670(%rdi) 82d1: __switch_to_asm+0x11 mov 0x1670(%rsi),%rsp 82d8: __switch_to_asm+0x18 mov 0xad8(%rsi),%rbx 82df: __switch_to_asm+0x1f mov %rbx,%gs:0x0(%rip) # 0x82e7 <__stack_chk_guard> 82e7: __switch_to_asm+0x27 <alternative.82e7> = DEFAULT 82e7: __switch_to_asm+0x27 | jmp 0x8312 <__switch_to_asm+0x52> 82e9: __switch_to_asm+0x29 | nop*41 | = X86_FEATURE_RSB_CTXSW 82e7: __switch_to_asm+0x27 | mov $0x10,%r12 82ee: __switch_to_asm+0x2e | callq 0x82f4 <__switch_to_asm+0x34> 82f3: __switch_to_asm+0x33 | int3 82f4: __switch_to_asm+0x34 | callq 0x82fa <__switch_to_asm+0x3a> 82f9: __switch_to_asm+0x39 | int3 82fa: __switch_to_asm+0x3a | add $0x10,%rsp 82fe: __switch_to_asm+0x3e | dec %r12 8301: __switch_to_asm+0x41 | jne 0x82ee <__switch_to_asm+0x2e> 8303: __switch_to_asm+0x43 | lfence 8306: __switch_to_asm+0x46 | movq $0xffffffffffffffff,%gs:0x0(%rip) # 0x20b <__x86_call_depth> | = !X86_FEATURE_ALWAYS 82e7: __switch_to_asm+0x27 | nop1 82e8: __switch_to_asm+0x28 | nop1 82e9: __switch_to_asm+0x29 | callq 0x82ef <__switch_to_asm+0x2f> 82ee: __switch_to_asm+0x2e | int3 82ef: __switch_to_asm+0x2f | add $0x8,%rsp 82f3: __switch_to_asm+0x33 | lfence | 8312: __switch_to_asm+0x52 pop %r15 8314: __switch_to_asm+0x54 pop %r14 8316: __switch_to_asm+0x56 pop %r13 8318: __switch_to_asm+0x58 pop %r12 831a: __switch_to_asm+0x5a pop %rbx 831b: __switch_to_asm+0x5b pop %rbp 831c: __switch_to_asm+0x5c jmpq 0x8321 <__switch_to>Wide Output (--wide option):
Alternatives with multiple instructions are displayed side-by-side, with an header describing the alternative. The code in the first column is the default code of the alternative.
$ ./tools/objtool/objtool --disas=__switch_to_asm --wide --link vmlinux.o __switch_to_asm: 82c0: __switch_to_asm+0x0 push %rbp 82c1: __switch_to_asm+0x1 push %rbx 82c2: __switch_to_asm+0x2 push %r12 82c4: __switch_to_asm+0x4 push %r13 82c6: __switch_to_asm+0x6 push %r14 82c8: __switch_to_asm+0x8 push %r15 82ca: __switch_to_asm+0xa mov %rsp,0x1670(%rdi) 82d1: __switch_to_asm+0x11 mov 0x1670(%rsi),%rsp 82d8: __switch_to_asm+0x18 mov 0xad8(%rsi),%rbx 82df: __switch_to_asm+0x1f mov %rbx,%gs:0x0(%rip) # 0x82e7 <__stack_chk_guard> 82e7: __switch_to_asm+0x27 | <alternative.82e7> | X86_FEATURE_RSB_CTXSW | !X86_FEATURE_ALWAYS 82e7: __switch_to_asm+0x27 | jmp 0x8312 <__switch_to_asm+0x52> | mov $0x10,%r12 | nop1 82e8: __switch_to_asm+0x28 | | | nop1 82e9: __switch_to_asm+0x29 | nop*41 | | callq 0x82ef <__switch_to_asm+0x2f> 82ee: __switch_to_asm+0x2e | | callq 0x82f4 <__switch_to_asm+0x34> | int3 82ef: __switch_to_asm+0x2f | | | add $0x8,%rsp 82f3: __switch_to_asm+0x33 | | int3 | lfence 82f4: __switch_to_asm+0x34 | | callq 0x82fa <__switch_to_asm+0x3a> | 82f9: __switch_to_asm+0x39 | | int3 | 82fa: __switch_to_asm+0x3a | | add $0x10,%rsp | 82fe: __switch_to_asm+0x3e | | dec %r12 | 8301: __switch_to_asm+0x41 | | jne 0x82ee <__switch_to_asm+0x2e> | 8303: __switch_to_asm+0x43 | | lfence | 8306: __switch_to_asm+0x46 | | movq $0xffffffffffffffff,%gs:0x0(%rip) # 0x20b <__x86_call_depth> | 8312: __switch_to_asm+0x52 pop %r15 8314: __switch_to_asm+0x54 pop %r14 8316: __switch_to_asm+0x56 pop %r13 8318: __switch_to_asm+0x58 pop %r12 831a: __switch_to_asm+0x5a pop %rbx 831b: __switch_to_asm+0x5b pop %rbp 831c: __switch_to_asm+0x5c jmpq 0x8321 <__switch_to>-----
Alexandre Chartre (30):
objtool: Move disassembly functions to a separated file
objtool: Create disassembly context
objtool: Disassemble code with libopcodes instead of running objdump tool build: Remove annoying newline in build output
objtool: Print symbol during disassembly
objtool: Store instruction disassembly result
objtool: Disassemble instruction on warning or backtrace
objtool: Extract code to validate instruction from the validate branch
loop
objtool: Record symbol name max length
objtool: Add option to trace function validation
objtool: Trace instruction state changes during function validation
objtool: Improve register reporting during function validation
objtool: Identify the different types of alternatives
objtool: Add functions to better name alternatives
objtool: Improve tracing of alternative instructions
objtool: Do not validate IBT for .return_sites and .call_sites
objtool: Add the --disas=<function-pattern> action
objtool: Preserve alternatives order
objtool: Print headers for alternatives
objtool: Disassemble group alternatives
objtool: Print addresses with alternative instructions
objtool: Disassemble exception table alternatives
objtool: Disassemble jump table alternatives
objtool: Fix address references in alternatives
objtool: Provide access to feature and flags of group alternatives
objtool: Function to get the name of a CPU feature
objtool: Improve naming of group alternatives
objtool: Compact output for alternatives with one instruction
objtool: Add wide output for disassembly
objtool: Trim trailing NOPs in alternative.../x86/tools/gen-cpu-feature-names-x86.awk | 33 + tools/build/Makefile.feature | 4 +- tools/objtool/.gitignore | 3 + tools/objtool/Build | 3 + tools/objtool/Makefile | 26 + tools/objtool/arch/loongarch/decode.c | 23 + tools/objtool/arch/loongarch/special.c | 5 + tools/objtool/arch/powerpc/decode.c | 24 + tools/objtool/arch/powerpc/special.c | 5 + tools/objtool/arch/x86/Build | 8 + tools/objtool/arch/x86/decode.c | 20 + tools/objtool/arch/x86/special.c | 10 + tools/objtool/builtin-check.c | 4 + tools/objtool/check.c | 648 +++++---- tools/objtool/disas.c | 1245 +++++++++++++++++ tools/objtool/include/objtool/arch.h | 11 + tools/objtool/include/objtool/builtin.h | 3 + tools/objtool/include/objtool/check.h | 35 +- tools/objtool/include/objtool/disas.h | 81 ++ tools/objtool/include/objtool/special.h | 4 +- tools/objtool/include/objtool/trace.h | 141 ++ tools/objtool/include/objtool/warn.h | 17 +- tools/objtool/special.c | 2 + tools/objtool/trace.c | 203 +++ 24 files changed, 2259 insertions(+), 299 deletions(-)create mode 100644
tools/arch/x86/tools/gen-cpu-feature-names-x86.awkcreate mode 100644tools/objtool/disas.c
create mode 100644tools/objtool/include/objtool/disas.hcreate mode 100644tools/objtool/include/objtool/trace.hcreate mode 100644tools/objtool/trace.cSignature · 1 line
2.43.5
Quoted 1 line · Alexandre Chartre
Sure. I will add a doc in
tools/objtool/Documentation/in followup patches.
Thanks, sounds good.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 7 lines · On Mon, 24 Nov 2025 12:04:25 +0100 Borislav Petkov <[email protected]> wrote:
Quoted 2 lines · Alexandre Chartre
Notes:
======So those examples below look very useful and cool. Can you pls document them so that I can find the breadcrumbs next time and use them?
Yes, it looks like the correct objdump 'spell' will be more useful than 'objdump -dr[w]' for looking at object files.
David