[patch V2 25/52] x86/fpu: Rename fregs related copy functions

Thomas Gleixner
2021-06-14T16:39:16Z

The function names for fnsave/fnrstor operations are horribly named and
a permanent source of confusion.

Rename:
copy_fregs_to_kernel() to fnsave_to_kernel()
copy_kernel_to_fregs() to fnrstor_from_kernel()
copy_fregs_to_user() to fnsave_to_user_sigframe()
copy_user_to_fregs() to fnrstor_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 | 10 +++++-----
arch/x86/kernel/fpu/core.c | 2 +-
arch/x86/kernel/fpu/signal.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)

--- a/arch/x86/include/asm/fpu/internal.h
+++ b/arch/x86/include/asm/fpu/internal.h
@@ -127,7 +127,7 @@ static inline void fpstate_init_soft(str
_ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_fprestore) \
: output : input)

-static inline int copy_fregs_to_user(struct fregs_state __user *fx)
+static inline int fnsave_to_user_sigframe(struct fregs_state __user *fx)
{
return user_insn(fnsave %[fx]; fwait, [fx] "=m" (*fx), "m" (*fx));
}
@@ -165,17 +165,17 @@ static inline int fxrstor_from_user_sigf
return user_insn(fxrstorq %[fx], "=m" (*fx), [fx] "m" (*fx));
}

-static inline void copy_kernel_to_fregs(struct fregs_state *fx)
+static inline void frstor_from_kernel(struct fregs_state *fx)
{
kernel_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));
}

-static inline int copy_kernel_to_fregs_err(struct fregs_state *fx)
+static inline int frstor_from_kernel_err(struct fregs_state *fx)
{
return kernel_insn_err(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));
}

-static inline int copy_user_to_fregs(struct fregs_state __user *fx)
+static inline int frstor_from_user_sigframe(struct fregs_state __user *fx)
{
return user_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));
}
@@ -383,7 +383,7 @@ static inline void __copy_kernel_to_fpre
if (use_fxsr())
fxrstor_from_kernel(&fpstate->fxsave);
else
- copy_kernel_to_fregs(&fpstate->fsave);
+ frstor_from_kernel(&fpstate->fsave);
}
}

--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -362,7 +362,7 @@ static inline void copy_init_fpstate_to_
else if (static_cpu_has(X86_FEATURE_FXSR))
fxrstor_from_kernel(&init_fpstate.fxsave);
else
- copy_kernel_to_fregs(&init_fpstate.fsave);
+ frstor_from_kernel(&init_fpstate.fsave);

if (boot_cpu_has(X86_FEATURE_OSPKE))
copy_init_pkru_to_fpregs();
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -133,7 +133,7 @@ static inline int copy_fpregs_to_sigfram
else if (use_fxsr())
err = fxsave_to_user_sigframe((struct fxregs_state __user *) buf);
else
- err = copy_fregs_to_user((struct fregs_state __user *) buf);
+ err = fnsave_to_user_sigframe((struct fregs_state __user *) buf);

if (unlikely(err) && __clear_user(buf, fpu_user_xstate_size))
err = -EFAULT;
@@ -284,7 +284,7 @@ static int copy_user_to_fpregs_zeroing(v
} else if (use_fxsr()) {
return fxrstor_from_user_sigframe(buf);
} else
- return copy_user_to_fregs(buf);
+ return frstor_from_user_sigframe(buf);
}

static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
@@ -474,7 +474,7 @@ static int __fpu__restore_sig(void __use
goto out;

fpregs_lock();
- ret = copy_kernel_to_fregs_err(&fpu->state.fsave);
+ ret = frstor_from_kernel_err(&fpu->state.fsave);
}
if (!ret)
fpregs_mark_activate();