x86_32: make restore_fpu ckecking
PATCH 1/3 x86_32: make restore_fpu ckecking
Like on x86_64, return an error from restore_fpu and kill the task if it fails.
Also rename restore_fpu to restore_fpu_checking which allows ifdefs to be removed in math_state_restore.
--- arch/x86/include/asm/i387.h | 9 ++++----- arch/x86/kernel/traps.c | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-)
arch/x86/include/asm/i387.h +4 -5
@@ -185,12 +185,10 @@ static inline void tolerant_fwait(void) asmvolatile ("fnclex ; fwait" ); } -static inline void restore_fpu (struct task_struct *tsk) +static inline int restore_fpu_checking (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) { -xrstor_checking (&tsk->thread.xstate->xsave); -return ; - } +if (task_thread_info (tsk)->status &TS_XSAVE ) +return xrstor_checking (&tsk->thread.xstate->xsave);/* * The "nop" is needed to make the instructions the same * length.
@@ -200,6 +198,7 @@ static inline void restore_fpu(struct task_struct *tsk)"fxrstor %1" ,X86_FEATURE_FXSR , "m" (tsk->thread.xstate->fxsave)); +return 0 ; }/* We need a safe address that is cheap to find and that is already
arch/x86/kernel/traps.c +1 -4
@@ -839,9 +839,6 @@ asmlinkage void math_state_restore(void) }clts ();/* Allow maths ops (or we recurse) */ -#ifdef CONFIG_X86_32 -restore_fpu (tsk); -#else /* * Paranoid restore. send a SIGSEGV if we fail to restore the state. */
@@ -850,7 +847,7 @@ asmlinkage void math_state_restore(void)force_sig (SIGSEGV , tsk);return ; } -#endif + thread->status |=TS_USEDFPU ;/* So we fnsave on switch_to() */ tsk->fpu_counter++; }
Signature · 1 line
1.6.2
PATCH 2/3 x86: unify restore_fpu_checking
On x86_32, separate f*rstor to an inline function which makes restore_fpu_checking the same on both platforms -> move it outside the ifdefs.
--- arch/x86/include/asm/i387.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
arch/x86/include/asm/i387.h +12 -12
@@ -75,14 +75,6 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)return err; } -static inline int restore_fpu_checking (struct task_struct *tsk) -{ -if (task_thread_info (tsk)->status &TS_XSAVE ) -return xrstor_checking (&tsk->thread.xstate->xsave); -else -return fxrstor_checking (&tsk->thread.xstate->fxsave); -} -/* AMD CPUs don't save/restore FDP/FIP/FOP unless an exception is pending. Clear the x87 state here by setting it to fixed values. The kernel data segment can be sometimes 0 and sometimes
@@ -185,10 +177,9 @@ static inline void tolerant_fwait(void) asmvolatile ("fnclex ; fwait" ); } -static inline int restore_fpu_checking (struct task_struct *tsk) +/* perform fxrstor iff the processor has extended states, otherwise frstor */ +static inline int fxrstor_checking (struct i387_fxsave_struct *fx) { -if (task_thread_info (tsk)->status &TS_XSAVE ) -return xrstor_checking (&tsk->thread.xstate->xsave);/* * The "nop" is needed to make the instructions the same * length.
@@ -197,7 +188,8 @@ static inline int restore_fpu_checking(struct task_struct *tsk)"nop ; frstor %1" ,"fxrstor %1" ,X86_FEATURE_FXSR , - "m" (tsk->thread.xstate->fxsave)); + "m" (*fx)); +return 0 ; }
@@ -261,6 +253,14 @@ end:#endif /* CONFIG_X86_64 */ +static inline int restore_fpu_checking (struct task_struct *tsk) +{ +if (task_thread_info (tsk)->status &TS_XSAVE ) +return xrstor_checking (&tsk->thread.xstate->xsave); +else +return fxrstor_checking (&tsk->thread.xstate->fxsave); +} +/* * Signal frame handlers... */
Signature · 1 line
1.6.2
PATCH 3/3 x86_64: fix wrong comments
The comments which fxrstor_checking and fxsave_uset refer to is now in fxsave. Change the comments appropriately.
--- arch/x86/include/asm/i387.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/i387.h +2 -2
@@ -67,7 +67,7 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)".previous\n" _ASM_EXTABLE(1b ,3b ) : [err] "=r" (err) -#if 0 /* See comment in __save_init_fpu() below. */ +#if 0 /* See comment in fxsave() below. */ : [fx] "r" (fx), "m" (*fx), "0" (0));#else : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0));
@@ -112,7 +112,7 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)".previous\n" _ASM_EXTABLE(1b ,3b ) : [err] "=r" (err), "=m" (*fx) -#if 0 /* See comment in __fxsave_clear() below. */ +#if 0 /* See comment in fxsave() below. */ : [fx] "r" (fx), "0" (0));#else : [fx] "cdaSDb" (fx), "0" (0));
Signature · 1 line
1.6.2
[tip:x86/fpu] x86_64: fix incorrect comments
Commit-ID: 4ecf458492c2d97b3f9d850a5f92d79792e0a7e7 Gitweb: http://git.kernel.org/tip/4ecf458492c2d97b3f9d850a5f92d79792e0a7e7 Author: Jiri Slaby <[email protected]> AuthorDate: Wed, 8 Apr 2009 13:32:00 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 13:46:01 +0200
x86_64: fix incorrect comments
Impact: cleanup
The comments which fxrstor_checking and fxsave_uset refer to is now in fxsave. Change the comments appropriately.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/i387.h +2 -2
@@ -67,7 +67,7 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)".previous\n" _ASM_EXTABLE(1b ,3b ) : [err] "=r" (err) -#if 0 /* See comment in __save_init_fpu() below. */ +#if 0 /* See comment in fxsave() below. */ : [fx] "r" (fx), "m" (*fx), "0" (0));#else : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0));
@@ -112,7 +112,7 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)".previous\n" _ASM_EXTABLE(1b ,3b ) : [err] "=r" (err), "=m" (*fx) -#if 0 /* See comment in __fxsave_clear() below. */ +#if 0 /* See comment in fxsave() below. */ : [fx] "r" (fx), "0" (0));#else : [fx] "cdaSDb" (fx), "0" (0));
[tip:x86/fpu] x86: unify restore_fpu_checking
In reply to Jiri SlabyCommit-ID: 34ba476a01e128aad51e02f9be854584e9ec73cf Gitweb: http://git.kernel.org/tip/34ba476a01e128aad51e02f9be854584e9ec73cf Author: Jiri Slaby <[email protected]> AuthorDate: Wed, 8 Apr 2009 13:31:59 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 13:46:01 +0200
x86: unify restore_fpu_checking
Impact: cleanup
On x86_32, separate f*rstor to an inline function which makes restore_fpu_checking the same on both platforms -> move it outside the ifdefs.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
arch/x86/include/asm/i387.h +12 -12
@@ -75,14 +75,6 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)return err; } -static inline int restore_fpu_checking (struct task_struct *tsk) -{ -if (task_thread_info (tsk)->status &TS_XSAVE ) -return xrstor_checking (&tsk->thread.xstate->xsave); -else -return fxrstor_checking (&tsk->thread.xstate->fxsave); -} -/* AMD CPUs don't save/restore FDP/FIP/FOP unless an exception is pending. Clear the x87 state here by setting it to fixed values. The kernel data segment can be sometimes 0 and sometimes
@@ -185,10 +177,9 @@ static inline void tolerant_fwait(void) asmvolatile ("fnclex ; fwait" ); } -static inline int restore_fpu_checking (struct task_struct *tsk) +/* perform fxrstor iff the processor has extended states, otherwise frstor */ +static inline int fxrstor_checking (struct i387_fxsave_struct *fx) { -if (task_thread_info (tsk)->status &TS_XSAVE ) -return xrstor_checking (&tsk->thread.xstate->xsave);/* * The "nop" is needed to make the instructions the same * length.
@@ -197,7 +188,8 @@ static inline int restore_fpu_checking(struct task_struct *tsk)"nop ; frstor %1" ,"fxrstor %1" ,X86_FEATURE_FXSR , - "m" (tsk->thread.xstate->fxsave)); + "m" (*fx)); +return 0 ; }
@@ -261,6 +253,14 @@ end:#endif /* CONFIG_X86_64 */ +static inline int restore_fpu_checking (struct task_struct *tsk) +{ +if (task_thread_info (tsk)->status &TS_XSAVE ) +return xrstor_checking (&tsk->thread.xstate->xsave); +else +return fxrstor_checking (&tsk->thread.xstate->fxsave); +} +/* * Signal frame handlers... */
[tip:x86/fpu] x86_32: introduce restore_fpu_checking()
In reply to Jiri SlabyCommit-ID: fcb2ac5bdfa3a7a04fb9749b916f64400f4c35a8 Gitweb: http://git.kernel.org/tip/fcb2ac5bdfa3a7a04fb9749b916f64400f4c35a8 Author: Jiri Slaby <[email protected]> AuthorDate: Wed, 8 Apr 2009 13:31:58 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 13:46:00 +0200
x86_32: introduce restore_fpu_checking()
Impact: cleanup, prepare FPU code unificaton
Like on x86_64, return an error from restore_fpu and kill the task if it fails.
Also rename restore_fpu to restore_fpu_checking which allows ifdefs to be removed in math_state_restore().
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 9 ++++----- arch/x86/kernel/traps.c | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-)
arch/x86/include/asm/i387.h +4 -5
@@ -185,12 +185,10 @@ static inline void tolerant_fwait(void) asmvolatile ("fnclex ; fwait" ); } -static inline void restore_fpu (struct task_struct *tsk) +static inline int restore_fpu_checking (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) { -xrstor_checking (&tsk->thread.xstate->xsave); -return ; - } +if (task_thread_info (tsk)->status &TS_XSAVE ) +return xrstor_checking (&tsk->thread.xstate->xsave);/* * The "nop" is needed to make the instructions the same * length.
@@ -200,6 +198,7 @@ static inline void restore_fpu(struct task_struct *tsk)"fxrstor %1" ,X86_FEATURE_FXSR , "m" (tsk->thread.xstate->fxsave)); +return 0 ; }/* We need a safe address that is cheap to find and that is already
arch/x86/kernel/traps.c +1 -4
@@ -839,9 +839,6 @@ asmlinkage void math_state_restore(void) }clts ();/* Allow maths ops (or we recurse) */ -#ifdef CONFIG_X86_32 -restore_fpu (tsk); -#else /* * Paranoid restore. send a SIGSEGV if we fail to restore the state. */
@@ -850,7 +847,7 @@ asmlinkage void math_state_restore(void)force_sig (SIGSEGV , tsk);return ; } -#endif + thread->status |=TS_USEDFPU ;/* So we fnsave on switch_to() */ tsk->fpu_counter++; }