Changeset 29405ac in mainline for uspace/lib/c

Timestamp:

2016-05-16T18:10:00Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bab0f42

Parents:

0dc9a474

Message:

DTPMOD relocations with null symbol name should return the current module index. Implement TPOFF relocations. dltest -n to not run dlfcn tests. Now dltest -n works like a charm. Place TLS images in descending order for variant II just to be safe. Propagate TLS alignment info.

Location:

uspace/lib/c

Files:

• arch/ia32/include/libarch/rtld/elf_dyn.h (modified) (2 diffs)
• arch/ia32/src/rtld/reloc.c (modified) (2 diffs)
• generic/elf/elf_mod.c (modified) (1 diff)
• generic/rtld/module.c (modified) (2 diffs)
• generic/rtld/rtld.c (modified) (5 diffs)
• include/elf/elf_mod.h (modified) (1 diff)
• include/types/rtld/module.h (modified) (1 diff)

uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h

@@ -36 +36 @@
 #define LIBC_ia32_RTLD_ELF_DYN_H_
 
-/* 
+/*
  * ia32 dynamic relocation types
  */
@@ -47 +47 @@
 #define R_386_RELATIVE  8
 
+#define R_386_TLS_TPOFF    14
 #define R_386_TLS_DTPMOD32 35
+#define R_386_TLS_DTPOFF32 36
 
 #endif

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -115 +115 @@
                         sym_addr = 0;
                         sym_def = NULL;
+
+                        /*
+                         * DTPMOD with null st_name should return the index
+                         * of the current module.
+                         */
+                        dest = m;
                 }
 
@@ -171 +177 @@
                         break;
 
-//              case R_386_TLS_DTPOFF32:
-//                      *r_ptr = sym_def->st_value;
-//                      break; 
+                case R_386_TLS_TPOFF:
+                        DPRINTF("fixup R_386_TLS_TPOFF\n");
+                        *r_ptr = (dest->ioffs + sym_def->st_value) - dest->rtld->tls_size;
+                        break;
+
+                case R_386_TLS_DTPOFF32:
+                        DPRINTF("fixup R_386_TLS_DTPOFF32\n");
+                        *r_ptr = sym_def->st_value;
+                        break;
 
                 case R_386_TLS_DTPMOD32:
+                        DPRINTF("fixup R_386_TLS_DTPMOD32\n");
                         *r_ptr = dest->id;
                         break;

uspace/lib/c/generic/elf/elf_mod.c

@@ -260 +260 @@
         info->tdata_size = hdr->p_filesz;
         info->tbss_size = hdr->p_memsz - hdr->p_filesz;
+        info->tls_align = hdr->p_align;
 }
 

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

@@ -189 +189 @@
         m->tdata_size = info.tls.tdata_size;
         m->tbss_size = info.tls.tbss_size;
+        m->tls_align = info.tls.tls_align;
 
         printf("tdata at %p size %zu, tbss size %zu\n",
@@ -284 +285 @@
 void modules_process_tls(rtld_t *rtld)
 {
+#ifdef CONFIG_TLS_VARIANT_1
         list_foreach(rtld->modules, modules_link, module_t, m) {
                 m->ioffs = rtld->tls_size;
                 rtld->tls_size += m->tdata_size + m->tbss_size;
         }
+#else /* CONFIG_TLS_VARIANT_2 */
+        size_t offs;
+
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                rtld->tls_size += m->tdata_size + m->tbss_size;
+        }
+
+        offs = 0;
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                offs += m->tdata_size + m->tbss_size;
+                m->ioffs = rtld->tls_size - offs;
+        }
+#endif
 }
 

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

@@ -95 +95 @@
         prog->tdata_size = p_info->tls.tdata_size;
         prog->tbss_size = p_info->tls.tbss_size;
+        prog->tls_align = p_info->tls.tls_align;
 
         printf("prog tdata at %p size %zu, tbss size %zu\n",
@@ -116 +117 @@
         module_load_deps(prog, 0);
 
+        /* Compute static TLS size */
+        modules_process_tls(env);
+
         /*
          * Now relocate/link all modules together.
@@ -124 +128 @@
         modules_process_relocs(env, prog);
 
-        modules_process_tls(env);
-
         *rre = env;
         return EOK;
@@ -149 +151 @@
          */
 
+#ifdef CONFIG_TLS_VARIANT_1
+        /*
+         * Ascending addresses
+         */
         offset = 0;
         list_foreach(rtld->modules, modules_link, module_t, m) {
@@ -157 +163 @@
                 offset += m->tbss_size;
         }
+#else /* CONFIG_TLS_VARIANT_2 */
+        /*
+         * Descending addresses
+         */
+        offset = 0;
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                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);
+        }
+#endif
 
         return tcb;

uspace/lib/c/include/elf/elf_mod.h

@@ -66 +66 @@
         /** Size of tbss section */
         size_t tbss_size;
+        /** Alignment of TLS initialization image */
+        size_t tls_align;
 } elf_tls_info_t;
 

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

@@ -59 +59 @@
         /** tbss size */
         size_t tbss_size;
+        /** TLS alignment */
+        size_t tls_align;
 
         size_t ioffs;