diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2021-03-26 16:12:05 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2021-04-02 12:43:19 +0200 |
| commit | a958c4fea768d2c378c89032ab41d38da2a24422 (patch) | |
| tree | 3f4dc0aa66d5ccc6ca739bbb66d7d335d7a567d3 /tools/objtool | |
| parent | objtool: Handle per arch retpoline naming (diff) | |
| download | linux-dev-a958c4fea768d2c378c89032ab41d38da2a24422.tar.xz linux-dev-a958c4fea768d2c378c89032ab41d38da2a24422.zip | |
objtool: Fix static_call list generation
Currently, objtool generates tail call entries in add_jump_destination()
but waits until validate_branch() to generate the regular call entries.
Move these to add_call_destination() for consistency.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/20210326151259.691529901@infradead.org
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/check.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 6fbc00122d27..8618d03f61ec 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1045,6 +1045,11 @@ static int add_call_destinations(struct objtool_file *file) } else insn->call_dest = reloc->sym; + if (insn->call_dest && insn->call_dest->static_call_tramp) { + list_add_tail(&insn->static_call_node, + &file->static_call_list); + } + /* * Many compilers cannot disable KCOV with a function attribute * so they need a little help, NOP out any KCOV calls from noinstr @@ -1788,6 +1793,9 @@ static int decode_sections(struct objtool_file *file) if (ret) return ret; + /* + * Must be before add_{jump_call}_destination. + */ ret = read_static_call_tramps(file); if (ret) return ret; @@ -1800,6 +1808,10 @@ static int decode_sections(struct objtool_file *file) if (ret) return ret; + /* + * Must be before add_call_destination(); it changes INSN_CALL to + * INSN_JUMP. + */ ret = read_intra_function_calls(file); if (ret) return ret; @@ -2762,11 +2774,6 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, if (dead_end_function(file, insn->call_dest)) return 0; - if (insn->type == INSN_CALL && insn->call_dest->static_call_tramp) { - list_add_tail(&insn->static_call_node, - &file->static_call_list); - } - break; case INSN_JUMP_CONDITIONAL: |