From: Peter Zijlstra <peterz@infradead.org>
To: tglx@linutronix.de, jpoimboe@redhat.com
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
peterz@infradead.org, mhiramat@kernel.org, mbenes@suse.cz,
jthierry@redhat.com, alexandre.chartre@oracle.com
Subject: [PATCH v5 15/17] objtool: Rearrange validate_section()
Date: Thu, 16 Apr 2020 13:47:21 +0200 [thread overview]
Message-ID: <20200416115119.405863817@infradead.org> (raw)
In-Reply-To: 20200416114706.625340212@infradead.org
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;
next prev parent reply other threads:[~2020-04-16 11:54 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 11:47 [PATCH v5 00/17] objtool: vmlinux.o and noinstr validation Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 01/17] objtool: Support multiple stack_op per instruction Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 02/17] objtool: Better handle IRET Peter Zijlstra
2020-04-17 11:29 ` Miroslav Benes
2020-04-17 12:25 ` Peter Zijlstra
2020-04-17 12:35 ` Miroslav Benes
2020-04-17 17:37 ` Alexandre Chartre
2020-04-17 18:23 ` Peter Zijlstra
2020-04-17 23:53 ` Andy Lutomirski
2020-04-18 17:18 ` Josh Poimboeuf
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 03/17] objtool: Introduce HINT_RET_OFFSET Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 04/17] x86,ftrace: Fix ftrace_regs_caller() unwind Peter Zijlstra
2020-04-17 19:24 ` Alexandre Chartre
2020-04-22 0:33 ` Steven Rostedt
2020-04-22 9:44 ` Peter Zijlstra
2020-04-22 13:33 ` Steven Rostedt
2020-04-22 20:20 ` Steven Rostedt
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 05/17] x86,ftrace: Use SIZEOF_PTREGS Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 06/17] x86,ftrace: Shrink ftrace_regs_caller() by one byte Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 07/17] objtool: Remove SAVE/RESTORE hints Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 08/17] objtool: Rename struct cfi_state Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 09/17] objtool: Fix !CFI insn_state propagation Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 10/17] objtool: Implement noinstr validation Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 11/17] objtool: Optimize !vmlinux.o again Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 12/17] objtool: Use sec_offset_hash() for insn_hash Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 13/17] kbuild/objtool: Add objtool-vmlinux.o pass Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 14/17] objtool: Avoid iterating !text section symbols Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` Peter Zijlstra [this message]
2020-04-22 22:24 ` [tip: objtool/core] objtool: Rearrange validate_section() tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 16/17] objtool: Add STT_NOTYPE noinstr validation Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2020-04-23 7:49 ` tip-bot2 for Peter Zijlstra
2020-04-16 11:47 ` [PATCH v5 17/17] objtool: Also consider .entry.text as noinstr Peter Zijlstra
2020-04-22 22:24 ` [tip: objtool/core] " tip-bot2 for Thomas Gleixner
2020-04-23 7:49 ` tip-bot2 for Thomas Gleixner
2020-04-17 12:33 ` [PATCH v5 00/17] objtool: vmlinux.o and noinstr validation Miroslav Benes
2020-04-17 20:22 ` Alexandre Chartre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200416115119.405863817@infradead.org \
--to=peterz@infradead.org \
--cc=alexandre.chartre@oracle.com \
--cc=jpoimboe@redhat.com \
--cc=jthierry@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mhiramat@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.