Unverified Commit a28e81b0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7747 x86/fpu: Keep xfd_state in sync with MSR_IA32_XFD 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2TE4OCF5EBJZ7YZ774TZWL7AEOICPM55/ 
 
https://gitee.com/openeuler/kernel/issues/I9Q992 
 
Link:https://gitee.com/openeuler/kernel/pulls/7747

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 043e60ec c77ae08a

arch/x86/kernel/fpu/xstate.c

+3 −2
Original line number Diff line number Diff line
@@ -152,10 +152,11 @@ void fpu__init_cpu_xstate(void) 
	 * Must happen after CR4 setup and before xsetbv() to allow KVM

	 * lazy passthrough.  Write independent of the dynamic state static

	 * key as that does not work on the boot CPU. This also ensures

	 * that any stale state is wiped out from XFD.

	 * that any stale state is wiped out from XFD. Reset the per CPU

	 * xfd cache too.

	 */

	if (cpu_feature_enabled(X86_FEATURE_XFD))

		wrmsrl(MSR_IA32_XFD, init_fpstate.xfd);

		xfd_set_state(init_fpstate.xfd);



	/*

	 * XCR_XFEATURE_ENABLED_MASK (aka. XCR0) sets user features

arch/x86/kernel/fpu/xstate.h

+10 −4
Original line number Diff line number Diff line
@@ -151,20 +151,26 @@ static inline void xfd_validate_state(struct fpstate *fpstate, u64 mask, bool rs 
#endif



#ifdef CONFIG_X86_64

static inline void xfd_set_state(u64 xfd)

{

	wrmsrl(MSR_IA32_XFD, xfd);

	__this_cpu_write(xfd_state, xfd);

}



static inline void xfd_update_state(struct fpstate *fpstate)

{

	if (fpu_state_size_dynamic()) {

		u64 xfd = fpstate->xfd;



		if (__this_cpu_read(xfd_state) != xfd) {

			wrmsrl(MSR_IA32_XFD, xfd);

			__this_cpu_write(xfd_state, xfd);

		}

		if (__this_cpu_read(xfd_state) != xfd)

			xfd_set_state(xfd);

	}

}



extern int __xfd_enable_feature(u64 which, struct fpu_guest *guest_fpu);

#else

static inline void xfd_set_state(u64 xfd) { }



static inline void xfd_update_state(struct fpstate *fpstate) { }



static inline int __xfd_enable_feature(u64 which, struct fpu_guest *guest_fpu) {