Changeset 328b89f in mainline

Timestamp:

2025-01-24T23:50:40Z (11 days ago)

Author:

Matěj Volf <git@…>

Children:

544c5b4

Parents:

bf0716f

git-author:

Matěj Volf <git@…> (2025-01-24 23:49:43)

git-committer:

Matěj Volf <git@…> (2025-01-24 23:50:40)

Message:

fix calculation of TLS size for main fibril

Before this patch, _tcb_data_offset always used progsymbols.elfstart. However,
that is wrong when it is being called from the loader server!! Now we pass to it
a pointer to the correct ELF, falling back to elfstart in the public tls_get call.

(debugging this was quite an ordeal and took me like 5 hours, thanks for asking ('

File:

• uspace/lib/c/generic/thread/tls.c (modified) (3 diffs)

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

@@ -59 +59 @@
 #endif
 
-static ptrdiff_t _tcb_data_offset(void)
+static ptrdiff_t _tcb_data_offset(const void* elf)
 {
         const elf_segment_header_t *tls =
-            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
+            elf_get_phdr(elf, PT_TLS);
 
         size_t tls_align = tls ? tls->p_align : 1;
@@ -80 +80 @@
         assert(runtime_env == NULL);
 #endif
-        return (uint8_t *)__tcb_get() + _tcb_data_offset();
+        return (uint8_t *)__tcb_get() + _tcb_data_offset(__progsymbols.elfstart);
 }
 
@@ -114 +114 @@
 #ifdef CONFIG_TLS_VARIANT_1
         tcb_t *tcb = area;
-        uint8_t *data = (uint8_t *)tcb + _tcb_data_offset();
+        uint8_t *data = (uint8_t *)tcb + _tcb_data_offset(elf);
         memset(tcb, 0, sizeof(*tcb));
 #else
         uint8_t *data = area;
-        tcb_t *tcb = (tcb_t *) (data - _tcb_data_offset());
+        tcb_t *tcb = (tcb_t *) (data - _tcb_data_offset(elf));
         memset(tcb, 0, sizeof(tcb_t));
         tcb->self = tcb;