x86/boot: Use __ASM_SIZE() to reduce ifdeffery in cpuflags.c
PATCH 1/1 x86/boot: Use __ASM_SIZE() to reduce ifdeffery in cpuflags.c
Use __ASM_SIZE() macro to add correct insn suffix to pushf/popf.
--- arch/x86/boot/cpuflags.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/x86/boot/cpuflags.c +3 -7
@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h>
@@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)int has_eflag (unsigned long mask) {
Signature · 1 line
2.45.2
H. Peter Anvin
reviewerQuoted 30 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +1
-2@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq"
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 10 lines
arch/x86/boot/cpuflags.c +2
-5-#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)int has_eflag (unsigned long mask) {
Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Quoted 40 lines · H. Peter Anvin
Quoted 38 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +3
-7@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)
Quoted 4 lines
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 2 lines
arch/x86/boot/cpuflags.c +0
-0int has_eflag (unsigned long mask) {Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Yes, this works, too. So I guess we can also remove the comment explaining the reason for explicit suffixes?
Thanks,
Uros.
H. Peter Anvin
reviewerQuoted 46 lines · Uros Bizjak
Quoted 40 lines · H. Peter Anvin
Quoted 38 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +3
-7@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)Quoted 4 lines
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 2 lines
arch/x86/boot/cpuflags.c +0
-0int has_eflag (unsigned long mask) {Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Quoted 6 lines
Yes, this works, too. So I guess we can also remove the comment explaining the reason for explicit suffixes?
Thanks,
Uros.
Yeah. You may want to check the version of binutils that fixed it and put that in the comments.
Quoted 16 lines · H. Peter Anvin
Quoted 16 lines
Quoted 15 lines
Quoted 11 lines
arch/x86/boot/cpuflags.c +2
-7-#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)Quoted 2 lines
int
has_eflag(unsigned long mask)
{Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Quoted 8 lines
Quoted 6 lines
Yes, this works, too. So I guess we can also remove the comment explaining the reason for explicit suffixes?
Thanks,
Uros.Yeah. You may want to check the version of binutils that fixed it and put that in the comments.
I have checked that the build works with 9 year old binutils-2.25 (minimal required version), so the fix was applied to an even earlier version. I guess we don't want to burden unsuspecting readers with historic toolchain oddities, so I propose to just remove the comment for good.
Uros.
H. Peter Anvin
reviewerQuoted 26 lines · Uros Bizjak
Quoted 16 lines · H. Peter Anvin
Quoted 16 lines
Quoted 15 lines
Quoted 11 lines
arch/x86/boot/cpuflags.c +2
-7-#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)Quoted 2 lines
int
has_eflag(unsigned long mask)
{Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Quoted 8 lines
Quoted 6 lines
Yes, this works, too. So I guess we can also remove the comment explaining the reason for explicit suffixes?
Thanks,
Uros.Yeah. You may want to check the version of binutils that fixed it and put that in the comments.
Quoted 8 lines
I have checked that the build works with 9 year old binutils-2.25 (minimal required version), so the fix was applied to an even earlier version. I guess we don't want to burden unsuspecting readers with historic toolchain oddities, so I propose to just remove the comment for good.
Uros.
Yeah, I meant the commit message not comments, sorry.
Quoted 40 lines · H. Peter Anvin
Quoted 38 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +3
-7@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)
Quoted 4 lines
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 2 lines
arch/x86/boot/cpuflags.c +0
-0int has_eflag (unsigned long mask) {Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Unfortunately, clang does not do the right thing when pushf/popf without suffix are used.
arch/x86/boot/cpuflags.c compiles to:
00000000 <has_eflag>:
0: 9c pushf 1: 9c pushf 2: 66 5a pop %edx 4: 66 89 d1 mov %edx,%ecx 7: 66 31 c1 xor %eax,%ecx a: 66 51 push %ecx c: 9d popf d: 9c pushf e: 66 59 pop %ecx 10: 9d popf 11: 66 31 ca xor %ecx,%edx 14: 66 31 c9 xor %ecx,%ecx 17: 66 85 c2 test %eax,%edx 1a: 0f 95 c1 setne %cl 1d: 66 89 c8 mov %ecx,%eax 20: 66 c3 retl
instead of:
00000000 <has_eflag>:
0: 66 9c pushfl 2: 66 9c pushfl 4: 66 5a pop %edx 6: 66 89 d1 mov %edx,%ecx 9: 66 31 c1 xor %eax,%ecx c: 66 51 push %ecx e: 66 9d popfl 10: 66 9c pushfl 12: 66 59 pop %ecx 14: 66 9d popfl 16: 66 31 ca xor %ecx,%edx 19: 66 31 c9 xor %ecx,%ecx 1c: 66 85 c2 test %eax,%edx 1f: 0f 95 c1 setne %cl 22: 66 89 c8 mov %ecx,%eax 25: 66 c3 retl
Please note missing 0x66 operand size override prefixes with pushfl and popfl. This is 16bit code, operand prefixes are mandatory to push 32-bit EFLAGS register (ID flag lives in bit 21).
So, the original patch is the way to go.
Uros.
H. Peter Anvin
reviewerQuoted 89 lines · Uros Bizjak
Quoted 40 lines · H. Peter Anvin
Quoted 38 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +3
-7@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)Quoted 4 lines
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 2 lines
arch/x86/boot/cpuflags.c +0
-0int has_eflag (unsigned long mask) {Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Unfortunately, clang does not do the right thing when pushf/popf without suffix are used.
arch/x86/boot/cpuflags.ccompiles to:00000000 <
has_eflag>:0: 9c pushf 1: 9c pushf 2: 66 5a pop %edx 4: 66 89 d1 mov %edx,%ecx 7: 66 31 c1 xor %eax,%ecx a: 66 51 push %ecx c: 9d popf d: 9c pushf e: 66 59 pop %ecx 10: 9d popf 11: 66 31 ca xor %ecx,%edx 14: 66 31 c9 xor %ecx,%ecx 17: 66 85 c2 test %eax,%edx 1a: 0f 95 c1 setne %cl 1d: 66 89 c8 mov %ecx,%eax 20: 66 c3 retlinstead of:
00000000 <
has_eflag>:0: 66 9c pushfl 2: 66 9c pushfl 4: 66 5a pop %edx 6: 66 89 d1 mov %edx,%ecx 9: 66 31 c1 xor %eax,%ecx c: 66 51 push %ecx e: 66 9d popfl 10: 66 9c pushfl 12: 66 59 pop %ecx 14: 66 9d popfl 16: 66 31 ca xor %ecx,%edx 19: 66 31 c9 xor %ecx,%ecx 1c: 66 85 c2 test %eax,%edx 1f: 0f 95 c1 setne %cl 22: 66 89 c8 mov %ecx,%eax 25: 66 c3 retl
Quoted 8 lines
Please note missing
0x66operand size override prefixes with pushfl and popfl. This is 16bit code, operand prefixes are mandatory to push 32-bit EFLAGS register (ID flag lives in bit 21).So, the original patch is the way to go.
Uros.
You do know that has_eflag can be completely elided on x86-64, or you can use %z with one of the register operands.
One more reason why clang really needs to shape up.
Quoted 95 lines · H. Peter Anvin
Quoted 93 lines · Uros Bizjak
Quoted 40 lines · H. Peter Anvin
Quoted 38 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +3
-7@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)Quoted 4 lines
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 2 lines
arch/x86/boot/cpuflags.c +0
-0int has_eflag (unsigned long mask) {Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Unfortunately, clang does not do the right thing when pushf/popf without suffix are used.
arch/x86/boot/cpuflags.ccompiles to:00000000 <
has_eflag>:0: 9c pushf 1: 9c pushf 2: 66 5a pop %edx 4: 66 89 d1 mov %edx,%ecx 7: 66 31 c1 xor %eax,%ecx a: 66 51 push %ecx c: 9d popf d: 9c pushf e: 66 59 pop %ecx 10: 9d popf 11: 66 31 ca xor %ecx,%edx 14: 66 31 c9 xor %ecx,%ecx 17: 66 85 c2 test %eax,%edx 1a: 0f 95 c1 setne %cl 1d: 66 89 c8 mov %ecx,%eax 20: 66 c3 retlinstead of:
00000000 <
has_eflag>:0: 66 9c pushfl 2: 66 9c pushfl 4: 66 5a pop %edx 6: 66 89 d1 mov %edx,%ecx 9: 66 31 c1 xor %eax,%ecx c: 66 51 push %ecx e: 66 9d popfl 10: 66 9c pushfl 12: 66 59 pop %ecx 14: 66 9d popfl 16: 66 31 ca xor %ecx,%edx 19: 66 31 c9 xor %ecx,%ecx 1c: 66 85 c2 test %eax,%edx 1f: 0f 95 c1 setne %cl 22: 66 89 c8 mov %ecx,%eax 25: 66 c3 retlPlease note missing
0x66operand size override prefixes with pushfl and popfl. This is 16bit code, operand prefixes are mandatory to push 32-bit EFLAGS register (ID flag lives in bit 21).
Quoted 6 lines
Quoted 4 lines
So, the original patch is the way to go.
Uros.
You do know that
has_eflagcan be completely elided on x86-64, or you can use %z with one of the register operands.
It is 32-bit PUSHFL insn that requires the "L" suffix in 16-bit code. This is x86_32 issue and clang was just lucky that the instruction was always defined with explicit L suffix. Please note that PUSHF has no register operand, so %z can't be used.
Quoted 1 line
One more reason why clang really needs to shape up.
Indeed.
Thanks,
Uros.
H. Peter Anvin
reviewerQuoted 108 lines · Uros Bizjak
Quoted 95 lines · H. Peter Anvin
Quoted 93 lines · Uros Bizjak
Quoted 40 lines · H. Peter Anvin
Quoted 38 lines · Uros Bizjak
Use
__ASM_SIZE()macro to add correct insn suffix to pushf/popf.Signed-off-by Uros Bizjak <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>---
arch/x86/boot/cpuflags.c| 10 +++-------1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/boot/cpuflags.c +3
-7@@ -2,6 +2,7 @@#include <linux/types.h> #include "bitops.h" +#include <asm/asm.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> @@ -36,13 +37,8 @@ static int has_fpu(void)* compressed/ directory where it may be 64-bit code, and thus needs * to be 'pushfq' or 'popfq' in that case. */ -#ifdef __x86_64__ -#define PUSHF "pushfq" -#define POPF "popfq" -#else -#define PUSHF "pushfl" -#define POPF "popfl" -#endif +#define PUSHF __ASM_SIZE(pushf) +#define POPF __ASM_SIZE(popf)Quoted 4 lines
arch/x86/boot/cpuflags.c static int has_fpu(void) · line 44
Quoted 2 lines
arch/x86/boot/cpuflags.c +0
-0int has_eflag (unsigned long mask) {Just use pushf/popf. gas hasn't needed that suffix for a long time as far as I know.
Unfortunately, clang does not do the right thing when pushf/popf without suffix are used.
arch/x86/boot/cpuflags.ccompiles to:00000000 <
has_eflag>:0: 9c pushf 1: 9c pushf 2: 66 5a pop %edx 4: 66 89 d1 mov %edx,%ecx 7: 66 31 c1 xor %eax,%ecx a: 66 51 push %ecx c: 9d popf d: 9c pushf e: 66 59 pop %ecx 10: 9d popf 11: 66 31 ca xor %ecx,%edx 14: 66 31 c9 xor %ecx,%ecx 17: 66 85 c2 test %eax,%edx 1a: 0f 95 c1 setne %cl 1d: 66 89 c8 mov %ecx,%eax 20: 66 c3 retlinstead of:
00000000 <
has_eflag>:0: 66 9c pushfl 2: 66 9c pushfl 4: 66 5a pop %edx 6: 66 89 d1 mov %edx,%ecx 9: 66 31 c1 xor %eax,%ecx c: 66 51 push %ecx e: 66 9d popfl 10: 66 9c pushfl 12: 66 59 pop %ecx 14: 66 9d popfl 16: 66 31 ca xor %ecx,%edx 19: 66 31 c9 xor %ecx,%ecx 1c: 66 85 c2 test %eax,%edx 1f: 0f 95 c1 setne %cl 22: 66 89 c8 mov %ecx,%eax 25: 66 c3 retlPlease note missing
0x66operand size override prefixes with pushfl and popfl. This is 16bit code, operand prefixes are mandatory to push 32-bit EFLAGS register (ID flag lives in bit 21).Quoted 6 lines
Quoted 4 lines
So, the original patch is the way to go.
Uros.
You do know that
has_eflagcan be completely elided on x86-64, or you can use %z with one of the register operands.It is 32-bit PUSHFL insn that requires the "L" suffix in 16-bit code. This is
x86_32issue and clang was just lucky that the instruction was always defined with explicit L suffix. Please note that PUSHF has no register operand, so %z can't be used.
Quoted 7 lines
Quoted 1 line
One more reason why clang really needs to shape up.
Indeed.
Thanks,
Uros.
Oh, I see – it is a bug in clang -m16 (.code16gcc or its equivalent.)
However, there you can always do pushfl/popfl since that doesn't apply to 64-bit mode: both AC and ID always exist in 64-bit mode and any future features should be detected by cpuid rather than by frobbing random bits in xFLAGS.
I suggest have_eflag_ac() and have_eflag_id() and just have them return true on 64 bits.