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

Commit 966ece61 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Remove xsave_init() bootmem allocations 



There's only 8 xstate bits at the moment, and it's not like we
can support unknown bits - so put xstate_offsets[] and
xstate_sizes[] into static allocation.

This is in preparation to be able to call the FPU init code
earlier, when there's no bootmem available yet.

Reviewed-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6a133207

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

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
#define XSTATE_ZMM_Hi256	0x40

#define XSTATE_Hi16_ZMM		0x80



/* The highest xstate bit above (of XSTATE_Hi16_ZMM): */

#define XFEATURES_NR_MAX	8



#define XSTATE_FPSSE	(XSTATE_FP | XSTATE_SSE)

#define XSTATE_AVX512	(XSTATE_OPMASK | XSTATE_ZMM_Hi256 | XSTATE_Hi16_ZMM)

/* Bit 63 of XCR0 is reserved for future expansion */

arch/x86/kernel/fpu/xsave.c

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ u64 xfeatures_mask; 
struct xsave_struct *init_xstate_buf;



static struct _fpx_sw_bytes fx_sw_reserved, fx_sw_reserved_ia32;

static unsigned int *xstate_offsets, *xstate_sizes;

static unsigned int xstate_offsets[XFEATURES_NR_MAX], xstate_sizes[XFEATURES_NR_MAX];

static unsigned int xstate_comp_offsets[sizeof(xfeatures_mask)*8];



/* The number of supported xfeatures in xfeatures_mask: */
@@ -478,8 +478,6 @@ static void __init setup_xstate_features(void) 
	int eax, ebx, ecx, edx, leaf = 0x2;



	xfeatures_nr = fls64(xfeatures_mask);

	xstate_offsets = alloc_bootmem(xfeatures_nr * sizeof(int));

	xstate_sizes = alloc_bootmem(xfeatures_nr * sizeof(int));



	do {

		cpuid_count(XSTATE_CPUID, leaf, &eax, &ebx, &ecx, &edx);