Commit 9ce40342 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Lin Wang
Browse files

x86/fpu: Remove unused supervisor only offsets 

mainline inclusion
from mainline-v5.18-rc1
commit d47f71f6
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I73H0T
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d47f71f6de7970d504748d1a60a11c51af5bce47



Intel-SIG: commit d47f71f6 x86/fpu: Remove unused supervisor only offsets.

--------------------------------

No users.

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


Signed-off-by: default avatarLin Wang <lin.x.wang@intel.com>
parent e1f821dd

arch/x86/kernel/fpu/xstate.c

+0 −30
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ static unsigned int xstate_sizes[XFEATURE_MAX] __ro_after_init = 
	{ [ 0 ... XFEATURE_MAX - 1] = -1};

static unsigned int xstate_comp_offsets[XFEATURE_MAX] __ro_after_init =

	{ [ 0 ... XFEATURE_MAX - 1] = -1};

static unsigned int xstate_supervisor_only_offsets[XFEATURE_MAX] __ro_after_init =

	{ [ 0 ... XFEATURE_MAX - 1] = -1};



/*

 * Return whether the system supports a given xfeature.
@@ -324,33 +322,6 @@ static void __init setup_xstate_comp_offsets(void) 
	}

}



/*

 * Setup offsets of a supervisor-state-only XSAVES buffer:

 *

 * The offsets stored in xstate_comp_offsets[] only work for one specific

 * value of the Requested Feature BitMap (RFBM).  In cases where a different

 * RFBM value is used, a different set of offsets is required.  This set of

 * offsets is for when RFBM=xfeatures_mask_supervisor().

 */

static void __init setup_supervisor_only_offsets(void)

{

	unsigned int next_offset;

	int i;



	next_offset = FXSAVE_SIZE + XSAVE_HDR_SIZE;



	for_each_extended_xfeature(i, fpu_kernel_cfg.max_features) {

		if (!xfeature_is_supervisor(i))

			continue;



		if (xfeature_is_aligned(i))

			next_offset = ALIGN(next_offset, 64);



		xstate_supervisor_only_offsets[i] = next_offset;

		next_offset += xstate_sizes[i];

	}

}



/*

 * Print out xstate component offsets and sizes

 */
@@ -951,7 +922,6 @@ void __init fpu__init_system_xstate(unsigned int legacy_size) 


	setup_init_fpu_buf();

	setup_xstate_comp_offsets();

	setup_supervisor_only_offsets();



	/*

	 * Paranoia check whether something in the setup modified the