Changeset 4f205248 in mainline for uspace/lib/c/generic/tls.c

Timestamp:

2018-04-23T18:50:40Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a2eb85d

Parents:

8d58fca

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-23 17:47:09)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-23 18:50:40)

Message:

Honor TLS alignment.

File:

• uspace/lib/c/generic/tls.c (modified) (9 diffs)

uspace/lib/c/generic/tls.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
 #include <stddef.h>
 #include <align.h>
@@ -41 +42 @@
 #include <stdlib.h>
 #include <str.h>
+#include <macros.h>
 #include <elf/elf.h>
 
@@ -47 +49 @@
 #endif
 
-size_t tls_get_size(void)
-{
-#ifdef CONFIG_RTLD
-        if (runtime_env != NULL)
-                return runtime_env->tls_size;
+#if !defined(CONFIG_TLS_VARIANT_1) && !defined(CONFIG_TLS_VARIANT_2)
+#error Unknown TLS variant.
+#endif
+
+/** Get address of static TLS block */
+void *tls_get(void)
+{
+#ifdef CONFIG_RTLD
+        assert(runtime_env == NULL);
 #endif
 
         const elf_segment_header_t *tls =
             elf_get_phdr(__executable_start, PT_TLS);
-        return tls->p_memsz;
-}
-
-/** Get address of static TLS block */
-void *tls_get(void)
-{
+
+        if (tls == NULL)
+                return NULL;
+
 #ifdef CONFIG_TLS_VARIANT_1
-        return (uint8_t *)__tcb_get() + sizeof(tcb_t);
+        return (uint8_t *)__tcb_get() + ALIGN_UP(sizeof(tcb_t), tls->p_align);
 #else /* CONFIG_TLS_VARIANT_2 */
-        return (uint8_t *)__tcb_get() - tls_get_size();
+        return (uint8_t *)__tcb_get() - ALIGN_UP(tls->p_memsz, tls->p_align);
 #endif
 }
@@ -89 +93 @@
 
         uintptr_t bias = elf_get_bias(__executable_start);
-
-        tcb = tls_alloc_arch(&data, tls->p_memsz);
+        size_t align = max(tls->p_align, _Alignof(tcb_t));
+
+#ifdef CONFIG_TLS_VARIANT_1
+        tcb = tls_alloc_arch(
+            ALIGN_UP(sizeof(tcb_t), align) + tls->p_memsz, align);
+        data = (void *) tcb + ALIGN_UP(sizeof(tcb_t), align);
+#else
+        tcb = tls_alloc_arch(
+            ALIGN_UP(tls->p_memsz, align) + sizeof(tcb_t), align);
+        data = (void *) tcb - ALIGN_UP(tls->p_memsz, tls->p_align);
+#endif
 
         /*
@@ -108 +121 @@
 #ifdef CONFIG_RTLD
         free(tcb->dtv);
-#endif
-        tls_free_arch(tcb, tls_get_size());
+
+        if (runtime_env != NULL) {
+                tls_free_arch(tcb, runtime_env->tls_size, runtime_env->tls_align);
+                return;
+        }
+#endif
+        const elf_segment_header_t *tls =
+            elf_get_phdr(__executable_start, PT_TLS);
+
+        assert(tls != NULL);
+        tls_free_arch(tcb,
+            ALIGN_UP(tls->p_memsz, tls->p_align) + sizeof(tcb_t),
+            max(tls->p_align, _Alignof(tcb_t)));
 }
 
@@ -119 +143 @@
  * @return              Pointer to tcb_t structure.
  */
-tcb_t *tls_alloc_variant_1(void **data, size_t size)
-{
-        tcb_t *tcb;
-
-        tcb = malloc(sizeof(tcb_t) + size);
+tcb_t *tls_alloc_variant_1(size_t size, size_t align)
+{
+        tcb_t *tcb = memalign(align, size);
         if (!tcb)
                 return NULL;
-
-        *data = ((void *) tcb) + sizeof(tcb_t);
-#ifdef CONFIG_RTLD
-        tcb->dtv = NULL;
-#endif
-
+        memset(tcb, 0, sizeof(tcb_t));
         return tcb;
 }
@@ -140 +157 @@
  * @param size          This argument is ignored.
  */
-void tls_free_variant_1(tcb_t *tcb, size_t size)
+void tls_free_variant_1(tcb_t *tcb, size_t size, size_t align)
 {
         free(tcb);
@@ -152 +169 @@
  *                      actually an output argument.
  * @param size          Size of thread local data.
+ * @param align         Alignment of thread local data.
  * @return              Pointer to TCB structure.
  */
-tcb_t *tls_alloc_variant_2(void **data, size_t size)
-{
-        tcb_t *tcb;
-
-        uintptr_t align = elf_get_phdr(__executable_start, PT_TLS)->p_align;
-
-        size = ALIGN_UP(size, align);
-        *data = memalign(align, sizeof(tcb_t) + size);
-        if (*data == NULL)
-                return NULL;
-        tcb = (tcb_t *) (*data + size);
+tcb_t *tls_alloc_variant_2(size_t size, size_t align)
+{
+        void *data = memalign(align, size);
+        if (data == NULL)
+                return NULL;
+
+        tcb_t *tcb = (tcb_t *) (data + size - sizeof(tcb_t));
+        memset(tcb, 0, sizeof(tcb_t));
         tcb->self = tcb;
-#ifdef CONFIG_RTLD
-        tcb->dtv = NULL;
-#endif
-
         return tcb;
 }
@@ -177 +188 @@
  * @param tcb           Pointer to TCB structure.
  * @param size          Size of thread local data.
- */
-void tls_free_variant_2(tcb_t *tcb, size_t size)
-{
-        uintptr_t align = elf_get_phdr(__executable_start, PT_TLS)->p_align;
-        size = ALIGN_UP(size, align);
-        void *start = ((void *) tcb) - size;
-        free(start);
+ * @param align         Alignment of thread local data.
+ */
+void tls_free_variant_2(tcb_t *tcb, size_t size, size_t align)
+{
+        if (tcb != NULL) {
+                void *start = ((void *) tcb) + sizeof(tcb_t) - size;
+                free(start);
+        }
 }
 #endif