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

x86/fpu: Cleanup the on_boot_cpu clutter 



Defensive programming is useful, but this on_boot_cpu debug is really
silly.

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

arch/x86/kernel/fpu/init.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -192,11 +192,6 @@ static void __init fpu__init_task_struct_size(void) 
 */

 */

static void __init fpu__init_system_xstate_size_legacy(void)

static void __init fpu__init_system_xstate_size_legacy(void)

{

{

	static int on_boot_cpu __initdata = 1;



	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;



	/*

	/*

	 * Note that xstate sizes might be overwritten later during

	 * Note that xstate sizes might be overwritten later during

	 * fpu__init_system_xstate().

	 * fpu__init_system_xstate().
@@ -216,15 +211,6 @@ static void __init fpu__init_system_xstate_size_legacy(void) 
	fpu_user_xstate_size = fpu_kernel_xstate_size;

	fpu_user_xstate_size = fpu_kernel_xstate_size;

}

}





/* Legacy code to initialize eager fpu mode. */

static void __init fpu__init_system_ctx_switch(void)

{

	static bool on_boot_cpu __initdata = 1;



	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;

}



/*

/*

 * Called on the boot CPU once per system bootup, to set up the initial

 * Called on the boot CPU once per system bootup, to set up the initial

 * FPU state that is later cloned into all processes:

 * FPU state that is later cloned into all processes:
@@ -243,6 +229,4 @@ void __init fpu__init_system(struct cpuinfo_x86 *c) 
	fpu__init_system_xstate_size_legacy();

	fpu__init_system_xstate_size_legacy();

	fpu__init_system_xstate();

	fpu__init_system_xstate();

	fpu__init_task_struct_size();

	fpu__init_task_struct_size();



	fpu__init_system_ctx_switch();

}
 
}

arch/x86/kernel/fpu/xstate.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -379,15 +379,10 @@ static void __init print_xstate_offset_size(void) 
 */

 */

static void __init setup_init_fpu_buf(void)

static void __init setup_init_fpu_buf(void)

{

{

	static int on_boot_cpu __initdata = 1;



	BUILD_BUG_ON((XFEATURE_MASK_USER_SUPPORTED |

	BUILD_BUG_ON((XFEATURE_MASK_USER_SUPPORTED |

		      XFEATURE_MASK_SUPERVISOR_SUPPORTED) !=

		      XFEATURE_MASK_SUPERVISOR_SUPPORTED) !=

		     XFEATURES_INIT_FPSTATE_HANDLED);

		     XFEATURES_INIT_FPSTATE_HANDLED);





	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;



	if (!boot_cpu_has(X86_FEATURE_XSAVE))

	if (!boot_cpu_has(X86_FEATURE_XSAVE))

		return;

		return;
@@ -721,14 +716,10 @@ static void fpu__init_disable_system_xstate(void) 
void __init fpu__init_system_xstate(void)

void __init fpu__init_system_xstate(void)

{

{

	unsigned int eax, ebx, ecx, edx;

	unsigned int eax, ebx, ecx, edx;

	static int on_boot_cpu __initdata = 1;

	u64 xfeatures;

	u64 xfeatures;

	int err;

	int err;

	int i;

	int i;





	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;



	if (!boot_cpu_has(X86_FEATURE_FPU)) {

	if (!boot_cpu_has(X86_FEATURE_FPU)) {

		pr_info("x86/fpu: No FPU detected\n");

		pr_info("x86/fpu: No FPU detected\n");

		return;

		return;