x86: signal: cosmetic unification of do_signal()
PATCH 1/3 x86: signal: cosmetic unification of do_signal()
From: Hiroshi Shimamoto <[email protected]>
Make do_signal() same.
Thia patch modifies only comments in signal_64.c.
--- arch/x86/kernel/signal_64.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/signal_64.c +4 -2
@@ -410,7 +410,8 @@ static void do_signal(struct pt_regs *regs) signr =get_signal_to_deliver (&info, &ka, regs,NULL );if (signr >0 ) { -/* Re-enable any watchpoints before delivering the +/* +* Re-enable any watchpoints before delivering the * signal to user space. The processor register will * have been cleared if the watchpoint triggered * inside the kernel.
@@ -418,7 +419,7 @@ static void do_signal(struct pt_regs *regs)if (current->thread.debugreg7)set_debugreg (current->thread.debugreg7,7 ); -/* Whee! Actually deliver the signal. */ +/* Whee! Actually deliver the signal. */ if (handle_signal (signr, &info, &ka, oldset, regs) ==0 ) {/* * A signal was successfully delivered; the saved
@@ -441,6 +442,7 @@ static void do_signal(struct pt_regs *regs) regs->ax = regs->orig_ax; regs->ip -=2 ;break ; +case -ERESTART_RESTARTBLOCK : regs->ax = NR_restart_syscall; regs->ip -=2 ;
Signature · 1 line
1.5.6
PATCH 2/3 x86: signal: cosmetic unification of do_notify_resume()
From: Hiroshi Shimamoto <[email protected]>
Make do_notify_resume() same.
--- arch/x86/kernel/signal_32.c | 8 ++++++++ arch/x86/kernel/signal_64.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-)
arch/x86/kernel/signal_32.c +8 -0
@@ -663,6 +663,12 @@ static void do_signal(struct pt_regs *regs)void do_notify_resume (struct pt_regs *regs,void *unused,__u32 thread_info_flags) { +#if defined(CONFIG_X86_64 ) && defined(CONFIG_X86_MCE ) +/* notify userspace of pending MCEs */ +if (thread_info_flags & _TIF_MCE_NOTIFY) +mce_notify_user (); +#endif /* CONFIG_X86_64 && CONFIG_X86_MCE */ +/* deal with pending signal delivery */ if (thread_info_flags & _TIF_SIGPENDING)do_signal (regs);
@@ -672,7 +678,9 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)tracehook_notify_resume (regs); } +#ifdef CONFIG_X86_32 clear_thread_flag (TIF_IRET ); +#endif /* CONFIG_X86_32 */ }void signal_fault (struct pt_regs *regs,void __user *frame,char *where)
arch/x86/kernel/signal_64.c +12 -4
@@ -460,14 +460,18 @@ static void do_signal(struct pt_regs *regs) } } -void do_notify_resume (struct pt_regs *regs,void *unused, -__u32 thread_info_flags) +/* +* notification of userspace execution resumption +* - triggered by the TIF_WORK_MASK flags +*/ +void +do_notify_resume (struct pt_regs *regs,void *unused,__u32 thread_info_flags) { -#ifdef CONFIG_X86_MCE +#if defined(CONFIG_X86_64 ) && defined(CONFIG_X86_MCE )/* notify userspace of pending MCEs */ if (thread_info_flags & _TIF_MCE_NOTIFY)mce_notify_user (); -#endif /* CONFIG_X86_MCE */ +#endif /* CONFIG_X86_64 && CONFIG_X86_MCE */ /* deal with pending signal delivery */ if (thread_info_flags & _TIF_SIGPENDING)
@@ -477,6 +481,10 @@ void do_notify_resume(struct pt_regs *regs, void *unused,clear_thread_flag (TIF_NOTIFY_RESUME );tracehook_notify_resume (regs); } + +#ifdef CONFIG_X86_32 +clear_thread_flag (TIF_IRET ); +#endif /* CONFIG_X86_32 */ }void signal_fault (struct pt_regs *regs,void __user *frame,char *where)
Signature · 1 line
1.5.6
PATCH 3/3 x86: signal: cosmetic unification of handle_signal()
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
Make handle_signal() same.
--- arch/x86/kernel/signal_32.c | 9 +++++++++ arch/x86/kernel/signal_64.c | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-)
arch/x86/kernel/signal_32.c +9 -0
@@ -550,6 +550,15 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,if (ret)return ret; +#ifdef CONFIG_X86_64 +/* +* This has nothing to do with segment registers, +* despite the name. This magic affects uaccess.h +* macros' behavior. Reset it to the normal setting. +*/ +set_fs (USER_DS ); +#endif +/* * Clear the direction flag as per the ABI for function entry. */
arch/x86/kernel/signal_64.c +2 -0
@@ -346,12 +346,14 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,if (ret)return ret; +#ifdef CONFIG_X86_64 /* * This has nothing to do with segment registers, * despite the name. This magic affects uaccess.h * macros' behavior. Reset it to the normal setting. */ set_fs (USER_DS ); +#endif /* * Clear the direction flag as per the ABI for function entry.
Signature · 1 line
1.5.6
Quoted 6 lines · Hiroshi Shimamoto
From: Hiroshi Shimamoto <[email protected]>
Make
do_signal()same.
Thia patch modifies only comments insignal_64.c.Signed-off-by Hiroshi Shimamoto <[email protected]>
applied your patches to tip/x86/signal:
86d3237: x86: signal: cosmetic unification of handle_signal()
ee847c5: x86: signal: cosmetic unification of do_notify_resume() 5fd9333: x86: signal: cosmetic unification of do_signal()
thanks!
Ingo