Commit 3a402a70 authored by Will Deacon's avatar Will Deacon

arm64: debug: avoid resetting stepping state machine when TIF_SINGLESTEP

When TIF_SINGLESTEP is set for a task, the single-step state machine is
enabled and we must take care not to reset it to the active-not-pending
state if it is already in the active-pending state.

Unfortunately, that's exactly what user_enable_single_step does, by
unconditionally setting the SS bit in the SPSR for the current task.
This causes failures in the GDB testsuite, where GDB ends up missing
expected step traps if the instruction being stepped generates another
trap, e.g. PTRACE_EVENT_FORK from an SVC instruction.

This patch fixes the problem by preserving the current state of the
stepping state machine when TIF_SINGLESTEP is set on the current thread.

Cc: <stable@vger.kernel.org>
Reported-by: default avatarYao Qi <yao.qi@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 675b0563
...@@ -435,7 +435,9 @@ NOKPROBE_SYMBOL(kernel_active_single_step); ...@@ -435,7 +435,9 @@ NOKPROBE_SYMBOL(kernel_active_single_step);
/* ptrace API */ /* ptrace API */
void user_enable_single_step(struct task_struct *task) void user_enable_single_step(struct task_struct *task)
{ {
set_ti_thread_flag(task_thread_info(task), TIF_SINGLESTEP); struct thread_info *ti = task_thread_info(task);
if (!test_and_set_ti_thread_flag(ti, TIF_SINGLESTEP))
set_regs_spsr_ss(task_pt_regs(task)); set_regs_spsr_ss(task_pt_regs(task));
} }
NOKPROBE_SYMBOL(user_enable_single_step); NOKPROBE_SYMBOL(user_enable_single_step);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment