瀏覽代碼

powerpc: Call tracehook_signal_handler() when setting up signal frames

This makes the powerpc signal handling code call tracehook_signal_handler()
after a handler is set up.  This means that using PTRACE_SINGLESTEP to
enter a signal handler will report to ptrace on the first instruction of
the handler, instead of the second.  This is consistent with what x86 and
other machines do, and what users and debuggers want.

BenH: Fixed up the test for the trap value.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Roland McGrath 17 年之前
父節點
當前提交
6558ba2b5c
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      arch/powerpc/kernel/signal.c

+ 7 - 1
arch/powerpc/kernel/signal.c

@@ -9,7 +9,7 @@
  * this archive for more details.
  * this archive for more details.
  */
  */
 
 
-#include <linux/ptrace.h>
+#include <linux/tracehook.h>
 #include <linux/signal.h>
 #include <linux/signal.h>
 #include <asm/uaccess.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/unistd.h>
@@ -177,6 +177,12 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
 		 * its frame, and we can clear the TLF_RESTORE_SIGMASK flag.
 		 * its frame, and we can clear the TLF_RESTORE_SIGMASK flag.
 		 */
 		 */
 		current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
 		current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
+
+		/*
+		 * Let tracing know that we've done the handler setup.
+		 */
+		tracehook_signal_handler(signr, &info, &ka, regs,
+					 test_thread_flag(TIF_SINGLESTEP));
 	}
 	}
 
 
 	return ret;
 	return ret;