diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-25 11:59:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:11:32 +0200 |
| commit | 003e2e8b57e79709e4973f6cb48381b2ba396680 (patch) | |
| tree | 51c7d2f09c0c053d9bd40e83456f1d268edaff5c /arch/x86/include | |
| parent | 9ccc27a5d297503e485373b69688d038a1d8e662 (diff) | |
x86/fpu: Standardize the parameter type of copy_kernel_to_fpregs()
Bring the __copy_fpstate_to_fpregs() and copy_fpstate_to_fpregs() functions
in line with the parameter passing convention of other kernel-to-FPU-registers
copying functions: pass around an in-memory FPU register state pointer,
instead of struct fpu *.
NOTE: This patch also changes the assembly constraint of the FXSAVE-leak
workaround from 'fpu->fpregs_active' to 'fpstate' - but that is fine,
as we only need a valid memory address there for the FILDL instruction.
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Bobby Powers <bobbypowers@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/fpu/internal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index da71d41227ff..12acbb32a561 100644 --- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -446,19 +446,19 @@ static inline int copy_fpregs_to_fpstate(struct fpu *fpu) return 0; } -static inline void __copy_kernel_to_fpregs(struct fpu *fpu) +static inline void __copy_kernel_to_fpregs(union fpregs_state *fpstate) { if (use_xsave()) { - copy_kernel_to_xregs(&fpu->state.xsave, -1); + copy_kernel_to_xregs(&fpstate->xsave, -1); } else { if (use_fxsr()) - copy_kernel_to_fxregs(&fpu->state.fxsave); + copy_kernel_to_fxregs(&fpstate->fxsave); else - copy_kernel_to_fregs(&fpu->state.fsave); + copy_kernel_to_fregs(&fpstate->fsave); } } -static inline void copy_kernel_to_fpregs(struct fpu *fpu) +static inline void copy_kernel_to_fpregs(union fpregs_state *fpstate) { /* * AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception is @@ -470,10 +470,10 @@ static inline void copy_kernel_to_fpregs(struct fpu *fpu) "fnclex\n\t" "emms\n\t" "fildl %P[addr]" /* set F?P to defined value */ - : : [addr] "m" (fpu->fpregs_active)); + : : [addr] "m" (fpstate)); } - __copy_kernel_to_fpregs(fpu); + __copy_kernel_to_fpregs(fpstate); } extern int copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size); @@ -642,7 +642,7 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu) static inline void switch_fpu_finish(struct fpu *new_fpu, fpu_switch_t fpu_switch) { if (fpu_switch.preload) - copy_kernel_to_fpregs(new_fpu); + copy_kernel_to_fpregs(&new_fpu->state); } /* |