selftests/x86: Use __builtin_ia32_read/writeeflags

The asm to read and write EFLAGS from userspace is horrible.  The
compiler builtins are now available on all supported compilers, so
use them instead.

(The compiler builtins are also unnecessarily ugly, but that's a
 more manageable level of ugliness.)

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/aee4b1cdfc56083eb779ce927b7d3459aad2af76.1604346818.git.luto@kernel.org
This commit is contained in:
Andy Lutomirski 2020-11-02 11:54:02 -08:00 committed by Borislav Petkov
parent 4b2d8ca920
commit 9297e602ad
1 changed files with 4 additions and 20 deletions

View File

@ -6,36 +6,20 @@
static inline unsigned long get_eflags(void) static inline unsigned long get_eflags(void)
{ {
unsigned long eflags;
asm volatile (
#ifdef __x86_64__ #ifdef __x86_64__
"subq $128, %%rsp\n\t" return __builtin_ia32_readeflags_u64();
"pushfq\n\t"
"popq %0\n\t"
"addq $128, %%rsp"
#else #else
"pushfl\n\t" return __builtin_ia32_readeflags_u32();
"popl %0"
#endif #endif
: "=r" (eflags) :: "memory");
return eflags;
} }
static inline void set_eflags(unsigned long eflags) static inline void set_eflags(unsigned long eflags)
{ {
asm volatile (
#ifdef __x86_64__ #ifdef __x86_64__
"subq $128, %%rsp\n\t" __builtin_ia32_writeeflags_u64(eflags);
"pushq %0\n\t"
"popfq\n\t"
"addq $128, %%rsp"
#else #else
"pushl %0\n\t" __builtin_ia32_writeeflags_u32(eflags);
"popfl"
#endif #endif
:: "r" (eflags) : "flags", "memory");
} }
#endif /* __SELFTESTS_X86_HELPERS_H */ #endif /* __SELFTESTS_X86_HELPERS_H */