[hurd,commited,3/5] htl: Fix tls initialization for already-created threads

Message ID 20200608000633.3551460-4-samuel.thibault@ens-lyon.org
State New
Headers show
Series
  • Fix and enable more tests
Related show

Commit Message

Samuel Thibault June 8, 2020, 12:06 a.m.
* sysdeps/htl/pthreadP.h: Include <link.h>
(__pthread_init_static_tls): New prototype.
* htl/pt-alloc.c (__pthread_init_static_tls): New function.
* sysdeps/mach/hurd/htl/pt-sysdep.c (_init_routine): Initialize tcb
field of initial thread. Set GL(dl_init_static_tls) to
&__pthread_init_static_tls.
---
 htl/pt-alloc.c                    | 29 +++++++++++++++++++++++++++++
 sysdeps/htl/pthreadP.h            |  3 +++
 sysdeps/mach/hurd/htl/pt-sysdep.c |  3 +++
 3 files changed, 35 insertions(+)

-- 
2.26.2

Patch

diff --git a/htl/pt-alloc.c b/htl/pt-alloc.c
index 4e6fa52c4a..d4426bb2e3 100644
--- a/htl/pt-alloc.c
+++ b/htl/pt-alloc.c
@@ -212,3 +212,32 @@  retry:
   *pthread = new;
   return 0;
 }
+
+void
+attribute_hidden
+__pthread_init_static_tls (struct link_map *map)
+{
+  int i;
+
+  __pthread_rwlock_wrlock (&__pthread_threads_lock);
+  for (i = 0; i < __pthread_num_threads; ++i)
+    {
+      struct __pthread *t = __pthread_threads[i];
+
+      if (t == NULL)
+	continue;
+
+# if TLS_TCB_AT_TP
+      void *dest = (char *) t->tcb - map->l_tls_offset;
+# elif TLS_DTV_AT_TP
+      void *dest = (char *) t->tcb + map->l_tls_offset + TLS_PRE_TCB_SIZE;
+# else
+#  error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
+# endif
+
+      /* Initialize the memory.  */
+      memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
+	      '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
+    }
+  __pthread_rwlock_unlock (&__pthread_threads_lock);
+}
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 7486c9383e..0eb969ea1a 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -22,10 +22,13 @@ 
 #define __PTHREAD_HTL
 
 #include <pthread.h>
+#include <link.h>
 
 /* Attribute to indicate thread creation was issued from C11 thrd_create.  */
 #define ATTR_C11_THREAD ((void*)(uintptr_t)-1)
 
+extern void __pthread_init_static_tls (struct link_map *) attribute_hidden;
+
 /* These represent the interface used by glibc itself.  */
 
 extern pthread_t __pthread_self (void);
diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.c b/sysdeps/mach/hurd/htl/pt-sysdep.c
index 84d191475d..0963b44878 100644
--- a/sysdeps/mach/hurd/htl/pt-sysdep.c
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.c
@@ -77,6 +77,7 @@  _init_routine (void *stack)
      to the new stack.  Pretend it wasn't allocated so that it remains
      valid if the main thread terminates.  */
   thread->stack = 0;
+  thread->tcb = THREAD_SELF;
 
 #ifndef PAGESIZE
   __pthread_default_attr.__guardsize = __vm_page_size;
@@ -91,6 +92,8 @@  _init_routine (void *stack)
 
   __pthread_atfork (NULL, NULL, reset_pthread_total);
 
+  GL(dl_init_static_tls) = &__pthread_init_static_tls;
+
   /* Make MiG code thread aware.  */
   __mig_init (thread->stackaddr);