| Date | Thu, 16 Apr 2020 13:47:21 +0200 | From | Peter Zijlstra <> | Subject | [PATCH v5 15/17] objtool: Rearrange validate_section() |
| |
In preparation of further changes, once again break out the loop body. No functional changes intended.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> --- tools/objtool/check.c | 51 ++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-)
--- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2447,12 +2447,37 @@ static bool ignore_unreachable_insn(stru return false; } -static int validate_section(struct objtool_file *file, struct section *sec) +static int validate_symbol(struct objtool_file *file, struct section *sec, + struct symbol *sym, struct insn_state *state) { - struct symbol *func; struct instruction *insn; + int ret; + + if (!sym->len) { + WARN("%s() is missing an ELF size annotation", sym->name); + return 1; + } + + if (sym->pfunc != sym || sym->alias != sym) + return 0; + + insn = find_insn(file, sec, sym->offset); + if (!insn || insn->ignore || insn->visited) + return 0; + + state->uaccess = sym->uaccess_safe; + + ret = validate_branch(file, insn->func, insn, *state); + if (ret && backtrace) + BT_FUNC("<=== (sym)", insn); + return ret; +} + +static int validate_section(struct objtool_file *file, struct section *sec) +{ struct insn_state state; - int ret, warnings = 0; + struct symbol *func; + int warnings = 0; clear_insn_state(&state); @@ -2473,25 +2498,7 @@ static int validate_section(struct objto if (func->type != STT_FUNC) continue; - if (!func->len) { - WARN("%s() is missing an ELF size annotation", - func->name); - warnings++; - } - - if (func->pfunc != func || func->alias != func) - continue; - - insn = find_insn(file, sec, func->offset); - if (!insn || insn->ignore || insn->visited) - continue; - - state.uaccess = func->uaccess_safe; - - ret = validate_branch(file, func, insn, state); - if (ret && backtrace) - BT_FUNC("<=== (func)", insn); - warnings += ret; + warnings += validate_symbol(file, sec, func, &state); } return warnings;
|