From baad294eaf59e0e1b311a11448a04e3d3c5f3c56 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Apr 2017 07:07:57 +0200 Subject: or1k: add NPTL/TLS support Signed-off-by: Waldemar Brodkorb --- libpthread/nptl/sysdeps/or1k/Makefile.arch | 4 + libpthread/nptl/sysdeps/or1k/dl-tls.h | 26 +++ libpthread/nptl/sysdeps/or1k/libc-tls.c | 36 ++++ libpthread/nptl/sysdeps/or1k/pthread_spin_lock.c | 65 +++++++ .../nptl/sysdeps/or1k/pthread_spin_trylock.c | 26 +++ libpthread/nptl/sysdeps/or1k/pthreaddef.h | 38 ++++ libpthread/nptl/sysdeps/or1k/tcb-offsets.sym | 6 + libpthread/nptl/sysdeps/or1k/tls.h | 201 +++++++++++++++++++++ 8 files changed, 402 insertions(+) create mode 100644 libpthread/nptl/sysdeps/or1k/Makefile.arch create mode 100644 libpthread/nptl/sysdeps/or1k/dl-tls.h create mode 100644 libpthread/nptl/sysdeps/or1k/libc-tls.c create mode 100644 libpthread/nptl/sysdeps/or1k/pthread_spin_lock.c create mode 100644 libpthread/nptl/sysdeps/or1k/pthread_spin_trylock.c create mode 100644 libpthread/nptl/sysdeps/or1k/pthreaddef.h create mode 100644 libpthread/nptl/sysdeps/or1k/tcb-offsets.sym create mode 100644 libpthread/nptl/sysdeps/or1k/tls.h (limited to 'libpthread/nptl/sysdeps/or1k') diff --git a/libpthread/nptl/sysdeps/or1k/Makefile.arch b/libpthread/nptl/sysdeps/or1k/Makefile.arch new file mode 100644 index 000000000..5be08a44c --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/Makefile.arch @@ -0,0 +1,4 @@ +# Makefile for uClibc-ng NPTL +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + +libc_arch_a_SSRC = libc-tls.S diff --git a/libpthread/nptl/sysdeps/or1k/dl-tls.h b/libpthread/nptl/sysdeps/or1k/dl-tls.h new file mode 100644 index 000000000..5613e21e2 --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/dl-tls.h @@ -0,0 +1,26 @@ +/* Copyright (C) 2005-2016 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 + . */ + +/* 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/libpthread/nptl/sysdeps/or1k/libc-tls.c b/libpthread/nptl/sysdeps/or1k/libc-tls.c new file mode 100644 index 000000000..7f440fb06 --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/libc-tls.c @@ -0,0 +1,36 @@ +/* Copyright (C) 2005-2016 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 + . */ + +#include +#include + +/* On Microblaze, 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. */ + +#if defined(USE_TLS) && USE_TLS + +void * +__tls_get_addr (tls_index *ti) +{ + dtv_t *dtv = THREAD_DTV (); + return (char *) dtv[1].pointer.val + ti->ti_offset; +} + +#endif diff --git a/libpthread/nptl/sysdeps/or1k/pthread_spin_lock.c b/libpthread/nptl/sysdeps/or1k/pthread_spin_lock.c new file mode 100644 index 000000000..cec3acbc6 --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/pthread_spin_lock.c @@ -0,0 +1,65 @@ +/* pthread_spin_lock -- lock a spin lock. Generic version. + Copyright (C) 2012-2016 Free Software Foundation, Inc. + + 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 + . */ + +#include +#include "pthreadP.h" + +/* A machine-specific version can define SPIN_LOCK_READS_BETWEEN_CMPXCHG + to the number of plain reads that it's optimal to spin on between uses + of atomic_compare_and_exchange_val_acq. If spinning forever is optimal + then use -1. If no plain reads here would ever be optimal, use 0. */ +#define SPIN_LOCK_READS_BETWEEN_CMPXCHG 1000 + +int +pthread_spin_lock (pthread_spinlock_t *lock) +{ + /* atomic_exchange usually takes less instructions than + atomic_compare_and_exchange. On the other hand, + atomic_compare_and_exchange potentially generates less bus traffic + when the lock is locked. + We assume that the first try mostly will be successful, and we use + atomic_exchange. For the subsequent tries we use + atomic_compare_and_exchange. */ + if (atomic_exchange_acq (lock, 1) == 0) + return 0; + + do + { + /* The lock is contended and we need to wait. Going straight back + to cmpxchg is not a good idea on many targets as that will force + expensive memory synchronizations among processors and penalize other + running threads. + On the other hand, we do want to update memory state on the local core + once in a while to avoid spinning indefinitely until some event that + will happen to update local memory as a side-effect. */ + if (SPIN_LOCK_READS_BETWEEN_CMPXCHG >= 0) + { + int wait = SPIN_LOCK_READS_BETWEEN_CMPXCHG; + + while (*lock != 0 && wait > 0) + --wait; + } + else + { + while (*lock != 0) + ; + } + } + while (atomic_compare_and_exchange_val_acq (lock, 1, 0) != 0); + + return 0; +} diff --git a/libpthread/nptl/sysdeps/or1k/pthread_spin_trylock.c b/libpthread/nptl/sysdeps/or1k/pthread_spin_trylock.c new file mode 100644 index 000000000..4e9aa64d3 --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/pthread_spin_trylock.c @@ -0,0 +1,26 @@ +/* pthread_spin_trylock -- trylock a spin lock. Generic version. + Copyright (C) 2012-2016 Free Software Foundation, Inc. + + 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 + . */ + +#include +#include +#include "pthreadP.h" + +int +pthread_spin_trylock (pthread_spinlock_t *lock) +{ + return atomic_exchange_acq (lock, 1) ? EBUSY : 0; +} diff --git a/libpthread/nptl/sysdeps/or1k/pthreaddef.h b/libpthread/nptl/sysdeps/or1k/pthreaddef.h new file mode 100644 index 000000000..e8da3d965 --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/pthreaddef.h @@ -0,0 +1,38 @@ +/* Copyright (C) 2002-2012 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 + . */ + +/* Default stack size. */ +#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) + +/* Required stack pointer alignment at beginning. */ +#define STACK_ALIGN 16 + +/* Minimal stack size after allocating thread descriptor and guard size. */ +#define MINIMAL_REST_STACK 2048 + +/* Alignment requirement for TCB. */ +#define TCB_ALIGNMENT 16 + +/* Location of current stack frame. */ +#define CURRENT_STACK_FRAME __builtin_frame_address (0) + + +/* XXX Until we have a better place keep the definitions here. */ +#define __exit_thread_inline(val) \ + INLINE_SYSCALL (exit, 1, (val)) + diff --git a/libpthread/nptl/sysdeps/or1k/tcb-offsets.sym b/libpthread/nptl/sysdeps/or1k/tcb-offsets.sym new file mode 100644 index 000000000..86025a402 --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/tcb-offsets.sym @@ -0,0 +1,6 @@ +#include +#include + +MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) +TID_OFFSET offsetof (struct pthread, tid) +TP_TO_PTHREAD_OFFSET -(sizeof (struct pthread) + sizeof (tcbhead_t)) diff --git a/libpthread/nptl/sysdeps/or1k/tls.h b/libpthread/nptl/sysdeps/or1k/tls.h new file mode 100644 index 000000000..25bdb5e5a --- /dev/null +++ b/libpthread/nptl/sysdeps/or1k/tls.h @@ -0,0 +1,201 @@ +/* Definition for thread-local data handling. NPTL/OR1K version. + Copyright (C) 2005, 2007, 2011 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 + . */ + +#ifndef _TLS_H +#define _TLS_H 1 + +#ifndef __ASSEMBLER__ +# include +# include +# include + +/* Type for the dtv. */ +typedef union dtv +{ + size_t counter; + struct + { + void *val; + bool is_static; + } pointer; +} dtv_t; + +typedef struct +{ + dtv_t *dtv; +} tcbhead_t; + +register tcbhead_t *__thread_self __asm__("r10"); + +# define TLS_MULTIPLE_THREADS_IN_TCB 1 + +#else /* __ASSEMBLER__ */ +# include +#endif /* __ASSEMBLER__ */ + +/* We require TLS support in the tools. */ +#define HAVE_TLS_SUPPORT 1 +#define HAVE_TLS_MODEL_ATTRIBUTE 1 +#define HAVE___THREAD 1 + +/* Signal that TLS support is available. */ +#define USE_TLS 1 + +#ifndef __ASSEMBLER__ + +/* Get system call information. */ +# include + +/* The TP points to the start of the TLS block. + * As I understand it, this isn't strictly that "TP points to DTV" - it's + * more where to place the TCB in the TLS block. This will place it in + * the beginning. + * + * Layout: + * ------------------------------------ + * | PRE | TCB | TLS MEMORY .. | + * ------------------------------------ + * ^ r10 / TP + * + * PRE is the struct pthread described below + * TCB is tcbhead_t + * TLS memory is where the TLS program sections are loaded + * + * See _dl_allocate_tls_storage and __libc_setup_tls for more information. + */ +# define TLS_DTV_AT_TP 1 + +/* Get the thread descriptor definition. */ +# include <../../descr.h> + +/* Requirements for the TCB. */ +# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t) +# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) + +# define TLS_TCB_SIZE sizeof (tcbhead_t) +# define TLS_TCB_ALIGN __alignof__ (tcbhead_t) + +/* This is the size of the TCB. */ + +/* This is the size we need before TCB. + * To support THREAD_GETMEM with friends we want to have a + * struct pthread available. + * Yank it in infront of everything, I'm sure nobody will mind. + * + * This memory is really allocated PRE the TLS block, so it's possible + * to do ((char*)tlsblock) - TLS_PRE_TCB_SIZE to access it. + * This is done for THREAD_SELF. */ +# define TLS_PRE_TCB_SIZE sizeof (struct pthread) + + +/* Install the dtv pointer. + * When called, dtvp is a pointer not the DTV per say (which should start + * with the generation counter) but to the length of the DTV. + * We can always index with -1, so we store dtvp[1] + */ +# define INSTALL_DTV(tcbp, dtvp) \ + (((tcbhead_t *) (tcbp))->dtv = (dtvp) + 1) + +/* Install new dtv for current thread + * In a logicial world dtv here would also point to the length of the DTV. + * However it does not, this time it points to the generation counter, + * so just store it. + * + * Note: -1 is still valid and contains the length. */ +# define INSTALL_NEW_DTV(dtv) \ + (THREAD_DTV() = (dtv)) + +/* Return dtv of given thread descriptor. */ +# define GET_DTV(tcbp) \ + (((tcbhead_t *) (tcbp))->dtv) + +/* Code to initially initialize the thread pointer. + * + * Set TP to the address _after_ tcbhead_t. This will allow us + * to change the size of tcbhead_t without having to re-link everything. + * + * secondcall has something to do with USE__THREAD, + * seems to always be 0 so we don't care about it. + * + * This has to return NULL on success (or a string with the failure text). + * It's hard to fail this, so return NULL always. + */ +# define TLS_INIT_TP(tcbp, secondcall) \ + ({__thread_self = ((tcbhead_t *)tcbp + 1); NULL;}) + +/* Return the address of the dtv for the current thread. + * + * Dereference TP, offset to dtv - really straightforward. + * Remember that we made TP point to after tcb, so we need to reverse that. + */ +# define THREAD_DTV() \ + ((((tcbhead_t *)__thread_self)-1)->dtv) + +/* Return the thread descriptor for the current thread. + * + * Return a pointer to the TLS_PRE area where we allocated space for + * a struct pthread. Again, TP points to after tcbhead_t, compensate with + * TLS_INIT_TCB_SIZE. + * + * I regard this is a seperate system from the "normal" TLS. + */ +# define THREAD_SELF \ + ((struct pthread *) ((char *) __thread_self - TLS_INIT_TCB_SIZE \ + - 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_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 */ + -- cgit v1.2.3