Commit 16dcf438 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

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()
	copy_kernel_to_fxregs() to fxrstor()
	copy_fxregs_to_user() to fxsave_to_user_sigframe()
	copy_user_to_fxregs() to fxrstor_from_user_sigframe()

so it's clear what these are doing. All these functions are really low
level wrappers around the equally named instructions, so mapping to the
documentation is just natural.

While at it, replace the static_cpu_has(X86_FEATURE_FXSR) with
use_fxsr() to be consistent with the rest of the code.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210623121454.017863494@linutronix.de
parent 6b862ba1

arch/x86/include/asm/fpu/internal.h

+5 −13
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static inline int copy_fregs_to_user(struct fregs_state __user *fx) 
	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));
@@ -138,7 +138,7 @@ static inline int copy_fxregs_to_user(struct fxregs_state __user *fx) 


}



static inline void copy_kernel_to_fxregs(struct fxregs_state *fx)

static inline void fxrstor(struct fxregs_state *fx)

{

	if (IS_ENABLED(CONFIG_X86_32))

		kernel_insn(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx));
@@ -146,7 +146,7 @@ static inline void copy_kernel_to_fxregs(struct fxregs_state *fx) 
		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_safe(struct fxregs_state *fx)

{

	if (IS_ENABLED(CONFIG_X86_32))

		return kernel_insn_err(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx));
@@ -154,7 +154,7 @@ static inline int copy_kernel_to_fxregs_err(struct fxregs_state *fx) 
		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));
@@ -177,14 +177,6 @@ static inline int copy_user_to_fregs(struct fregs_state __user *fx) 
	return user_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));

}



static inline void copy_fxregs_to_kernel(struct fpu *fpu)

{

	if (IS_ENABLED(CONFIG_X86_32))

		asm volatile( "fxsave %[fx]" : [fx] "=m" (fpu->state.fxsave));

	else

		asm volatile("fxsaveq %[fx]" : [fx] "=m" (fpu->state.fxsave));

}



static inline void fxsave(struct fxregs_state *fx)

{

	if (IS_ENABLED(CONFIG_X86_32))
@@ -391,7 +383,7 @@ static inline void __copy_kernel_to_fpregs(union fpregs_state *fpstate, u64 mask 
		os_xrstor(&fpstate->xsave, mask);

	} else {

		if (use_fxsr())

			copy_kernel_to_fxregs(&fpstate->fxsave);

			fxrstor(&fpstate->fxsave);

		else

			copy_kernel_to_fregs(&fpstate->fsave);

	}

arch/x86/kernel/fpu/core.c

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ int copy_fpregs_to_fpstate(struct fpu *fpu) 
	}



	if (likely(use_fxsr())) {

		copy_fxregs_to_kernel(fpu);

		fxsave(&fpu->state.fxsave);

		return 1;

	}
@@ -315,8 +315,8 @@ static inline void copy_init_fpstate_to_fpregs(u64 features_mask) 
{

	if (use_xsave())

		os_xrstor(&init_fpstate.xsave, features_mask);

	else if (static_cpu_has(X86_FEATURE_FXSR))

		copy_kernel_to_fxregs(&init_fpstate.fxsave);

	else if (use_fxsr())

		fxrstor(&init_fpstate.fxsave);

	else

		copy_kernel_to_fregs(&init_fpstate.fsave);

arch/x86/kernel/fpu/signal.c

+5 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline int save_fsave_header(struct task_struct *tsk, void __user *buf) 


		fpregs_lock();

		if (!test_thread_flag(TIF_NEED_FPU_LOAD))

			copy_fxregs_to_kernel(&tsk->thread.fpu);

			fxsave(&tsk->thread.fpu.state.fxsave);

		fpregs_unlock();



		convert_from_fxsr(&env, tsk);
@@ -131,7 +131,7 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf) 
	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);
@@ -259,7 +259,7 @@ static int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only) 
		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)

				os_xrstor(&init_fpstate.xsave, init_bv);

			return r;
@@ -272,7 +272,7 @@ static int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only) 
			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);

}
@@ -458,7 +458,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) 
			os_xrstor(&init_fpstate.xsave, init_bv);

		}



		ret = copy_kernel_to_fxregs_err(&fpu->state.fxsave);

		ret = fxrstor_safe(&fpu->state.fxsave);

	} else {

		ret = __copy_from_user(&fpu->state.fsave, buf_fx, state_size);

		if (ret)