Messages in this thread Patch in this message | | | Date | Mon, 14 Jun 2021 17:44:30 +0200 | From | Thomas Gleixner <> | Subject | [patch V2 22/52] x86/fpu: Rename copy_xregs_to_kernel() and copy_kernel_to_xregs() |
| |
The function names for xsave[s]/xrstor[s] operations are horribly named and a permanent source of confusion.
Rename: copy_xregs_to_kernel() to xsave_to_kernel() copy_kernel_to_xregs() to xrstor_from_kernel()
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 | 10 +++++----- arch/x86/kernel/fpu/core.c | 6 +++--- arch/x86/kernel/fpu/signal.c | 14 +++++++------- arch/x86/kernel/fpu/xstate.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-)
--- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -264,7 +264,7 @@ static inline void fxsave_to_kernel(stru * This function is called only during boot time when x86 caps are not set * up and alternative can not be used yet. */ -static inline void copy_kernel_to_xregs_booting(struct xregs_state *xstate) +static inline void xrstor_from_kernel_booting(struct xregs_state *xstate) { u64 mask = -1; u32 lmask = mask; @@ -288,7 +288,7 @@ static inline void copy_kernel_to_xregs_ /* * Save processor xstate to xsave area. */ -static inline void copy_xregs_to_kernel(struct xregs_state *xstate) +static inline void xsave_to_kernel(struct xregs_state *xstate) { u64 mask = xfeatures_mask_all; u32 lmask = mask; @@ -306,7 +306,7 @@ static inline void copy_xregs_to_kernel( /* * Restore processor xstate from xsave area. */ -static inline void copy_kernel_to_xregs(struct xregs_state *xstate, u64 mask) +static inline void xrstor_from_kernel(struct xregs_state *xstate, u64 mask) { u32 lmask = mask; u32 hmask = mask >> 32; @@ -367,7 +367,7 @@ static inline int copy_user_to_xregs(str * Restore xstate from kernel space xsave area, return an error code instead of * an exception. */ -static inline int copy_kernel_to_xregs_err(struct xregs_state *xstate, u64 mask) +static inline int xrstor_from_kernel_err(struct xregs_state *xstate, u64 mask) { u32 lmask = mask; u32 hmask = mask >> 32; @@ -386,7 +386,7 @@ extern int copy_fpregs_to_fpstate(struct static inline void __copy_kernel_to_fpregs(union fpregs_state *fpstate, u64 mask) { if (use_xsave()) { - copy_kernel_to_xregs(&fpstate->xsave, mask); + xrstor_from_kernel(&fpstate->xsave, mask); } else { if (use_fxsr()) copy_kernel_to_fxregs(&fpstate->fxsave); --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -95,7 +95,7 @@ EXPORT_SYMBOL(irq_fpu_usable); int copy_fpregs_to_fpstate(struct fpu *fpu) { if (likely(use_xsave())) { - copy_xregs_to_kernel(&fpu->state.xsave); + xsave_to_kernel(&fpu->state.xsave); /* * AVX512 state is tracked here because its use is @@ -358,7 +358,7 @@ void fpu__drop(struct fpu *fpu) static inline void copy_init_fpstate_to_fpregs(u64 features_mask) { if (use_xsave()) - copy_kernel_to_xregs(&init_fpstate.xsave, features_mask); + xrstor_from_kernel(&init_fpstate.xsave, features_mask); else if (static_cpu_has(X86_FEATURE_FXSR)) copy_kernel_to_fxregs(&init_fpstate.fxsave); else @@ -389,7 +389,7 @@ static void fpu__clear(struct fpu *fpu, if (user_only) { if (!fpregs_state_valid(fpu, smp_processor_id()) && xfeatures_mask_supervisor()) - copy_kernel_to_xregs(&fpu->state.xsave, + xrstor_from_kernel(&fpu->state.xsave, xfeatures_mask_supervisor()); copy_init_fpstate_to_fpregs(xfeatures_mask_user()); } else { --- a/arch/x86/kernel/fpu/signal.c +++ b/arch/x86/kernel/fpu/signal.c @@ -271,14 +271,14 @@ static int copy_user_to_fpregs_zeroing(v r = copy_user_to_fxregs(buf); if (!r) - copy_kernel_to_xregs(&init_fpstate.xsave, init_bv); + xrstor_from_kernel(&init_fpstate.xsave, init_bv); return r; } else { init_bv = xfeatures_mask_user() & ~xbv; r = copy_user_to_xregs(buf, xbv); if (!r && unlikely(init_bv)) - copy_kernel_to_xregs(&init_fpstate.xsave, init_bv); + xrstor_from_kernel(&init_fpstate.xsave, init_bv); return r; } } else if (use_fxsr()) { @@ -367,7 +367,7 @@ static int __fpu__restore_sig(void __use */ if (test_thread_flag(TIF_NEED_FPU_LOAD) && xfeatures_mask_supervisor()) - copy_kernel_to_xregs(&fpu->state.xsave, + xrstor_from_kernel(&fpu->state.xsave, xfeatures_mask_supervisor()); fpregs_mark_activate(); fpregs_unlock(); @@ -422,7 +422,7 @@ static int __fpu__restore_sig(void __use * above XRSTOR failed or ia32_fxstate is true. Shrug. */ if (xfeatures_mask_supervisor()) - copy_xregs_to_kernel(&fpu->state.xsave); + xsave_to_kernel(&fpu->state.xsave); set_thread_flag(TIF_NEED_FPU_LOAD); } __fpu_invalidate_fpregs_state(fpu); @@ -440,13 +440,13 @@ static int __fpu__restore_sig(void __use fpregs_lock(); if (unlikely(init_bv)) - copy_kernel_to_xregs(&init_fpstate.xsave, init_bv); + xrstor_from_kernel(&init_fpstate.xsave, init_bv); /* * Restore previously saved supervisor xstates along with * copied-in user xstates. */ - ret = copy_kernel_to_xregs_err(&fpu->state.xsave, + ret = xrstor_from_kernel_err(&fpu->state.xsave, user_xfeatures | xfeatures_mask_supervisor()); } else if (use_fxsr()) { @@ -464,7 +464,7 @@ static int __fpu__restore_sig(void __use u64 init_bv; init_bv = xfeatures_mask_user() & ~XFEATURE_MASK_FPSSE; - copy_kernel_to_xregs(&init_fpstate.xsave, init_bv); + xrstor_from_kernel(&init_fpstate.xsave, init_bv); } ret = copy_kernel_to_fxregs_err(&fpu->state.fxsave); --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -411,7 +411,7 @@ static void __init setup_init_fpu_buf(vo /* * Init all the features state with header.xfeatures being 0x0 */ - copy_kernel_to_xregs_booting(&init_fpstate.xsave); + xrstor_from_kernel_booting(&init_fpstate.xsave); /* * All components are now in init state. Read the state back so
| |