Changeset 6adb775f in mainline for uspace/lib/c/include

Timestamp:

2016-04-25T16:46:31Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

32573ff

Parents:

dc0d8b52

Message:

TLS for dynamically linked executables and initially loaded DSOs (but must not call dlopen or there will be trouble).

Location:

uspace/lib/c/include

Files:

• elf/elf_mod.h (modified) (2 diffs)
• rtld/module.h (modified) (1 diff)
• rtld/rtld.h (modified) (2 diffs)
• tls.h (modified) (1 diff)
• types/rtld/module.h (modified) (1 diff)
• types/rtld/rtld.h (modified) (1 diff)

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

@@ -58 +58 @@
 } eld_flags_t;
 
+/** TLS info for a module */
+typedef struct {
+        /** tdata section image */
+        void *tdata;
+        /** Size of tdata section image in bytes */
+        size_t tdata_size;
+        /** Size of tbss section */
+        size_t tbss_size;
+} elf_tls_info_t;
+
 /**
  * Some data extracted from the headers are stored here
@@ -70 +80 @@
         /** Pointer to the dynamic section */
         void *dynamic;
+
+        /** TLS info */
+        elf_tls_info_t tls;
 } elf_finfo_t;
 

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

@@ -46 +46 @@
 extern module_t *module_load(rtld_t *, const char *);
 extern void module_load_deps(module_t *);
+extern module_t *module_by_id(rtld_t *, unsigned long);
 
 extern void modules_process_relocs(rtld_t *, module_t *);
+extern void modules_process_tls(rtld_t *);
 extern void modules_untag(rtld_t *);
 

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

@@ -41 +41 @@
 
 #include <rtld/dynamic.h>
+#include <tls.h>
 #include <types/rtld/rtld.h>
 
@@ -47 +48 @@
 extern void rtld_init_static(void);
 extern int rtld_prog_process(elf_finfo_t *, rtld_t **);
+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);
 
 #endif

uspace/lib/c/include/tls.h

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

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

@@ -40 +40 @@
 
 typedef struct module {
+        /** Module ID */
+        unsigned long id;
+        /** Dynamic info for this module */
         dyn_info_t dyn;
+        /** Load bias */
         size_t bias;
+
+        /** tdata image start */
+        void *tdata;
+        /** tdata image size */
+        size_t tdata_size;
+        /** tbss size */
+        size_t tbss_size;
+
+        size_t ioffs;
 
         /** Containing rtld */

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

@@ -48 +48 @@
         module_t *program;
 
+        /** Next module ID */
+        unsigned long next_id;
+
+        /** Size of initial TLS tdata + tbss */
+        size_t tls_size;
+
         /** List of all loaded modules including rtld and the program */
         list_t modules;