Changes in uspace/lib/c/generic/rtld/module.c [9d58539:58563585] in mainline

File:

• uspace/lib/c/generic/rtld/module.c (modified) (13 diffs)

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

@@ -37 +37 @@
 #include <adt/list.h>
 #include <elf/elf_load.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <loader/pcb.h>
@@ -49 +50 @@
 #include <rtld/module.h>
 
+/** Create module for static executable.
+ *
+ * @param rtld Run-time dynamic linker
+ * @param rmodule Place to store pointer to new module or @c NULL
+ * @return EOK on success, ENOMEM if out of memory
+ */
+int module_create_static_exec(rtld_t *rtld, module_t **rmodule)
+{
+        module_t *module;
+
+        module = calloc(1, sizeof(module_t));
+        if (module == NULL)
+                return ENOMEM;
+
+        module->id = rtld_get_next_id(rtld);
+        module->dyn.soname = "[program]";
+
+        module->rtld = rtld;
+        module->exec = true;
+        module->local = true;
+
+        module->tdata = &_tdata_start;
+        module->tdata_size = &_tdata_end - &_tdata_start;
+        module->tbss_size = &_tbss_end - &_tbss_start;
+        module->tls_align = (uintptr_t)&_tls_alignment;
+
+        list_append(&module->modules_link, &rtld->modules);
+
+        if (rmodule != NULL)
+                *rmodule = module;
+        return EOK;
+}
+
 /** (Eagerly) process all relocation tables in a module.
  *
@@ -62 +96 @@
         module_process_pre_arch(m);
 
-        if (m->dyn.plt_rel == DT_REL) {
-                DPRINTF("table type DT_REL\n");
-                if (m->dyn.rel != NULL) {
-                        DPRINTF("non-empty\n");
-                        rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+        /* jmp_rel table */
+        if (m->dyn.jmp_rel != NULL) {
+                DPRINTF("jmp_rel table\n");
+                if (m->dyn.plt_rel == DT_REL) {
+                        DPRINTF("jmp_rel table type DT_REL\n");
+                        rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
+                } else {
+                        assert(m->dyn.plt_rel == DT_RELA);
+                        DPRINTF("jmp_rel table type DT_RELA\n");
+                        rela_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
                 }
-                /* FIXME: this seems wrong */
-                if (m->dyn.jmp_rel != NULL) {
-                DPRINTF("table type jmp-rel\n");
-                        DPRINTF("non-empty\n");
-                        rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
-                }
-        } else { /* (m->dyn.plt_rel == DT_RELA) */
-                DPRINTF("table type DT_RELA\n");
-                if (m->dyn.rela != NULL) {
-                        DPRINTF("non-empty\n");
-                        rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
-                }
+        }
+
+        /* rel table */
+        if (m->dyn.rel != NULL) {
+                DPRINTF("rel table\n");
+                rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+        }
+
+        /* rela table */
+        if (m->dyn.rela != NULL) {
+                DPRINTF("rela table\n");
+                rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
         }
 
@@ -91 +130 @@
  * path components are ignored.
  */
-module_t *module_find(const char *name)
-{
-        module_t *m;
+module_t *module_find(rtld_t *rtld, const char *name)
+{
         const char *p, *soname;
 
@@ -107 +145 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        list_foreach(runtime_env->modules, cur) {
-                DPRINTF("cur = %p\n", cur);
-                m = list_get_instance(cur, module_t, modules_link);
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                DPRINTF("m = %p\n", m);
                 if (str_cmp(m->dyn.soname, soname) == 0) {
                         return m; /* Found */
@@ -124 +161 @@
  * Currently this trivially tries to load '/<name>'.
  */
-module_t *module_load(const char *name)
-{
-        elf_info_t info;
+module_t *module_load(rtld_t *rtld, const char *name, mlflags_t flags)
+{
+        elf_finfo_t info;
         char name_buf[NAME_BUF_SIZE];
         module_t *m;
         int rc;
         
-        m = malloc(sizeof(module_t));
-        if (!m) {
+        m = calloc(1, sizeof(module_t));
+        if (m == NULL) {
                 printf("malloc failed\n");
                 exit(1);
         }
+        
+        m->rtld = rtld;
+        m->id = rtld_get_next_id(rtld);
+
+        if ((flags & mlf_local) != 0)
+                m->local = true;
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
@@ -147 +190 @@
 
         /* FIXME: need to real allocation of address space */
-        m->bias = runtime_env->next_bias;
-        runtime_env->next_bias += 0x100000;
+        m->bias = rtld->next_bias;
+        rtld->next_bias += 0x100000;
 
         DPRINTF("filename:'%s'\n", name_buf);
@@ -173 +216 @@
 
         /* Insert into the list of loaded modules */
-        list_append(&m->modules_link, &runtime_env->modules);
+        list_append(&m->modules_link, &rtld->modules);
+        
+        /* Copy TLS info */
+        m->tdata = info.tls.tdata;
+        m->tdata_size = info.tls.tdata_size;
+        m->tbss_size = info.tls.tbss_size;
+        m->tls_align = info.tls.tls_align;
+        
+        DPRINTF("tdata at %p size %zu, tbss size %zu\n",
+            m->tdata, m->tdata_size, m->tbss_size);
 
         return m;
@@ -180 +232 @@
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m)
+void module_load_deps(module_t *m, mlflags_t flags)
 {
         elf_dyn_t *dp;
@@ -223 +275 @@
 
                         DPRINTF("%s needs %s\n", m->dyn.soname, dep_name);
-                        dm = module_find(dep_name);
+                        dm = module_find(m->rtld, dep_name);
                         if (!dm) {
-                                dm = module_load(dep_name);
-                                module_load_deps(dm);
+                                dm = module_load(m->rtld, dep_name, flags);
+                                module_load_deps(dm, flags);
                         }
 
@@ -236 +288 @@
 }
 
+/** Find module structure by ID. */
+module_t *module_by_id(rtld_t *rtld, unsigned long id)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                if (m->id == id)
+                        return m;
+        }
+
+        return NULL;
+}
+
 /** Process relocations in modules.
  *
@@ -243 +306 @@
  * @param       start   The module where to start from.
  */
-void modules_process_relocs(module_t *start)
-{
-        module_t *m;
-
-        list_foreach(runtime_env->modules, cur) {
-                m = list_get_instance(cur, module_t, modules_link);
-
-                /* Skip rtld, since it has already been processed */
-                if (m != &runtime_env->rtld) {
+void modules_process_relocs(rtld_t *rtld, module_t *start)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                /* Skip rtld module, since it has already been processed */
+                if (m != &rtld->rtld) {
                         module_process_relocs(m);
                 }
@@ -257 +316 @@
 }
 
+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;
+                list_append(&m->imodules_link, &rtmd->imodules);
+                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;
+                list_append(&m->imodules_link, &rtld->imodules);
+        }
+#endif
+}
+
 /** Clear BFS tags of all modules.
  */
-void modules_untag(void)
-{
-        module_t *m;
-
-        list_foreach(runtime_env->modules, cur) {
-                m = list_get_instance(cur, module_t, modules_link);
+void modules_untag(rtld_t *rtld)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
                 m->bfs_tag = false;
         }