From patchwork Thu May 17 16:25:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 27318 Received: (qmail 98165 invoked by alias); 17 May 2018 16:25:44 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 98154 invoked by uid 89); 17 May 2018 16:25:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:feature, include_next, dec X-HELO: mail-oi0-f68.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=cA/YQcw/Y1uWBe7I9hTHKntTls2yc8AhBGmtqVg//5k=; b=jzKUZbk4tx3bhPOO34DfvlK0Rl+lN+HbY30MFxUK31pJF9oCvR5pFN5ztTbLPhvCyE WVlRqfd4gE/sgKxcwOJfHvO63TBIRj9kktEHYxcOhZZFNLQ3sKYm3MF7FrpRr7ujjZNc ak/a95lWCZWKaUxdSjmUoa+Qkcnu8wpnZuXTPTdGt3ClhGHc3rC8PkwOVJF2GIKjyrnS tXr2dlIlaxkDvQ5RwGW5ZhRcS5RpvgK0g9ZOGIWbGNaBarhcLoXeipVWVhUNnSKVRNvZ foMyy9Gvz6oNFdocrccKMwT88W4VI5KDdZm4RPDLJ1RrDhMj8CuMeHzfzpgcnCZkqteW WZLg== X-Gm-Message-State: ALKqPwe5UDknqdoyPI+CU9ILxv4SyceOh/bDiuoOJ0owQEvEASZTAjhV edFr4Dio+9MJ9nKHsrZu9Dx1lgg5dv7pRhsA73tKPw== X-Google-Smtp-Source: AB8JxZrszYdzsF6MoAdSen/4QpRLgHMf8DgG1x0g3VTOGl0nAdoXyYXOcNI0mPhZaakn0VtVijxis6Q8xU+nFWlfVbg= X-Received: by 2002:aca:b888:: with SMTP id i130-v6mr3775477oif.279.1526574340342; Thu, 17 May 2018 09:25:40 -0700 (PDT) MIME-Version: 1.0 From: "H.J. Lu" Date: Thu, 17 May 2018 09:25:39 -0700 Message-ID: Subject: [PATCH] x86: Rename __glibc_reserved1 to feature_1 in tcbhead_t [BZ #22563] To: Florian Weimer Cc: GNU C Library , "Carlos O'Donell" On Wed, May 16, 2018 at 7:28 AM, Florian Weimer wrote: > On 05/08/2018 10:39 PM, H.J. Lu wrote: >> >> diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h >> index 8ca0924692..c3a0edd253 100644 >> --- a/sysdeps/i386/nptl/tls.h >> +++ b/sysdeps/i386/nptl/tls.h >> @@ -50,6 +50,10 @@ typedef struct >> void *__private_tm[4]; >> /* GCC split stack support. */ >> void *__private_ss; >> + /* Bit 0: IBT. >> + Bit 1: SHSTK. >> + */ >> + unsigned int feature_1; >> } tcbhead_t; > > > It might be nicer to reuse __glibc_reserved1 for that (I think > __ASSUME_PRIVATE_FUTEX is always defined these days), in case some extern > tools hard-code the tcbhead_t layout. > Now __ASSUME_PRIVATE_FUTEX has been removed. Here is the patch to rename __glibc_reserved1 to feature_1 in tcbhead_t. From 4ce4deb87a4ded83073fc935acc6a24e7a436b23 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 7 Dec 2017 05:47:21 -0800 Subject: [PATCH] x86: Rename __glibc_reserved1 to feature_1 in tcbhead_t [BZ #22563] This will be used by CET run-time control. [BZ #22563] * nptl/pthread_create.c (__pthread_create_2_1): Use THREAD_COPY_ADDITONAL_INFO to copy additonal info if defined. * 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/unix/sysv/linux/x86/pthreaddef.h: New file. --- nptl/pthread_create.c | 5 +++++ sysdeps/i386/nptl/tcb-offsets.sym | 1 + sysdeps/i386/nptl/tls.h | 5 ++++- sysdeps/unix/sysv/linux/x86/pthreaddef.h | 24 ++++++++++++++++++++++++ sysdeps/x86_64/nptl/tcb-offsets.sym | 1 + sysdeps/x86_64/nptl/tls.h | 5 ++++- 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/x86/pthreaddef.h diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 92c945b12b..16998f4bbd 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -712,6 +712,11 @@ __pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr, THREAD_COPY_POINTER_GUARD (pd); #endif + /* Copy additonal info. */ +#ifdef THREAD_COPY_ADDITONAL_INFO + THREAD_COPY_ADDITONAL_INFO (pd); +#endif + /* Verify the sysinfo bits were copied in allocate_stack if needed. */ #ifdef NEED_DL_SYSINFO CHECK_THREAD_SYSINFO (pd); diff --git a/sysdeps/i386/nptl/tcb-offsets.sym b/sysdeps/i386/nptl/tcb-offsets.sym index 7d7fe5e71c..fbac241c45 100644 --- a/sysdeps/i386/nptl/tcb-offsets.sym +++ b/sysdeps/i386/nptl/tcb-offsets.sym @@ -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) diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h index 6c36e58e9c..40d10f2e85 100644 --- a/sysdeps/i386/nptl/tls.h +++ b/sysdeps/i386/nptl/tls.h @@ -41,7 +41,10 @@ typedef struct uintptr_t stack_guard; uintptr_t pointer_guard; int gscope_flag; - int __glibc_reserved1; + /* Bit 0: IBT. + Bit 1: SHSTK. + */ + unsigned int feature_1; /* Reservation of some values for the TM ABI. */ void *__private_tm[4]; /* GCC split stack support. */ diff --git a/sysdeps/unix/sysv/linux/x86/pthreaddef.h b/sysdeps/unix/sysv/linux/x86/pthreaddef.h new file mode 100644 index 0000000000..539f6540d0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/pthreaddef.h @@ -0,0 +1,24 @@ +/* Pthread macros. Linux/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 + . */ + +#include_next + +/* Wee need to copy feature_1 in pthread_create. */ +#define THREAD_COPY_ADDITONAL_INFO(descr) \ + ((descr)->header.feature_1 \ + = THREAD_GETMEM (THREAD_SELF, header.feature_1)) diff --git a/sysdeps/x86_64/nptl/tcb-offsets.sym b/sysdeps/x86_64/nptl/tcb-offsets.sym index be63404a16..387621e88c 100644 --- a/sysdeps/x86_64/nptl/tcb-offsets.sym +++ b/sysdeps/x86_64/nptl/tcb-offsets.sym @@ -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 diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h index 6da1c04a98..5c4201d988 100644 --- a/sysdeps/x86_64/nptl/tls.h +++ b/sysdeps/x86_64/nptl/tls.h @@ -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: IBT. + Bit 1: SHSTK. + */ + unsigned int feature_1; int __glibc_unused1; /* Reservation of some values for the TM ABI. */ void *__private_tm[4]; -- 2.17.0