x86: signal_32.c: introduce signr_convert()
PATCH 1/4 x86: signal_32.c: introduce signr_convert()
From: Hiroshi Shimamoto <[email protected]>
Introduce signr_convert().
This function will help unification of setup_rt_frame().
--- arch/x86/kernel/signal_32.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)
arch/x86/kernel/signal_32.c +10 -7
@@ -482,18 +482,21 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,/* * OK, we're invoking a handler: */ +static int signr_convert (int sig) +{ +struct thread_info *info =current_thread_info (); + +if (info->exec_domain && info->exec_domain->signal_invmap && sig <32 ) +return info->exec_domain->signal_invmap[sig]; +return sig; +} +static int setup_rt_frame (int sig,struct k_sigaction *ka,siginfo_t *info,sigset_t *set,struct pt_regs *regs) { +int usig =signr_convert (sig);int ret; -int usig; - - usig =current_thread_info ()->exec_domain - &¤t_thread_info ()->exec_domain->signal_invmap - && sig <32 - ?current_thread_info ()->exec_domain->signal_invmap[sig] - : sig;/* Set up the stack frame */ if (ka->sa.sa_flags &SA_SIGINFO )
Signature · 1 line
1.5.6
PATCH 2/4 x86: signal_64.c: introduce helper function signr_convert()
From: Hiroshi Shimamoto <[email protected]>
This helper function is for unification of setup_rt_frame(). No affect in binary.
--- arch/x86/kernel/signal_64.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
arch/x86/kernel/signal_64.c +8 -2
@@ -281,18 +281,24 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,/* * OK, we're invoking a handler */ +static int signr_convert (int sig) +{ +return sig; +} +static int setup_rt_frame (int sig,struct k_sigaction *ka,siginfo_t *info,sigset_t *set,struct pt_regs *regs) { +int usig =signr_convert (sig);int ret;#ifdef CONFIG_IA32_EMULATION if (test_thread_flag (TIF_IA32 )) {if (ka->sa.sa_flags &SA_SIGINFO ) - ret =ia32_setup_rt_frame (sig, ka, info, set, regs); + ret =ia32_setup_rt_frame (usig, ka, info, set, regs);else - ret =ia32_setup_frame (sig, ka, set, regs); + ret =ia32_setup_frame (usig, ka, set, regs); } else#endif ret =__setup_rt_frame (sig, ka, info, set, regs);
Signature · 1 line
1.5.6
PATCH 3/4 x86: signal: introduce helper macro is_ia32
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
Introduce new macro is_ia32 for unification of setup_rt_frame(). No affect in binary, compiler will optimize.
--- arch/x86/kernel/signal_32.c | 13 +++++++++---- arch/x86/kernel/signal_64.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-)
arch/x86/kernel/signal_32.c +9 -4
@@ -491,6 +491,8 @@ static int signr_convert(int sig)return sig; } +#define is_ia32 1 +static int setup_rt_frame (int sig,struct k_sigaction *ka,siginfo_t *info,sigset_t *set,struct pt_regs *regs)
@@ -499,10 +501,13 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,int ret;/* Set up the stack frame */ -if (ka->sa.sa_flags &SA_SIGINFO ) - ret =__setup_rt_frame (usig, ka, info, set, regs); -else - ret =__setup_frame (usig, ka, set, regs); +if (is_ia32) { +if (ka->sa.sa_flags &SA_SIGINFO ) + ret =__setup_rt_frame (usig, ka, info, set, regs); +else + ret =__setup_frame (usig, ka, set, regs); + }else + ret =__setup_rt_frame (sig, ka, info, set, regs);if (ret) {force_sigsegv (sig, current);
arch/x86/kernel/signal_64.c +9 -4
@@ -286,6 +286,12 @@ static int signr_convert(int sig)return sig; } +#ifdef CONFIG_IA32_EMULATION +#define is_ia32 test_thread_flag(TIF_IA32) +#else +#define is_ia32 0 +#endif +static int setup_rt_frame (int sig,struct k_sigaction *ka,siginfo_t *info,sigset_t *set,struct pt_regs *regs)
@@ -293,15 +299,14 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,int usig =signr_convert (sig);int ret; -#ifdef CONFIG_IA32_EMULATION -if (test_thread_flag (TIF_IA32 )) { +/* Set up the stack frame */ +if (is_ia32) {if (ka->sa.sa_flags &SA_SIGINFO ) ret =ia32_setup_rt_frame (usig, ka, info, set, regs);else ret =ia32_setup_frame (usig, ka, set, regs); }else -#endif - ret =__setup_rt_frame (sig, ka, info, set, regs); + ret =__setup_rt_frame (sig, ka, info, set, regs);if (ret) {force_sigsegv (sig, current);
Signature · 1 line
1.5.6
PATCH 4/4 x86: signal_32.c: introduce macro ia32_setup_frame and ia32_setup_rt_frame
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
Make 32-bit setup_rt_frame() look like 64-bit version for unification.
--- arch/x86/kernel/signal_32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/signal_32.c +4 -2
@@ -492,6 +492,8 @@ static int signr_convert(int sig) }#define is_ia32 1 +#define ia32_setup_frame __setup_frame +#define ia32_setup_rt_frame __setup_rt_frame static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
@@ -503,9 +505,9 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,/* Set up the stack frame */ if (is_ia32) {if (ka->sa.sa_flags &SA_SIGINFO ) - ret =__setup_rt_frame (usig, ka, info, set, regs); + ret =ia32_setup_rt_frame (usig, ka, info, set, regs);else - ret =__setup_frame (usig, ka, set, regs); + ret =ia32_setup_frame (usig, ka, set, regs); }else ret =__setup_rt_frame (sig, ka, info, set, regs);
Signature · 1 line
1.5.6
applied your patches to tip/x86/signal:
4694d23: x86: signal_32.c: introduce macro ia32_setup_frame and ia32_setup_rt_frame 455edbc: x86: signal: introduce helper macro is_ia32
b94fd69: x86: signal_64.c: introduce helper function signr_convert() 8d8c13b: x86: signal_32.c: introduce signr_convert()
thanks! FYI, your other 13 x86 signal code unification commits and other x86-signals enhancements passed testing just fine so far.
Ingo
Quoted 9 lines · Ingo Molnar
applied your patches to tip/x86/signal:
4694d23: x86:
signal_32.c: introduce macroia32_setup_frameandia32_setup_rt_frame455edbc: x86: signal: introduce helper macrois_ia32
b94fd69: x86:signal_64.c: introduce helper functionsignr_convert()8d8c13b: x86:signal_32.c: introducesignr_convert()thanks! FYI, your other 13 x86 signal code unification commits and other x86-signals enhancements passed testing just fine so far.
Hi, Ingo.
Thanks for that information and testing my patches! It's very important to test patches.
thanks,
Hiroshi Shimamoto