From patchwork Wed Feb 2 15:02:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 50671 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D4F53858C2C for ; Wed, 2 Feb 2022 15:03:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D4F53858C2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643814210; bh=2QNWspEfVV4KQz01J8SNqmO5q1/01dDnZkEymODX9tA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=oJH0zAMwK96OJ9OeUlFLGF8GYQ3cGkh0kZurXiyMXXf4o/OFGdbvLawj0xVvfMei4 HQ5yZsSQGcnzwnM5xc5D6LckSM+mnkOHoBPMWxk8DuLpyJPcomj7dQfIpP6Tg92OPh vb8eA4OgSxmZrWZDB6KdMOb5dTDqO9pnUMZ0UZHQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 6E0203857C6B for ; Wed, 2 Feb 2022 15:03:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E0203857C6B Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-553-sZnKiz8OOSm88JKbV8JHSQ-1; Wed, 02 Feb 2022 10:02:57 -0500 X-MC-Unique: sZnKiz8OOSm88JKbV8JHSQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CBE51923E24; Wed, 2 Feb 2022 15:02:49 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.193.205]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3ED06798CF; Wed, 2 Feb 2022 15:02:48 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Linux: Use ptrdiff_t for __rseq_offset Date: Wed, 02 Feb 2022 16:02:46 +0100 Message-ID: <87iltxxqeh.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Cc: Mathieu Desnoyers Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This matches the data size initial-exec relocations use on most targets. Tested on armv7hl-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, s390x-linux-gnu, x86_64-linux-gnu. Built with build many-glibcs.py. Reviewed-by: Mathieu Desnoyers Reviewed-by: Carlos O'Donell --- manual/threads.texi | 2 +- sysdeps/nptl/dl-tls_init_tp.c | 4 ++-- sysdeps/unix/sysv/linux/aarch64/ld.abilist | 2 +- sysdeps/unix/sysv/linux/alpha/ld.abilist | 2 +- sysdeps/unix/sysv/linux/ia64/ld.abilist | 2 +- sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist | 2 +- sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist | 2 +- sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist | 2 +- sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist | 2 +- sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist | 2 +- sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist | 2 +- sysdeps/unix/sysv/linux/sys/rseq.h | 3 ++- sysdeps/unix/sysv/linux/x86_64/64/ld.abilist | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/manual/threads.texi b/manual/threads.texi index 4869f69d2c..48fd562923 100644 --- a/manual/threads.texi +++ b/manual/threads.texi @@ -1004,7 +1004,7 @@ The manual for the @code{rseq} system call can be found at @uref{https://git.kernel.org/pub/scm/libs/librseq/librseq.git/tree/doc/man/rseq.2}. @end deftp -@deftypevar {int} __rseq_offset +@deftypevar {ptrdiff_t} __rseq_offset @standards{Linux, sys/rseq.h} This variable contains the offset between the thread pointer (as defined by @code{__builtin_thread_pointer} or the thread pointer register for diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c index 531a065ed7..1294c91816 100644 --- a/sysdeps/nptl/dl-tls_init_tp.c +++ b/sysdeps/nptl/dl-tls_init_tp.c @@ -46,7 +46,7 @@ rtld_mutex_dummy (pthread_mutex_t *lock) const unsigned int __rseq_flags; const unsigned int __rseq_size attribute_relro; -const int __rseq_offset attribute_relro; +const ptrdiff_t __rseq_offset attribute_relro; void __tls_pre_init_tp (void) @@ -119,7 +119,7 @@ __tls_init_tp (void) all targets support __thread_pointer, so set __rseq_offset only if thre rseq registration may have happened because RSEQ_SIG is defined. */ - extern int offset __asm__ ("__rseq_offset"); + extern ptrdiff_t offset __asm__ ("__rseq_offset"); offset = (char *) &pd->rseq_area - (char *) __thread_pointer (); #endif } diff --git a/sysdeps/unix/sysv/linux/aarch64/ld.abilist b/sysdeps/unix/sysv/linux/aarch64/ld.abilist index bf4d4f9b6f..5151c0781d 100644 --- a/sysdeps/unix/sysv/linux/aarch64/ld.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/ld.abilist @@ -5,5 +5,5 @@ GLIBC_2.17 _dl_mcount F GLIBC_2.17 _r_debug D 0x28 GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/alpha/ld.abilist b/sysdeps/unix/sysv/linux/alpha/ld.abilist index a23325a566..3e296c5473 100644 --- a/sysdeps/unix/sysv/linux/alpha/ld.abilist +++ b/sysdeps/unix/sysv/linux/alpha/ld.abilist @@ -4,6 +4,6 @@ GLIBC_2.1 _dl_mcount F GLIBC_2.3 __tls_get_addr F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 GLIBC_2.4 __stack_chk_guard D 0x8 diff --git a/sysdeps/unix/sysv/linux/ia64/ld.abilist b/sysdeps/unix/sysv/linux/ia64/ld.abilist index 8ccb5be911..5471b24d59 100644 --- a/sysdeps/unix/sysv/linux/ia64/ld.abilist +++ b/sysdeps/unix/sysv/linux/ia64/ld.abilist @@ -4,5 +4,5 @@ GLIBC_2.2 _r_debug D 0x28 GLIBC_2.3 __tls_get_addr F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist index 37a47ebc0a..f26e594a13 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist @@ -4,6 +4,6 @@ GLIBC_2.2 _dl_mcount F GLIBC_2.3 __tls_get_addr F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 GLIBC_2.4 __stack_chk_guard D 0x8 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist index da24dc7fb5..21f472e674 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist @@ -6,5 +6,5 @@ GLIBC_2.3 _dl_mcount F GLIBC_2.3 _r_debug D 0x28 GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist index b9ae89ae8d..9c9c40450d 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist @@ -6,5 +6,5 @@ GLIBC_2.22 __tls_get_addr_opt F GLIBC_2.23 __parse_hwcap_and_convert_at_platform F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist index 48431c91a9..a7758a0e52 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist @@ -5,5 +5,5 @@ GLIBC_2.27 _dl_mcount F GLIBC_2.27 _r_debug D 0x28 GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist index 117d1430a4..78d071600b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist @@ -4,5 +4,5 @@ GLIBC_2.2 _r_debug D 0x28 GLIBC_2.3 __tls_get_offset F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist index 8ccb5be911..5471b24d59 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist @@ -4,5 +4,5 @@ GLIBC_2.2 _r_debug D 0x28 GLIBC_2.3 __tls_get_addr F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4 diff --git a/sysdeps/unix/sysv/linux/sys/rseq.h b/sysdeps/unix/sysv/linux/sys/rseq.h index db6c3cebf1..8533782cf4 100644 --- a/sysdeps/unix/sysv/linux/sys/rseq.h +++ b/sysdeps/unix/sysv/linux/sys/rseq.h @@ -21,6 +21,7 @@ /* Architecture-specific rseq signature. */ #include +#include #include #include #include @@ -172,7 +173,7 @@ struct rseq #endif /* __GLIBC_HAVE_KERNEL_RSEQ */ /* Offset from the thread pointer to the rseq area. */ -extern const int __rseq_offset; +extern const ptrdiff_t __rseq_offset; /* Size of the registered rseq area. 0 if the registration was unsuccessful. */ diff --git a/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist b/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist index ae622bdf97..5a8bd322cd 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist @@ -4,5 +4,5 @@ GLIBC_2.2.5 _r_debug D 0x28 GLIBC_2.3 __tls_get_addr F GLIBC_2.34 __rtld_version_placeholder F GLIBC_2.35 __rseq_flags D 0x4 -GLIBC_2.35 __rseq_offset D 0x4 +GLIBC_2.35 __rseq_offset D 0x8 GLIBC_2.35 __rseq_size D 0x4