Changeset e2f26002 in mainline

Timestamp:

2016-05-17T17:15:13Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d2bb25e7

Parents:

bab0f42

Message:

symbol_get_addr() must treat thread-local variables differently than normal variables.

Files:

• abi/include/abi/elf.h (modified) (1 diff)
• uspace/app/dltest/dltest.c (modified) (1 diff)
• uspace/lib/c/arch/ia32/src/tls.c (modified) (1 diff)
• uspace/lib/c/generic/rtld/rtld.c (modified) (1 diff)
• uspace/lib/c/generic/rtld/symbol.c (modified) (1 diff)
• uspace/lib/c/generic/tls.c (modified) (1 diff)
• uspace/lib/c/include/rtld/rtld.h (modified) (1 diff)
• uspace/lib/c/include/tls.h (modified) (1 diff)
• uspace/lib/dltest/libdltest.h (modified) (1 diff)

abi/include/abi/elf.h

@@ -157 +157 @@
 #define STT_SECTION  3
 #define STT_FILE     4
+#define STT_TLS      6
 #define STT_LOPROC   13
 #define STT_HIPROC   15

uspace/app/dltest/dltest.c

@@ -581 +581 @@
 
         printf("Got %d, expected %d... ", val, dl_private_fib_var_val);
-        if (val != dl_private_var_val) {
+        if (val != dl_private_fib_var_val) {
                 printf("FAILED\n");
                 return false;

uspace/lib/c/arch/ia32/src/tls.c

@@ -69 +69 @@
     *___tls_get_addr(tls_index *ti)
 {
-        size_t tls_size;
         uint8_t *tls;
-
-        /* Calculate size of TLS block */
-        tls_size = tls_get_size();
-
-        /* The TLS block is just before TCB */
-        tls = (uint8_t *)__tcb_get() - tls_size;
 
 #ifdef CONFIG_RTLD
         if (runtime_env != NULL) {
-                return rtld_tls_get_addr(runtime_env, tls, ti->ti_module,
+                return rtld_tls_get_addr(runtime_env, ti->ti_module,
                     ti->ti_offset);
         }
 #endif
+        /* Get address of static TLS block */
+        tls = tls_get();
         return tls + ti->ti_offset;
 }

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

@@ -187 +187 @@
 }
 
-void *rtld_tls_get_addr(rtld_t *rtld, void *tls, unsigned long mod_id,
+void *rtld_tls_get_addr(rtld_t *rtld, unsigned long mod_id,
     unsigned long offset)
 {
         module_t *m;
+        uint8_t *tls;
 
         m = module_by_id(rtld, mod_id);
         assert(m != NULL);
 
+        if (!link_used(&m->imodules_link)) {
+                printf("module '%s' is not initial. aborting.\n",
+                    m->dyn.soname);
+                abort();
+        }
+
+        tls = tls_get();
         return tls + m->ioffs + offset;
 }

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

@@ -251 +251 @@
 void *symbol_get_addr(elf_symbol_t *sym, module_t *m)
 {
-        if (sym->st_shndx == SHN_ABS) {
+        if (ELF_ST_TYPE(sym->st_info) == STT_TLS) {
+                return rtld_tls_get_addr(m->rtld, m->id, sym->st_value);
+        } else if (sym->st_shndx == SHN_ABS) {
                 /* Do not add bias to absolute symbols */
                 return (void *) sym->st_value;

uspace/lib/c/generic/tls.c

@@ -52 +52 @@
 #endif
         return &_tbss_end - &_tdata_start;
+}
+
+/** Get address of static TLS block */
+void *tls_get(void)
+{
+#ifdef CONFIG_TLS_VARIANT_1
+        return (uint8_t *)__tcb_get() + sizeof(tcb_t);
+#else /* CONFIG_TLS_VARIANT_2 */
+        return (uint8_t *)__tcb_get() - tls_get_size();
+#endif
 }
 

uspace/lib/c/include/rtld/rtld.h

@@ -50 +50 @@
 extern tcb_t *rtld_tls_make(rtld_t *);
 extern unsigned long rtld_get_next_id(rtld_t *);
-extern void *rtld_tls_get_addr(rtld_t *, void *, unsigned long, unsigned long);
+extern void *rtld_tls_get_addr(rtld_t *, unsigned long, unsigned long);
 
 #endif

uspace/lib/c/include/tls.h

@@ -53 +53 @@
 extern void tls_free_arch(tcb_t *, size_t);
 extern size_t tls_get_size(void);
+extern void *tls_get(void);
 
 #ifdef CONFIG_TLS_VARIANT_1

uspace/lib/dltest/libdltest.h

@@ -43 +43 @@
         dl_private_var_val = 220022,
         dl_public_var_val = 330033,
-        dl_private_fib_var_val = 220022,
-        dl_public_fib_var_val = 330033
+        dl_private_fib_var_val = 440044,
+        dl_public_fib_var_val = 550055
 };