p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

objtool: Assume only ELF functions do sibling calls 

There's an inconsistency in how sibling calls are detected in
non-function asm code, depending on the scope of the object.  If the
target code is external to the object, objtool considers it a sibling
call.  If the target code is internal but not a function, objtool
*doesn't* consider it a sibling call.

This can cause some inconsistencies between per-object and vmlinux.o
validation.

Instead, assume only ELF functions can do sibling calls.  This generally
matches existing reality, and makes sibling call validation consistent
between vmlinux.o and per-object.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/0e9ab6f3628cc7bf3bde7aa6762d54d7df19ad78.1611263461.git.jpoimboe@redhat.com
This commit is contained in:
Josh Poimboeuf 2021-01-21 15:29:22 -06:00
parent 18660698a3
commit ecf11ba4d0
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/objtool/check.c
View File

@ -110,15 +110,20 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file,
static bool is_sibling_call(struct instruction *insn) static bool is_sibling_call(struct instruction *insn)
{ {
/*
* Assume only ELF functions can make sibling calls. This ensures
* sibling call detection consistency between vmlinux.o and individual
* objects.
*/
if (!insn->func)
return false;
/* An indirect jump is either a sibling call or a jump to a table. */ /* An indirect jump is either a sibling call or a jump to a table. */
if (insn->type == INSN_JUMP_DYNAMIC) if (insn->type == INSN_JUMP_DYNAMIC)
return list_empty(&insn->alts); return list_empty(&insn->alts);
if (!is_static_jump(insn))
return false;
/* add_jump_destinations() sets insn->call_dest for sibling calls. */ /* add_jump_destinations() sets insn->call_dest for sibling calls. */
return !!insn->call_dest; return (is_static_jump(insn) && insn->call_dest);
} }
/* /*
@ -794,18 +799,21 @@ static int add_jump_destinations(struct objtool_file *file)
insn->retpoline_safe = true; insn->retpoline_safe = true;
continue; continue;
} else if (reloc->sym->sec->idx) { } else if (insn->func) {
dest_sec = reloc->sym->sec; /* internal or external sibling call (with reloc) */
dest_off = reloc->sym->sym.st_value +
arch_dest_reloc_offset(reloc->addend);
} else {
/* external sibling call */
insn->call_dest = reloc->sym; insn->call_dest = reloc->sym;
if (insn->call_dest->static_call_tramp) { if (insn->call_dest->static_call_tramp) {
list_add_tail(&insn->static_call_node, list_add_tail(&insn->static_call_node,
&file->static_call_list); &file->static_call_list);
} }
continue; continue;
} else if (reloc->sym->sec->idx) {
dest_sec = reloc->sym->sec;
dest_off = reloc->sym->sym.st_value +
arch_dest_reloc_offset(reloc->addend);
} else {
/* non-func asm code jumping to another file */
continue;
} }
insn->jump_dest = find_insn(file, dest_sec, dest_off); insn->jump_dest = find_insn(file, dest_sec, dest_off);
@ -854,7 +862,7 @@ static int add_jump_destinations(struct objtool_file *file)
} else if (insn->jump_dest->func->pfunc != insn->func->pfunc && } else if (insn->jump_dest->func->pfunc != insn->func->pfunc &&
insn->jump_dest->offset == insn->jump_dest->func->offset) { insn->jump_dest->offset == insn->jump_dest->func->offset) {
/* internal sibling call */ /* internal sibling call (without reloc) */
insn->call_dest = insn->jump_dest->func; insn->call_dest = insn->jump_dest->func;
if (insn->call_dest->static_call_tramp) { if (insn->call_dest->static_call_tramp) {
list_add_tail(&insn->static_call_node, list_add_tail(&insn->static_call_node,
@ -2587,7 +2595,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
case INSN_JUMP_CONDITIONAL: case INSN_JUMP_CONDITIONAL:
case INSN_JUMP_UNCONDITIONAL: case INSN_JUMP_UNCONDITIONAL:
if (func && is_sibling_call(insn)) { if (is_sibling_call(insn)) {
ret = validate_sibling_call(insn, &state); ret = validate_sibling_call(insn, &state);
if (ret) if (ret)
return ret; return ret;
@ -2609,7 +2617,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
case INSN_JUMP_DYNAMIC: case INSN_JUMP_DYNAMIC:
case INSN_JUMP_DYNAMIC_CONDITIONAL: case INSN_JUMP_DYNAMIC_CONDITIONAL:
if (func && is_sibling_call(insn)) { if (is_sibling_call(insn)) {
ret = validate_sibling_call(insn, &state); ret = validate_sibling_call(insn, &state);
if (ret) if (ret)
return ret; return ret;