!tls: move tls handling to libphoenix

JIRA: RTOS-921
phoenix-rtos · Sep 24, 2024 · 8b89a84 · 8b89a84
1 parent 96c4c08
commit 8b89a84
Show file tree

Hide file tree

Showing 30 changed files with 622 additions and 26 deletions.
diff --git a/arch/arm/v7a/Makefile b/arch/arm/v7a/Makefile
@@ -5,4 +5,4 @@
 # Author: Pawel Pisarczyk
 #
 
-OBJS += $(addprefix $(PREFIX_O)arch/arm/v7a/, syscalls.o reboot.o)
+OBJS += $(addprefix $(PREFIX_O)arch/arm/v7a/, syscalls.o reboot.o tls.o)
diff --git a/arch/arm/v7a/tls.c b/arch/arm/v7a/tls.c
@@ -0,0 +1,39 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * tls (armv7a)
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Hubert Badocha
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+
+#include <sys/tls.h>
+
+
+struct tls_tcb *__tls_getTcb(void)
+{
+	void *tcb;
+	/* clang-format off */
+	__asm__ volatile("mrc p15, 0, %0, cr13, cr0, 3" : "=r"(tcb));
+	/* clang-format on */
+	return tcb;
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)tcb;
+}
+
+
+void __tls_archInit(void)
+{
+	/* Nothing to do. */
+}
diff --git a/arch/arm/v7m/tls.c b/arch/arm/v7m/tls.c
@@ -13,10 +13,12 @@
  * %LICENSE%
  */
 
+
 #include <sys/types.h>
+#include <sys/tls.h>
 
 
-volatile uintptr_t arm_tls_ptr __attribute__((section("armtls"))) = 0;
+volatile uintptr_t arm_tls_ptr = 0;
 
 
 void *read_tls_ptr(void)
@@ -32,3 +34,21 @@ void __attribute__((naked)) __aeabi_read_tp(void)
 		"bl read_tls_ptr;"
 		"pop {r1-r4,r12,pc}");
 }
+
+
+struct tls_tcb *__tls_getTcb(void)
+{
+	return (struct tls_tcb *)read_tls_ptr();
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)tcb;
+}
+
+
+void __tls_archInit(void)
+{
+	tlsSetReg((void *)&arm_tls_ptr);
+}
diff --git a/arch/arm/v8m/tls.c b/arch/arm/v8m/tls.c
@@ -13,10 +13,12 @@
  * %LICENSE%
  */
 
+
 #include <sys/types.h>
+#include <sys/tls.h>
 
 
-volatile uintptr_t arm_tls_ptr __attribute__((section("armtls"))) = 0;
+volatile uintptr_t arm_tls_ptr = 0;
 
 
 void *read_tls_ptr(void)
@@ -32,3 +34,21 @@ void __attribute__((naked)) __aeabi_read_tp(void)
 		"bl read_tls_ptr;"
 		"pop {r1-r4,r12,pc}");
 }
+
+
+struct tls_tcb *__tls_getTcb(void)
+{
+	return (struct tls_tcb *)read_tls_ptr();
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)tcb;
+}
+
+
+void __tls_archInit(void)
+{
+	tlsSetReg((void *)&arm_tls_ptr);
+}
diff --git a/arch/arm/v8r/Makefile b/arch/arm/v8r/Makefile
@@ -6,4 +6,4 @@
 # %LICENSE%
 #
 
-OBJS += $(addprefix $(PREFIX_O)arch/arm/v8r/, syscalls.o reboot.o)
+OBJS += $(addprefix $(PREFIX_O)arch/arm/v8r/, syscalls.o reboot.o tls.o)
diff --git a/arch/arm/v8r/tls.c b/arch/arm/v8r/tls.c
@@ -0,0 +1,39 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * tls (armv8r)
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Hubert Badocha
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+
+#include <sys/tls.h>
+
+
+struct tls_tcb *__tls_getTcb(void)
+{
+	void *tcb;
+	/* clang-format off */
+	__asm__ volatile("mrc p15, 0, %0, cr13, cr0, 3" : "=r"(tcb));
+	/* clang-format on */
+	return tcb;
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)tcb;
+}
+
+
+void __tls_archInit(void)
+{
+	/* Nothing to do. */
+}
diff --git a/arch/ia32/Makefile b/arch/ia32/Makefile
@@ -5,5 +5,5 @@
 # Author: Pawel Pisarczyk
 #
 
-OBJS += $(addprefix $(PREFIX_O)arch/ia32/, syscalls.o jmp.o signal.o string.o reboot.o)
+OBJS += $(addprefix $(PREFIX_O)arch/ia32/, syscalls.o jmp.o signal.o string.o reboot.o tls.o)
 CRT0_OBJS += $(addprefix $(PREFIX_O)arch/ia32/, crt0.o)
diff --git a/arch/ia32/tls.c b/arch/ia32/tls.c
@@ -0,0 +1,39 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * tls (ia32)
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Hubert Badocha
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+
+#include <sys/tls.h>
+
+
+struct tls_tcb *__tls_getTcb(void)
+{
+	struct tls_tcb *tcb;
+	/* clang-format off */
+	__asm__ volatile("movl %%gs:0, %0" : "=r"(tcb));
+	/* clang-format on */
+	return tcb;
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)tcb;
+}
+
+
+void __tls_archInit(void)
+{
+	/* Nothing to do. */
+}
diff --git a/arch/riscv64/Makefile b/arch/riscv64/Makefile
@@ -5,5 +5,5 @@
 # Author: Pawel Pisarczyk
 #
 
