diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2018-01-12 18:50:33 -0200 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2018-01-19 09:50:09 -0200 |
| commit | 4612268a0ad8e3409d8ce2314dd2dd8ee0af5269 (patch) | |
| tree | acae53363aaa961433f545260843c0e9ba5fb238 /sysdeps/powerpc | |
| parent | 64f63cb4583ecc1ba16c7253aacc192b6d088511 (diff) | |
| download | glibc-4612268a0ad8e3409d8ce2314dd2dd8ee0af5269.tar.gz glibc-4612268a0ad8e3409d8ce2314dd2dd8ee0af5269.tar.xz glibc-4612268a0ad8e3409d8ce2314dd2dd8ee0af5269.zip | |
powerpc: Fix syscalls during early process initialization [BZ #22685]
The tunables framework needs to execute syscall early in process
initialization, before the TCB is available for consumption. This
behavior conflicts with powerpc{|64|64le}'s lock elision code, that
checks the TCB before trying to abort transactions immediately before
executing a syscall.
This patch adds a powerpc-specific implementation of __access_noerrno
that does not abort transactions before the executing syscall.
Tested on powerpc{|64|64le}.
[BZ #22685]
* sysdeps/powerpc/powerpc32/sysdep.h (ABORT_TRANSACTION_IMPL): Renamed
from ABORT_TRANSACTION.
(ABORT_TRANSACTION): Redirect to ABORT_TRANSACTION_IMPL.
* sysdeps/powerpc/powerpc64/sysdep.h (ABORT_TRANSACTION,
ABORT_TRANSACTION_IMPL): Likewise.
* sysdeps/unix/sysv/linux/powerpc/not-errno.h: New file. Reuse
Linux code, but remove the code that aborts transactions.
Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Tested-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/powerpc32/sysdep.h | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/sysdep.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sysdeps/powerpc/powerpc32/sysdep.h b/sysdeps/powerpc/powerpc32/sysdep.h index 62c018f27e..8e32a2a131 100644 --- a/sysdeps/powerpc/powerpc32/sysdep.h +++ b/sysdeps/powerpc/powerpc32/sysdep.h @@ -91,7 +91,7 @@ GOT_LABEL: ; \ ASM_SIZE_DIRECTIVE(name) #if ! IS_IN(rtld) -# define ABORT_TRANSACTION \ +# define ABORT_TRANSACTION_IMPL \ cmpwi 2,0; \ beq 1f; \ lwz 0,TM_CAPABLE(2); \ @@ -102,8 +102,9 @@ GOT_LABEL: ; \ .align 4; \ 1: #else -# define ABORT_TRANSACTION +# define ABORT_TRANSACTION_IMPL #endif +#define ABORT_TRANSACTION ABORT_TRANSACTION_IMPL #define DO_CALL(syscall) \ ABORT_TRANSACTION \ diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h index 26b088517f..2df1d9b6e6 100644 --- a/sysdeps/powerpc/powerpc64/sysdep.h +++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -264,7 +264,7 @@ LT_LABELSUFFIX(name,_name_end): ; \ END_2(name) #if !IS_IN(rtld) -# define ABORT_TRANSACTION \ +# define ABORT_TRANSACTION_IMPL \ cmpdi 13,0; \ beq 1f; \ lwz 0,TM_CAPABLE(13); \ @@ -275,8 +275,9 @@ LT_LABELSUFFIX(name,_name_end): ; \ .p2align 4; \ 1: #else -# define ABORT_TRANSACTION +# define ABORT_TRANSACTION_IMPL #endif +#define ABORT_TRANSACTION ABORT_TRANSACTION_IMPL #define DO_CALL(syscall) \ ABORT_TRANSACTION \ |