From patchwork Sun Oct 2 14:23:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 1685356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=kELiMG6R; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MgR6F6dfZz1ypH for ; Mon, 3 Oct 2022 01:23:49 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 151A83858413 for ; Sun, 2 Oct 2022 14:23:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 151A83858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664720627; bh=ft2hkH0iCmt2+uIMFRQySmZKJFdECXZJDUveERgLUoc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=kELiMG6Rpwx0gY/aFmCvoTSmL2CBzBijktE3a6f0JmEUAMi0e0reAuDifpnwK7nXA TjmMgAHjFGlEZWdyEhuhyy1milP4IcCJcTllS9BC03V+xOo91UxVqzlTMLMF9mTmGt eoClhPtdep40QyBKt54TZ8sIMucHxrZ9q54q3t9w= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from xry111.site (xry111.site [IPv6:2001:470:683e::1]) by sourceware.org (Postfix) with ESMTPS id DAECF3858D32 for ; Sun, 2 Oct 2022 14:23:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DAECF3858D32 Received: from xry111-x57s1.. (unknown [IPv6:240e:358:1125:6e00:dc73:854d:832e:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id D5B9166872; Sun, 2 Oct 2022 10:23:21 -0400 (EDT) To: libc-alpha@sourceware.org Subject: [PATCH] LoongArch: Fix the condition to use PC-relative addressing in start.S Date: Sun, 2 Oct 2022 22:23:09 +0800 Message-Id: <20221002142309.900714-1-xry111@xry111.site> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FROM_SUSPICIOUS_NTLD, FROM_SUSPICIOUS_NTLD_FP, GIT_PATCH_0, LIKELY_SPAM_FROM, SPF_HELO_PASS, SPF_PASS, TXREP, T_PDS_OTHER_BAD_TLD autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Cc: Wang Xuerui , Joseph Myers , caiyinyu Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" A start.o compiled from start.S with -DPIC and no -DSHARED is used by both crt1.o and rcrt1.o. So the LoongArch static PIE patch unintentionally introduced PC-relative addressing for main and __libc_start_main into crt1.o. While the latest Binutils (trunk, which will be released as 2.40) supports the PC-relative relocs against an external function by creating a PLT entry, the 2.39 release branch doesn't (and won't) support this. An error is raised: "PLT stub does not represent and symbol not defined." So, we need the following changes: 1. Check if ld supports the PC-relative relocs against an external function. If it's not supported, we deem static PIE unsupported. 2. Change start.S. If static PIE is supported, use PC-relative addressing for main and __libc_start_main and rely on the linker to create PLT entries. Otherwise, restore the old behavior (using GOT to address these functions). An alternative would be adding a new "static-pie-start.S", and some custom logic into Makefile to build rcrt1.o with it. And, restore start.S to the state before static PIE change so crt1.o won't contain PC-relative relocs against external symbols. But I can't see any benefit of this alternative, so I'd just keep it simple. Tested by building glibc with the following configurations: 1. Binutils trunk + GCC trunk. Static PIE enabled. All tests passed. 2. Binutils 2.39 branch + GCC trunk. Static PIE disabled. Tests related to ifunc failed (it's a known issue). All other tests passed. 3. Binutils 2.39 branch + GCC 12 branch, cross compilation with build-many-glibcs.py from x86_64-linux-gnu. Static PIE disabled. Build succeeded. --- sysdeps/loongarch/configure | 29 +++++++++++++++++++++++++---- sysdeps/loongarch/configure.ac | 19 +++++++++++++++---- sysdeps/loongarch/start.S | 11 +++++++---- 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure index 6edd6d08a5..3046915ce2 100644 --- a/sysdeps/loongarch/configure +++ b/sysdeps/loongarch/configure @@ -10,7 +10,7 @@ if ${libc_cv_static_pie_on_loongarch+:} false; then : $as_echo_n "(cached) " >&6 else - cat > conftest.S << EOF + cat > conftest1.S << EOF .global _start .type _start, @function _start: @@ -26,14 +26,35 @@ x: /* This should produce an R_LARCH_RELATIVE in the static PIE. */ .dword _start EOF + cat > conftest2.S << EOF +.global f +.type f, @function +f: + /* The linker should be able to handle this and produce a PLT entry. */ + la.pcrel \$t0, \$t0, external_func + jirl \$zero, \$t0, 0 +EOF + libc_cv_static_pie_on_loongarch=no - if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest conftest.S' + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest1 conftest1.S' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ + && { ac_try='LC_ALL=C $READELF -Wr conftest1 | grep -q R_LARCH_RELATIVE' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ + && { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -shared -fPIC -o conftest2.so conftest2.S' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } \ - && { ac_try='LC_ALL=C $READELF -Wr conftest | grep -q R_LARCH_RELATIVE' + && { ac_try='LC_ALL=C $READELF -Wr conftest2.so | grep -q 'R_LARCH_JUMP_SLOT.*external_func'' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42,7 +63,7 @@ EOF then libc_cv_static_pie_on_loongarch=yes fi - rm -rf conftest.* + rm -rf conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_static_pie_on_loongarch" >&5 $as_echo "$libc_cv_static_pie_on_loongarch" >&6; } diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac index a8a373bea3..06dd408ad9 100644 --- a/sysdeps/loongarch/configure.ac +++ b/sysdeps/loongarch/configure.ac @@ -13,7 +13,7 @@ dnl satisify the requirement, but a distro may backport static PIE support into dnl earlier GCC or Binutils releases as well. AC_CACHE_CHECK([if the toolchain is sufficient to build static PIE on LoongArch], libc_cv_static_pie_on_loongarch, [ - cat > conftest.S << EOF + cat > conftest1.S << EOF .global _start .type _start, @function _start: @@ -29,13 +29,24 @@ x: /* This should produce an R_LARCH_RELATIVE in the static PIE. */ .dword _start EOF + cat > conftest2.S << EOF +.global f +.type f, @function +f: + /* The linker should be able to handle this and produce a PLT entry. */ + la.pcrel \$t0, \$t0, external_func + jirl \$zero, \$t0, 0 +EOF + libc_cv_static_pie_on_loongarch=no - if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest conftest.S]) \ - && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest | grep -q R_LARCH_RELATIVE]) + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest1 conftest1.S]) \ + && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest1 | grep -q R_LARCH_RELATIVE]) \ + && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -shared -fPIC -o conftest2.so conftest2.S]) \ + && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest2.so | grep -q 'R_LARCH_JUMP_SLOT.*external_func']) then libc_cv_static_pie_on_loongarch=yes fi - rm -rf conftest.*]) + rm -rf conftest* ]) if test "$libc_cv_static_pie_on_loongarch" = yes; then AC_DEFINE(SUPPORT_STATIC_PIE) diff --git a/sysdeps/loongarch/start.S b/sysdeps/loongarch/start.S index 05cabd9b96..09e5a3c59c 100644 --- a/sysdeps/loongarch/start.S +++ b/sysdeps/loongarch/start.S @@ -60,13 +60,16 @@ ENTRY (ENTRY_POINT) cfi_undefined (1) or a5, a0, zero /* rtld_fini */ -#if defined(PIC) && !defined(SHARED) +#if ENABLE_STATIC_PIE /* For static PIE, the GOT cannot be used in _start because the GOT entries are - offsets instead of real addresses before __libc_start_main. */ + offsets instead of real addresses before __libc_start_main. + __libc_start_main and/or main may be not local, so we rely on the linker to + produce PLT entries for them. GNU ld >= 2.40 supports this. */ # define LA la.pcrel #else -/* We must get symbol main through GOT table, since main may not be local. - For instance: googletest defines main in dynamic library. */ +/* Old GNU ld (< 2.40) cannot handle PC relative address against a non-local + function correctly. We deem these old linkers failing to support static PIE + and load the addresses from GOT. */ # define LA la.got #endif