-OBJS += $(addprefix $(PREFIX_O)arch/riscv64/, syscalls.o string.o signal.o reboot.o jmp.o)
+OBJS += $(addprefix $(PREFIX_O)arch/riscv64/, syscalls.o string.o signal.o reboot.o jmp.o tls.o)
 CRT0_OBJS += $(addprefix $(PREFIX_O)arch/riscv64/, crt0.o)
diff --git a/arch/riscv64/tls.c b/arch/riscv64/tls.c
@@ -0,0 +1,43 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * tls (riscv64)
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Hubert Badocha
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+
+#include <sys/tls.h>
+
+
+/* As per RISC-V ABI:
+ * RISC-V uses Variant I as described by the ELF TLS specification, with tp containing the address one past the end of the TCB */
+struct tls_tcb *__tls_getTcb(void)
+{
+	void *tcb;
+	/* clang-format off */
+	__asm__ volatile("addi %[tcb], tp, %[offset]"
+					 : [tcb] "=r"(tcb)
+					 : [offset] "n"(-sizeof(struct tls_tcb)));
+	/* clang-format on */
+	return tcb;
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)(tcb + 1);
+}
+
+
+void __tls_archInit(void)
+{
+	/* Nothing to do. */
+}
diff --git a/arch/sparcv8leon3/Makefile b/arch/sparcv8leon3/Makefile
@@ -5,5 +5,5 @@
 # Author: Lukasz Leczkowski
 #
 
-OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon3/, syscalls.o jmp.o signal.o string.o reboot.o)
+OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon3/, syscalls.o jmp.o signal.o string.o reboot.o tls.o)
 CRT0_OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon3/, crt0.o)
diff --git a/arch/sparcv8leon3/tls.c b/arch/sparcv8leon3/tls.c
@@ -0,0 +1,36 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * tls (sparc)
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Hubert Badocha
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+
+#include <sys/tls.h>
+
+
+struct tls_tcb *__tls_getTcb(void)
+{
+	register struct tls_tcb *tcb asm("g7");
+
+	return tcb;
+}
+
+
+void *__tls_tcbPtrToTlsPtr(struct tls_tcb *tcb)
+{
+	return (void *)tcb;
+}
+
+
+void __tls_archInit(void) {
+	/* Nothing to do. */
+}
diff --git a/crt0-common.c b/crt0-common.c
@@ -72,13 +72,26 @@ extern int main(int argc, char **argv);
 
 char **environ;
 const char *argv_progname;
+char **auxvStart; /* char** instead of void* to make iteration easier and don't waste any stack space. */
 
 
 __attribute__((noreturn)) void _startc(void (*cleanup)(void), int argc, char **argv, char **env)
 {
 	environ = env;
 	argv_progname = *argv;
 
+	if (env == NULL) {
+		auxvStart = argv;
+	}
+	else {
+		auxvStart = env;
+	}
+
+	while ((*auxvStart) != NULL) {
+		auxvStart++;
+	}
+	auxvStart++;
+
 	_libc_init();
 
 	/* cleanup function is not NULL when the dynamic linker is used */

diff --git a/errno/errno.c b/errno/errno.c
@@ -15,13 +15,15 @@
 
 #include <sys/rb.h>
 #include <sys/threads.h>
+#include <sys/tls.h>
 #include <errno.h>
 #include <arch.h>
 
 
-#ifdef __LIBPHOENIX_ARCH_TLS_SUPPORTED
+#ifdef __LIBPHOENIX_ARCH_USE_TLS
 
 static __thread int __errno_tls;
+static int __errno_singlethread;
 
 #else
 
@@ -45,7 +47,7 @@ static int errno_cmp(rbnode_t *n1, rbnode_t *n2)
 
 int *__errno_location(void)
 {
-#ifndef __LIBPHOENIX_ARCH_TLS_SUPPORTED
+#ifndef __LIBPHOENIX_ARCH_USE_TLS
 	struct __errno_t *e, r;
 	r.tid = gettid();
 
@@ -58,14 +60,15 @@ int *__errno_location(void)
 
 	return &errno_global;
 #else
-	return &__errno_tls;
+	/* Errno maybe called before TLS is initialized(malloc) */
+	return (__isthreaded == 0) ? &__errno_singlethread : &__errno_tls;
 #endif
 }
 
 
 void _errno_new(struct __errno_t *e)
 {
-#ifndef __LIBPHOENIX_ARCH_TLS_SUPPORTED
+#ifndef __LIBPHOENIX_ARCH_USE_TLS
 	e->no = 0;
 	e->tid = gettid();
 
@@ -78,7 +81,7 @@ void _errno_new(struct __errno_t *e)
 
 void _errno_remove(struct __errno_t *e)
 {
-#ifndef __LIBPHOENIX_ARCH_TLS_SUPPORTED
+#ifndef __LIBPHOENIX_ARCH_USE_TLS
 	mutexLock(errno_common.lock);
 	lib_rbRemove(&errno_common.tree, &e->linkage);
 	mutexUnlock(errno_common.lock);
@@ -88,7 +91,7 @@ void _errno_remove(struct __errno_t *e)
 
 void _errno_init(void)
 {
-#ifndef __LIBPHOENIX_ARCH_TLS_SUPPORTED
+#ifndef __LIBPHOENIX_ARCH_USE_TLS
 	mutexCreate(&errno_common.lock);
 	lib_rbInit(&errno_common.tree, errno_cmp, NULL);
 #endif