From patchwork Tue Nov 26 14:20:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Adhemerval Zanella (Code Review)" X-Patchwork-Id: 1201077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-107393-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gnutoolchain-gerrit.osci.io Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="rynQIKk4"; 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 47MmJq65hpz9s7T for ; Wed, 27 Nov 2019 01:20:27 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:references :reply-to:mime-version:content-transfer-encoding:content-type :message-id; q=dns; s=default; b=Hb50uIf0Azz5oVDWyx4V8VfcyBbkFRL 5gexmu034mG+tkIHcIhYvQXbLhdR9G8i+bc/kScN0CsOc/3SEc+kHOs+JgM/LBm9 rt55unarg4QlVGhZEkOdoLDff6QPYhfIg2fia5GBYVzEwiZJxo7jtG9/iHgmSEMu 817SgrKvNzzM= 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:date:from:to:cc:subject:in-reply-to:references :reply-to:mime-version:content-transfer-encoding:content-type :message-id; s=default; bh=S9N4mSBZJp430fIV4UkRsgNRtfU=; b=rynQI Kk4wgYRW/sN3u+OrSHGwTYieIOLFAO99oy/MgHZw3dNzzGTAYecg70Ab6VgENFHt cLaTxedja1Zld/aYQqXe61EosfjudR8f0dXRgfrevOTLqg70cR33NtusO2OsuaHI 0/epK7LW6cn8a6CoeO3o6XL1lHVeGMqQbtQpT0= Received: (qmail 127828 invoked by alias); 26 Nov 2019 14:20:21 -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 127820 invoked by uid 89); 26 Nov 2019 14:20:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io X-Gerrit-PatchSet: 4 Date: Tue, 26 Nov 2019 09:20:11 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Adhemerval Zanella , libc-alpha@sourceware.org Cc: Florian Weimer Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] nptl: Cleanup mutex internal offset tests X-Gerrit-Change-Id: I7a4e48cc91b4c4ada57e9a5d1b151fb702bfaa9f X-Gerrit-Change-Number: 581 X-Gerrit-ChangeURL: X-Gerrit-Commit: 71d260c1077ce7ab1530809fc826756bdcd032b0 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, adhemerval.zanella@linaro.org, fweimer@redhat.com, libc-alpha@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191126142011.4BB3B20AF6@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/581 ...................................................................... nptl: Cleanup mutex internal offset tests The offsets of pthread_mutex_t __data.__nusers, __data.__spins, __data.elision, __data.list are not required to be constant over the releases. Only the __data.__kind is used for static initializers. This patch also adds an additional size check for __data.__kind. Checked with a build against affected ABIs. Change-Id: I7a4e48cc91b4c4ada57e9a5d1b151fb702bfaa9f --- M nptl/pthreadP.h M nptl/pthread_mutex_init.c M sysdeps/aarch64/nptl/pthread-offsets.h M sysdeps/alpha/nptl/pthread-offsets.h M sysdeps/arm/nptl/pthread-offsets.h M sysdeps/csky/nptl/pthread-offsets.h M sysdeps/hppa/nptl/pthread-offsets.h M sysdeps/i386/nptl/pthread-offsets.h M sysdeps/ia64/nptl/pthread-offsets.h M sysdeps/m68k/nptl/pthread-offsets.h M sysdeps/microblaze/nptl/pthread-offsets.h M sysdeps/mips/nptl/pthread-offsets.h M sysdeps/nios2/nptl/pthread-offsets.h M sysdeps/powerpc/nptl/pthread-offsets.h M sysdeps/riscv/nptl/pthread-offsets.h M sysdeps/s390/nptl/pthread-offsets.h M sysdeps/sh/nptl/pthread-offsets.h M sysdeps/sparc/nptl/pthread-offsets.h M sysdeps/x86_64/nptl/pthread-offsets.h 19 files changed, 6 insertions(+), 94 deletions(-) Approvals: Florian Weimer: Looks good to me, approved diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index bbb2bf0..9c20067 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -617,5 +617,8 @@ _Static_assert (offsetof (type, member) == offset, \ "offset of " #member " field of " #type " != " \ ASSERT_PTHREAD_STRING (offset)) +#define ASSERT_PTHREAD_INTERNAL_MEMBER_SIZE(type, member, mtype) \ + _Static_assert (sizeof (((type) { 0 }).member) != 8, \ + "sizeof (" #type "." #member ") != sizeof (" #mtype "))") #endif /* pthreadP.h */ diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c index 20800b8..daef8b4 100644 --- a/nptl/pthread_mutex_init.c +++ b/nptl/pthread_mutex_init.c @@ -55,18 +55,11 @@ ASSERT_TYPE_SIZE (pthread_mutex_t, __SIZEOF_PTHREAD_MUTEX_T); - ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__nusers, - __PTHREAD_MUTEX_NUSERS_OFFSET); + /* __kind is the only field where its offset should be checked to + avoid ABI breakage with static initializers. */ ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__kind, __PTHREAD_MUTEX_KIND_OFFSET); - ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__spins, - __PTHREAD_MUTEX_SPINS_OFFSET); -#if __PTHREAD_MUTEX_LOCK_ELISION - ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__elision, - __PTHREAD_MUTEX_ELISION_OFFSET); -#endif - ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__list, - __PTHREAD_MUTEX_LIST_OFFSET); + ASSERT_PTHREAD_INTERNAL_MEMBER_SIZE (pthread_mutex_t, __data.__kind, int); imutexattr = ((const struct pthread_mutexattr *) mutexattr ?: &default_mutexattr); diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h index 16c6b0d..8208f6f 100644 --- a/sysdeps/aarch64/nptl/pthread-offsets.h +++ b/sysdeps/aarch64/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 #define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h index 16c6b0d..8208f6f 100644 --- a/sysdeps/alpha/nptl/pthread-offsets.h +++ b/sysdeps/alpha/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 #define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/arm/nptl/pthread-offsets.h +++ b/sysdeps/arm/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/csky/nptl/pthread-offsets.h b/sysdeps/csky/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/csky/nptl/pthread-offsets.h +++ b/sysdeps/csky/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/hppa/nptl/pthread-offsets.h b/sysdeps/hppa/nptl/pthread-offsets.h index 8ae01b9..e4e775d 100644 --- a/sysdeps/hppa/nptl/pthread-offsets.h +++ b/sysdeps/hppa/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 32 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 36 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 36 diff --git a/sysdeps/i386/nptl/pthread-offsets.h b/sysdeps/i386/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/i386/nptl/pthread-offsets.h +++ b/sysdeps/i386/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h index 16c6b0d..8208f6f 100644 --- a/sysdeps/ia64/nptl/pthread-offsets.h +++ b/sysdeps/ia64/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 #define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/m68k/nptl/pthread-offsets.h +++ b/sysdeps/m68k/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/microblaze/nptl/pthread-offsets.h +++ b/sysdeps/microblaze/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/mips/nptl/pthread-offsets.h b/sysdeps/mips/nptl/pthread-offsets.h index 0ac3eda..e96d34a 100644 --- a/sysdeps/mips/nptl/pthread-offsets.h +++ b/sysdeps/mips/nptl/pthread-offsets.h @@ -1,13 +1,5 @@ #if _MIPS_SIM == _ABI64 -# define __PTHREAD_MUTEX_NUSERS_OFFSET 12 # define __PTHREAD_MUTEX_KIND_OFFSET 16 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 24 #else -# define __PTHREAD_MUTEX_NUSERS_OFFSET 16 # define __PTHREAD_MUTEX_KIND_OFFSET 12 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 20 #endif diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/nios2/nptl/pthread-offsets.h +++ b/sysdeps/nios2/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/powerpc/nptl/pthread-offsets.h b/sysdeps/powerpc/nptl/pthread-offsets.h index bdda1f1..25b5bf2 100644 --- a/sysdeps/powerpc/nptl/pthread-offsets.h +++ b/sysdeps/powerpc/nptl/pthread-offsets.h @@ -1,15 +1,7 @@ #include #if __WORDSIZE == 64 -# define __PTHREAD_MUTEX_NUSERS_OFFSET 12 # define __PTHREAD_MUTEX_KIND_OFFSET 16 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 24 #else -# define __PTHREAD_MUTEX_NUSERS_OFFSET 16 # define __PTHREAD_MUTEX_KIND_OFFSET 12 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 20 #endif diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h index f164004..6fc032f 100644 --- a/sysdeps/riscv/nptl/pthread-offsets.h +++ b/sysdeps/riscv/nptl/pthread-offsets.h @@ -17,8 +17,4 @@ License along with the GNU C Library. If not, see . */ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 #define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 diff --git a/sysdeps/s390/nptl/pthread-offsets.h b/sysdeps/s390/nptl/pthread-offsets.h index bdda1f1..25b5bf2 100644 --- a/sysdeps/s390/nptl/pthread-offsets.h +++ b/sysdeps/s390/nptl/pthread-offsets.h @@ -1,15 +1,7 @@ #include #if __WORDSIZE == 64 -# define __PTHREAD_MUTEX_NUSERS_OFFSET 12 # define __PTHREAD_MUTEX_KIND_OFFSET 16 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 24 #else -# define __PTHREAD_MUTEX_NUSERS_OFFSET 16 # define __PTHREAD_MUTEX_KIND_OFFSET 12 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 20 #endif diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h index 9617354..e4e775d 100644 --- a/sysdeps/sh/nptl/pthread-offsets.h +++ b/sysdeps/sh/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 #define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h index bdda1f1..25b5bf2 100644 --- a/sysdeps/sparc/nptl/pthread-offsets.h +++ b/sysdeps/sparc/nptl/pthread-offsets.h @@ -1,15 +1,7 @@ #include #if __WORDSIZE == 64 -# define __PTHREAD_MUTEX_NUSERS_OFFSET 12 # define __PTHREAD_MUTEX_KIND_OFFSET 16 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 24 #else -# define __PTHREAD_MUTEX_NUSERS_OFFSET 16 # define __PTHREAD_MUTEX_KIND_OFFSET 12 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 20 #endif diff --git a/sysdeps/x86_64/nptl/pthread-offsets.h b/sysdeps/x86_64/nptl/pthread-offsets.h index 16c6b0d..8208f6f 100644 --- a/sysdeps/x86_64/nptl/pthread-offsets.h +++ b/sysdeps/x86_64/nptl/pthread-offsets.h @@ -1,5 +1 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 #define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24