s390/uprobes: architecture backend for uprobes

Signed-off-by: Jan Willeke <willeke@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 5dc7ad9e2fbf..fe99d6b3f185 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -84,7 +84,8 @@ void update_cr_regs(struct task_struct *task)
         new.end = thread->per_user.end;
 
         /* merge TIF_SINGLE_STEP into user specified PER registers. */
-        if (test_tsk_thread_flag(task, TIF_SINGLE_STEP)) {
+        if (test_tsk_thread_flag(task, TIF_SINGLE_STEP) ||
+            test_tsk_thread_flag(task, TIF_UPROBE_SINGLESTEP)) {
                 if (test_tsk_thread_flag(task, TIF_BLOCK_STEP))
                         new.control |= PER_EVENT_BRANCH;
                 else
@@ -93,6 +94,8 @@ void update_cr_regs(struct task_struct *task)
                 new.control |= PER_CONTROL_SUSPENSION;
                 new.control |= PER_EVENT_TRANSACTION_END;
 #endif
+                if (test_tsk_thread_flag(task, TIF_UPROBE_SINGLESTEP))
+                        new.control |= PER_EVENT_IFETCH;
                 new.start = 0;
                 new.end = PSW_ADDR_INSN;
         }