From patchwork Wed May 16 16:36:15 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: 914777 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-92570-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="q8EgJxAy"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40mKnr181nz9s1d for ; Thu, 17 May 2018 02:36:31 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :cc:content-type; q=dns; s=default; b=llGWxtbx55U2sCtCiMX2r8fCOY g9MJF2G+YkFO0zy3lJkikCjwdJ5ZnNTj5NL2WOa0/dKhk1SCVOFvANTwTsxUiKPl PFeDwM0509FZWZaMEG9qO22Vv7rFb6Qn1TUKmxlRdUP5FY/XRNa+Bni8BZNnSsgp 2qa9DCEIc79Isvex8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :cc:content-type; s=default; bh=dAldpzOvUhv0ad/Ia9jwkwHaY4s=; b= q8EgJxAyc0p8akWCnQ7cDhvrWugegUsCGIPPkD0snvDCNNxgGrYMcwvqktX94A8E 7krIJkxG7qqlzDEO3mNyxNSTG7sZF72SCWPxGeuiWd4zgvQ5DyrAOrIrRxCkst7L XlbNjoooIQZryjQYJZj/gaGlDxqLPjEm28QdItNKnX4= Received: (qmail 20588 invoked by alias); 16 May 2018 16:36:20 -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 20471 invoked by uid 89); 16 May 2018 16:36:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=TCB, tcb, Reservation, reservation X-HELO: mail-ot0-f194.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=wES8iQWo6wJQnpQhwX7HzNsLQ/6wvwT3iHEJFk2H2og=; b=qFV37i7bKnXq3OdaqC58/9hN5AzhPbEDXpOmwqpYIStszadGhLe7RajMCejtbausQk HfgEos+/HJwxIxydGxscBjgUEsmge2a9HJYNfbZL9QJ36snT4xBB1r9txNt0YiJ1cUHQ oWoxfWYHrUQuLFYLWl77RJPJ+rcHqfPX8x3fgxJgihhUt+xBSFs7A93Sb8XdNovC7LH/ yjE9vzXua393TRIAik7kN6p44C5mSR8aouPrOSYZZVvuhXZ9ub/OAOHNoP77lHz60o2x Sohwmx1zdcmC5+XgEyG5VSN2JJaunEVx5eDoLVYDGT2er7+2tD9600EHD2lJIPy8O7rs chuw== X-Gm-Message-State: ALKqPwfbEvnZf2/6JNh024j58PW4g+N8xUaU8es7cp8gpPueXJBCoYvV LTmB9YXDgUPHGMwcEJVJsvWDfWehzFCGD7W9rVU= X-Google-Smtp-Source: AB8JxZpGk59Ad4T/0Eg3vzkoqQmgAKr5hXB+90MiTIfxKBSovXJFAj6RvtqZcMsEA77ySS+qCdAehz6aXwIruve+DUU= X-Received: by 2002:a9d:73c5:: with SMTP id m5-v6mr1249919otk.332.1526488576099; Wed, 16 May 2018 09:36:16 -0700 (PDT) MIME-Version: 1.0 From: "H.J. Lu" Date: Wed, 16 May 2018 09:36:15 -0700 Message-ID: Subject: [PATCH] x86: Assert __ASSUME_PRIVATE_FUTEX == 1 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. > Good idea. How about this patch to remove __ASSUME_PRIVATE_FUTEX checks first? From b57d23f77d0b240781b73478e75c1f833ec14bb2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 16 May 2018 09:30:14 -0700 Subject: [PATCH] x86: Assert __ASSUME_PRIVATE_FUTEX == 1 Since __ASSUME_PRIVATE_FUTEX is always defined, this patch replaces "#if" on __ASSUME_PRIVATE_FUTEX with _Static_assert on __ASSUME_PRIVATE_FUTEX. * i386/nptl/tcb-offsets.sym (PRIVATE_FUTEX): Removed. * x86_64/nptl/tcb-offsets.sym (PRIVATE_FUTEX): Likewise. * sysdeps/i386/nptl/tls.h: Assert __ASSUME_PRIVATE_FUTEX == 1. (tcbhead_t): Remve "#ifndef __ASSUME_PRIVATE_FUTEX". * sysdeps/x86_64/nptl/tls.h: Assert __ASSUME_PRIVATE_FUTEX == 1. (tcbhead_t): Remve "#ifndef __ASSUME_PRIVATE_FUTEX". --- sysdeps/i386/nptl/tcb-offsets.sym | 3 --- sysdeps/i386/nptl/tls.h | 7 +++---- sysdeps/x86_64/nptl/tcb-offsets.sym | 3 --- sysdeps/x86_64/nptl/tls.h | 7 +++---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sysdeps/i386/nptl/tcb-offsets.sym b/sysdeps/i386/nptl/tcb-offsets.sym index 695a810386..7d7fe5e71c 100644 --- a/sysdeps/i386/nptl/tcb-offsets.sym +++ b/sysdeps/i386/nptl/tcb-offsets.sym @@ -12,6 +12,3 @@ 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) -#ifndef __ASSUME_PRIVATE_FUTEX -PRIVATE_FUTEX offsetof (tcbhead_t, private_futex) -#endif diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h index 8ca0924692..2ee451a4ac 100644 --- a/sysdeps/i386/nptl/tls.h +++ b/sysdeps/i386/nptl/tls.h @@ -30,6 +30,9 @@ # include # include +_Static_assert (__ASSUME_PRIVATE_FUTEX == 1, + "__ASSUME_PRIVATE_FUTEX != 1"); + typedef struct { void *tcb; /* Pointer to the TCB. Not necessarily the @@ -41,11 +44,7 @@ typedef struct uintptr_t stack_guard; uintptr_t pointer_guard; int gscope_flag; -#ifndef __ASSUME_PRIVATE_FUTEX - int private_futex; -#else int __glibc_reserved1; -#endif /* Reservation of some values for the TM ABI. */ void *__private_tm[4]; /* GCC split stack support. */ diff --git a/sysdeps/x86_64/nptl/tcb-offsets.sym b/sysdeps/x86_64/nptl/tcb-offsets.sym index 8a25c482cb..be63404a16 100644 --- a/sysdeps/x86_64/nptl/tcb-offsets.sym +++ b/sysdeps/x86_64/nptl/tcb-offsets.sym @@ -12,9 +12,6 @@ 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) -#ifndef __ASSUME_PRIVATE_FUTEX -PRIVATE_FUTEX offsetof (tcbhead_t, private_futex) -#endif -- 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 059f9675a0..d942b7446c 100644 --- a/sysdeps/x86_64/nptl/tls.h +++ b/sysdeps/x86_64/nptl/tls.h @@ -30,6 +30,9 @@ # include # include +_Static_assert (__ASSUME_PRIVATE_FUTEX == 1, + "__ASSUME_PRIVATE_FUTEX != 1"); + /* Replacement type for __m128 since this file is included by ld.so, which is compiled with -mno-sse. It must not change the alignment of rtld_savespace_sse. */ @@ -51,11 +54,7 @@ typedef struct uintptr_t stack_guard; uintptr_t pointer_guard; unsigned long int vgetcpu_cache[2]; -# ifndef __ASSUME_PRIVATE_FUTEX - int private_futex; -# else int __glibc_reserved1; -# endif int __glibc_unused1; /* Reservation of some values for the TM ABI. */ void *__private_tm[4]; -- 2.17.0