ppc32: arch code preempt fixes
PATCH 1/1 ppc32: arch code preempt fixes
Hi !
I figured the best way to stop beeing bothered by users trying to run preempt was to fix it ;) Here's a first batch that close some races we had when testing regs->msr for altivec or FPU enable, then doing the giveup_* function. A preempt in between those would have caused us to save a stale altivec or FPU context.
Please, apply.
Ben.
arch/ppc/kernel/process.c +10 -0
@@ -164,6 +164,7 @@void enable_kernel_altivec (void ) { +preempt_disable ();#ifdef CONFIG_SMP if (current->thread.regs && (current->thread.regs->msr &MSR_VEC ))giveup_altivec (current);
@@ -172,12 +173,14 @@#else giveup_altivec (last_task_used_altivec);#endif /* __SMP __ */ + preempt_enable(); }#endif /* CONFIG_ALTIVEC */ void enable_kernel_fp (void ) { +preempt_disable ();#ifdef CONFIG_SMP if (current->thread.regs && (current->thread.regs->msr &MSR_FP ))giveup_fpu (current);
@@ -186,13 +189,16 @@#else giveup_fpu (last_task_used_math);#endif /* CONFIG_SMP */ +preempt_enable (); }int dump_fpu (struct pt_regs *regs,elf_fpregset_t *fpregs) { +preempt_disable ();if (regs->msr &MSR_FP )giveup_fpu (current); +preempt_enable ();memcpy (fpregs, ¤t->thread.fpr[0 ],sizeof (*fpregs));return 1 ; }
@@ -330,12 +336,14 @@if (regs ==NULL )return ; +preempt_disable ();if (regs->msr &MSR_FP )giveup_fpu (current);#ifdef CONFIG_ALTIVEC if (regs->msr &MSR_VEC )giveup_altivec (current);#endif /* CONFIG_ALTIVEC */ +preempt_enable (); }/*
@@ -480,12 +488,14 @@ error =PTR_ERR (filename);if (IS_ERR (filename)) goto out; +preempt_disable ();if (regs->msr &MSR_FP )giveup_fpu (current);#ifdef CONFIG_ALTIVEC if (regs->msr &MSR_VEC )giveup_altivec (current);#endif /* CONFIG_ALTIVEC */ +preempt_enable (); error =do_execve (filename, (char __user *__user *) a1, (char __user *__user *) a2, regs);if (error ==0 )
arch/ppc/kernel/traps.c +21 -0
@@ -391,14 +391,25 @@return 0 ;if (bug->line &BUG_WARNING_TRAP ) {/* this is a WARN_ON rather than BUG/BUG_ON */ +#ifdef CONFIG_XMON +xmon_printf (KERN_ERR "Badness in %s at %s:%d\n" , + bug->function, bug->file, + bug->line & ~BUG_WARNING_TRAP ); +#endif /* CONFIG_XMON */ printk (KERN_ERR "Badness in %s at %s:%d\n" , bug->function, bug->file, bug->line & ~BUG_WARNING_TRAP );dump_stack ();return 1 ; } +#ifdef CONFIG_XMON +xmon_printf (KERN_CRIT "kernel BUG in %s at %s:%d!\n" , + bug->function, bug->file, bug->line); +xmon (regs); +#endif /* CONFIG_XMON */ printk (KERN_CRIT "kernel BUG in %s at %s:%d!\n" , bug->function, bug->file, bug->line); +return 0 ; }
@@ -427,8 +438,14 @@int code =0 ;u32 fpscr; +/* We must make sure the FP state is consistent with +* our MSR_FP in regs +*/ +preempt_disable ();if (regs->msr &MSR_FP )giveup_fpu (current); +preempt_enable (); + fpscr = current->thread.fpscr; fpscr &= fpscr <<22 ;/* mask summary bits with enables */ if (fpscr &FPSCR_VX )
@@ -592,13 +609,17 @@void AltivecAssistException (struct pt_regs *regs) { +preempt_disable ();if (regs->msr &MSR_VEC )giveup_altivec (current); +preempt_enable (); +/* XXX quick hack for now: set the non-Java bit in the VSCR */ current->thread.vscr.u[3 ] |=0x10000 ; }#endif /* CONFIG_ALTIVEC */ +void __init trap_init (void ) { }
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 11 lines · Linus Torvalds
Quoted 8 lines · Benjamin Herrenschmidt
I figured the best way to stop beeing bothered by users trying to run preempt was to fix it ;)
Here's a first batch that close some races we had when testing
regs->msrfor altivec or FPU enable, then doing the giveup_* function. A preempt in between those would have caused us to save a stale altivec or FPU context.
Quoted 4 lines
Ok, this clashed with Paul work on threaded core-dumps.
I fixed up the clashes by hand, but you should really check the end result for sanity. Ben, Paul?
Will do, thanks. Sorry for the clash, I should have pulled this morning..
Ben.
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/