From: Alan Modra <amodra@gmail.com>
To: libc-alpha@sourceware.org
Cc: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Subject: [PATCH 2/5] [PowerPC64] Set up thread register for _dl_relocate_static_pie
Date: Mon, 24 Jan 2022 14:17:32 +1030 [thread overview]
Message-ID: <Ye4hVIPjYpPZxj5j@squeak.grove.modra.org> (raw)
In-Reply-To: <Ye1NJQwEpe7AyNYD@squeak.grove.modra.org>
On Sun, Jan 23, 2022 at 11:12:13PM +1030, Alan Modra wrote:
> There's a serious problem in libgcc too. libgcc ifuncs access the
> AT_HWCAP words stored in the tcb with an offset from the thread
> pointer (r13), but r13 isn't set at the time _dl_relocate_static_pie
> runs, and I'm loathe to try calling init_tls early. A better approach
> that might work is to fake r13 so that _dl_hwcap is at the expected
> offset where we'd normally find the tcb hwcap words.
Like this.
libgcc ifunc resolvers that access hwcap via a field in the tcb can't
be called until the thread pointer is set up. This patch sets up a
fake thread pointer early so that static-pies won't segfault on
attempting to relocate themselves.
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h
index eb41c85280..413bbe7c06 100644
--- a/sysdeps/powerpc/powerpc64/dl-machine.h
+++ b/sysdeps/powerpc/powerpc64/dl-machine.h
@@ -589,6 +589,27 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
#define ARCH_LA_PLTEXIT ppc64v2_gnu_pltexit
#endif
+#if ENABLE_STATIC_PIE && !defined SHARED && !IS_IN (rtld)
+#include <libc-diag.h>
+#include <tcb-offsets.h>
+
+/* Set up r13 for _dl_relocate_static_pie so that libgcc ifuncs that
+ normally access the tcb copy of hwcap will see __tcb_hwcap. */
+
+static inline void __attribute__ ((always_inline))
+ppc_init_fake_thread_pointer (void)
+{
+ DIAG_PUSH_NEEDS_COMMENT;
+ /* We are playing pointer tricks. Silence gcc warning. */
+ DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Warray-bounds");
+ __thread_register = (char *) &__tcb_hwcap - TCB_HWCAP;
+ DIAG_POP_NEEDS_COMMENT;
+}
+
+#define ELF_MACHINE_BEFORE_RTLD_RELOC(map, dynamic_info) \
+ ppc_init_fake_thread_pointer ();
+#endif /* ENABLE_STATIC_PIE && !defined SHARED && !IS_IN (rtld) */
+
#endif /* dl_machine_h */
#ifdef RESOLVE_MAP
--
Alan Modra
Australia Development Lab, IBM
next prev parent reply other threads:[~2022-01-24 3:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 12:42 [PowerPC64] Use medium model toc accesses throughout Alan Modra
2022-01-24 3:47 ` Alan Modra [this message]
2022-02-16 23:02 ` [PATCH 2/5] [PowerPC64] Set up thread register for _dl_relocate_static_pie Paul E Murphy
2022-02-19 0:49 ` Alan Modra
2022-01-24 3:50 ` [PATCH 3/5] [PowerPC] Relocate stinfo->main Alan Modra
2022-01-24 4:48 ` H.J. Lu
2022-01-24 6:51 ` Alan Modra
2022-01-24 3:52 ` [PATCH 4/5] Constify a variable in dl_vdso_vsym Alan Modra
2022-01-24 4:06 ` [PATCH 5/5] Enable static-pie on powerpc64 Alan Modra
2022-01-27 18:39 ` Florian Weimer
2022-01-28 8:45 ` Alan Modra
2022-01-28 17:48 ` [PowerPC64] Use medium model toc accesses throughout Paul E Murphy
2022-01-29 1:24 ` Alan Modra
2022-02-28 6:40 ` [PATCH v2 0/4] PowerPC64 static-pie Alan Modra
2022-02-28 6:40 ` [PATCH v2 1/4] powerpc64: Use medium model toc accesses throughout Alan Modra
2022-04-08 22:28 ` Tulio Magno Quites Machado Filho
2022-02-28 6:40 ` [PATCH v2 2/4] powerpc64: Set up thread register for _dl_relocate_static_pie Alan Modra
2022-04-08 22:28 ` Tulio Magno Quites Machado Filho
2022-02-28 6:40 ` [PATCH v2 3/4] powerpc: Relocate stinfo->main Alan Modra
2022-04-08 22:32 ` Tulio Magno Quites Machado Filho
2022-02-28 6:40 ` [PATCH v2 4/4] powerpc64: Enable static-pie Alan Modra
2022-04-08 22:49 ` Tulio Magno Quites Machado Filho
2022-04-14 1:16 ` Alan Modra
2022-04-14 3:42 ` Fangrui Song
2022-04-20 7:21 ` [PATCH v3] " Alan Modra
2022-03-04 12:48 ` [PATCH v2 0/4] PowerPC64 static-pie Alan Modra
2022-04-08 8:06 ` Alan Modra
2022-04-09 0:14 ` Fangrui Song
2022-04-14 0:33 ` Alan Modra
2022-04-14 1:54 ` DT_RELR without libc.so dependency H.J. Lu
2022-04-14 3:43 ` Fangrui Song
2022-04-14 5:18 ` Alan Modra
2022-04-14 17:55 ` H.J. Lu
2022-04-08 22:27 ` [PATCH v2 0/4] PowerPC64 static-pie Tulio Magno Quites Machado Filho
2022-04-11 1:38 ` Alan Modra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Ye4hVIPjYpPZxj5j@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=tuliom@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).