]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
arm64: debug: avoid resetting stepping state machine when TIF_SINGLESTEP
authorWill Deacon <will.deacon@arm.com>
Fri, 26 Aug 2016 10:36:39 +0000 (11:36 +0100)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 20 Oct 2016 13:07:01 +0000 (08:07 -0500)
commit36e7c3578921a757cfa28a6cc158a00271146d98
treef58a69048af606872b3fce20a33444fb44ece558
parentb4936cc1a0a5e5db7ee75bb3c1b482c6eb33be82
arm64: debug: avoid resetting stepping state machine when TIF_SINGLESTEP

BugLink: http://bugs.launchpad.net/bugs/1631468
commit 3a402a709500c5a3faca2111668c33d96555e35a upstream.

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: Yao Qi <yao.qi@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
arch/arm64/kernel/debug-monitors.c