diff options
author | Szabolcs Nagy <nsz@port70.net> | 2015-06-17 12:37:49 +0100 |
---|---|---|
committer | Szabolcs Nagy <nsz@port70.net> | 2015-06-17 12:41:01 +0100 |
commit | 08325735c2efb0257b8c07ac0ff91e44c27ecbf8 (patch) | |
tree | 99dc57d7a1643c344595497080985d3d6d6b7a44 /elf/tlsdeschtab.h | |
parent | 2a8c2c7b335ed07f63c246077fa672d8eaed23e4 (diff) | |
download | glibc-08325735c2efb0257b8c07ac0ff91e44c27ecbf8.tar.gz glibc-08325735c2efb0257b8c07ac0ff91e44c27ecbf8.tar.xz glibc-08325735c2efb0257b8c07ac0ff91e44c27ecbf8.zip |
[BZ 18034][AArch64] Lazy TLSDESC relocation data race fix
Lazy TLSDESC initialization needs to be synchronized with concurrent TLS accesses. The TLS descriptor contains a function pointer (entry) and an argument that is accessed from the entry function. With lazy initialization the first call to the entry function updates the entry and the argument to their final value. A final entry function must make sure that it accesses an initialized argument, this needs synchronization on systems with weak memory ordering otherwise the writes of the first call can be observed out of order. There are at least two issues with the current code: tlsdesc.c (i386, x86_64, arm, aarch64) uses volatile memory accesses on the write side (in the initial entry function) instead of C11 atomics. And on systems with weak memory ordering (arm, aarch64) the read side synchronization is missing from the final entry functions (dl-tlsdesc.S). This patch only deals with aarch64. * Write side: Volatile accesses were replaced with C11 relaxed atomics, and a release store was used for the initialization of entry so the read side can synchronize with it. * Read side: TLS access generated by the compiler and an entry function code is roughly ldr x1, [x0] // load the entry blr x1 // call it entryfunc: ldr x0, [x0,#8] // load the arg ret Various alternatives were considered to force the ordering in the entry function between the two loads: (1) barrier entryfunc: dmb ishld ldr x0, [x0,#8] (2) address dependency (if the address of the second load depends on the result of the first one the ordering is guaranteed): entryfunc: ldr x1,[x0] and x1,x1,#8 orr x1,x1,#8 ldr x0,[x0,x1] (3) load-acquire (ARMv8 instruction that is ordered before subsequent loads and stores) entryfunc: ldar xzr,[x0] ldr x0,[x0,#8] Option (1) is the simplest but slowest (note: this runs at every TLS access), options (2) and (3) do one extra load from [x0] (same address loads are ordered so it happens-after the load on the call site), option (2) clobbers x1 which is problematic because existing gcc does not expect that, so approach (3) was chosen. A new _dl_tlsdesc_return_lazy entry function was introduced for lazily relocated static TLS, so non-lazy static TLS can avoid the synchronization cost. [BZ #18034] * sysdeps/aarch64/dl-tlsdesc.h (_dl_tlsdesc_return_lazy): Declare. * sysdeps/aarch64/dl-tlsdesc.S (_dl_tlsdesc_return_lazy): Define. (_dl_tlsdesc_undefweak): Guarantee TLSDESC entry and argument load-load ordering using ldar. (_dl_tlsdesc_dynamic): Likewise. (_dl_tlsdesc_return_lazy): Likewise. * sysdeps/aarch64/tlsdesc.c (_dl_tlsdesc_resolve_rela_fixup): Use relaxed atomics instead of volatile and synchronize with release store. (_dl_tlsdesc_resolve_hold_fixup): Use relaxed atomics instead of volatile. * elf/tlsdeschtab.h (_dl_tlsdesc_resolve_early_return_p): Likewise.
Diffstat (limited to 'elf/tlsdeschtab.h')
-rw-r--r-- | elf/tlsdeschtab.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h index d13b4e57c7..fb0eb88e7e 100644 --- a/elf/tlsdeschtab.h +++ b/elf/tlsdeschtab.h @@ -20,6 +20,8 @@ #ifndef TLSDESCHTAB_H # define TLSDESCHTAB_H 1 +#include <atomic.h> + # ifdef SHARED # include <inline-hashtab.h> @@ -138,17 +140,17 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) static int _dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller) { - if (caller != td->entry) + if (caller != atomic_load_relaxed (&td->entry)) return 1; __rtld_lock_lock_recursive (GL(dl_load_lock)); - if (caller != td->entry) + if (caller != atomic_load_relaxed (&td->entry)) { __rtld_lock_unlock_recursive (GL(dl_load_lock)); return 1; } - td->entry = _dl_tlsdesc_resolve_hold; + atomic_store_relaxed (&td->entry, _dl_tlsdesc_resolve_hold); return 0; } |