Changeset e996050 in mainline

Timestamp:

2025-01-30T10:41:55Z (23 hours ago)

Author:

GitHub <noreply@…>

Parents:

56210a7 (diff), bdcf71e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matěj Volf <mat.volfik@…> (2025-01-30 10:41:55)

git-committer:

GitHub <noreply@…> (2025-01-30 10:41:55)

Message:

Merge bdcf71e7108c1065465bbc29a3666276eef4f7a4 into 56210a7aca94cc904bb253efade72fb9a4cc1a40

Location:

uspace

Files:

• app/dltest/dltest.c (modified) (1 diff)
• lib/c/generic/elf/elf_load.c (modified) (3 diffs)
• lib/c/generic/libc.c (modified) (1 diff)
• lib/c/generic/rtld/module.c (modified) (3 diffs)
• lib/c/generic/rtld/rtld.c (modified) (2 diffs)
• lib/c/generic/thread/tls.c (modified) (1 diff)
• lib/c/include/rtld/module.h (modified) (1 diff)
• lib/c/include/rtld/rtld.h (modified) (1 diff)
• srv/loader/main.c (modified) (1 diff)

uspace/app/dltest/dltest.c

@@ -944 +944 @@
                 return 1;
 
-#ifndef STATIC_EXE
+#ifndef STATIC_EXE // FIXME: this define is not set anywhere
 
         if (!test_dlfcn_dl_get_private_fib_var())

uspace/lib/c/generic/elf/elf_load.c

@@ -60 +60 @@
         rtld_t *env;
 #endif
-        errno_t rc;
+        errno_t rc = EOK;
+        elf_finfo_t *finfo = &info->finfo;
 
-        rc = elf_load_file(file, 0, &info->finfo);
+        rc = elf_load_file(file, 0, finfo);
         if (rc != EOK) {
                 DPRINTF("Failed to load executable '%s'.\n", file_name);
@@ -72 +73 @@
                 DPRINTF("Binary is statically linked.\n");
                 info->env = NULL;
+#ifdef CONFIG_RTLD
+                rc = rtld_init_static(finfo, &env);
+                info->env = env;
+#endif
                 return EOK;
         }
@@ -77 +82 @@
         DPRINTF("Binary is dynamically linked.\n");
 #ifdef CONFIG_RTLD
-        DPRINTF("- prog dynamic: %p\n", info->finfo.dynamic);
-
-        rc = rtld_prog_process(&info->finfo, &env);
+        DPRINTF("- prog dynamic: %p\n", finfo->dynamic);
+        rc = rtld_prog_process(finfo, &env);
         info->env = env;
 #else

uspace/lib/c/generic/libc.c

@@ -96 +96 @@
 
 #ifdef CONFIG_RTLD
-        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+        if (__pcb == NULL) {
+                /*
+                 * A binary loaded by kernel, not the loader.
+                 * Noop - code loaded by kernel doesn't need RTLD.
+                 */
+        } else {
+                assert(__pcb->rtld_runtime != NULL);
                 runtime_env = (rtld_t *) __pcb->rtld_runtime;
-        } else {
-                if (rtld_init_static() != EOK)
-                        abort();
         }
 #endif

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

@@ -61 +61 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t module_create_static_exec(rtld_t *rtld, module_t **rmodule)
+errno_t module_create_static_exec(const void *elf, rtld_t *rtld)
 {
         module_t *module;
@@ -79 +79 @@
 
         const elf_segment_header_t *tls =
-            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
+            elf_get_phdr(elf, PT_TLS);
 
         if (tls) {
-                uintptr_t bias = elf_get_bias(__progsymbols.elfstart);
+                uintptr_t bias = elf_get_bias(elf);
                 module->tdata = (void *) (tls->p_vaddr + bias);
                 module->tdata_size = tls->p_filesz;
@@ -95 +95 @@
 
         list_append(&module->modules_link, &rtld->modules);
-
-        if (rmodule != NULL)
-                *rmodule = module;
         return EOK;
 }

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

@@ -43 +43 @@
 
 rtld_t *runtime_env;
-static rtld_t rt_env_static;
 
 /** Initialize the runtime linker for use in a statically-linked executable. */
-errno_t rtld_init_static(void)
-{
+errno_t rtld_init_static(elf_finfo_t *finfo, rtld_t **rre)
+{
+        rtld_t *env;
         errno_t rc;
 
-        runtime_env = &rt_env_static;
-        list_initialize(&runtime_env->modules);
-        list_initialize(&runtime_env->imodules);
-        runtime_env->program = NULL;
-        runtime_env->next_id = 1;
-
-        rc = module_create_static_exec(runtime_env, NULL);
+        env = calloc(1, sizeof(rtld_t));
+        if (env == NULL)
+                return ENOMEM;
+
+        list_initialize(&env->modules);
+        list_initialize(&env->imodules);
+        env->program = NULL;
+        env->next_id = 1;
+
+        rc = module_create_static_exec(finfo->base, env);
         if (rc != EOK)
                 return rc;
 
-        modules_process_tls(runtime_env);
-
+        modules_process_tls(env);
+
+        *rre = env;
         return EOK;
 }
@@ -127 +131 @@
         errno_t rc = module_load_deps(prog, 0);
         if (rc != EOK) {
+                free(prog);
+                free(env);
                 return rc;
         }

uspace/lib/c/generic/thread/tls.c

@@ -74 +74 @@
 }
 
-/** Get address of static TLS block */
+/** Get address of static TLS block - only when RTLD is not initialized  */
 void *tls_get(void)
 {

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

@@ -41 +41 @@
 #include <types/rtld/rtld.h>
 
-extern errno_t module_create_static_exec(rtld_t *, module_t **);
+extern errno_t module_create_static_exec(const void *, rtld_t *);
 extern void module_process_relocs(module_t *);
 extern module_t *module_find(rtld_t *, const char *);

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

@@ -45 +45 @@
 extern rtld_t *runtime_env;
 
-extern errno_t rtld_init_static(void);
+extern errno_t rtld_init_static(elf_finfo_t *, rtld_t **);
 extern errno_t rtld_prog_process(elf_finfo_t *, rtld_t **);
 extern tcb_t *rtld_tls_make(rtld_t *);

uspace/srv/loader/main.c

@@ -300 +300 @@
 
 #ifdef CONFIG_RTLD
-        if (prog_info.env) {
-                pcb.tcb = rtld_tls_make(prog_info.env);
-        } else {
-                pcb.tcb = tls_make(prog_info.finfo.base);
-        }
+        assert(prog_info.env != NULL);
+        pcb.tcb = rtld_tls_make(prog_info.env);
 #else
         pcb.tcb = tls_make(prog_info.finfo.base);