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

Timestamp:

2018-04-23T18:50:40Z (7 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/rtld/rtld.c (modified) (3 diffs)

uspace/lib/c/generic/rtld/rtld.c

@@ -152 +152 @@
 tcb_t *rtld_tls_make(rtld_t *rtld)
 {
-        void *data;
         tcb_t *tcb;
-        size_t offset;
         void **dtv;
         size_t nmods;
         size_t i;
 
-        tcb = tls_alloc_arch(&data, rtld->tls_size);
+        tcb = tls_alloc_arch(rtld->tls_size, rtld->tls_align);
         if (tcb == NULL)
                 return NULL;
@@ -182 +180 @@
          */
 
-#ifdef CONFIG_TLS_VARIANT_1
-        /*
-         * Ascending addresses
-         */
-        offset = 0;
         i = 1;
         list_foreach(rtld->imodules, imodules_link, module_t, m) {
-                assert(i == m->id);
-                assert(offset + m->tdata_size + m->tbss_size <= rtld->tls_size);
-                dtv[i++] = data + offset;
-                memcpy(data + offset, m->tdata, m->tdata_size);
-                offset += m->tdata_size;
-                memset(data + offset, 0, m->tbss_size);
-                offset += m->tbss_size;
-        }
-#else /* CONFIG_TLS_VARIANT_2 */
-        /*
-         * Descending addresses
-         */
-        offset = 0;
-        i = 1;
-        list_foreach(rtld->imodules, imodules_link, module_t, m) {
-                assert(i == m->id);
-                assert(offset + m->tdata_size + m->tbss_size <= rtld->tls_size);
-                offset += m->tbss_size;
-                memset(data + rtld->tls_size - offset, 0, m->tbss_size);
-                offset += m->tdata_size;
-                memcpy(data + rtld->tls_size - offset, m->tdata, m->tdata_size);
-                dtv[i++] = data + rtld->tls_size - offset;
-        }
-#endif
+                assert(i++ == m->id);
+
+                dtv[m->id] = (void *) tcb + m->tpoff;
+
+                assert(((uintptr_t) dtv[m->id]) % m->tls_align == 0);
+
+                memcpy(dtv[m->id], m->tdata, m->tdata_size);
+                memset(dtv[m->id] + m->tdata_size, 0, m->tbss_size);
+        }
 
         tcb->dtv = dtv;
@@ -259 +237 @@
                 assert(!link_used(&m->imodules_link));
 
-                tls_block = malloc(m->tdata_size + m->tbss_size);
+                tls_block = memalign(m->tls_align, m->tdata_size + m->tbss_size);
                 /* XXX This can fail if OOM */
                 assert(tls_block != NULL);