The patch titled x86: do_signal: simplify the TS_RESTORE_SIGMASK logic has been added to the -mm tree. Its filename is x86-do_signal-simplify-the-ts_restore_sigmask-logic.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86: do_signal: simplify the TS_RESTORE_SIGMASK logic From: Oleg Nesterov <oleg@xxxxxxxxxx> 1. do_signal() looks at TS_RESTORE_SIGMASK and calculates the mask which should be stored in the signal frame, then it passes "oldset" to the callees, down to setup_rt_frame(). This is ugly, setup_rt_frame() can do this itself and nobody else needs this sigset_t. Move this code into setup_rt_frame. 2. do_signal() also clears TS_RESTORE_SIGMASK if handle_signal() succeeds. We can move this to setup_rt_frame() as well, this avoids the unnecessary checks and makes the logic more clear. 3. use set_current_blocked() instead of sigprocmask(SIG_SETMASK), sigprocmask() should be avoided. Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx> Reviewed-by: Matt Fleming <matt.fleming@xxxxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx>, Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/signal.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff -puN arch/x86/kernel/signal.c~x86-do_signal-simplify-the-ts_restore_sigmask-logic arch/x86/kernel/signal.c --- a/arch/x86/kernel/signal.c~x86-do_signal-simplify-the-ts_restore_sigmask-logic +++ a/arch/x86/kernel/signal.c @@ -653,11 +653,15 @@ int ia32_setup_frame(int sig, struct k_s static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, - sigset_t *set, struct pt_regs *regs) + struct pt_regs *regs) { int usig = signr_convert(sig); + sigset_t *set = ¤t->blocked; int ret; + if (current_thread_info()->status & TS_RESTORE_SIGMASK) + set = ¤t->saved_sigmask; + /* Set up the stack frame */ if (is_ia32) { if (ka->sa.sa_flags & SA_SIGINFO) @@ -672,12 +676,13 @@ setup_rt_frame(int sig, struct k_sigacti return -EFAULT; } + current_thread_info()->status &= ~TS_RESTORE_SIGMASK; return ret; } static int handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, - sigset_t *oldset, struct pt_regs *regs) + struct pt_regs *regs) { sigset_t blocked; int ret; @@ -712,7 +717,7 @@ handle_signal(unsigned long sig, siginfo likely(test_and_clear_thread_flag(TIF_FORCED_TF))) regs->flags &= ~X86_EFLAGS_TF; - ret = setup_rt_frame(sig, ka, info, oldset, regs); + ret = setup_rt_frame(sig, ka, info, regs); if (ret) return ret; @@ -767,7 +772,6 @@ static void do_signal(struct pt_regs *re struct k_sigaction ka; siginfo_t info; int signr; - sigset_t *oldset; /* * We want the common case to go fast, which is why we may in certain @@ -779,23 +783,10 @@ static void do_signal(struct pt_regs *re if (!user_mode(regs)) return; - if (current_thread_info()->status & TS_RESTORE_SIGMASK) - oldset = ¤t->saved_sigmask; - else - oldset = ¤t->blocked; - signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { /* Whee! Actually deliver the signal. */ - if (handle_signal(signr, &info, &ka, oldset, regs) == 0) { - /* - * A signal was successfully delivered; the saved - * sigmask will have been stored in the signal frame, - * and will be restored by sigreturn, so we can simply - * clear the TS_RESTORE_SIGMASK flag. - */ - current_thread_info()->status &= ~TS_RESTORE_SIGMASK; - } + handle_signal(signr, &info, &ka, regs); return; } @@ -823,7 +814,7 @@ static void do_signal(struct pt_regs *re */ if (current_thread_info()->status & TS_RESTORE_SIGMASK) { current_thread_info()->status &= ~TS_RESTORE_SIGMASK; - sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + set_current_blocked(¤t->saved_sigmask); } } _ Patches currently in -mm which might be from oleg@xxxxxxxxxx are xtensa-prevent-arbitrary-read-in-ptrace.patch xtensa-prevent-arbitrary-read-in-ptrace-fix.patch linux-next.patch x86-do_signal-simplify-the-ts_restore_sigmask-logic.patch ptrace-unify-show_regs-prototype.patch ptrace-unify-show_regs-prototype-fix.patch signals-convert-the-ia32_emulation-code-to-use-set_current_blocked.patch signals-convert-the-x86_32-code-to-use-set_current_blocked.patch signals-sys_ssetmask-sys_rt_sigsuspend-should-use-set_current_blocked.patch coredump-use-task-comm-instead-of-unknown.patch do_coredump-fix-the-ispipe-error-check.patch ipc-introduce-shm_rmid_forced-sysctl.patch ipc-introduce-shm_rmid_forced-sysctl-fix-2.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html