Commit 2883b4c2 authored by Uros Bizjak's avatar Uros Bizjak Committed by Ingo Molnar
Browse files

x86/fpu: Use XSAVE{,OPT,C,S} and XRSTOR{,S} mnemonics in xstate.h 



Current minimum required version of binutils is 2.25, which
supports XSAVE{,OPT,C,S} and XRSTOR{,S} instruction mnemonics.

Replace the byte-wise specification of XSAVE{,OPT,C,S}
and XRSTOR{,S} with these proper mnemonics.

No functional change intended.

Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250313130251.383204-1-ubizjak@gmail.com
parent d0219855

arch/x86/kernel/fpu/xstate.h

+13 −14
Original line number Diff line number Diff line
@@ -94,18 +94,17 @@ static inline int update_pkru_in_sigframe(struct xregs_state __user *buf, u64 ma 
/* XSAVE/XRSTOR wrapper functions */



#ifdef CONFIG_X86_64

#define REX_PREFIX	"0x48, "

#define REX_SUFFIX	"64"

#else

#define REX_PREFIX

#define REX_SUFFIX

#endif



/* These macros all use (%edi)/(%rdi) as the single memory argument. */

#define XSAVE		".byte " REX_PREFIX "0x0f,0xae,0x27"

#define XSAVEOPT	".byte " REX_PREFIX "0x0f,0xae,0x37"

#define XSAVEC		".byte " REX_PREFIX "0x0f,0xc7,0x27"

#define XSAVES		".byte " REX_PREFIX "0x0f,0xc7,0x2f"

#define XRSTOR		".byte " REX_PREFIX "0x0f,0xae,0x2f"

#define XRSTORS		".byte " REX_PREFIX "0x0f,0xc7,0x1f"

#define XSAVE		"xsave" REX_SUFFIX " %[xa]"

#define XSAVEOPT	"xsaveopt" REX_SUFFIX " %[xa]"

#define XSAVEC		"xsavec" REX_SUFFIX " %[xa]"

#define XSAVES		"xsaves" REX_SUFFIX " %[xa]"

#define XRSTOR		"xrstor" REX_SUFFIX " %[xa]"

#define XRSTORS		"xrstors" REX_SUFFIX " %[xa]"



/*

 * After this @err contains 0 on success or the trap number when the
@@ -114,10 +113,10 @@ static inline int update_pkru_in_sigframe(struct xregs_state __user *buf, u64 ma 
#define XSTATE_OP(op, st, lmask, hmask, err)				\

	asm volatile("1:" op "\n\t"					\

		     "xor %[err], %[err]\n"				\

		     "2:\n\t"						\

		     "2:\n"						\

		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_FAULT_MCE_SAFE)	\

		     : [err] "=a" (err)					\

		     : "D" (st), "m" (*st), "a" (lmask), "d" (hmask)	\

		     : [xa] "m" (*(st)), "a" (lmask), "d" (hmask)	\

		     : "memory")



/*
@@ -137,12 +136,12 @@ static inline int update_pkru_in_sigframe(struct xregs_state __user *buf, u64 ma 
				   XSAVEOPT, X86_FEATURE_XSAVEOPT,	\

				   XSAVEC,   X86_FEATURE_XSAVEC,	\

				   XSAVES,   X86_FEATURE_XSAVES)	\

		     "\n"						\

		     "\n\t"						\

		     "xor %[err], %[err]\n"				\

		     "3:\n"						\

		     _ASM_EXTABLE_TYPE_REG(1b, 3b, EX_TYPE_EFAULT_REG, %[err]) \

		     : [err] "=r" (err)					\

		     : "D" (st), "m" (*st), "a" (lmask), "d" (hmask)	\

		     : [xa] "m" (*(st)), "a" (lmask), "d" (hmask)	\

		     : "memory")



/*
@@ -156,7 +155,7 @@ static inline int update_pkru_in_sigframe(struct xregs_state __user *buf, u64 ma 
		     "3:\n"						\

		     _ASM_EXTABLE_TYPE(1b, 3b, EX_TYPE_FPU_RESTORE)	\

		     :							\

		     : "D" (st), "m" (*st), "a" (lmask), "d" (hmask)	\

		     : [xa] "m" (*(st)), "a" (lmask), "d" (hmask)	\

		     : "memory")



#if defined(CONFIG_X86_64) && defined(CONFIG_X86_DEBUG_FPU)