Skip to content

Commit

Permalink
x86/unwind/orc: Prevent unwinding before ORC initialization
Browse files Browse the repository at this point in the history
If the unwinder is called before the ORC data has been initialized,
orc_find() returns NULL, and it tries to fall back to using frame
pointers.  This can cause some unexpected warnings during boot.

Move the 'orc_init' check from orc_find() to __unwind_init(), so that it
doesn't even try to unwind from an uninitialized state.

Fixes: ee9f8fc ("x86/unwind: Add the ORC unwinder")
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Jones <dsj@fb.com>
Cc: Jann Horn <jannh@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: https://lore.kernel.org/r/069d1499ad606d85532eb32ce39b2441679667d5.1587808742.git.jpoimboe@redhat.com
  • Loading branch information
jpoimboe authored and Ingo Molnar committed Apr 25, 2020
1 parent f1d9a2a commit 98d0c8e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/x86/kernel/unwind_orc.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,6 @@ static struct orc_entry *orc_find(unsigned long ip)
{
static struct orc_entry *orc;

if (!orc_init)
return NULL;

if (ip == 0)
return &null_orc_entry;

Expand Down Expand Up @@ -591,6 +588,9 @@ EXPORT_SYMBOL_GPL(unwind_next_frame);
void __unwind_start(struct unwind_state *state, struct task_struct *task,
struct pt_regs *regs, unsigned long *first_frame)
{
if (!orc_init)
goto done;

memset(state, 0, sizeof(*state));
state->task = task;

Expand Down

0 comments on commit 98d0c8e

Please sign in to comment.