system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch 3/4 of the effort to make TLS access async-signal-safe.

Browse Source 
Factor out _dl_clear_dtv.

2013-12-18  Andrew Hunter  <ahh@google.com>

	* elf/Versions (ld): Add _dl_clear_dtv.
	* sysdeps/generic/ldsodefs.h (_dl_clear_dtv): New prototype.
	* elf/dl-tls.c (_dl_clear_dtv): New function.
	* nptl/allocatestack.c (get_cached_stack): Call _dl_clear_dtv.
This commit is contained in:
Paul Pluzhnikov 2013-12-18 16:24:19 -08:00
parent 69a17d9d24
commit 35e8f7ab94
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2013-12-18 Andrew Hunter <ahh@google.com>
* elf/Versions (ld): Add _dl_clear_dtv.
* sysdeps/generic/ldsodefs.h (_dl_clear_dtv): New prototype.
* elf/dl-tls.c (_dl_clear_dtv): New function.
* nptl/allocatestack.c (get_cached_stack): Call _dl_clear_dtv.
2013-12-18 Andrew Hunter <ahh@google.com> 2013-12-18 Andrew Hunter <ahh@google.com>
* sysdeps/generic/ldsodefs.h (_dl_mask_all_signals): New prototype. * sysdeps/generic/ldsodefs.h (_dl_mask_all_signals): New prototype.

1
elf/Versions
View File

@ -53,6 +53,7 @@ ld {
_dl_allocate_tls; _dl_allocate_tls_init; _dl_allocate_tls; _dl_allocate_tls_init;
_dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info; _dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info;
_dl_deallocate_tls; _dl_make_stack_executable; _dl_out_of_memory; _dl_deallocate_tls; _dl_make_stack_executable; _dl_out_of_memory;
_dl_clear_dtv;
_dl_rtld_di_serinfo; _dl_starting_up; _dl_tls_setup; _dl_rtld_di_serinfo; _dl_starting_up; _dl_tls_setup;
_rtld_global; _rtld_global_ro; _rtld_global; _rtld_global_ro;

12
elf/dl-tls.c
View File

@ -463,6 +463,18 @@ _dl_allocate_tls (void *mem)
} }
rtld_hidden_def (_dl_allocate_tls) rtld_hidden_def (_dl_allocate_tls)
void
internal_function
_dl_clear_dtv (dtv_t *dtv)
{
for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt)
if (! dtv[1 + cnt].pointer.is_static
&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
free (dtv[1 + cnt].pointer.val);
memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t));
}
rtld_hidden_def (_dl_clear_dtv)
#ifndef SHARED #ifndef SHARED
extern dtv_t _dl_static_dtv[]; extern dtv_t _dl_static_dtv[];

6
nptl/allocatestack.c
View File

@ -242,11 +242,7 @@ get_cached_stack (size_t *sizep, void **memp)
/* Clear the DTV. */ /* Clear the DTV. */
dtv_t *dtv = GET_DTV (TLS_TPADJ (result)); dtv_t *dtv = GET_DTV (TLS_TPADJ (result));
for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt) _dl_clear_dtv (dtv);
if (! dtv[1 + cnt].pointer.is_static
&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
free (dtv[1 + cnt].pointer.val);
memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t));
/* Re-initialize the TLS. */ /* Re-initialize the TLS. */
_dl_allocate_tls_init (TLS_TPADJ (result)); _dl_allocate_tls_init (TLS_TPADJ (result));

5
sysdeps/generic/ldsodefs.h
View File

@ -989,6 +989,11 @@ extern void *_dl_allocate_tls_storage (void)
extern void *_dl_allocate_tls_init (void *) internal_function; extern void *_dl_allocate_tls_init (void *) internal_function;
rtld_hidden_proto (_dl_allocate_tls_init) rtld_hidden_proto (_dl_allocate_tls_init)
/* Remove all allocated dynamic TLS regions from a DTV
for reuse by new thread. */
extern void _dl_clear_dtv (dtv_t *dtv) internal_function;
rtld_hidden_proto (_dl_clear_dtv)
/* Deallocate memory allocated with _dl_allocate_tls. */ /* Deallocate memory allocated with _dl_allocate_tls. */
extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb) internal_function; extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb) internal_function;
rtld_hidden_proto (_dl_deallocate_tls) rtld_hidden_proto (_dl_deallocate_tls)