Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d366bf7e authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Replace cpu_has_xsave with boot_cpu_has() usage 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm@vger.kernel.org
Link: http://lkml.kernel.org/r/1459801503-15600-10-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 01f8fd73

arch/x86/ia32/ia32_signal.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, 
		put_user_ex(ptr_to_compat(&frame->uc), &frame->puc);



		/* Create the ucontext.  */

		if (cpu_has_xsave)

		if (boot_cpu_has(X86_FEATURE_XSAVE))

			put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);

		else

			put_user_ex(0, &frame->uc.uc_flags);

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	set_bit(bit, (unsigned long *)cpu_caps_set);	\

} while (0)



#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

/*

 * Do not add any more of those clumsy macros - use static_cpu_has() for

arch/x86/kernel/fpu/regset.c

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, 
	 * update the header bits in the xsave header, indicating the

	 * presence of FP and SSE state.

	 */

	if (cpu_has_xsave)

	if (boot_cpu_has(X86_FEATURE_XSAVE))

		fpu->state.xsave.header.xfeatures |= XFEATURE_MASK_FPSSE;



	return ret;
@@ -82,7 +82,7 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset, 
	struct xregs_state *xsave;

	int ret;



	if (!cpu_has_xsave)

	if (!boot_cpu_has(X86_FEATURE_XSAVE))

		return -ENODEV;



	fpu__activate_fpstate_read(fpu);
@@ -111,7 +111,7 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset, 
	struct xregs_state *xsave;

	int ret;



	if (!cpu_has_xsave)

	if (!boot_cpu_has(X86_FEATURE_XSAVE))

		return -ENODEV;



	fpu__activate_fpstate_write(fpu);
@@ -328,7 +328,7 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset, 
	 * update the header bit in the xsave header, indicating the

	 * presence of FP.

	 */

	if (cpu_has_xsave)

	if (boot_cpu_has(X86_FEATURE_XSAVE))

		fpu->state.xsave.header.xfeatures |= XFEATURE_MASK_FP;

	return ret;

}

arch/x86/kernel/fpu/xstate.c

+4 −4
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void fpstate_sanitize_xstate(struct fpu *fpu) 
 */

void fpu__init_cpu_xstate(void)

{

	if (!cpu_has_xsave || !xfeatures_mask)

	if (!boot_cpu_has(X86_FEATURE_XSAVE) || !xfeatures_mask)

		return;



	cr4_set_bits(X86_CR4_OSXSAVE);
@@ -316,7 +316,7 @@ static void __init setup_init_fpu_buf(void) 
	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;



	if (!cpu_has_xsave)

	if (!boot_cpu_has(X86_FEATURE_XSAVE))

		return;



	setup_xstate_features();
@@ -630,7 +630,7 @@ void __init fpu__init_system_xstate(void) 
	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;



	if (!cpu_has_xsave) {

	if (!boot_cpu_has(X86_FEATURE_XSAVE)) {

		pr_info("x86/fpu: Legacy x87 FPU detected.\n");

		return;

	}
@@ -678,7 +678,7 @@ void fpu__resume_cpu(void) 
	/*

	 * Restore XCR0 on xsave capable CPUs:

	 */

	if (cpu_has_xsave)

	if (boot_cpu_has(X86_FEATURE_XSAVE))

		xsetbv(XCR_XFEATURE_ENABLED_MASK, xfeatures_mask);

}

arch/x86/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, 
		put_user_ex(&frame->uc, &frame->puc);



		/* Create the ucontext.  */

		if (cpu_has_xsave)

		if (boot_cpu_has(X86_FEATURE_XSAVE))

			put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);

		else

			put_user_ex(0, &frame->uc.uc_flags);
@@ -442,7 +442,7 @@ static unsigned long frame_uc_flags(struct pt_regs *regs) 
{

	unsigned long flags;



	if (cpu_has_xsave)

	if (boot_cpu_has(X86_FEATURE_XSAVE))

		flags = UC_FP_XSTATE | UC_SIGCONTEXT_SS;

	else

		flags = UC_SIGCONTEXT_SS;