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

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

x86/cpufeature: Replace cpu_has_xsaves with boot_cpu_has() usage 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: <kvm@vger.kernel.org>
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>
Link: http://lkml.kernel.org/r/1459801503-15600-11-git-send-email-bp@alien8.de


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

arch/x86/include/asm/cpufeature.h

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

} while (0)



#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

/*

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

 * fast paths and boot_cpu_has() otherwise!

 */



#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_X86_FAST_FEATURE_TESTS)

/*

 * Static testing of CPU features.  Used the same as boot_cpu_has().

arch/x86/kernel/fpu/xstate.c

+5 −5
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void __init setup_xstate_comp(void) 
	xstate_comp_offsets[0] = 0;

	xstate_comp_offsets[1] = offsetof(struct fxregs_state, xmm_space);



	if (!cpu_has_xsaves) {

	if (!boot_cpu_has(X86_FEATURE_XSAVES)) {

		for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {

			if (xfeature_enabled(i)) {

				xstate_comp_offsets[i] = xstate_offsets[i];
@@ -322,7 +322,7 @@ static void __init setup_init_fpu_buf(void) 
	setup_xstate_features();

	print_xstate_features();



	if (cpu_has_xsaves) {

	if (boot_cpu_has(X86_FEATURE_XSAVES)) {

		init_fpstate.xsave.header.xcomp_bv = (u64)1 << 63 | xfeatures_mask;

		init_fpstate.xsave.header.xfeatures = xfeatures_mask;

	}
@@ -417,7 +417,7 @@ static int xfeature_size(int xfeature_nr) 
 */

static int using_compacted_format(void)

{

	return cpu_has_xsaves;

	return boot_cpu_has(X86_FEATURE_XSAVES);

}



static void __xstate_dump_leaves(void)
@@ -549,7 +549,7 @@ static unsigned int __init calculate_xstate_size(void) 
	unsigned int eax, ebx, ecx, edx;

	unsigned int calculated_xstate_size;



	if (!cpu_has_xsaves) {

	if (!boot_cpu_has(X86_FEATURE_XSAVES)) {

		/*

		 * - CPUID function 0DH, sub-function 0:

		 *    EBX enumerates the size (in bytes) required by
@@ -667,7 +667,7 @@ void __init fpu__init_system_xstate(void) 
	pr_info("x86/fpu: Enabled xstate features 0x%llx, context size is %d bytes, using '%s' format.\n",

		xfeatures_mask,

		xstate_size,

		cpu_has_xsaves ? "compacted" : "standard");

		boot_cpu_has(X86_FEATURE_XSAVES) ? "compacted" : "standard");

}



/*

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -3386,7 +3386,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) 
		}

	}



	if (cpu_has_xsaves)

	if (boot_cpu_has(X86_FEATURE_XSAVES))

		rdmsrl(MSR_IA32_XSS, host_xss);



	return 0;

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -3095,7 +3095,7 @@ static void load_xsave(struct kvm_vcpu *vcpu, u8 *src) 


	/* Set XSTATE_BV and possibly XCOMP_BV.  */

	xsave->header.xfeatures = xstate_bv;

	if (cpu_has_xsaves)

	if (boot_cpu_has(X86_FEATURE_XSAVES))

		xsave->header.xcomp_bv = host_xcr0 | XSTATE_COMPACTION_ENABLED;



	/*
@@ -7292,7 +7292,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 
static void fx_init(struct kvm_vcpu *vcpu)

{

	fpstate_init(&vcpu->arch.guest_fpu.state);

	if (cpu_has_xsaves)

	if (boot_cpu_has(X86_FEATURE_XSAVES))

		vcpu->arch.guest_fpu.state.xsave.header.xcomp_bv =

			host_xcr0 | XSTATE_COMPACTION_ENABLED;