| From df4bf2b9f625e49cce65849da96a6978ff451450 Mon Sep 17 00:00:00 2001 |
| From: Miroslav Benes <mbenes@suse.cz> |
| Date: Sat, 25 Apr 2020 05:03:07 -0500 |
| Subject: [PATCH] x86/unwind/orc: Don't skip the first frame for inactive tasks |
| |
| commit f1d9a2abff66aa8156fbc1493abed468db63ea48 upstream. |
| |
| When unwinding an inactive task, the ORC unwinder skips the first frame |
| by default. If both the 'regs' and 'first_frame' parameters of |
| unwind_start() are NULL, 'state->sp' and 'first_frame' are later |
| initialized to the same value for an inactive task. Given there is a |
| "less than or equal to" comparison used at the end of __unwind_start() |
| for skipping stack frames, the first frame is skipped. |
| |
| Drop the equal part of the comparison and make the behavior equivalent |
| to the frame pointer unwinder. |
| |
| Fixes: ee9f8fce9964 ("x86/unwind: Add the ORC unwinder") |
| Reviewed-by: Miroslav Benes <mbenes@suse.cz> |
| Signed-off-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/7f08db872ab59e807016910acdbe82f744de7065.1587808742.git.jpoimboe@redhat.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c |
| index 332ae6530fa8..4419a16a6fad 100644 |
| --- a/arch/x86/kernel/unwind_orc.c |
| +++ b/arch/x86/kernel/unwind_orc.c |
| @@ -648,7 +648,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task, |
| /* Otherwise, skip ahead to the user-specified starting frame: */ |
| while (!unwind_done(state) && |
| (!on_stack(&state->stack_info, first_frame, sizeof(long)) || |
| - state->sp <= (unsigned long)first_frame)) |
| + state->sp < (unsigned long)first_frame)) |
| unwind_next_frame(state); |
| |
| return; |
| -- |
| 2.7.4 |
| |