]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
x86: Rename __glibc_reserved1 to feature_1 in tcbhead_t [BZ #22563]
authorH.J. Lu <hjl.tools@gmail.com>
Sat, 14 Jul 2018 12:53:05 +0000 (05:53 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Sat, 14 Jul 2018 12:56:46 +0000 (05:56 -0700)
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.

ChangeLog
nptl/pthread_create.c
sysdeps/generic/tls-setup.h [new file with mode: 0644]
sysdeps/i386/nptl/tcb-offsets.sym
sysdeps/i386/nptl/tls.h
sysdeps/x86/nptl/tls-setup.h [new file with mode: 0644]
sysdeps/x86/sysdep.h
sysdeps/x86_64/nptl/tcb-offsets.sym
sysdeps/x86_64/nptl/tls.h

index 981e65ed3f54f3ed534c735e6079d397fea03d38..e5eead0f0fe74a595806e7783495dbc881be6b13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2018-07-14  H.J. Lu  <hongjiu.lu@intel.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.
+
 2018-07-13  Rafal Luzynski  <digitalfreak@lingonborough.com>
 
        [BZ #23208]
index 92c945b12b35010ced834ad5c5b53b09e100422c..5f5a007b7f048f7b2a9c4dad9f357ff39957379a 100644 (file)
@@ -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);
diff --git a/sysdeps/generic/tls-setup.h b/sysdeps/generic/tls-setup.h
new file mode 100644 (file)
index 0000000..8d0c36d
--- /dev/null
@@ -0,0 +1,22 @@
+/* Definitions to set up thread-local data.  Generic 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/>.  */
+
+static inline void __attribute__ ((always_inline))
+tls_setup_tcbhead (struct pthread *pd)
+{
+}
index 7d7fe5e71c19f63d65d33e7a95c303c5ed9b3bf4..fbac241c45781b736b0a3a67f10cb7b14d34c86f 100644 (file)
@@ -12,3 +12,4 @@ CLEANUP                       offsetof (struct pthread, cleanup)
 CLEANUP_PREV           offsetof (struct _pthread_cleanup_buffer, __prev)
 MUTEX_FUTEX            offsetof (pthread_mutex_t, __data.__lock)
 POINTER_GUARD          offsetof (tcbhead_t, pointer_guard)
+FEATURE_1_OFFSET       offsetof (tcbhead_t, feature_1)
index afb71ce4310d8aa78b9c70ae799d262b3c73462b..21e23cd8095b4d1c1d6bb0b25562a8d43ccc2df6 100644 (file)
@@ -41,7 +41,10 @@ typedef struct
   uintptr_t stack_guard;
   uintptr_t pointer_guard;
   int gscope_flag;
-  int __glibc_reserved1;
+  /* Bit 0: X86_FEATURE_1_IBT.
+     Bit 1: X86_FEATURE_1_SHSTK.
+   */
+  unsigned int feature_1;
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[3];
   /* GCC split stack support.  */
diff --git a/sysdeps/x86/nptl/tls-setup.h b/sysdeps/x86/nptl/tls-setup.h
new file mode 100644 (file)
index 0000000..ef5a4df
--- /dev/null
@@ -0,0 +1,23 @@
+/* Definitions to set up thread-local data.  x86 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/>.  */
+
+static inline void __attribute__ ((always_inline))
+tls_setup_tcbhead (struct pthread *pd)
+{
+  pd->header.feature_1 = THREAD_GETMEM (THREAD_SELF, header.feature_1);
+}
index afcb7cfd76b22f925da54710e5cccb155f620208..976566aa37b9a167a13e2aa8c02c530203a258ba 100644 (file)
 
 #include <sysdeps/generic/sysdep.h>
 
+/* __CET__ is defined by GCC with Control-Flow Protection values:
+
+enum cf_protection_level
+{
+  CF_NONE = 0,
+  CF_BRANCH = 1 << 0,
+  CF_RETURN = 1 << 1,
+  CF_FULL = CF_BRANCH | CF_RETURN,
+  CF_SET = 1 << 2
+};
+*/
+
+/* Set if CF_BRANCH (IBT) is enabled.  */
+#define X86_FEATURE_1_IBT      (1U << 0)
+/* Set if CF_RETURN (SHSTK) is enabled.  */
+#define X86_FEATURE_1_SHSTK    (1U << 1)
+
+#ifdef __CET__
+# define CET_ENABLED   1
+# define IBT_ENABLED   (__CET__ & X86_FEATURE_1_IBT)
+# define SHSTK_ENABLED (__CET__ & X86_FEATURE_1_SHSTK)
+#else
+# define CET_ENABLED   0
+# define IBT_ENABLED   0
+# define SHSTK_ENABLED 0
+#endif
+
 #ifdef __ASSEMBLER__
 
 /* Syntactic details of assembler.  */
index be63404a1604dc1640e840619ec7eb70730f0728..387621e88cdacef4ddc950e2b6d42b82fa83c774 100644 (file)
@@ -12,6 +12,7 @@ MUTEX_FUTEX           offsetof (pthread_mutex_t, __data.__lock)
 MULTIPLE_THREADS_OFFSET        offsetof (tcbhead_t, multiple_threads)
 POINTER_GUARD          offsetof (tcbhead_t, pointer_guard)
 VGETCPU_CACHE_OFFSET   offsetof (tcbhead_t, vgetcpu_cache)
+FEATURE_1_OFFSET       offsetof (tcbhead_t, feature_1)
 
 -- Not strictly offsets, but these values are also used in the TCB.
 TCB_CANCELSTATE_BITMASK         CANCELSTATE_BITMASK
index 65c0051dcf245c24b1030ba1cbc6b030b2ead2a6..f042a0250aebc3f0d423826e149f6defbe390bd2 100644 (file)
@@ -51,7 +51,10 @@ typedef struct
   uintptr_t stack_guard;
   uintptr_t pointer_guard;
   unsigned long int vgetcpu_cache[2];
-  int __glibc_reserved1;
+  /* Bit 0: X86_FEATURE_1_IBT.
+     Bit 1: X86_FEATURE_1_SHSTK.
+   */
+  unsigned int feature_1;
   int __glibc_unused1;
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];