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

x86/fpu: Get rid of fpu__get_supported_xfeatures_mask() 



This function is really not doing what the comment advertises:

 "Find supported xfeatures based on cpu features and command-line input.
  This must be called after fpu__init_parse_early_param() is called and
  xfeatures_mask is enumerated."

fpu__init_parse_early_param() does not exist anymore and the function just
returns a constant.

Remove it and fix the caller and get rid of further references to
fpu__init_parse_early_param().

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

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

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ extern void fpu__init_cpu_xstate(void); 
extern void fpu__init_system(struct cpuinfo_x86 *c);

extern void fpu__init_check_bugs(void);

extern void fpu__resume_cpu(void);

extern u64 fpu__get_supported_xfeatures_mask(void);



/*

 * Debugging facility:

arch/x86/kernel/cpu/common.c

+2 −3
Original line number Diff line number Diff line
@@ -1715,9 +1715,8 @@ void print_cpu_info(struct cpuinfo_x86 *c) 
}



/*

 * clearcpuid= was already parsed in fpu__init_parse_early_param.

 * But we need to keep a dummy __setup around otherwise it would

 * show up as an environment variable for init.

 * clearcpuid= was already parsed in cpu_parse_early_param().  This dummy

 * function prevents it from becoming an environment variable for init.

 */

static __init int setup_clearcpuid(char *arg)

{

arch/x86/kernel/fpu/init.c

+0 −11
Original line number Diff line number Diff line
@@ -216,17 +216,6 @@ static void __init fpu__init_system_xstate_size_legacy(void) 
	fpu_user_xstate_size = fpu_kernel_xstate_size;

}



/*

 * Find supported xfeatures based on cpu features and command-line input.

 * This must be called after fpu__init_parse_early_param() is called and

 * xfeatures_mask is enumerated.

 */

u64 __init fpu__get_supported_xfeatures_mask(void)

{

	return XFEATURE_MASK_USER_SUPPORTED |

	       XFEATURE_MASK_SUPERVISOR_SUPPORTED;

}



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

static void __init fpu__init_system_ctx_switch(void)

{

arch/x86/kernel/fpu/xstate.c

+3 −1
Original line number Diff line number Diff line
@@ -868,7 +868,9 @@ void __init fpu__init_system_xstate(void) 
			xfeatures_mask_all &= ~BIT_ULL(i);

	}



	xfeatures_mask_all &= fpu__get_supported_xfeatures_mask();

	xfeatures_mask_all &= XFEATURE_MASK_USER_SUPPORTED |

			      XFEATURE_MASK_SUPERVISOR_SUPPORTED;



	/* Store it for paranoia check at the end */

	xfeatures = xfeatures_mask_all;