diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-07-14 05:53:05 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-07-14 05:56:46 -0700 |
| commit | ebff9c5cfae62e84dbd0456d564bd882818dc15f (patch) | |
| tree | bf8bb50ca20fe7cd8adbac896707bd02975ea1ff /nptl | |
| parent | 0a83bad2aae6807a108d5bb3eb3389060702265b (diff) | |
x86: Rename __glibc_reserved1 to feature_1 in tcbhead_t [BZ #22563]
feature_1 has X86_FEATURE_1_IBT and X86_FEATURE_1_SHSTK bits for CET
run-time control.
CET_ENABLED, IBT_ENABLED and SHSTK_ENABLED are defined to 1 or 0 to
indicate that if CET, IBT and SHSTK are enabled.
<tls-setup.h> is added to set up thread-local data.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
[BZ #22563]
* nptl/pthread_create.c: Include <tls-setup.h>.
(__pthread_create_2_1): Call tls_setup_tcbhead.
* sysdeps/generic/tls-setup.h: New file.
* sysdeps/x86/nptl/tls-setup.h: Likewise.
* sysdeps/i386/nptl/tcb-offsets.sym (FEATURE_1_OFFSET): New.
* sysdeps/x86_64/nptl/tcb-offsets.sym (FEATURE_1_OFFSET):
Likewise.
* sysdeps/i386/nptl/tls.h (tcbhead_t): Rename __glibc_reserved1
to feature_1.
* sysdeps/x86_64/nptl/tls.h (tcbhead_t): Likewise.
* sysdeps/x86/sysdep.h (X86_FEATURE_1_IBT): New.
(X86_FEATURE_1_SHSTK): Likewise.
(CET_ENABLED): Likewise.
(IBT_ENABLED): Likewise.
(SHSTK_ENABLED): Likewise.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/pthread_create.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 92c945b12b..5f5a007b7f 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -32,6 +32,7 @@ #include <exit-thread.h> #include <default-sched.h> #include <futex-internal.h> +#include <tls-setup.h> #include "libioP.h" #include <shlib-compat.h> @@ -712,6 +713,9 @@ __pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr, THREAD_COPY_POINTER_GUARD (pd); #endif + /* Setup tcbhead. */ + tls_setup_tcbhead (pd); + /* Verify the sysinfo bits were copied in allocate_stack if needed. */ #ifdef NEED_DL_SYSINFO CHECK_THREAD_SYSINFO (pd); |