Messages in this thread Patch in this message | | | Date | Fri, 11 Jun 2021 18:15:37 +0200 | From | Thomas Gleixner <> | Subject | [patch 14/41] x86/fpu: Rename fxregs related copy functions |
| |
The function names for fxsave/fxrstor operations are horribly named and a permanent source of confusion.
Rename: copy_fxregs_to_kernel() to fxsave_to_kernel() copy_kernel_to_fxregs() to fxrstor_from_kernel() copy_fxregs_to_user() to fxsave_to_user_sigframe() copy_user_to_fxregs() to fxrstor_from_user_sigframe()
so it's entirely clear what this is about.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/include/asm/fpu/internal.h | 12 ++++++------ arch/x86/kernel/fpu/core.c | 4 ++-- arch/x86/kernel/fpu/signal.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-)
--- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -132,7 +132,7 @@ static inline int copy_fregs_to_user(str return user_insn(fnsave %[fx]; fwait, [fx] "=m" (*fx), "m" (*fx)); } -static inline int copy_fxregs_to_user(struct fxregs_state __user *fx) +static inline int fxsave_to_user_sigframe(struct fxregs_state __user *fx) { if (IS_ENABLED(CONFIG_X86_32)) return user_insn(fxsave %[fx], [fx] "=m" (*fx), "m" (*fx)); @@ -141,7 +141,7 @@ static inline int copy_fxregs_to_user(st } -static inline void copy_kernel_to_fxregs(struct fxregs_state *fx) +static inline void fxrstor_from_kernel(struct fxregs_state *fx) { if (IS_ENABLED(CONFIG_X86_32)) kernel_insn(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx)); @@ -149,7 +149,7 @@ static inline void copy_kernel_to_fxregs kernel_insn(fxrstorq %[fx], "=m" (*fx), [fx] "m" (*fx)); } -static inline int copy_kernel_to_fxregs_err(struct fxregs_state *fx) +static inline int fxrstor_from_kernel_err(struct fxregs_state *fx) { if (IS_ENABLED(CONFIG_X86_32)) return kernel_insn_err(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx)); @@ -157,7 +157,7 @@ static inline int copy_kernel_to_fxregs_ return kernel_insn_err(fxrstorq %[fx], "=m" (*fx), [fx] "m" (*fx)); } -static inline int copy_user_to_fxregs(struct fxregs_state __user *fx) +static inline int fxrstor_from_user_sigframe(struct fxregs_state __user *fx) { if (IS_ENABLED(CONFIG_X86_32)) return user_insn(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx)); @@ -180,7 +180,7 @@ static inline int copy_user_to_fregs(str return user_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx)); } -static inline void copy_fxregs_to_kernel(struct fpu *fpu) +static inline void fxsave_to_kernel(struct fpu *fpu) { if (IS_ENABLED(CONFIG_X86_32)) asm volatile( "fxsave %[fx]" : [fx] "=m" (fpu->state.fxsave)); @@ -403,7 +403,7 @@ static inline void __copy_kernel_to_fpre xrstor_from_kernel(&fpstate->xsave, mask); } else { if (use_fxsr()) - copy_kernel_to_fxregs(&fpstate->fxsave); + fxrstor_from_kernel(&fpstate->fxsave); else copy_kernel_to_fregs(&fpstate->fsave); } --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -107,7 +107,7 @@ int copy_fpregs_to_fpstate(struct fpu *f } if (likely(use_fxsr())) { - copy_fxregs_to_kernel(fpu); + fxsave_to_kernel(fpu); return 1; } @@ -360,7 +360,7 @@ static inline void copy_init_fpstate_to_ if (use_xsave()) xrstor_from_kernel(&init_fpstate.xsave, features_mask); else if (static_cpu_has(X86_FEATURE_FXSR)) - copy_kernel_to_fxregs(&init_fpstate.fxsave); + fxrstor_from_kernel(&init_fpstate.fxsave); else copy_kernel_to_fregs(&init_fpstate.fsave); --- a/arch/x86/kernel/fpu/signal.c +++ b/arch/x86/kernel/fpu/signal.c @@ -64,7 +64,7 @@ static inline int save_fsave_header(stru fpregs_lock(); if (!test_thread_flag(TIF_NEED_FPU_LOAD)) - copy_fxregs_to_kernel(&tsk->thread.fpu); + fxsave_to_kernel(&tsk->thread.fpu); fpregs_unlock(); convert_from_fxsr(&env, tsk); @@ -131,7 +131,7 @@ static inline int copy_fpregs_to_sigfram if (use_xsave()) err = xsave_to_user_sigframe(buf); else if (use_fxsr()) - err = copy_fxregs_to_user((struct fxregs_state __user *) buf); + err = fxsave_to_user_sigframe((struct fxregs_state __user *) buf); else err = copy_fregs_to_user((struct fregs_state __user *) buf); @@ -269,7 +269,7 @@ static int copy_user_to_fpregs_zeroing(v if (fx_only) { init_bv = xfeatures_mask_user() & ~XFEATURE_MASK_FPSSE; - r = copy_user_to_fxregs(buf); + r = fxrstor_from_user_sigframe(buf); if (!r) xrstor_from_kernel(&init_fpstate.xsave, init_bv); return r; @@ -282,7 +282,7 @@ static int copy_user_to_fpregs_zeroing(v return r; } } else if (use_fxsr()) { - return copy_user_to_fxregs(buf); + return fxrstor_from_user_sigframe(buf); } else return copy_user_to_fregs(buf); } @@ -467,7 +467,7 @@ static int __fpu__restore_sig(void __use xrstor_from_kernel(&init_fpstate.xsave, init_bv); } - ret = copy_kernel_to_fxregs_err(&fpu->state.fxsave); + ret = fxrstor_from_kernel_err(&fpu->state.fxsave); } else { ret = __copy_from_user(&fpu->state.fsave, buf_fx, state_size); if (ret)
| |