x86 FPU API
v3 cover x86 FPU API
Currently all fpu accessors are wedded to task_struct. However kvm also uses the fpu in a different context. Introduce an FPU API, and replace the current uses with the new API.
While this patchset is oriented towards deeper changes, as a first step it simlifies xsave for kvm.
v3:
use u8 instead of bool in asm to avoid bad code generation on older gccs.
v2:
eliminate useless padding in use_xsave() by using a larger instruction
Avi Kivity (2):
x86: eliminate TS_XSAVE
x86: Introduce 'struct fpu' and related API
arch/x86/include/asm/i387.h | 135 +++++++++++++++++++++++++++--------- arch/x86/include/asm/processor.h | 6 ++- arch/x86/include/asm/thread_info.h | 1 - arch/x86/include/asm/xsave.h | 7 +- arch/x86/kernel/cpu/common.c | 5 +- arch/x86/kernel/i387.c | 107 ++++++++++++++--------------- arch/x86/kernel/process.c | 20 +++--- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/xsave.c | 8 +- arch/x86/math-emu/fpu_aux.c | 6 +- 11 files changed, 181 insertions(+), 118 deletions(-)
PATCH v3 1/2 x86: eliminate TS_XSAVE
The fpu code currently uses current->thread_info->status & TS_XSAVE as a way to distinguish between XSAVE capable processors and older processors. The decision is not really task specific; instead we use the task status to avoid a global memory reference - the value should be the same across all threads.
Eliminate this tie-in into the task structure by using an alternative instruction keyed off the XSAVE cpu feature; this results in shorter and faster code, without introducing a global memory reference.
--- arch/x86/include/asm/i387.h | 20 ++++++++++++++++---- arch/x86/include/asm/thread_info.h | 1 - arch/x86/kernel/cpu/common.c | 5 +---- arch/x86/kernel/i387.c | 5 +---- arch/x86/kernel/xsave.c | 6 +++--- 5 files changed, 21 insertions(+), 16 deletions(-)
arch/x86/include/asm/i387.h +16 -4
@@ -56,6 +56,18 @@ extern int restore_i387_xstate_ia32(void __user *buf);#define X87_FSW_ES (1 << 7)/* Exception Summary */ +static inline bool use_xsave (void ) +{ +u8 has_xsave; + +alternative_io ("mov $0, %0" , +"mov $1, %0" , +X86_FEATURE_XSAVE , +"=g" (has_xsave)); + +return has_xsave; +} +#ifdef CONFIG_X86_64 /* Ignore delayed exceptions from user space */
@@ -99,7 +111,7 @@ static inline void clear_fpu_state(struct task_struct *tsk)/* * xsave header may indicate the init state of the FP. */ -if ((task_thread_info (tsk)->status &TS_XSAVE ) && +if (use_xsave () && !(xstate->xsave_hdr.xstate_bv &XSTATE_FP ))return ;
@@ -164,7 +176,7 @@ static inline void fxsave(struct task_struct *tsk)static inline void __save_init_fpu (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ())xsave (tsk);else fxsave (tsk);
@@ -218,7 +230,7 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)*/ static inline void __save_init_fpu (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) { +if (use_xsave ()) {struct xsave_struct *xstate = &tsk->thread.xstate->xsave;struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave;
@@ -266,7 +278,7 @@ end:static inline int restore_fpu_checking (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ())return xrstor_checking (&tsk->thread.xstate->xsave);else return fxrstor_checking (&tsk->thread.xstate->fxsave);
arch/x86/include/asm/thread_info.h +0 -1
@@ -242,7 +242,6 @@ static inline struct thread_info *current_thread_info(void)#define TS_POLLING 0x0004/* true if in idle loop and not sleeping */ #define TS_RESTORE_SIGMASK 0x0008/* restore signal mask in do_signal() */ -#define TS_XSAVE 0x0010/* Use xsave/xrstor */ #define tsk_is_polling (t) (task_thread_info(t)->status & TS_POLLING)
arch/x86/kernel/cpu/common.c +1 -4
@@ -1243,10 +1243,7 @@ void __cpuinit cpu_init(void)/* * Force FPU initialization: */ -if (cpu_has_xsave) -current_thread_info ()->status =TS_XSAVE ; -else -current_thread_info ()->status =0 ; +current_thread_info ()->status =0 ;clear_used_math ();mxcsr_feature_mask_init ();
arch/x86/kernel/i387.c +1 -4
@@ -102,10 +102,7 @@ void __cpuinit fpu_init(void)mxcsr_feature_mask_init ();/* clean state in init */ -if (cpu_has_xsave) -current_thread_info ()->status =TS_XSAVE ; -else -current_thread_info ()->status =0 ; +current_thread_info ()->status =0 ; clear_used_math(); }#endif /* CONFIG_X86_64 */
arch/x86/kernel/xsave.c +3 -3
@@ -99,7 +99,7 @@ int save_i387_xstate(void __user *buf)if (err)return err; -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ()) err =xsave_user (buf);else err =fxsave_user (buf);
@@ -116,7 +116,7 @@ int save_i387_xstate(void __user *buf)clear_used_math ();/* trigger finit */ -if (task_thread_info (tsk)->status &TS_XSAVE ) { +if (use_xsave ()) {struct _fpstate __user *fx = buf;struct _xstate __user *x = buf;u64 xstate_bv;
@@ -225,7 +225,7 @@ int restore_i387_xstate(void __user *buf)clts ();task_thread_info (current)->status |=TS_USEDFPU ; } -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ()) err =restore_user_xstate (buf);else err = fxrstor_checking((__force struct i387_fxsave_struct *)
Signature · 1 line
1.7.0.4
[tip:x86/fpu] x86: Eliminate TS_XSAVE
Commit-ID: c9ad488289144ae5ef53b012e15895ef1f5e4bb6 Gitweb: http://git.kernel.org/tip/c9ad488289144ae5ef53b012e15895ef1f5e4bb6 Author: Avi Kivity <[email protected]> AuthorDate: Thu, 6 May 2010 11:45:45 +0300 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 10 May 2010 10:39:33 -0700
x86: Eliminate TS_XSAVE
The fpu code currently uses current->thread_info->status & TS_XSAVE as a way to distinguish between XSAVE capable processors and older processors. The decision is not really task specific; instead we use the task status to avoid a global memory reference - the value should be the same across all threads.
Eliminate this tie-in into the task structure by using an alternative instruction keyed off the XSAVE cpu feature; this results in shorter and faster code, without introducing a global memory reference.
[ hpa: in the future, this probably should use an asm jmp ]
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 20 ++++++++++++++++---- arch/x86/include/asm/thread_info.h | 1 - arch/x86/kernel/cpu/common.c | 5 +---- arch/x86/kernel/i387.c | 5 +---- arch/x86/kernel/xsave.c | 6 +++--- 5 files changed, 21 insertions(+), 16 deletions(-)
arch/x86/include/asm/i387.h +16 -4
@@ -56,6 +56,18 @@ extern int restore_i387_xstate_ia32(void __user *buf);#define X87_FSW_ES (1 << 7)/* Exception Summary */ +static inline bool use_xsave (void ) +{ +u8 has_xsave; + +alternative_io ("mov $0, %0" , +"mov $1, %0" , +X86_FEATURE_XSAVE , +"=g" (has_xsave)); + +return has_xsave; +} +#ifdef CONFIG_X86_64 /* Ignore delayed exceptions from user space */
@@ -99,7 +111,7 @@ static inline void clear_fpu_state(struct task_struct *tsk)/* * xsave header may indicate the init state of the FP. */ -if ((task_thread_info (tsk)->status &TS_XSAVE ) && +if (use_xsave () && !(xstate->xsave_hdr.xstate_bv &XSTATE_FP ))return ;
@@ -164,7 +176,7 @@ static inline void fxsave(struct task_struct *tsk)static inline void __save_init_fpu (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ())xsave (tsk);else fxsave (tsk);
@@ -218,7 +230,7 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)*/ static inline void __save_init_fpu (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) { +if (use_xsave ()) {struct xsave_struct *xstate = &tsk->thread.xstate->xsave;struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave;
@@ -266,7 +278,7 @@ end:static inline int restore_fpu_checking (struct task_struct *tsk) { -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ())return xrstor_checking (&tsk->thread.xstate->xsave);else return fxrstor_checking (&tsk->thread.xstate->fxsave);
arch/x86/include/asm/thread_info.h +0 -1
@@ -244,7 +244,6 @@ static inline struct thread_info *current_thread_info(void)#define TS_POLLING 0x0004/* true if in idle loop and not sleeping */ #define TS_RESTORE_SIGMASK 0x0008/* restore signal mask in do_signal() */ -#define TS_XSAVE 0x0010/* Use xsave/xrstor */ #define tsk_is_polling (t) (task_thread_info(t)->status & TS_POLLING)
arch/x86/kernel/cpu/common.c +1 -4
@@ -1243,10 +1243,7 @@ void __cpuinit cpu_init(void)/* * Force FPU initialization: */ -if (cpu_has_xsave) -current_thread_info ()->status =TS_XSAVE ; -else -current_thread_info ()->status =0 ; +current_thread_info ()->status =0 ;clear_used_math ();mxcsr_feature_mask_init ();
arch/x86/kernel/i387.c +1 -4
@@ -102,10 +102,7 @@ void __cpuinit fpu_init(void)mxcsr_feature_mask_init ();/* clean state in init */ -if (cpu_has_xsave) -current_thread_info ()->status =TS_XSAVE ; -else -current_thread_info ()->status =0 ; +current_thread_info ()->status =0 ; clear_used_math(); }#endif /* CONFIG_X86_64 */
arch/x86/kernel/xsave.c +3 -3
@@ -99,7 +99,7 @@ int save_i387_xstate(void __user *buf)if (err)return err; -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ()) err =xsave_user (buf);else err =fxsave_user (buf);
@@ -116,7 +116,7 @@ int save_i387_xstate(void __user *buf)clear_used_math ();/* trigger finit */ -if (task_thread_info (tsk)->status &TS_XSAVE ) { +if (use_xsave ()) {struct _fpstate __user *fx = buf;struct _xstate __user *x = buf;u64 xstate_bv;
@@ -225,7 +225,7 @@ int restore_i387_xstate(void __user *buf)clts ();task_thread_info (current)->status |=TS_USEDFPU ; } -if (task_thread_info (tsk)->status &TS_XSAVE ) +if (use_xsave ()) err =restore_user_xstate (buf);else err = fxrstor_checking((__force struct i387_fxsave_struct *)
tip-bot for H. Peter Anvin
reviewer[tip:x86/fpu] x86, fpu: Use the proper asm constraint in use_xsave()
In reply to Avi KivityCommit-ID: dce8bf4e115aa44d590802ce3554e926840c9042 Gitweb: http://git.kernel.org/tip/dce8bf4e115aa44d590802ce3554e926840c9042 Author: H. Peter Anvin <[email protected]> AuthorDate: Mon, 10 May 2010 13:41:41 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 10 May 2010 13:41:41 -0700
x86, fpu: Use the proper asm constraint in use_xsave()
The proper constraint for a receiving 8-bit variable is "=qm", not "=g" which equals "=rim"; even though the "i" will never match, bugs can and do happen due to the difference between "q" and "r".
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/i387.h +1 -1
@@ -64,7 +64,7 @@ static inline bool use_xsave(void)alternative_io ("mov $0, %0" ,"mov $1, %0" ,X86_FEATURE_XSAVE , -"=g" (has_xsave)); +"=qm" (has_xsave));return has_xsave; }
tip-bot for H. Peter Anvin
reviewer[tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
In reply to Avi KivityCommit-ID: a3c8acd04376d604370dcb6cd2143c9c14078a50 Gitweb: http://git.kernel.org/tip/a3c8acd04376d604370dcb6cd2143c9c14078a50 Author: H. Peter Anvin <[email protected]> AuthorDate: Tue, 11 May 2010 17:47:07 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 11 May 2010 17:47:07 -0700
x86: Add new static_cpu_has() function using alternatives
For CPU-feature-specific code that touches performance-critical paths, introduce a static patching version of [boot_]cpu_has(). This is run at alternatives time and is therefore not appropriate for most initialization code, but on the other hand initialization code is generally not performance critical.
On gcc 4.5+ this uses the new "asm goto" feature.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/cpufeature.h | 57 +++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpufeature.h +57 -0
@@ -175,6 +175,7 @@#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#include <asm/asm.h> #include <linux/bitops.h> extern const char *const x86_cap_flags[NCAPINTS *32 ];
@@ -283,6 +284,62 @@ extern const char * const x86_power_flags[32];#endif /* CONFIG_X86_64 */ +/* +* Static testing of CPU features. Used the same as boot_cpu_has(). +* These are only valid after alternatives have run, but will statically +* patch the target code for additional performance. +* +*/ +static __always_inline __pure bool __static_cpu_has(u8 bit) +{ +#if __GNUC__ >4 || (__GNUC__ ==4 && __GNUC_MINOR__ >=5 ) + asm goto("1: jmp %l[t_no]\n" +"2:\n" +".section .altinstructions,\"a\"\n" + _ASM_ALIGN"\n" + _ASM_PTR"1b\n" + _ASM_PTR"0\n" /* no replacement */ +" .byte %P0\n" /* feature bit */ +" .byte 2b - 1b\n" /* source len */ +" .byte 0\n" /* replacement len */ +" .byte 0xff + 0 - (2b-1b)\n" /* padding */ +".previous\n" + : :"i" (bit) : : t_no); +return true; + t_no: +return false; +#else +u8 flag; +/* Open-coded due to __stringify() in ALTERNATIVE() */ + asmvolatile ("1: movb $0,%0\n" +"2:\n" +".section .altinstructions,\"a\"\n" + _ASM_ALIGN"\n" + _ASM_PTR"1b\n" + _ASM_PTR"3f\n" +" .byte %P1\n" /* feature bit */ +" .byte 2b - 1b\n" /* source len */ +" .byte 4f - 3f\n" /* replacement len */ +" .byte 0xff + (4f-3f) - (2b-1b)\n" /* padding */ +".previous\n" +".section .altinstr_replacement,\"ax\"\n" +"3: movb $1,%0\n" +"4:\n" +".previous\n" + :"=qm" (flag) :"i" (bit)); +return flag; +#endif +} + +#define static_cpu_has (bit) \ +( \ + __builtin_constant_p(boot_cpu_has(bit)) ? \ + boot_cpu_has(bit) : \ + (__builtin_constant_p(bit) && !((bit) & ~0xff)) ? \ + __static_cpu_has(bit) : \ + boot_cpu_has(bit) \ +) +#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ #endif /* _ASM_X86_CPUFEATURE_H */
Re: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
Le mercredi 12 mai 2010 à 01:06 +0000, tip-bot for H. Peter Anvin a écrit :
Quoted 9 lines
Commit-ID: a3c8acd04376d604370dcb6cd2143c9c14078a50 Gitweb: http://git.kernel.org/tip/a3c8acd04376d604370dcb6cd2143c9c14078a50 Author: H. Peter Anvin <[email protected]> AuthorDate: Tue, 11 May 2010 17:47:07 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 11 May 2010 17:47:07 -0700x86: Add new
static_cpu_has()function using alternatives
Quoted 7 lines
For CPU-feature-specific code that touches performance-critical paths, introduce a static patching version of [boot_]cpu_has(). This is run at alternatives time and is therefore not appropriate for most initialization code, but on the other hand initialization code is generally not performance critical.
On gcc 4.5+ this uses the new "asm goto" feature.
Might be time to change Documentation/Changes about gcc requirements ...
# make CHK include/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/x86/kernel/process_32.o /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h: In function `prepare_to_copy': /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:315: warning: asm operand 1 probably doesn't match constraints /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:315: error: impossible constraint in `asm' /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:313: warning: 'flag' might be used uninitialized in this function make[2]: *** [arch/x86/kernel/process_32.o] Error 1 make[1]: *** [arch/x86/kernel] Error 2 make: *** [arch/x86] Error 2 # gcc -v Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.6/specs Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux Thread model: posix gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)
H. Peter Anvin
reviewerRe: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
Quoted 17 lines · Eric Dumazet
Le mercredi 12 mai 2010 à 01:06 +0000, tip-bot for H. Peter Anvin a écrit :
Quoted 15 lines
Commit-ID: a3c8acd04376d604370dcb6cd2143c9c14078a50 Gitweb: http://git.kernel.org/tip/a3c8acd04376d604370dcb6cd2143c9c14078a50 Author: H. Peter Anvin <[email protected]> AuthorDate: Tue, 11 May 2010 17:47:07 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 11 May 2010 17:47:07 -0700x86: Add new
static_cpu_has()function using alternativesFor CPU-feature-specific code that touches performance-critical paths, introduce a static patching version of [boot_]cpu_has(). This is run at alternatives time and is therefore not appropriate for most initialization code, but on the other hand initialization code is generally not performance critical.
Quoted 4 lines
Quoted 1 line
On gcc 4.5+ this uses the new "asm goto" feature.
Might be time to change
Documentation/Changesabout gcc requirements ...
Well, this failure is in the fallback code. What this seems to imply is that gcc 3.4.6 doesn't know how to propagate what is already known to be constant in an inline into an immediate. This is a pretty big fail, and yes, if it really is this broken it might just be time to declare gcc 3.4 dead.
Quoted 18 lines
# make CHK include/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/x86/kernel/process_32.o /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h: In function `prepare_to_copy': /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:315: warning: asm operand 1 probably doesn't match constraints /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:315: error: impossible constraint in `asm' /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:313: warning: 'flag' might be used uninitialized in this function make[2]: *** [arch/x86/kernel/process_32.o] Error 1 make[1]: *** [arch/x86/kernel] Error 2 make: *** [arch/x86] Error 2 # gcc -v
Quoted 9 lines
Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.6/specs Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux Thread model: posix gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)
-hpa
H. Peter Anvin
reviewerRe: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
In reply to Eric DumazetQuoted 9 lines · Eric Dumazet
# gcc -v Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.6/specs Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux Thread model: posix gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)
I just implemented a fallback for gcc 3, but the real question is to which degree we still care about gcc 3 support for x86 specifically (other architectures might have other needs, but this is x86-specific code.)
Lately the number of issues with gcc 3 support seems to have gone way up, and at some point we're going to have to cut it loose -- when would depend largely on what the usage case is; e.g. why are you, yourself, using gcc 3.4 to compile a state of the art kernel?
-hpa
Re: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
Quoted 11 lines · H. Peter Anvin
Quoted 9 lines · Eric Dumazet
# gcc -v Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.6/specs Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux Thread model: posix gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)
Quoted 8 lines
I just implemented a fallback for gcc 3, but the real question is to which degree we still care about gcc 3 support for x86 specifically (other architectures might have other needs, but this is x86-specific code.)
Lately the number of issues with gcc 3 support seems to have gone way up, and at some point we're going to have to cut it loose -- when would depend largely on what the usage case is; e.g. why are you, yourself, using gcc 3.4 to compile a state of the art kernel?
I use many different machines to compile kernels, and found this one using gcc-3.4.6, but still running original 2.6.9.something RHEL kernel ;)
For kernels I actually boot, I use gcc-4.5, 4.4.x, 4.3.x, 4.2.x, 4.1.2 (cross compiler)
H. Peter Anvin
reviewerRe: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
Quoted 5 lines · Eric Dumazet
I use many different machines to compile kernels, and found this one using gcc-3.4.6, but still running original 2.6.9.something RHEL kernel ;)
OK, so this is "testing only, not actually using."
I guess I'm trying to figure out if *anyone* would actually care if gcc 3.x support is discontinued.
-hpa
H. Peter Anvin
reviewerDoes anyone care about gcc 3.x support for x86 anymore?
In reply to Eric DumazetRecently, we have seen an increasing number of problems with gcc 3.4 on x86; mostly due to poor constant propagation producing not just bad code but failing to properly eliminate what should be dead code.
I'm wondering if there is any remaining real use of gcc 3.4 on x86 for compiling current kernels (as opposed to residual use for compiling applications on old enterprise distros.) I'm specifically not referring to other architectures here -- most of these issues have been in relation to low-level arch-specific code, and as such only affects the x86 architectures. Other architectures may very well have a much stronger need for continued support of an older toolchain.
If there isn't a reason to preserve support, I would like to consider discontinue support for using gcc 3 to compile x86 kernels. If there is a valid use case, it would be good to know what it is.
-hpa
Re: Does anyone care about gcc 3.x support for x86 anymore?
Quoted 3 lines · H. Peter Anvin
Recently, we have seen an increasing number of problems with gcc 3.4 on x86; mostly due to poor constant propagation producing not just bad code but failing to properly eliminate what should be dead code.
I don't see any problem, as, if people are using gcc3, they are probably not interested on the bleeding edge kernel.
However, if the problems are just performance/dead code removal, I would just add a big warning if someone tries to compile x86 with it. I don't like very much the idea of having different minimum gcc requirements for each architecture, except if gcc is producing a broken code.
Currently,Documentation/Changes list just a common minimal list for everything - although the text describing gcc say that the "version requirements" may vary for each CPU type.
Signature · 2 lines
Cheers, Mauro
H. Peter Anvin
reviewerRe: Does anyone care about gcc 3.x support for x86 anymore?
Quoted 8 lines · Mauro Carvalho Chehab
Quoted 3 lines · H. Peter Anvin
Recently, we have seen an increasing number of problems with gcc 3.4 on x86; mostly due to poor constant propagation producing not just bad code but failing to properly eliminate what should be dead code.
I don't see any problem, as, if people are using gcc3, they are probably not interested on the bleeding edge kernel.
Quoted 9 lines
However, if the problems are just performance/dead code removal, I would just add a big warning if someone tries to compile x86 with it. I don't like very much the idea of having different minimum gcc requirements for each architecture, except if gcc is producing a broken code.
Currently,Documentation/Changes list just a common minimal list for everything - although the text describing gcc say that the "version requirements" may vary for each CPU type.
We already have different gcc version requirements, whether or not they're written down is another matter...
-hpa
H. Peter Anvin
reviewerRe: Does anyone care about gcc 3.x support for x86 anymore?
In reply to Mauro Carvalho ChehabQuoted 6 lines · Mauro Carvalho Chehab
However, if the problems are just performance/dead code removal, I would just add a big warning if someone tries to compile x86 with it. I don't like very much the idea of having different minimum gcc requirements for each architecture, except if gcc is producing a broken code.
I should clarify the problem. The problems we have seen are related to constant propagation, which causes gcc3 to die when there is an assembly constraint like:
asm("..." : : "i" (foo));... since "foo" isn't constant as far as it is concerned. We can put in workarounds, but it's real effort to keep it alive that probably isn't well spent.
Similarly, lack of constant propagation can cause code that should have been compile-time removed to still be there, causing link failures.
-hpa
Re: Does anyone care about gcc 3.x support for x86 anymore?
Quoted 16 lines · H. Peter Anvin
Quoted 8 lines · Mauro Carvalho Chehab
However, if the problems are just performance/dead code removal, I would just add a big warning if someone tries to compile x86 with it. I don't like very much the idea of having different minimum gcc requirements for each architecture, except if gcc is producing a broken code.
I should clarify the problem. The problems we have seen are related to constant propagation, which causes gcc3 to die when there is an assembly constraint like:
asm("..." : : "i" (foo));
Quoted 7 lines
... since "foo" isn't constant as far as it is concerned. We can put in workarounds, but it's real effort to keep it alive that probably isn't well spent.
Similarly, lack of constant propagation can cause code that should have been compile-time removed to still be there, causing link failures.
Put in a deprecation warning first perhaps?
Ingo
H. Peter Anvin
reviewerRe: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
In reply to Eric DumazetQuoted 21 lines · Eric Dumazet
Might be time to change
Documentation/Changesabout gcc requirements ...# make CHK include/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/x86/kernel/process_32.o /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h: In function `prepare_to_copy': /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:315: warning: asm operand 1 probably doesn't match constraints /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:315: error: impossible constraint in `asm' /usr/src/linux-2.6/arch/x86/include/asm/cpufeature.h:313: warning: 'flag' might be used uninitialized in this function make[2]: *** [arch/x86/kernel/process_32.o] Error 1 make[1]: *** [arch/x86/kernel] Error 2 make: *** [arch/x86] Error 2 # gcc -v
Quoted 9 lines
Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.6/specs Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux Thread model: posix gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)
Here is the fallback patch if you want to test it.
-hpa
arch/x86/include/asm/cpufeature.h +7 -0
@@ -332,6 +332,7 @@ static __always_inline __pure bool __static_cpu_has(u8 bit)#endif } +#if __GNUC__ >=4 #define static_cpu_has (bit) \ ( \ __builtin_constant_p(boot_cpu_has(bit)) ? \
@@ -340,6 +341,12 @@ static __always_inline __pure bool __static_cpu_has(u8 bit) __static_cpu_has(bit) : \ boot_cpu_has(bit) \ ) +#else +/* +* gcc 3.x is too stupid to do the static test; fall back to dynamic. +*/ +#define static_cpu_has (bit) boot_cpu_has(bit) +#endif #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
Re: [tip:x86/fpu] x86: Add new static_cpu_has() function using alternatives
Quoted 2 lines · H. Peter Anvin
Here is the fallback patch if you want to test it.
Thanks, kernel compiled just fine with this patch.
[tip:x86/urgent] x86, cpufeature: Unbreak compile with gcc 3.x
In reply to H. Peter AnvinCommit-ID: 1ba4f22c426ba04b00fd717318d50620c621a0e1 Gitweb: http://git.kernel.org/tip/1ba4f22c426ba04b00fd717318d50620c621a0e1 Author: H. Peter Anvin <[email protected]> AuthorDate: Thu, 27 May 2010 12:02:00 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 27 May 2010 12:02:00 -0700
x86, cpufeature: Unbreak compile with gcc 3.x
gcc 3 is too braindamaged to be able to compile static_cpu_has() -- apparently it can't tell that a constant passed to an inline function is still a constant -- so if we're using gcc 3, just use the dynamic test. This is bad for performance, but if you care about performance, don't use an ancient, known-to-optimize-poorly compiler.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/cpufeature.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpufeature.h +7 -0
@@ -332,6 +332,7 @@ static __always_inline __pure bool __static_cpu_has(u8 bit)#endif } +#if __GNUC__ >=4 #define static_cpu_has (bit) \ ( \ __builtin_constant_p(boot_cpu_has(bit)) ? \
@@ -340,6 +341,12 @@ static __always_inline __pure bool __static_cpu_has(u8 bit) __static_cpu_has(bit) : \ boot_cpu_has(bit) \ ) +#else +/* +* gcc 3.x is too stupid to do the static test; fall back to dynamic. +*/ +#define static_cpu_has (bit) boot_cpu_has(bit) +#endif #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
tip-bot for H. Peter Anvin
reviewer[tip:x86/fpu] x86, fpu: Use static_cpu_has() to implement use_xsave()
In reply to Avi KivityCommit-ID: c9775b4cc522e5f1b40b1366a993f0f05f600f39 Gitweb: http://git.kernel.org/tip/c9775b4cc522e5f1b40b1366a993f0f05f600f39 Author: H. Peter Anvin <[email protected]> AuthorDate: Tue, 11 May 2010 17:49:54 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 11 May 2010 17:49:54 -0700
x86, fpu: Use static_cpu_has() to implement use_xsave()
use_xsave() is now just a special case of static_cpu_has(), so use static_cpu_has().
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-)
arch/x86/include/asm/i387.h +3 -9
@@ -18,6 +18,7 @@#include <linux/hardirq.h> #include <linux/slab.h> #include <asm/asm.h> +#include <asm/cpufeature.h> #include <asm/processor.h> #include <asm/sigcontext.h> #include <asm/user.h>
@@ -57,16 +58,9 @@ extern int restore_i387_xstate_ia32(void __user *buf);#define X87_FSW_ES (1 << 7)/* Exception Summary */ -static inline bool use_xsave (void ) +static __always_inline __pure bool use_xsave(void) { -u8 has_xsave; - -alternative_io ("mov $0, %0" , -"mov $1, %0" , -X86_FEATURE_XSAVE , -"=qm" (has_xsave)); - -return has_xsave; +return static_cpu_has (X86_FEATURE_XSAVE ); }#ifdef CONFIG_X86_64
PATCH v3 2/2 x86: Introduce 'struct fpu' and related API
In reply to Avi KivityCurrently all fpu state access is through tsk->thread.xstate. Since we wish to generalize fpu access to non-task contexts, wrap the state in a new 'struct fpu' and convert existing access to use an fpu API.
Signal frame handlers are not converted to the API since they will remain task context only things.
--- arch/x86/include/asm/i387.h | 115 ++++++++++++++++++++++++++++---------- arch/x86/include/asm/processor.h | 6 ++- arch/x86/include/asm/xsave.h | 7 +- arch/x86/kernel/i387.c | 102 +++++++++++++++++----------------- arch/x86/kernel/process.c | 20 +++---- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/xsave.c | 2 +- arch/x86/math-emu/fpu_aux.c | 6 +- 9 files changed, 160 insertions(+), 102 deletions(-)
arch/x86/include/asm/i387.h +85 -30
@@ -16,6 +16,7 @@#include <linux/kernel_stat.h> #include <linux/regset.h> #include <linux/hardirq.h> +#include <linux/slab.h> #include <asm/asm.h> #include <asm/processor.h> #include <asm/sigcontext.h>
@@ -103,10 +104,10 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)values. The kernel data segment can be sometimes 0 and sometimes new user value. Both should be ok. Use the PDA as safe address because it should be already in L1. */ -static inline void clear_fpu_state (struct task_struct *tsk) +static inline void fpu_clear (struct fpu *fpu) { -struct xsave_struct *xstate = &tsk->thread.xstate->xsave; -struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; +struct xsave_struct *xstate = &fpu->state->xsave; +struct i387_fxsave_struct *fx = &fpu->state->fxsave;/* * xsave header may indicate the init state of the FP.
@@ -123,6 +124,11 @@ static inline void clear_fpu_state(struct task_struct *tsk) X86_FEATURE_FXSAVE_LEAK); } +static inline void clear_fpu_state (struct task_struct *tsk) +{ +fpu_clear (&tsk->thread.fpu); +} +static inline int fxsave_user (struct i387_fxsave_struct __user *fx) {int err;
@@ -147,7 +153,7 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)return err; } -static inline void fxsave (struct task_struct *tsk) +static inline void fpu_fxsave (struct fpu *fpu) {/* Using "rex64; fxsave %0" is broken because, if the memory operand uses any extended registers for addressing, a second REX prefix
@@ -157,42 +163,45 @@ static inline void fxsave(struct task_struct *tsk)/* Using "fxsaveq %0" would be the ideal choice, but is only supported starting with gas 2.16. */ __asm__ __volatile__("fxsaveq %0" - :"=m" (tsk->thread.xstate->fxsave)); + :"=m" (fpu->state->fxsave));#elif 0 /* Using, as a workaround, the properly prefixed form below isn't accepted by any binutils version so far released, complaining that the same type of prefix is used twice if an extended register is needed for addressing (fix submitted to mainline 2005-11-21). */ __asm__ __volatile__("rex64/fxsave %0" - :"=m" (tsk->thread.xstate->fxsave)); + :"=m" (fpu->state->fxsave));#else /* This, however, we can work around by forcing the compiler to select an addressing mode that doesn't require extended registers. */ __asm__ __volatile__("rex64/fxsave (%1)" - :"=m" (tsk->thread.xstate->fxsave) - :"cdaSDb" (&tsk->thread.xstate->fxsave)); + :"=m" (fpu->state->fxsave) + :"cdaSDb" (&fpu->state->fxsave));#endif } -static inline void __save_init_fpu (struct task_struct *tsk) +static inline void fpu_save_init (struct fpu *fpu) {if (use_xsave ()) -xsave (tsk); +fpu_xsave (fpu);else -fxsave (tsk); +fpu_fxsave (fpu); -clear_fpu_state (tsk); +fpu_clear (fpu); +} + +static inline void __save_init_fpu (struct task_struct *tsk) +{ +fpu_save_init (&tsk->thread.fpu);task_thread_info (tsk)->status &= ~TS_USEDFPU ; }#else /* CONFIG_X86_32 */ #ifdef CONFIG_MATH_EMULATION -extern void finit_task (struct task_struct *tsk); +extern void finit_soft_fpu (struct i387_soft_struct *soft);#else -static inline void finit_task (struct task_struct *tsk) -{ -} +static inline void finit_soft_fpu (struct i387_soft_struct *soft) {}#endif static inline void tolerant_fwait (void )
@@ -228,13 +237,13 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)/* * These must be called with preempt disabled */ -static inline void __save_init_fpu (struct task_struct *tsk) +static inline void fpu_save_init (struct fpu *fpu) {if (use_xsave ()) { -struct xsave_struct *xstate = &tsk->thread.xstate->xsave; -struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; +struct xsave_struct *xstate = &fpu->state->xsave; +struct i387_fxsave_struct *fx = &fpu->state->fxsave; -xsave (tsk); +fpu_xsave (fpu);/* * xsave header may indicate the init state of the FP.
@@ -258,8 +267,8 @@ static inline void __save_init_fpu(struct task_struct *tsk)"fxsave %[fx]\n" "bt $7,%[fsw] ; jnc 1f ; fnclex\n1:" , X86_FEATURE_FXSR, - [fx] "m" (tsk->thread.xstate->fxsave), - [fsw] "m" (tsk->thread.xstate->fxsave.swd) : "memory"); + [fx] "m" (fpu->state->fxsave), + [fsw] "m" (fpu->state->fxsave.swd) : "memory"); clear_state:/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception is pending. Clear the x87 state here by setting it to fixed
@@ -271,17 +280,34 @@ clear_state: X86_FEATURE_FXSAVE_LEAK, [addr] "m" (safe_address)); end: + ; +} + +static inline void __save_init_fpu (struct task_struct *tsk) +{ +fpu_save_init (&tsk->thread.fpu);task_thread_info (tsk)->status &= ~TS_USEDFPU ; } +#endif /* CONFIG_X86_64 */ -static inline int restore_fpu_checking (struct task_struct *tsk) +static inline int fpu_fxrstor_checking (struct fpu *fpu) +{ +return fxrstor_checking (&fpu->state->fxsave); +} + +static inline int fpu_restore_checking (struct fpu *fpu) {if (use_xsave ()) -return xrstor_checking (&tsk->thread.xstate->xsave); +return fpu_xrstor_checking (fpu);else -return fxrstor_checking (&tsk->thread.xstate->fxsave); +return fpu_fxrstor_checking (fpu); +} + +static inline int restore_fpu_checking (struct task_struct *tsk) +{ +return fpu_restore_checking (&tsk->thread.fpu); }/*
@@ -409,30 +435,59 @@ static inline void clear_fpu(struct task_struct *tsk)static inline unsigned short get_fpu_cwd (struct task_struct *tsk) {if (cpu_has_fxsr) { -return tsk->thread.xstate->fxsave.cwd; +return tsk->thread.fpu.state->fxsave.cwd; }else { -return (unsigned short )tsk->thread.xstate->fsave.cwd; +return (unsigned short )tsk->thread.fpu.state->fsave.cwd; } }static inline unsigned short get_fpu_swd (struct task_struct *tsk) {if (cpu_has_fxsr) { -return tsk->thread.xstate->fxsave.swd; +return tsk->thread.fpu.state->fxsave.swd; }else { -return (unsigned short )tsk->thread.xstate->fsave.swd; +return (unsigned short )tsk->thread.fpu.state->fsave.swd; } }static inline unsigned short get_fpu_mxcsr (struct task_struct *tsk) {if (cpu_has_xmm) { -return tsk->thread.xstate->fxsave.mxcsr; +return tsk->thread.fpu.state->fxsave.mxcsr; }else {return MXCSR_DEFAULT ; } } +static bool fpu_allocated (struct fpu *fpu) +{ +return fpu->state !=NULL ; +} + +static inline int fpu_alloc (struct fpu *fpu) +{ +if (fpu_allocated (fpu)) +return 0 ; + fpu->state =kmem_cache_alloc (task_xstate_cachep,GFP_KERNEL ); +if (!fpu->state) +return -ENOMEM ; +WARN_ON ((unsigned long )fpu->state &15 ); +return 0 ; +} + +static inline void fpu_free (struct fpu *fpu) +{ +if (fpu->state) { +kmem_cache_free (task_xstate_cachep, fpu->state); + fpu->state =NULL ; + } +} + +static inline void fpu_copy (struct fpu *dst,struct fpu *src) +{ +memcpy (dst->state, src->state, xstate_size); +} +#endif /* __ASSEMBLY__ */ #define PSHUFB_XMM5_XMM0 .byte 0x66, 0x0f, 0x38, 0x00, 0xc5
arch/x86/include/asm/processor.h +5 -1
@@ -380,6 +380,10 @@ union thread_xstate {struct xsave_struct xsave; }; +struct fpu { +union thread_xstate *state; +}; +#ifdef CONFIG_X86_64 DECLARE_PER_CPU(struct orig_ist, orig_ist);
@@ -457,7 +461,7 @@ struct thread_struct {unsigned long trap_no;unsigned long error_code;/* floating point and extended processor state */ -union thread_xstate *xstate; +struct fpu fpu;#ifdef CONFIG_X86_32 /* Virtual 86 mode info */ struct vm86_struct __user *vm86_info;
arch/x86/include/asm/xsave.h +4 -3
@@ -37,8 +37,9 @@ extern int check_for_xstate(struct i387_fxsave_struct __user *buf,void __user *fpstate, struct _fpx_sw_bytes *sw); -static inline int xrstor_checking (struct xsave_struct *fx) +static inline int fpu_xrstor_checking (struct fpu *fpu) { +struct xsave_struct *fx = &fpu->state->xsave;int err; asm volatile("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n\t"
@@ -110,12 +111,12 @@ static inline void xrstor_state(struct xsave_struct *fx, u64 mask) : "memory"); } -static inline void xsave (struct task_struct *tsk) +static inline void fpu_xsave (struct fpu *fpu) {/* This, however, we can work around by forcing the compiler to select an addressing mode that doesn't require extended registers. */ __asm__ __volatile__(".byte " REX_PREFIX "0x0f,0xae,0x27" - : :"D" (&(tsk->thread.xstate->xsave)), + : :"D" (&(fpu->state->xsave)),"a" (-1 ),"d" (-1 ) :"memory" ); }#endif
arch/x86/kernel/i387.c +51 -51
242 lines not on this page · raw message
arch/x86/kernel/process.c +9 -11
@@ -31,24 +31,22 @@ struct kmem_cache *task_xstate_cachep;int arch_dup_task_struct (struct task_struct *dst,struct task_struct *src) { +int ret; + *dst = *src; -if (src->thread.xstate) { - dst->thread.xstate =kmem_cache_alloc (task_xstate_cachep, -GFP_KERNEL ); -if (!dst->thread.xstate) -return -ENOMEM ; -WARN_ON ((unsigned long )dst->thread.xstate &15 ); -memcpy (dst->thread.xstate, src->thread.xstate, xstate_size); +if (fpu_allocated (&src->thread.fpu)) { +memset (&dst->thread.fpu,0 ,sizeof (dst->thread.fpu)); + ret =fpu_alloc (&dst->thread.fpu); +if (ret) +return ret; +fpu_copy (&dst->thread.fpu, &src->thread.fpu); }return 0 ; }void free_thread_xstate (struct task_struct *tsk) { -if (tsk->thread.xstate) { -kmem_cache_free (task_xstate_cachep, tsk->thread.xstate); - tsk->thread.xstate =NULL ; - } +fpu_free (&tsk->thread.fpu); }void free_thread_info (struct thread_info *ti)
arch/x86/kernel/process_32.c +1 -1
@@ -309,7 +309,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)/* we're going to use this soon, after a few expensive things */ if (preload_fpu) -prefetch (next->xstate); +prefetch (next->fpu.state);/* * Reload esp0.
arch/x86/kernel/process_64.c +1 -1
@@ -388,7 +388,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)/* we're going to use this soon, after a few expensive things */ if (preload_fpu) -prefetch (next->xstate); +prefetch (next->fpu.state);/* * Reload esp0, LDT and the page table pointer:
arch/x86/kernel/xsave.c +1 -1
@@ -109,7 +109,7 @@ int save_i387_xstate(void __user *buf)task_thread_info (tsk)->status &= ~TS_USEDFPU ;stts (); }else { -if (__copy_to_user (buf, &tsk->thread.xstate->fxsave, +if (__copy_to_user (buf, &tsk->thread.fpu.state->fxsave, xstate_size))return -1 ; }
arch/x86/math-emu/fpu_aux.c +3 -3
@@ -30,10 +30,10 @@ static void fclex(void) }/* Needs to be externally visible */ -void finit_task (struct task_struct *tsk) +void finit_soft_fpu (struct i387_soft_struct *soft) { -struct i387_soft_struct *soft = &tsk->thread.xstate->soft;struct address *oaddr, *iaddr; +memset (soft,0 ,sizeof (*soft)); soft->cwd =0x037f ; soft->swd =0 ; soft->ftop =0 ;/* We don't keep top in the status word internally. */
@@ -52,7 +52,7 @@ void finit_task(struct task_struct *tsk)void finit (void ) { -finit_task (current); +finit_task (¤t->thread.fpu); }/*
Signature · 1 line
1.7.0.4
[tip:x86/fpu] x86: Introduce 'struct fpu' and related API
Commit-ID: 86603283326c9e95e5ad4e9fdddeec93cac5d9ad Gitweb: http://git.kernel.org/tip/86603283326c9e95e5ad4e9fdddeec93cac5d9ad Author: Avi Kivity <[email protected]> AuthorDate: Thu, 6 May 2010 11:45:46 +0300 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 10 May 2010 10:48:55 -0700
x86: Introduce 'struct fpu' and related API
Currently all fpu state access is through tsk->thread.xstate. Since we wish to generalize fpu access to non-task contexts, wrap the state in a new 'struct fpu' and convert existing access to use an fpu API.
Signal frame handlers are not converted to the API since they will remain task context only things.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/i387.h | 115 ++++++++++++++++++++++++++++---------- arch/x86/include/asm/processor.h | 6 ++- arch/x86/include/asm/xsave.h | 7 +- arch/x86/kernel/i387.c | 102 +++++++++++++++++----------------- arch/x86/kernel/process.c | 21 +++---- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/xsave.c | 2 +- arch/x86/math-emu/fpu_aux.c | 6 +- 9 files changed, 160 insertions(+), 103 deletions(-)
arch/x86/include/asm/i387.h +85 -30
@@ -16,6 +16,7 @@#include <linux/kernel_stat.h> #include <linux/regset.h> #include <linux/hardirq.h> +#include <linux/slab.h> #include <asm/asm.h> #include <asm/processor.h> #include <asm/sigcontext.h>
@@ -103,10 +104,10 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)values. The kernel data segment can be sometimes 0 and sometimes new user value. Both should be ok. Use the PDA as safe address because it should be already in L1. */ -static inline void clear_fpu_state (struct task_struct *tsk) +static inline void fpu_clear (struct fpu *fpu) { -struct xsave_struct *xstate = &tsk->thread.xstate->xsave; -struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; +struct xsave_struct *xstate = &fpu->state->xsave; +struct i387_fxsave_struct *fx = &fpu->state->fxsave;/* * xsave header may indicate the init state of the FP.
@@ -123,6 +124,11 @@ static inline void clear_fpu_state(struct task_struct *tsk) X86_FEATURE_FXSAVE_LEAK); } +static inline void clear_fpu_state (struct task_struct *tsk) +{ +fpu_clear (&tsk->thread.fpu); +} +static inline int fxsave_user (struct i387_fxsave_struct __user *fx) {int err;
@@ -147,7 +153,7 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)return err; } -static inline void fxsave (struct task_struct *tsk) +static inline void fpu_fxsave (struct fpu *fpu) {/* Using "rex64; fxsave %0" is broken because, if the memory operand uses any extended registers for addressing, a second REX prefix
@@ -157,42 +163,45 @@ static inline void fxsave(struct task_struct *tsk)/* Using "fxsaveq %0" would be the ideal choice, but is only supported starting with gas 2.16. */ __asm__ __volatile__("fxsaveq %0" - :"=m" (tsk->thread.xstate->fxsave)); + :"=m" (fpu->state->fxsave));#elif 0 /* Using, as a workaround, the properly prefixed form below isn't accepted by any binutils version so far released, complaining that the same type of prefix is used twice if an extended register is needed for addressing (fix submitted to mainline 2005-11-21). */ __asm__ __volatile__("rex64/fxsave %0" - :"=m" (tsk->thread.xstate->fxsave)); + :"=m" (fpu->state->fxsave));#else /* This, however, we can work around by forcing the compiler to select an addressing mode that doesn't require extended registers. */ __asm__ __volatile__("rex64/fxsave (%1)" - :"=m" (tsk->thread.xstate->fxsave) - :"cdaSDb" (&tsk->thread.xstate->fxsave)); + :"=m" (fpu->state->fxsave) + :"cdaSDb" (&fpu->state->fxsave));#endif } -static inline void __save_init_fpu (struct task_struct *tsk) +static inline void fpu_save_init (struct fpu *fpu) {if (use_xsave ()) -xsave (tsk); +fpu_xsave (fpu);else -fxsave (tsk); +fpu_fxsave (fpu); -clear_fpu_state (tsk); +fpu_clear (fpu); +} + +static inline void __save_init_fpu (struct task_struct *tsk) +{ +fpu_save_init (&tsk->thread.fpu);task_thread_info (tsk)->status &= ~TS_USEDFPU ; }#else /* CONFIG_X86_32 */ #ifdef CONFIG_MATH_EMULATION -extern void finit_task (struct task_struct *tsk); +extern void finit_soft_fpu (struct i387_soft_struct *soft);#else -static inline void finit_task (struct task_struct *tsk) -{ -} +static inline void finit_soft_fpu (struct i387_soft_struct *soft) {}#endif static inline void tolerant_fwait (void )
@@ -228,13 +237,13 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)/* * These must be called with preempt disabled */ -static inline void __save_init_fpu (struct task_struct *tsk) +static inline void fpu_save_init (struct fpu *fpu) {if (use_xsave ()) { -struct xsave_struct *xstate = &tsk->thread.xstate->xsave; -struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; +struct xsave_struct *xstate = &fpu->state->xsave; +struct i387_fxsave_struct *fx = &fpu->state->fxsave; -xsave (tsk); +fpu_xsave (fpu);/* * xsave header may indicate the init state of the FP.
@@ -258,8 +267,8 @@ static inline void __save_init_fpu(struct task_struct *tsk)"fxsave %[fx]\n" "bt $7,%[fsw] ; jnc 1f ; fnclex\n1:" , X86_FEATURE_FXSR, - [fx] "m" (tsk->thread.xstate->fxsave), - [fsw] "m" (tsk->thread.xstate->fxsave.swd) : "memory"); + [fx] "m" (fpu->state->fxsave), + [fsw] "m" (fpu->state->fxsave.swd) : "memory"); clear_state:/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception is pending. Clear the x87 state here by setting it to fixed
@@ -271,17 +280,34 @@ clear_state: X86_FEATURE_FXSAVE_LEAK, [addr] "m" (safe_address)); end: + ; +} + +static inline void __save_init_fpu (struct task_struct *tsk) +{ +fpu_save_init (&tsk->thread.fpu);task_thread_info (tsk)->status &= ~TS_USEDFPU ; } +#endif /* CONFIG_X86_64 */ -static inline int restore_fpu_checking (struct task_struct *tsk) +static inline int fpu_fxrstor_checking (struct fpu *fpu) +{ +return fxrstor_checking (&fpu->state->fxsave); +} + +static inline int fpu_restore_checking (struct fpu *fpu) {if (use_xsave ()) -return xrstor_checking (&tsk->thread.xstate->xsave); +return fpu_xrstor_checking (fpu);else -return fxrstor_checking (&tsk->thread.xstate->fxsave); +return fpu_fxrstor_checking (fpu); +} + +static inline int restore_fpu_checking (struct task_struct *tsk) +{ +return fpu_restore_checking (&tsk->thread.fpu); }/*
@@ -409,30 +435,59 @@ static inline void clear_fpu(struct task_struct *tsk)static inline unsigned short get_fpu_cwd (struct task_struct *tsk) {if (cpu_has_fxsr) { -return tsk->thread.xstate->fxsave.cwd; +return tsk->thread.fpu.state->fxsave.cwd; }else { -return (unsigned short )tsk->thread.xstate->fsave.cwd; +return (unsigned short )tsk->thread.fpu.state->fsave.cwd; } }static inline unsigned short get_fpu_swd (struct task_struct *tsk) {if (cpu_has_fxsr) { -return tsk->thread.xstate->fxsave.swd; +return tsk->thread.fpu.state->fxsave.swd; }else { -return (unsigned short )tsk->thread.xstate->fsave.swd; +return (unsigned short )tsk->thread.fpu.state->fsave.swd; } }static inline unsigned short get_fpu_mxcsr (struct task_struct *tsk) {if (cpu_has_xmm) { -return tsk->thread.xstate->fxsave.mxcsr; +return tsk->thread.fpu.state->fxsave.mxcsr; }else {return MXCSR_DEFAULT ; } } +static bool fpu_allocated (struct fpu *fpu) +{ +return fpu->state !=NULL ; +} + +static inline int fpu_alloc (struct fpu *fpu) +{ +if (fpu_allocated (fpu)) +return 0 ; + fpu->state =kmem_cache_alloc (task_xstate_cachep,GFP_KERNEL ); +if (!fpu->state) +return -ENOMEM ; +WARN_ON ((unsigned long )fpu->state &15 ); +return 0 ; +} + +static inline void fpu_free (struct fpu *fpu) +{ +if (fpu->state) { +kmem_cache_free (task_xstate_cachep, fpu->state); + fpu->state =NULL ; + } +} + +static inline void fpu_copy (struct fpu *dst,struct fpu *src) +{ +memcpy (dst->state, src->state, xstate_size); +} +#endif /* __ASSEMBLY__ */ #define PSHUFB_XMM5_XMM0 .byte 0x66, 0x0f, 0x38, 0x00, 0xc5
arch/x86/include/asm/processor.h +5 -1
@@ -380,6 +380,10 @@ union thread_xstate {struct xsave_struct xsave; }; +struct fpu { +union thread_xstate *state; +}; +#ifdef CONFIG_X86_64 DECLARE_PER_CPU(struct orig_ist, orig_ist);
@@ -457,7 +461,7 @@ struct thread_struct {unsigned long trap_no;unsigned long error_code;/* floating point and extended processor state */ -union thread_xstate *xstate; +struct fpu fpu;#ifdef CONFIG_X86_32 /* Virtual 86 mode info */ struct vm86_struct __user *vm86_info;
arch/x86/include/asm/xsave.h +4 -3
@@ -37,8 +37,9 @@ extern int check_for_xstate(struct i387_fxsave_struct __user *buf,void __user *fpstate, struct _fpx_sw_bytes *sw); -static inline int xrstor_checking (struct xsave_struct *fx) +static inline int fpu_xrstor_checking (struct fpu *fpu) { +struct xsave_struct *fx = &fpu->state->xsave;int err; asm volatile("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n\t"
@@ -110,12 +111,12 @@ static inline void xrstor_state(struct xsave_struct *fx, u64 mask) : "memory"); } -static inline void xsave (struct task_struct *tsk) +static inline void fpu_xsave (struct fpu *fpu) {/* This, however, we can work around by forcing the compiler to select an addressing mode that doesn't require extended registers. */ __asm__ __volatile__(".byte " REX_PREFIX "0x0f,0xae,0x27" - : :"D" (&(tsk->thread.xstate->xsave)), + : :"D" (&(fpu->state->xsave)),"a" (-1 ),"d" (-1 ) :"memory" ); }#endif
arch/x86/kernel/i387.c +51 -51
242 lines not on this page · raw message
arch/x86/kernel/process.c +9 -12
@@ -32,25 +32,22 @@ struct kmem_cache *task_xstate_cachep;int arch_dup_task_struct (struct task_struct *dst,struct task_struct *src) { +int ret; + *dst = *src; -if (src->thread.xstate) { - dst->thread.xstate =kmem_cache_alloc (task_xstate_cachep, -GFP_KERNEL ); -if (!dst->thread.xstate) -return -ENOMEM ; -WARN_ON ((unsigned long )dst->thread.xstate &15 ); -memcpy (dst->thread.xstate, src->thread.xstate, xstate_size); +if (fpu_allocated (&src->thread.fpu)) { +memset (&dst->thread.fpu,0 ,sizeof (dst->thread.fpu)); + ret =fpu_alloc (&dst->thread.fpu); +if (ret) +return ret; +fpu_copy (&dst->thread.fpu, &src->thread.fpu); }return 0 ; }void free_thread_xstate (struct task_struct *tsk) { -if (tsk->thread.xstate) { -kmem_cache_free (task_xstate_cachep, tsk->thread.xstate); - tsk->thread.xstate =NULL ; - } - +fpu_free (&tsk->thread.fpu);WARN (tsk->thread.ds_ctx,"leaking DS context\n" ); }
arch/x86/kernel/process_32.c +1 -1
@@ -317,7 +317,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)/* we're going to use this soon, after a few expensive things */ if (preload_fpu) -prefetch (next->xstate); +prefetch (next->fpu.state);/* * Reload esp0.
arch/x86/kernel/process_64.c +1 -1
@@ -396,7 +396,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)/* we're going to use this soon, after a few expensive things */ if (preload_fpu) -prefetch (next->xstate); +prefetch (next->fpu.state);/* * Reload esp0, LDT and the page table pointer:
arch/x86/kernel/xsave.c +1 -1
@@ -109,7 +109,7 @@ int save_i387_xstate(void __user *buf)task_thread_info (tsk)->status &= ~TS_USEDFPU ;stts (); }else { -if (__copy_to_user (buf, &tsk->thread.xstate->fxsave, +if (__copy_to_user (buf, &tsk->thread.fpu.state->fxsave, xstate_size))return -1 ; }
arch/x86/math-emu/fpu_aux.c +3 -3
@@ -30,10 +30,10 @@ static void fclex(void) }/* Needs to be externally visible */ -void finit_task (struct task_struct *tsk) +void finit_soft_fpu (struct i387_soft_struct *soft) { -struct i387_soft_struct *soft = &tsk->thread.xstate->soft;struct address *oaddr, *iaddr; +memset (soft,0 ,sizeof (*soft)); soft->cwd =0x037f ; soft->swd =0 ; soft->ftop =0 ;/* We don't keep top in the status word internally. */
@@ -52,7 +52,7 @@ void finit_task(struct task_struct *tsk)void finit (void ) { -finit_task (current); +finit_task (¤t->thread.fpu); }/*
tip-bot for H. Peter Anvin
reviewer[tip:x86/fpu] x86, fpu: Unbreak FPU emulation
In reply to Avi KivityCommit-ID: c3f8978ea332cd4be88e12574452a025892ac9af Gitweb: http://git.kernel.org/tip/c3f8978ea332cd4be88e12574452a025892ac9af Author: H. Peter Anvin <[email protected]> AuthorDate: Mon, 10 May 2010 13:37:16 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 10 May 2010 13:37:16 -0700
x86, fpu: Unbreak FPU emulation
Unbreak FPU emulation, broken by checkin 86603283326c9e95e5ad4e9fdddeec93cac5d9ad:
x86: Introduce 'struct fpu' and related API
LKML-Reference: <[email protected]>
--- arch/x86/math-emu/fpu_aux.c | 2 +- arch/x86/math-emu/fpu_entry.c | 4 ++-- arch/x86/math-emu/fpu_system.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/math-emu/fpu_aux.c +1 -1
@@ -52,7 +52,7 @@ void finit_soft_fpu(struct i387_soft_struct *soft)void finit (void ) { -finit_task (¤t->thread.fpu); +finit_soft_fpu (¤t->thread.fpu.state->soft); }/*
arch/x86/math-emu/fpu_entry.c +2 -2
@@ -681,7 +681,7 @@ int fpregs_soft_set(struct task_struct *target, unsigned int pos, unsigned int count, const void *kbuf, const void __user *ubuf) { - struct i387_soft_struct *s387 = &target->thread.xstate->soft; + struct i387_soft_struct *s387 = &target->thread.fpu.state->soft;void *space = s387->st_space;int ret;int offset, other, i, tags, regnr, tag, newtop;
@@ -733,7 +733,7 @@ int fpregs_soft_get(struct task_struct *target, unsigned int pos, unsigned int count, void *kbuf, void __user *ubuf) { - struct i387_soft_struct *s387 = &target->thread.xstate->soft; + struct i387_soft_struct *s387 = &target->thread.fpu.state->soft;const void *space = s387->st_space;int ret;int offset = (S387 ->ftop &7 ) *10 , other =80 - offset;
arch/x86/math-emu/fpu_system.h +1 -1
@@ -31,7 +31,7 @@#define SEG_EXPAND_DOWN (s) (((s).b & ((1 << 11) | (1 << 10))) \ == (1 << 10)) -#define I387 (current->thread.xstate) +#define I387 (current->thread.fpu.state)#define FPU_info (I387->soft.info)#define FPU_CS (*(unsigned short *) &(FPU_info->regs->cs))
Quoted 7 lines · Avi Kivity
Currently all fpu accessors are wedded to
task_struct. However kvm also uses the fpu in a different context. Introduce an FPU API, and replace the current uses with the new API.While this patchset is oriented towards deeper changes, as a first step it simlifies xsave for kvm.
Peter/Ingo, what are the plans for merging it? The kvm xsave work depends on this.
Signature · 1 line
error compiling committee.c: too many arguments to function
H. Peter Anvin
reviewerQuoted 6 lines · Avi Kivity
Quoted 5 lines · Avi Kivity
Currently all fpu accessors are wedded to
task_struct. However kvm also uses
the fpu in a different context. Introduce an FPU API, and replace the current uses with the new API.
Quoted 8 lines
Quoted 4 lines
While this patchset is oriented towards deeper changes, as a first step it
simlifies xsave for kvm.Peter/Ingo, what are the plans for merging it? The kvm xsave work depends on this.
Going to look at it today. Looks good, but I want to go over it in detail to catch any gotchas.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.