From: Fangrui Song <maskray@google.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: "H.J. Lu" <hjl.tools@gmail.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH v2] i386: Avoid avoid rely on linker optimization to avoid relocation
Date: Thu, 17 Nov 2022 12:53:25 -0800 [thread overview]
Message-ID: <20221117205325.6mudue53vffnuqcv@google.com> (raw)
In-Reply-To: <CAMe9rOq-utBg8OYBrDWDkWoDqwcZ7k73pU=5md9J3UHAupjuiw@mail.gmail.com>
On 2022-11-17, H.J. Lu wrote:
>On Thu, Nov 17, 2022 at 10:13 AM Adhemerval Zanella
><adhemerval.zanella@linaro.org> wrote:
>>
>> lld does not implement all the linker optimization to avoid the GOT
>> relocation as done by binutils (bfd/elf32-i386.c:elf_i386_convert_load_reloc).
>> The current 'movl main@GOT(%ebx), %eax' will then create a GOT
>> relocation when building with lld, which make static-pie status to
>> not being able to start the provided main function.
>>
>> The change uses a __wrap_main local symbol, which in turn calls main
>> (similar as used by aarch64 and s390x).
>>
>> Checked on i686-linux-gnu with binutils and lld.
>> ---
>> sysdeps/i386/start.S | 13 +++++++++----
>> 1 file changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/sysdeps/i386/start.S b/sysdeps/i386/start.S
>> index 4ec04bdfd7..23e4f2b012 100644
>> --- a/sysdeps/i386/start.S
>> +++ b/sysdeps/i386/start.S
>> @@ -98,11 +98,10 @@ ENTRY (_start)
>> pushl main@GOT(%ebx)
>> # else
>> /* Avoid relocation in static PIE since _start is called before
>> - it is relocated. Don't use "leal main@GOTOFF(%ebx), %eax"
>> - since main may be in a shared object. Linker will convert
>> - "movl main@GOT(%ebx), %eax" to "leal main@GOTOFF(%ebx), %eax"
>> + it is relocated. This also avoid rely on linker optimization to
>> + transform 'movl main@GOT(%ebx), %eax' to 'leal main@GOTOFF(%ebx)'
>> if main is defined locally. */
>> - movl main@GOT(%ebx), %eax
>> + leal __wrap_main@GOTOFF(%ebx), %eax
>> pushl %eax
>> # endif
>>
>> @@ -130,6 +129,12 @@ ENTRY (_start)
>> 1: movl (%esp), %ebx
>> ret
>> #endif
>> +
>> +#if defined PIC && !defined SHARED
>> +__wrap_main:
>> + _CET_ENDBR
>> + jmp main@PLT
>> +#endif
>> END (_start)
>>
>> /* To fulfill the System V/i386 ABI we need this symbol. Yuck, it's so
>> --
>> 2.34.1
>>
>
>LGTM.
>
>Thanks.
LGTM, too.
Reviewed-by: Fangrui Song <maskray@google.com>
BTW: do you know when start.o/start.os is assembled without -DPIC?
I find that in both --enable-static-pie and --disable-static-pie modes,
both start.o and start.os use -DPIC. start.os uses an additional -DSHARED.
Is the non-`#ifdef __PIC__` path dead?
prev parent reply other threads:[~2022-11-17 20:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 18:13 Adhemerval Zanella
2022-11-17 19:54 ` H.J. Lu
2022-11-17 20:53 ` Fangrui Song [this message]
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=20221117205325.6mudue53vffnuqcv@google.com \
--to=maskray@google.com \
--cc=adhemerval.zanella@linaro.org \
--cc=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
/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).