leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/fpu: Move fpu__clear() to 'struct fpu *' parameter passing

Browse Source 
Do it like all other high level FPU state handling functions: they
only know about struct fpu, not about the task.

(Also remove a dead prototype while at it.)

Cc: Andy Lutomirski <luto@amacapital.net>
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: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2015-04-29 20:35:33 +02:00
parent 6ffc152e46
commit 04c8e01d50
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/include/asm/fpu/internal.h
View File

@@ -37,9 +37,8 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
#define MXCSR_DEFAULT 0x1f80 #define MXCSR_DEFAULT 0x1f80
extern unsigned int mxcsr_feature_mask; extern unsigned int mxcsr_feature_mask;
extern void fpu__init_cpu(void);
extern void eager_fpu_init(void);
extern void fpu__init_cpu(void);
extern void fpu__init_system_xstate(void); extern void fpu__init_system_xstate(void);
extern void fpu__init_cpu_xstate(void); extern void fpu__init_cpu_xstate(void);
extern void fpu__init_system(struct cpuinfo_x86 *c); extern void fpu__init_system(struct cpuinfo_x86 *c);
@@ -57,7 +56,7 @@ extern void fpu__restore(void);
extern void fpu__drop(struct fpu *fpu); extern void fpu__drop(struct fpu *fpu);
extern int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu); extern int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu);
extern void fpu__reset(struct fpu *fpu); extern void fpu__reset(struct fpu *fpu);
extern void fpu__clear(struct task_struct *tsk); extern void fpu__clear(struct fpu *fpu);
extern void fpu__init_check_bugs(void); extern void fpu__init_check_bugs(void);
extern void fpu__resume_cpu(void); extern void fpu__resume_cpu(void);

6
arch/x86/kernel/fpu/core.c
View File

@@ -390,11 +390,9 @@ void fpu__reset(struct fpu *fpu)
* Called by sys_execve() to clear the FPU fpregs, so that FPU state * Called by sys_execve() to clear the FPU fpregs, so that FPU state
* of the previous binary does not leak over into the exec()ed binary: * of the previous binary does not leak over into the exec()ed binary:
*/ */
void fpu__clear(struct task_struct *tsk) void fpu__clear(struct fpu *fpu)
{ {
struct fpu *fpu = &tsk->thread.fpu; WARN_ON_ONCE(fpu != &current->thread.fpu); /* Almost certainly an anomaly */
WARN_ON_ONCE(tsk != current); /* Almost certainly an anomaly */
if (!use_eager_fpu()) { if (!use_eager_fpu()) {
/* FPU state will be reallocated lazily at the first use. */ /* FPU state will be reallocated lazily at the first use. */

2
arch/x86/kernel/process.c
View File

@@ -120,7 +120,7 @@ void flush_thread(void)
flush_ptrace_hw_breakpoint(tsk); flush_ptrace_hw_breakpoint(tsk);
memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
fpu__clear(tsk); fpu__clear(&tsk->thread.fpu);
} }
static void hard_disable_TSC(void) static void hard_disable_TSC(void)