x86/boot: Remove x86_32 PIC using ebx workaround
PATCH 1/1 x86/boot: Remove x86_32 PIC using ebx workaround
Current minimum required version of GCC is version 5.1 which allows reuse of PIC hard register on x86/x86-64 targets [1]. Remove obsolete workaround that was needed for earlier GCC versions.
[1] https://gcc.gnu.org/gcc-5/changes.html
--- arch/x86/boot/cpuflags.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
arch/x86/boot/cpuflags.c +3 -12
@@ -64,20 +64,11 @@ int has_eflag(unsigned long mask)return !!((f0^f1) & mask); } -/* Handle x86_32 PIC using ebx. */ -#if defined(__i386__) && defined(__PIC__) -# define EBX_REG "=r" -#else -# define EBX_REG "=b" -#endif -void cpuid_count (u32 id,u32 count,u32 *a,u32 *b,u32 *c,u32 *d) { - asmvolatile (".ifnc %%ebx,%3 ; movl %%ebx,%3 ; .endif \n\t" -"cpuid \n\t" -".ifnc %%ebx,%3 ; xchgl %%ebx,%3 ; .endif \n\t" - : "=a" (*a), "=c" (*c), "=d" (*d), EBX_REG (*b) - :"a" (id),"c" (count) + asmvolatile ("cpuid" + :"=a" (*a),"=b" (*b),"=c" (*c),"=d" (*d) + :"0" (id),"2" (count) ); }
Signature · 1 line
2.37.3
Borislav Petkov
maintainerQuoted 5 lines · Uros Bizjak
Current minimum required version of GCC is version 5.1 which allows reuse of PIC hard register on x86/x86-64 targets [1]. Remove obsolete workaround that was needed for earlier GCC versions.
Thanks for the doc pointer.
Lemme see if I understand this commit message correctly:
SysV i386 ABI says that %ebx is used as the base reg in PIC. gcc 5 and newer can handle all possible cases properly where inline asm could clobber the PIC reg. I.e., it is able to deal with the "=b" constraint where an insn can overwrite %ebx and it'll push and pop around that statement.
So far so good.
Why then does this matter for x86-64 where PIC addressing is done rip-relative so %rbx is normal reg there?
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 18 lines · Borislav Petkov
Quoted 5 lines · Uros Bizjak
Current minimum required version of GCC is version 5.1 which allows reuse of PIC hard register on x86/x86-64 targets [1]. Remove obsolete workaround that was needed for earlier GCC versions.
Thanks for the doc pointer.
Lemme see if I understand this commit message correctly:
SysV i386 ABI says that %ebx is used as the base reg in PIC. gcc 5 and newer can handle all possible cases properly where inline asm could clobber the PIC reg. I.e., it is able to deal with the "=b" constraint where an insn can overwrite %ebx and it'll push and pop around that statement.
Quoted 4 lines
So far so good.
Why then does this matter for x86-64 where PIC addressing is done rip-relative so %rbx is normal reg there?
x86-64 uses a PIC register for the medium and large PIC code models, where offsets can be larger than +/- 2GB.
--
Brian Gerst
Quoted 10 lines · Borislav Petkov
Quoted 5 lines · Uros Bizjak
Current minimum required version of GCC is version 5.1 which allows reuse of PIC hard register on x86/x86-64 targets [1]. Remove obsolete workaround that was needed for earlier GCC versions.
Thanks for the doc pointer.
Quoted 7 lines
Lemme see if I understand this commit message correctly:
SysV i386 ABI says that %ebx is used as the base reg in PIC. gcc 5 and newer can handle all possible cases properly where inline asm could clobber the PIC reg. I.e., it is able to deal with the "=b" constraint where an insn can overwrite %ebx and it'll push and pop around that statement.
gcc-5 considers PIC register as a pseudo-register and reloads it before instruction that requires the value in %ebx. This way, PIC register is no more special and does not need any special handling. This includes inline asm which can clobber %ebx.
Quoted 5 lines
So far so good.
Why then does this matter for x86-64 where PIC addressing is done rip-relative so %rbx is normal reg there?
x86_64 does not use PIC register for small code models. Also, it uses %r15 instead of %rbx for PIC register, so the removed workaround applies only to x86_32.
Uros.
Borislav Petkov
maintainerQuoted 13 lines · Uros Bizjak
Quoted 12 lines · Borislav Petkov
Quoted 5 lines · Uros Bizjak
Current minimum required version of GCC is version 5.1 which allows reuse of PIC hard register on x86/x86-64 targets [1]. Remove obsolete workaround that was needed for earlier GCC versions.
Thanks for the doc pointer.
Lemme see if I understand this commit message correctly:
Quoted 7 lines
Quoted 5 lines
SysV i386 ABI says that %ebx is used as the base reg in PIC. gcc 5 and newer can handle all possible cases properly where inline asm could clobber the PIC reg. I.e., it is able to deal with the "=b" constraint where an insn can overwrite %ebx and it'll push and pop around that statement.
gcc-5 considers PIC register as a pseudo-register and reloads it
So not a "hard" register as you say above?
Quoted 3 lines
x86_64does not use PIC register for small code models. Also, it uses %r15 instead of %rbx for PIC register, so the removed workaround applies only tox86_32.
Let's see:
arch/x86/Makefile:
# Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
KBUILD_CFLAGS += -fno-pic
$ gcc -Wp,-MMD,arch/x86/boot/.cpuflags.o.d ... -fno-pic ... -D__KBUILD_MODNAME=kmod_cpuflags -c -o arch/x86/boot/cpuflags.o arch/x86/boot/cpuflags.c
So this workaround applies to nothing, I'd say. :)
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
maintainerQuoted 2 lines · Brian Gerst
x86-64 uses a PIC register for the medium and large PIC code models, where offsets can be larger than +/- 2GB.
Right but 64-bit is built with -mcmodel=kernel which obviously generates rip-relative.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 21 lines · Borislav Petkov
Quoted 19 lines · Uros Bizjak
Quoted 17 lines · Borislav Petkov
Quoted 5 lines · Uros Bizjak
Current minimum required version of GCC is version 5.1 which allows reuse of PIC hard register on x86/x86-64 targets [1]. Remove obsolete workaround that was needed for earlier GCC versions.
Thanks for the doc pointer.
Lemme see if I understand this commit message correctly:
SysV i386 ABI says that %ebx is used as the base reg in PIC. gcc 5 and newer can handle all possible cases properly where inline asm could clobber the PIC reg. I.e., it is able to deal with the "=b" constraint where an insn can overwrite %ebx and it'll push and pop around that statement.
Quoted 3 lines
Quoted 1 line
gcc-5 considers PIC register as a pseudo-register and reloads it
So not a "hard" register as you say above?
There are registers of different "hardness" as far as gcc is concerned. Before gcc-5.1, PIC register was considered as "fixed", it was simply unavailable to a register allocator, decreasing the miniscule available x86_32 register set by one register. Also, RA was unable to satisfy the "=b" constraint. OTOH, a pseudo register belongs to a certain class of registers (e.g. integer registers) and when allocating real ("hard" ) registers, RA uses instruction (or inline asm) register constraints to allocate correct "hard" register. In this aspect, PIC access "requires" %ebx register in the same way as e.g. shift instructions "require" %cl register. gcc-5.1 allows RA much more freedom of how to use %ebx register - it can be used for other purposes , as long as it is reloaded with correct value before insn with PIC access.
Quoted 6 lines
Quoted 3 lines
x86_64does not use PIC register for small code models. Also, it uses %r15 instead of %rbx for PIC register, so the removed workaround applies only tox86_32.Let's see:
Quoted 8 lines
arch/x86/Makefile:
# Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
KBUILD_CFLAGS+= -fno-pic$ gcc -Wp,-MMD,arch/x86/boot/.cpuflags.o.d ... -fno-pic ... -D__KBUILD_MODNAME=kmod_cpuflags -c -o arch/x86/boot/cpuflags.o arch/x86/boot/cpuflags.cSo this workaround applies to nothing, I'd say. :)
It looks like the workaround serves no purpose even when compiled with gcc < 5.1.
Uros.
Quoted 7 lines · Borislav Petkov
Quoted 2 lines · Brian Gerst
x86-64 uses a PIC register for the medium and large PIC code models, where offsets can be larger than +/- 2GB.
Right but 64-bit is built with -mcmodel=kernel which obviously generates rip-relative.
Correct. He quoted the specific part of the GCC changelog that fixed the issue for the 32-bit kernel, but it's not applicable to the 64-bit kernel. Perhaps the commit message should be more apparent that it's quoting the GCC changelog verbatim, or better yet, reference the specific commit or bug number instead of the general release notes.
--
Brian Gerst
Quoted 7 lines · Brian Gerst
Quoted 5 lines · Borislav Petkov
Quoted 2 lines · Brian Gerst
x86-64 uses a PIC register for the medium and large PIC code models, where offsets can be larger than +/- 2GB.
Quoted 6 lines
Quoted 2 lines
Right but 64-bit is built with -mcmodel=kernel which obviously generates rip-relative.
Correct. He quoted the specific part of the GCC changelog that fixed the issue for the 32-bit kernel, but it's not applicable to the 64-bit kernel.
It says so right in the summary.
Uros.
Borislav Petkov
maintainerOk,
I tried to summarize what we talked on the thread and have the whole deal explained in greater detail.
Holler if something's missing:
---
From: Uros Bizjak <[email protected]>
Date: Fri, 4 Nov 2022 13:45:46 +0100
Subject: [PATCH] x86/boot: Remove x86_32 PIC using %ebx workaround
The currently supported minimum gcc version is 5.1. Before that, the PIC register, when generating Position Independent Code, was considered "fixed" in the sense that it wasn't in the set of registers available to the compiler's register allocator. Which, on x86-32, is already a very small set.
What is more, the register allocator was unable to satisfy extended asm "=b" constraints. (Yes, PIC code uses %ebx on 32-bit as the base reg.)
With gcc5:
"Reuse of the PIC hard register, instead of using a fixed register, was implemented on x86/x86-64 targets. This improves generated PIC code performance as more hard registers can be used. Shared libraries can significantly benefit from this optimization. Currently it is switched on only for x86/x86-64 targets. As RA infrastructure is already implemented for PIC register reuse, other targets might follow this in the future."
(from: https://gcc.gnu.org/gcc-5/changes.html)
which basically means that the register allocator has a higher degree of freedom when handling %ebx, including reloading it with the correct value before a PIC access.
Furthermore:
arch/x86/Makefile:
# Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
KBUILD_CFLAGS += -fno-pic
$ gcc -Wp,-MMD,arch/x86/boot/.cpuflags.o.d ... -fno-pic ... -D__KBUILD_MODNAME=kmod_cpuflags -c -o arch/x86/boot/cpuflags.o arch/x86/boot/cpuflags.c
so the 32-bit workaround in cpuid_count() is fixing exactly nothing because 32-bit configs don't even allow PIC builds.
As to 64-bit builds: they're done using -mcmodel=kernel which produces RIP-relative addressing for PIC builds and thus does not apply here either.
So get rid of the thing and make cpuid_count() nice and simple.
There should be no functional changes resulting from this.
[ bp: Expand commit message. ]
--- arch/x86/boot/cpuflags.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
arch/x86/boot/cpuflags.c +3 -12
@@ -64,20 +64,11 @@ int has_eflag(unsigned long mask)return !!((f0^f1) & mask); } -/* Handle x86_32 PIC using ebx. */ -#if defined(__i386__) && defined(__PIC__) -# define EBX_REG "=r" -#else -# define EBX_REG "=b" -#endif -void cpuid_count (u32 id,u32 count,u32 *a,u32 *b,u32 *c,u32 *d) { - asmvolatile (".ifnc %%ebx,%3 ; movl %%ebx,%3 ; .endif \n\t" -"cpuid \n\t" -".ifnc %%ebx,%3 ; xchgl %%ebx,%3 ; .endif \n\t" - : "=a" (*a), "=c" (*c), "=d" (*d), EBX_REG (*b) - :"a" (id),"c" (count) + asmvolatile ("cpuid" + :"=a" (*a),"=b" (*b),"=c" (*c),"=d" (*d) + :"0" (id),"2" (count) ); }
Signature · 7 lines
2.35.1
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 19 lines · Borislav Petkov
Ok,
I tried to summarize what we talked on the thread and have the whole deal explained in greater detail.
Holler if something's missing:
---
From: Uros Bizjak <[email protected]>
Date: Fri, 4 Nov 2022 13:45:46 +0100
Subject: [PATCH] x86/boot: Removex86_32PIC using %ebx workaroundThe currently supported minimum gcc version is 5.1. Before that, the PIC register, when generating Position Independent Code, was considered "fixed" in the sense that it wasn't in the set of registers available to the compiler's register allocator. Which, on x86-32, is already a very small set.
Quoted 4 lines
What is more, the register allocator was unable to satisfy extended asm "=b" constraints. (Yes, PIC code uses %ebx on 32-bit as the base reg.)
With gcc5:
Please say gcc 5.1 here.
Otherwise a really comprehensive and detailed explanation of the issue!
Uros.
Quoted 80 lines
"Reuse of the PIC hard register, instead of using a fixed register, was implemented on x86/x86-64 targets. This improves generated PIC code performance as more hard registers can be used. Shared libraries can significantly benefit from this optimization. Currently it is switched on only for x86/x86-64 targets. As RA infrastructure is already implemented for PIC register reuse, other targets might follow this in the future."
(from: https://gcc.gnu.org/gcc-5/changes.html)
which basically means that the register allocator has a higher degree of freedom when handling %ebx, including reloading it with the correct value before a PIC access.
Furthermore:
arch/x86/Makefile:
# Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
KBUILD_CFLAGS+= -fno-pic$ gcc -Wp,-MMD,arch/x86/boot/.cpuflags.o.d ... -fno-pic ... -D__KBUILD_MODNAME=kmod_cpuflags -c -o arch/x86/boot/cpuflags.o arch/x86/boot/cpuflags.cso the 32-bit workaround in
cpuid_count()is fixing exactly nothing because 32-bit configs don't even allow PIC builds.As to 64-bit builds: they're done using -mcmodel=kernel which produces RIP-relative addressing for PIC builds and thus does not apply here either.
So get rid of the thing and make
cpuid_count()nice and simple.There should be no functional changes resulting from this.
[ bp: Expand commit message. ]
Signed-off-by Uros Bizjak <[email protected]>Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/boot/cpuflags.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)arch/x86/boot/cpuflags.c +3
-13@@ -64,20 +64,11 @@ int has_eflag(unsigned long mask)return !!((f0^f1) & mask); } -/* Handle x86_32 PIC using ebx. */ -#if defined(__i386__) && defined(__PIC__) -# define EBX_REG "=r" -#else -# define EBX_REG "=b" -#endif -void cpuid_count (u32 id,u32 count,u32 *a,u32 *b,u32 *c,u32 *d) { - asmvolatile (".ifnc %%ebx,%3 ; movl %%ebx,%3 ; .endif \n\t" -"cpuid \n\t" -".ifnc %%ebx,%3 ; xchgl %%ebx,%3 ; .endif \n\t" - : "=a" (*a), "=c" (*c), "=d" (*d), EBX_REG (*b) - :"a" (id),"c" (count) + asmvolatile ("cpuid" + :"=a" (*a),"=b" (*b),"=c" (*c),"=d" (*d) + :"0" (id),"2" (count) ); } --2.35.1
--
Regards/Gruss,
Boris.
Borislav Petkov
maintainerQuoted 1 line · Uros Bizjak
Please say gcc 5.1 here.
Done.
Quoted 1 line
Otherwise a really comprehensive and detailed explanation of the issue!
Thanks.
Lemme run it through the build tests just in case.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette[tip: x86/boot] x86/boot: Remove x86_32 PIC using %ebx workaround
In reply to Uros BizjakThe following commit has been merged into the x86/boot branch of tip:
The following commit has been merged into the x86/boot branch of tip:
Commit-ID: 60253f100c5846029f1370e51be6ebaeb160dcec Gitweb: https://git.kernel.org/tip/60253f100c5846029f1370e51be6ebaeb160dcec Author: Uros Bizjak <[email protected]> AuthorDate: Fri, 04 Nov 2022 13:45:46 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Tue, 29 Nov 2022 16:26:53 +01:00
x86/boot: Remove x86_32 PIC using %ebx workaround
The currently supported minimum gcc version is 5.1. Before that, the PIC register, when generating Position Independent Code, was considered "fixed" in the sense that it wasn't in the set of registers available to the compiler's register allocator. Which, on x86-32, is already a very small set.
What is more, the register allocator was unable to satisfy extended asm "=b" constraints. (Yes, PIC code uses %ebx on 32-bit as the base reg.)
With gcc 5.1:
"Reuse of the PIC hard register, instead of using a fixed register, was implemented on x86/x86-64 targets. This improves generated PIC code performance as more hard registers can be used. Shared libraries can significantly benefit from this optimization. Currently it is switched on only for x86/x86-64 targets. As RA infrastructure is already implemented for PIC register reuse, other targets might follow this in the future."
(from: https://gcc.gnu.org/gcc-5/changes.html)
which basically means that the register allocator has a higher degree of freedom when handling %ebx, including reloading it with the correct value before a PIC access.
Furthermore:
arch/x86/Makefile:
# Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
KBUILD_CFLAGS += -fno-pic
$ gcc -Wp,-MMD,arch/x86/boot/.cpuflags.o.d ... -fno-pic ... -D__KBUILD_MODNAME=kmod_cpuflags -c -o arch/x86/boot/cpuflags.o arch/x86/boot/cpuflags.c
so the 32-bit workaround in cpuid_count() is fixing exactly nothing because 32-bit configs don't even allow PIC builds.
As to 64-bit builds: they're done using -mcmodel=kernel which produces RIP-relative addressing for PIC builds and thus does not apply here either.
So get rid of the thing and make cpuid_count() nice and simple.
There should be no functional changes resulting from this.
[ bp: Expand commit message. ]
--- arch/x86/boot/cpuflags.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
arch/x86/boot/cpuflags.c +3 -12
@@ -64,20 +64,11 @@ int has_eflag(unsigned long mask)return !!((f0^f1) & mask); } -/* Handle x86_32 PIC using ebx. */ -#if defined(__i386__) && defined(__PIC__) -# define EBX_REG "=r" -#else -# define EBX_REG "=b" -#endif -void cpuid_count (u32 id,u32 count,u32 *a,u32 *b,u32 *c,u32 *d) { - asmvolatile (".ifnc %%ebx,%3 ; movl %%ebx,%3 ; .endif \n\t" -"cpuid \n\t" -".ifnc %%ebx,%3 ; xchgl %%ebx,%3 ; .endif \n\t" - : "=a" (*a), "=c" (*c), "=d" (*d), EBX_REG (*b) - :"a" (id),"c" (count) + asmvolatile ("cpuid" + :"=a" (*a),"=b" (*b),"=c" (*c),"=d" (*d) + :"0" (id),"2" (count) ); }