From: Mao Han <han_mao@c-sky.com>
To: libc-alpha@sourceware.org
Cc: Mao Han <han_mao@c-sky.com>,
c-sky_gcc_upstream@c-sky.com, gnu-csky@mentor.com
Subject: [PATCH v4 02/13] C-SKY: TLS support
Date: Wed, 12 Sep 2018 02:56:00 -0000 [thread overview]
Message-ID: <376085ff01ef6e2d82b4cb573fb200ed2c16b5c9.1536720821.git.han_mao@c-sky.com> (raw)
In-Reply-To: <cover.1536715883.git.han_mao@c-sky.com>
In-Reply-To: <cover.1536720821.git.han_mao@c-sky.com>
This patch implements TLS support for C-SKY. We support all four
standard TLS addressing modes (LE, IE, LD, and GD) when running on
Linux via NPTL.
* sysdeps/csky/abiv2/tls-macros.h: New file.
* sysdeps/csky/dl-tls.h: Likewise.
* sysdeps/csky/libc-tls.c: Likewise.
* sysdeps/csky/nptl/tcb-offsets.sym: Likewise.
* sysdeps/csky/nptl/tls.h: Likewise.
---
sysdeps/csky/abiv2/tls-macros.h | 55 ++++++++++++++
sysdeps/csky/dl-tls.h | 26 +++++++
sysdeps/csky/libc-tls.c | 32 ++++++++
sysdeps/csky/nptl/tcb-offsets.sym | 10 +++
sysdeps/csky/nptl/tls.h | 156 ++++++++++++++++++++++++++++++++++++++
5 files changed, 279 insertions(+)
create mode 100644 sysdeps/csky/abiv2/tls-macros.h
create mode 100644 sysdeps/csky/dl-tls.h
create mode 100644 sysdeps/csky/libc-tls.c
create mode 100644 sysdeps/csky/nptl/tcb-offsets.sym
create mode 100644 sysdeps/csky/nptl/tls.h
diff --git a/sysdeps/csky/abiv2/tls-macros.h b/sysdeps/csky/abiv2/tls-macros.h
new file mode 100644
index 0000000..59af059
--- /dev/null
+++ b/sysdeps/csky/abiv2/tls-macros.h
@@ -0,0 +1,55 @@
+/* Macros for accessing thread-local storage. C-SKY ABIV2 version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+# define TLS_LE(x) \
+ ({ int *__result; \
+ __asm__ ("lrw %0, " #x "@TPOFF\n\t" \
+ "add %0, tls, %0" \
+ : "=&r" (__result)); \
+ __result; })
+
+# define TLS_IE(x) \
+ ({ int *__result; \
+ __asm__ ("grs a1, 1f\n" \
+ "1:\tlrw %0, " #x "@GOTTPOFF\n\t" \
+ "ldr.w %0, (a1, %0 << 0)\n\t" \
+ "add %0, tls, %0" \
+ : "=&r" (__result): : "a1"); \
+ __result; })
+
+# define TLS_LD(x) \
+ ({ char *__result; \
+ int __offset; \
+ extern void *__tls_get_addr (void *); \
+ __asm__ ("grs a1, 1f\n" \
+ "1:\tlrw %0, " #x "@TLSLDM32;\n\t" \
+ "add %0, a1, %0" \
+ : "=r" (__result) : : "a1"); \
+ __result = (char *)__tls_get_addr (__result); \
+ __asm__ ("lrw %0, " #x "@TLSLDO32" \
+ : "=r" (__offset)); \
+ (int *) (__result + __offset); })
+
+# define TLS_GD(x) \
+ ({ int *__result; \
+ extern void *__tls_get_addr (void *); \
+ __asm__ ("grs a1, 1f\n" \
+ "1:\tlrw %0, " #x "@TLSGD32\n\t" \
+ "add %0, a1, %0" \
+ : "=r" (__result) : : "a1"); \
+ (int *)__tls_get_addr (__result); })
diff --git a/sysdeps/csky/dl-tls.h b/sysdeps/csky/dl-tls.h
new file mode 100644
index 0000000..d44fc18
--- /dev/null
+++ b/sysdeps/csky/dl-tls.h
@@ -0,0 +1,26 @@
+/* Thread-local storage handling in the ELF dynamic linker. C-SKY version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* Type used for the representation of TLS information in the GOT. */
+typedef struct
+{
+ unsigned long int ti_module;
+ unsigned long int ti_offset;
+} tls_index;
+
+extern void *__tls_get_addr (tls_index *ti);
diff --git a/sysdeps/csky/libc-tls.c b/sysdeps/csky/libc-tls.c
new file mode 100644
index 0000000..30baf62
--- /dev/null
+++ b/sysdeps/csky/libc-tls.c
@@ -0,0 +1,32 @@
+/* Thread-local storage handling in the ELF dynamic linker. C-SKY version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <csu/libc-tls.c>
+#include <dl-tls.h>
+
+/* On C-SKY, linker optimizations are not required, so __tls_get_addr
+ can be called even in statically linked binaries. In this case module
+ must be always 1 and PT_TLS segment exist in the binary, otherwise it
+ would not link. */
+
+void *
+__tls_get_addr (tls_index *ti)
+{
+ dtv_t *dtv = THREAD_DTV ();
+ return (char *) dtv[1].pointer.val + ti->ti_offset;
+}
diff --git a/sysdeps/csky/nptl/tcb-offsets.sym b/sysdeps/csky/nptl/tcb-offsets.sym
new file mode 100644
index 0000000..f110520
--- /dev/null
+++ b/sysdeps/csky/nptl/tcb-offsets.sym
@@ -0,0 +1,10 @@
+#include <sysdep.h>
+#include <tls.h>
+
+--
+
+-- Derive offsets relative to the thread register.
+#define thread_offsetof(mem) (long)(offsetof (struct pthread, mem) - sizeof (struct pthread))
+
+MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads)
+TID_OFFSET thread_offsetof (tid)
diff --git a/sysdeps/csky/nptl/tls.h b/sysdeps/csky/nptl/tls.h
new file mode 100644
index 0000000..14dbf94
--- /dev/null
+++ b/sysdeps/csky/nptl/tls.h
@@ -0,0 +1,156 @@
+/* Definitions for thread-local data handling. NPTL/C-SKY version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _TLS_H
+#define _TLS_H 1
+
+#ifndef __ASSEMBLER__
+
+# include <stdbool.h>
+# include <stddef.h>
+# include <stdint.h>
+# include <dl-dtv.h>
+
+/* Define r31 as thread pointer register. */
+# define READ_THREAD_POINTER() \
+ ({ void *__result; \
+ __asm__ __volatile__ ("mov %0, r31" \
+ : "=r" (__result)); \
+ __result; })
+
+#else
+# include <tcb-offsets.h>
+/* Define r31 as thread pointer register. */
+# define READ_THREAD_POINTER() \
+ mov r0, r31;
+#endif /* __ASSEMBLER__ */
+
+#ifndef __ASSEMBLER__
+
+/* Get system call information. */
+# include <sysdep.h>
+
+/* The TP points to the start of the thread blocks. */
+# define TLS_DTV_AT_TP 1
+# define TLS_TCB_AT_TP 0
+
+/* Get the thread descriptor definition. */
+# include <nptl/descr.h>
+
+typedef struct
+{
+ dtv_t *dtv;
+ void *private;
+} tcbhead_t;
+
+/* This is the size of the initial TCB. */
+# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
+
+/* Alignment requirements for the initial TCB. */
+# define TLS_INIT_TCB_ALIGN 8
+
+/* This is the size of the TCB. */
+# define TLS_TCB_SIZE sizeof (tcbhead_t)
+
+/* Alignment requirements for the TCB. */
+# define TLS_TCB_ALIGN 8
+
+/* This is the size we need before TCB. */
+# define TLS_PRE_TCB_SIZE sizeof (struct pthread)
+
+/* The thread pointer tp points to the end of the TCB.
+ The pthread_descr structure is immediately in front of the TCB. */
+# define TLS_TCB_OFFSET 0
+
+/* Install the dtv pointer. The pointer passed is to the element with
+ index -1 which contain the length. */
+# define INSTALL_DTV(tcbp, dtvp) \
+ (((tcbhead_t *) (tcbp))->dtv = (dtvp) + 1)
+
+/* Install new dtv for current thread. */
+# define INSTALL_NEW_DTV(dtv) \
+ (THREAD_DTV() = (dtv))
+
+/* Return dtv of given thread descriptor. */
+# define GET_DTV(tcbp) \
+ (((tcbhead_t *) (tcbp))->dtv)
+
+# define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
+
+/* Code to initially initialize the thread pointer. This might need
+ special attention since 'errno' is not yet available and if the
+ operation can cause a failure 'errno' must not be touched. */
+# define TLS_INIT_TP(tcbp) \
+ ({ INTERNAL_SYSCALL_DECL (err); \
+ long result_var; \
+ result_var = INTERNAL_SYSCALL (set_thread_area, err, 1, \
+ (char *) (tcbp) + TLS_TCB_OFFSET); \
+ INTERNAL_SYSCALL_ERROR_P (result_var, err) \
+ ? "unknown error" : NULL; })
+
+/* Return the address of the dtv for the current thread. */
+# define THREAD_DTV() \
+ (((tcbhead_t *) (READ_THREAD_POINTER () - TLS_TCB_OFFSET))->dtv)
+
+/* Return the thread descriptor for the current thread. */
+# undef THREAD_SELF
+# define THREAD_SELF \
+ ((struct pthread *) (READ_THREAD_POINTER () \
+ - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE))
+
+/* Magic for libthread_db to know how to do THREAD_SELF. */
+# define DB_THREAD_SELF \
+ CONST_THREAD_AREA (32, sizeof (struct pthread))
+
+/* Access to data in the thread descriptor is easy. */
+# define THREAD_GETMEM(descr, member) \
+ descr->member
+# define THREAD_GETMEM_NC(descr, member, idx) \
+ descr->member[idx]
+# define THREAD_SETMEM(descr, member, value) \
+ descr->member = (value)
+# define THREAD_SETMEM_NC(descr, member, idx, value) \
+ descr->member[idx] = (value)
+
+/* Get and set the global scope generation counter in struct pthread. */
+# define THREAD_GSCOPE_IN_TCB 1
+# define THREAD_GSCOPE_FLAG_UNUSED 0
+# define THREAD_GSCOPE_FLAG_USED 1
+# define THREAD_GSCOPE_FLAG_WAIT 2
+# define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
+ } \
+ while (0)
+# define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+# define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
+#endif /* __ASSEMBLER__ */
+
+#endif /* tls.h */
--
2.7.4
next prev parent reply other threads:[~2018-09-12 2:56 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 2:56 [PATCH v4 00/13] port C-SKY to glibc Mao Han
[not found] ` <cover.1536720821.git.han_mao@c-sky.com>
2018-09-12 2:56 ` [PATCH v4 05/13] C-SKY: Linux Syscall Interface Mao Han
2018-09-12 2:56 ` [PATCH v4 01/13] C-SKY: ABI related code Mao Han
2018-09-12 4:16 ` H.J. Lu
2018-09-12 7:07 ` Mao Han
2018-09-12 8:23 ` Florian Weimer
2018-09-12 9:06 ` Mao Han
2018-09-29 1:46 ` Palmer Dabbelt
2018-09-30 9:04 ` Manuel A. Fernandez Montecelo
2018-10-01 8:18 ` Richard W.M. Jones
2018-09-17 21:46 ` Joseph Myers
2018-09-18 6:09 ` Mao Han
2018-09-12 2:56 ` [PATCH v4 03/13] C-SKY: Math support Mao Han
2018-09-17 21:49 ` Joseph Myers
2018-09-18 6:05 ` Mao Han
2018-09-12 2:56 ` Mao Han [this message]
2018-09-12 2:57 ` [PATCH v4 08/13] C-SKY: Linux Startup and Dynamic Loading Code Mao Han
2018-09-12 2:57 ` [PATCH v4 13/13] C-SKY: Skeleton documentation Mao Han
2018-09-12 2:57 ` [PATCH v4 06/13] C-SKY: Linux ABI Mao Han
2018-09-12 13:40 ` Arnd Bergmann
2018-09-12 14:21 ` Joseph Myers
2018-09-12 15:34 ` Arnd Bergmann
2018-09-12 21:28 ` struct elf_prstatus and Y2038 (was: Re: [PATCH v4 06/13] C-SKY: Linux ABI) Florian Weimer
2018-09-13 10:48 ` Arnd Bergmann
2018-09-13 10:56 ` struct elf_prstatus and Y2038 Florian Weimer
2018-09-13 8:17 ` [PATCH v4 06/13] C-SKY: Linux ABI Mao Han
2018-09-13 8:46 ` Arnd Bergmann
2018-09-13 15:32 ` [gnu-csky] " Joseph Myers
2018-09-13 16:35 ` Joseph Myers
2018-09-13 20:47 ` Arnd Bergmann
2018-09-13 20:59 ` Joseph Myers
2018-09-13 21:32 ` Arnd Bergmann
2018-09-13 22:57 ` Joseph Myers
2018-09-13 20:31 ` Arnd Bergmann
2018-09-13 20:49 ` Joseph Myers
2018-09-13 21:38 ` Arnd Bergmann
2018-09-12 2:57 ` [PATCH v4 12/13] C-SKY: Add build-many-glibcs.py support Mao Han
2018-09-12 2:57 ` [PATCH v4 11/13] C-SKY: Add ABI definitions in config.h.in Mao Han
2018-09-12 2:57 ` [PATCH v4 09/13] C-SKY: Add dynamic relocations to elf.h Mao Han
2018-09-12 3:05 ` [PATCH v4 07/13] C-SKY: ABI Lists Mao Han
2018-09-12 6:51 ` Andreas Schwab
2018-09-12 7:12 ` Mao Han
2018-09-12 12:35 ` Joseph Myers
2018-09-12 13:46 ` Andreas Schwab
2018-09-12 15:19 ` Joseph Myers
2018-09-13 8:23 ` Mao Han
2018-09-12 3:05 ` [PATCH v4 04/13] C-SKY: NPTL support and Atomic Mao Han
2018-09-12 3:05 ` [PATCH v4 10/13] C-SKY: Build Infastructure Mao Han
2018-09-17 21:52 ` Joseph Myers
2018-09-18 6:02 ` Mao Han
2018-09-12 3:05 ` [PATCH 1/1] Update config.guess and config.sub to current versions Mao Han
2018-09-12 12:31 ` [PATCH v4 00/13] port C-SKY to glibc Joseph Myers
2018-09-13 8:14 ` Mao Han
2018-09-13 12:36 ` Joseph Myers
2018-09-18 6:22 ` Mao Han
2018-09-18 7:18 ` Mao Han
2018-09-18 11:43 ` Joseph Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=376085ff01ef6e2d82b4cb573fb200ed2c16b5c9.1536720821.git.han_mao@c-sky.com \
--to=han_mao@c-sky.com \
--cc=c-sky_gcc_upstream@c-sky.com \
--cc=gnu-csky@mentor.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).