x86: Unspaghettize do_trap()
PATCH 1/1 x86: Unspaghettize do_trap()
Cleanup the label maze in this function. Having a seperate function to first handle the traps that don't generate a signal makes it easier to convert into more readable conditional paths.
--- arch/x86/kernel/traps.c | 58 ++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 30 deletions(-)
arch/x86/kernel/traps.c +28 -30
@@ -107,30 +107,45 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)dec_preempt_count (); } -static void __kprobes -do_trap (int trapnr,int signr,char *str,struct pt_regs *regs, -long error_code,siginfo_t *info) +static int __kprobes +do_trap_no_signal (struct task_struct *tsk,int trapnr,char *str, +struct pt_regs *regs,long error_code) { -struct task_struct *tsk = current; -#ifdef CONFIG_X86_32 if (regs->flags &X86_VM_MASK ) {/* * traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. */ -if (trapnr <X86_TRAP_UD ) - goto vm86_trap; - goto trap_signal; +if (trapnr <X86_TRAP_UD ) { +if (!handle_vm86_trap ((struct kernel_vm86_regs *) regs, + error_code, trapnr)) +return 0 ; + } + return -1 }#endif +if (!user_mode (regs)) { +if (!fixup_exception (regs)) { + tsk->thread.error_code = error_code; + tsk->thread.trap_nr = trapnr; +die (str, regs, error_code); + } +return 0 ; + } -if (!user_mode (regs)) - goto kernel_trap; +return -1 ; +} -#ifdef CONFIG_X86_32 -trap_signal: -#endif +static void __kprobes +do_trap (int trapnr,int signr,char *str,struct pt_regs *regs, +long error_code,siginfo_t *info) +{ +struct task_struct *tsk = current; + + +if (!do_trap_no_signal (tsk, trapnr, str, regs, error_code)) +return ;/* * We want error_code and trap_nr set for userspace faults and * kernelspace faults which result in die(), but not
@@ -158,23 +173,6 @@ trap_signal:force_sig_info (signr, info, tsk); elseforce_sig (signr ,tsk ); -return ; - -kernel_trap: -if (!fixup_exception (regs)) { - tsk->thread.error_code = error_code; - tsk->thread.trap_nr = trapnr; -die (str, regs, error_code); - } -return ; - -#ifdef CONFIG_X86_32 -vm86_trap: -if (handle_vm86_trap ((struct kernel_vm86_regs *) regs, - error_code, trapnr)) - goto trap_signal; -return ; -#endif }#define DO_ERROR (trapnr, signr, str, name) \
Signature · 1 line
1.7.5.4
arch/x86/kernel/traps.c static inline void preempt_conditional_cli(struct pt_regs *regs) · line 125
Quoted 1 line · Frederic Weisbecker
arch/x86/kernel/traps.c +1
-0+return -1
this bit wasn't very well tested. I applied it with the obvious fix, lets hope it holds up in testing.
Thanks,
Ingo
2012/9/26 Ingo Molnar <[email protected]>:
Quoted 7 lines · Frederic Weisbecker
Quoted 2 lines
+ return -1
this bit wasn't very well tested. I applied it with the obvious fix, lets hope it holds up in testing.
Ouch. Bad indeed. I booted with x86-64 but forgot to try x86-32.
Sorry about that.
Commit-ID: c416ddf5b909736f5b57d348f5de159693e699ad Gitweb: http://git.kernel.org/tip/c416ddf5b909736f5b57d348f5de159693e699ad Author: Frederic Weisbecker <[email protected]> AuthorDate: Tue, 25 Sep 2012 14:51:19 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 26 Sep 2012 13:36:50 +0200
x86: Unspaghettize do_trap()
Cleanup the label maze in this function. Having a seperate function to first handle the traps that don't generate a signal makes it easier to convert into more readable conditional paths.
--- arch/x86/kernel/traps.c | 60 ++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 31 deletions(-)
arch/x86/kernel/traps.c +29 -31
@@ -107,30 +107,45 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)dec_preempt_count (); } -static void __kprobes -do_trap (int trapnr,int signr,char *str,struct pt_regs *regs, -long error_code,siginfo_t *info) +static int __kprobes +do_trap_no_signal (struct task_struct *tsk,int trapnr,char *str, +struct pt_regs *regs,long error_code) { -struct task_struct *tsk = current; -#ifdef CONFIG_X86_32 if (regs->flags &X86_VM_MASK ) {/* -* traps 0, 1, 3, 4, and 5 should be forwarded to vm86. +* Traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. */ -if (trapnr <X86_TRAP_UD ) - goto vm86_trap; - goto trap_signal; +if (trapnr <X86_TRAP_UD ) { +if (!handle_vm86_trap ((struct kernel_vm86_regs *) regs, + error_code, trapnr)) +return 0 ; + } +return -1 ; }#endif +if (!user_mode (regs)) { +if (!fixup_exception (regs)) { + tsk->thread.error_code = error_code; + tsk->thread.trap_nr = trapnr; +die (str, regs, error_code); + } +return 0 ; + } -if (!user_mode (regs)) - goto kernel_trap; +return -1 ; +} -#ifdef CONFIG_X86_32 -trap_signal: -#endif +static void __kprobes +do_trap (int trapnr,int signr,char *str,struct pt_regs *regs, +long error_code,siginfo_t *info) +{ +struct task_struct *tsk = current; + + +if (!do_trap_no_signal (tsk, trapnr, str, regs, error_code)) +return ;/* * We want error_code and trap_nr set for userspace faults and * kernelspace faults which result in die(), but not
@@ -158,23 +173,6 @@ trap_signal:force_sig_info (signr, info, tsk); elseforce_sig (signr ,tsk ); -return ; - -kernel_trap: -if (!fixup_exception (regs)) { - tsk->thread.error_code = error_code; - tsk->thread.trap_nr = trapnr; -die (str, regs, error_code); - } -return ; - -#ifdef CONFIG_X86_32 -vm86_trap: -if (handle_vm86_trap ((struct kernel_vm86_regs *) regs, - error_code, trapnr)) - goto trap_signal; -return ; -#endif }#define DO_ERROR (trapnr, signr, str, name) \