Commit e62bb3d8 authored by Ingo Molnar's avatar Ingo Molnar

x86/fpu: Rename fpstate_alloc_init() to fpstate_init_curr()

Now that there are no FPU context allocations, rename fpstate_alloc_init()
to fpstate_init_curr(), to signal that it initializes the fpstate and
marks it active, for the current task.
Reviewed-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
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: default avatarIngo Molnar <mingo@kernel.org>
parent 91d93d0e
...@@ -44,7 +44,7 @@ extern void fpu__init_system_xstate(void); ...@@ -44,7 +44,7 @@ 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);
extern void fpstate_alloc_init(struct fpu *fpu); extern void fpstate_init_curr(struct fpu *fpu);
extern void fpstate_init(struct fpu *fpu); extern void fpstate_init(struct fpu *fpu);
extern void fpu__clear(struct task_struct *tsk); extern void fpu__clear(struct task_struct *tsk);
......
...@@ -261,7 +261,7 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu) ...@@ -261,7 +261,7 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)
/* /*
* Initialize the current task's in-memory FPU context: * Initialize the current task's in-memory FPU context:
*/ */
void fpstate_alloc_init(struct fpu *fpu) void fpstate_init_curr(struct fpu *fpu)
{ {
WARN_ON_ONCE(fpu != &current->thread.fpu); WARN_ON_ONCE(fpu != &current->thread.fpu);
WARN_ON_ONCE(fpu->fpstate_active); WARN_ON_ONCE(fpu->fpstate_active);
...@@ -271,7 +271,7 @@ void fpstate_alloc_init(struct fpu *fpu) ...@@ -271,7 +271,7 @@ void fpstate_alloc_init(struct fpu *fpu)
/* Safe to do for the current task: */ /* Safe to do for the current task: */
fpu->fpstate_active = 1; fpu->fpstate_active = 1;
} }
EXPORT_SYMBOL_GPL(fpstate_alloc_init); EXPORT_SYMBOL_GPL(fpstate_init_curr);
/* /*
* This function is called before we modify a stopped child's * This function is called before we modify a stopped child's
...@@ -332,7 +332,7 @@ void fpu__restore(void) ...@@ -332,7 +332,7 @@ void fpu__restore(void)
struct fpu *fpu = &tsk->thread.fpu; struct fpu *fpu = &tsk->thread.fpu;
if (!fpu->fpstate_active) if (!fpu->fpstate_active)
fpstate_alloc_init(fpu); fpstate_init_curr(fpu);
/* Avoid __kernel_fpu_begin() right after fpregs_activate() */ /* Avoid __kernel_fpu_begin() right after fpregs_activate() */
kernel_fpu_disable(); kernel_fpu_disable();
...@@ -358,7 +358,7 @@ void fpu__clear(struct task_struct *tsk) ...@@ -358,7 +358,7 @@ void fpu__clear(struct task_struct *tsk)
drop_fpu(fpu); drop_fpu(fpu);
} else { } else {
if (!fpu->fpstate_active) { if (!fpu->fpstate_active) {
fpstate_alloc_init(fpu); fpstate_init_curr(fpu);
user_fpu_begin(); user_fpu_begin();
} }
restore_init_xstate(); restore_init_xstate();
......
...@@ -359,7 +359,7 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size) ...@@ -359,7 +359,7 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)
return -EACCES; return -EACCES;
if (!fpu->fpstate_active) if (!fpu->fpstate_active)
fpstate_alloc_init(fpu); fpstate_init_curr(fpu);
if (!static_cpu_has(X86_FEATURE_FPU)) if (!static_cpu_has(X86_FEATURE_FPU))
return fpregs_soft_set(current, NULL, return fpregs_soft_set(current, NULL,
......
...@@ -6602,7 +6602,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) ...@@ -6602,7 +6602,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
sigset_t sigsaved; sigset_t sigsaved;
if (!fpu->fpstate_active) if (!fpu->fpstate_active)
fpstate_alloc_init(fpu); fpstate_init_curr(fpu);
if (vcpu->sigset_active) if (vcpu->sigset_active)
sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
......
...@@ -150,7 +150,7 @@ void math_emulate(struct math_emu_info *info) ...@@ -150,7 +150,7 @@ void math_emulate(struct math_emu_info *info)
struct fpu *fpu = &current->thread.fpu; struct fpu *fpu = &current->thread.fpu;
if (!fpu->fpstate_active) if (!fpu->fpstate_active)
fpstate_alloc_init(fpu); fpstate_init_curr(fpu);
#ifdef RE_ENTRANT_CHECKING #ifdef RE_ENTRANT_CHECKING
if (emulating) { if (emulating) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment