From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: carlos <carlos@redhat.com>,
Joseph Myers <joseph@codesourcery.com>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
libc-alpha <libc-alpha@sourceware.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ben Maurer <bmaurer@fb.com>,
Peter Zijlstra <peterz@infradead.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Boqun Feng <boqun.feng@gmail.com>,
Will Deacon <will.deacon@arm.com>,
Dave Watson <davejwatson@fb.com>, Paul Turner <pjt@google.com>,
Rich Felker <dalias@libc.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-api <linux-api@vger.kernel.org>
Subject: Re: [PATCH 1/5] glibc: Perform rseq(2) registration at C startup and thread creation (v10)
Date: Fri, 14 Jun 2019 09:34:07 -0400 (EDT) [thread overview]
Message-ID: <189377747.3315.1560519247118.JavaMail.zimbra@efficios.com> (raw)
In-Reply-To: <87wohoti47.fsf@oldenburg2.str.redhat.com>
----- On Jun 14, 2019, at 3:24 PM, Florian Weimer fweimer@redhat.com wrote:
> * Mathieu Desnoyers:
>
>> ----- On Jun 14, 2019, at 3:09 PM, Florian Weimer fweimer@redhat.com wrote:
>>
>>> * Mathieu Desnoyers:
>>>
>>>> But my original issue remains: if I define a variable called __rseq_handled
>>>> within either the main executable or the preloaded library, it overshadows
>>>> the libc one:
>>>>
>>>> efficios@compudjdev:~/test/libc-sym$ ./a
>>>> __rseq_handled main: 0 0x56135fd5102c
>>>> __rseq_abi.cpu_id main: 29 0x7fcbeca6d5a0
>>>> efficios@compudjdev:~/test/libc-sym$ LD_PRELOAD=./s.so ./a
>>>> __rseq_handled s.so: 0 0x558f70aeb02c
>>>> __rseq_abi.cpu_id s.so: -1 0x7fdca78b7760
>>>> __rseq_handled main: 0 0x558f70aeb02c
>>>> __rseq_abi.cpu_id main: 27 0x7fdca78b7760
>>>>
>>>> Which is unexpected.
>>>
>>> Why is this unexpected? It has to be this way if the main program uses
>>> a copy relocation of __rseq_handled. As long as there is just one
>>> address across the entire program and ld.so initializes the copy of the
>>> variable that is actually used, everything will be fine.
>>
>> Here is a printout of the __rseq_handled address observed by ld.so, it
>> does not match:
>>
>> LD_PRELOAD=./s.so ./a
>> elf: __rseq_handled addr: 7f501c98a140
>> __rseq_handled s.so: 0 0x55817a88d02c
>> __rseq_abi.cpu_id s.so: -1 0x7f501c983760
>> __rseq_handled main: 0 0x55817a88d02c
>> __rseq_abi.cpu_id main: 27 0x7f501c983760
>
> Where do you print the address? Before or after the self-relocation of
> the dynamic loader? The address is only correct after self-relocation.
I printed the address within rseq_init (), which happened to be invoked
by the linker startup waaaay too early. I followed your advice and moved
the rseq_init () invocation after linker re-relocation:
diff --git a/elf/rtld.c b/elf/rtld.c
index f29f284a7c..66b0894f9d 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1410,9 +1410,6 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
/* Assign a module ID. Do this before loading any audit modules. */
GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid ();
- /* Publicize rseq registration ownership. */
- rseq_init ();
-
/* If we have auditing DSOs to load, do it now. */
bool need_security_init = true;
if (__glibc_unlikely (audit_list != NULL)
@@ -2284,6 +2281,11 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
HP_TIMING_ACCUM_NT (relocate_time, add);
}
+ /* Publicize rseq registration ownership. This must be performed
+ after rtld re-relocation, before invoking constructors of
+ preloaded libraries. */
+ rseq_init ();
+
/* Do any necessary cleanups for the startup OS interface code.
We do these now so that no calls are made after rtld re-relocation
which might be resolved to different functions than we expect.
It works fine now!
LD_PRELOAD=./s.so ./a
elf: __rseq_handled addr: 56300f0a402c
__rseq_handled s.so: 1 0x56300f0a402c
__rseq_abi.cpu_id s.so: -1 0x7fad2ff58760
__rseq_handled main: 1 0x56300f0a402c
__rseq_abi.cpu_id main: 27 0x7fad2ff58760
Thanks!
Mathieu
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
next prev parent reply other threads:[~2019-06-14 13:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 18:42 [PATCH 0/5] Restartable Sequences support for glibc 2.30 Mathieu Desnoyers
2019-05-03 18:42 ` [PATCH 1/5] glibc: Perform rseq(2) registration at C startup and thread creation (v10) Mathieu Desnoyers
2019-05-27 11:19 ` Florian Weimer
2019-05-27 19:27 ` Mathieu Desnoyers
2019-05-29 15:45 ` Mathieu Desnoyers
2019-05-30 20:56 ` Mathieu Desnoyers
2019-05-31 8:06 ` Florian Weimer
2019-05-31 14:48 ` Mathieu Desnoyers
2019-05-31 15:46 ` Florian Weimer
2019-05-31 18:10 ` Mathieu Desnoyers
2019-06-04 11:46 ` Florian Weimer
2019-06-04 15:57 ` Mathieu Desnoyers
2019-06-06 11:57 ` Florian Weimer
2019-06-10 14:43 ` Carlos O'Donell
2019-06-12 14:00 ` Mathieu Desnoyers
2019-06-14 10:03 ` Mathieu Desnoyers
2019-06-14 10:06 ` Florian Weimer
2019-06-14 10:14 ` Mathieu Desnoyers
2019-06-14 11:35 ` Florian Weimer
2019-06-14 12:55 ` Mathieu Desnoyers
2019-06-14 13:01 ` Mathieu Desnoyers
2019-06-14 13:09 ` Florian Weimer
2019-06-14 13:18 ` Mathieu Desnoyers
2019-06-14 13:24 ` Florian Weimer
2019-06-14 13:34 ` Mathieu Desnoyers [this message]
2019-06-14 13:42 ` Florian Weimer
2019-06-14 13:47 ` Mathieu Desnoyers
2019-06-14 13:53 ` Florian Weimer
2019-06-14 13:59 ` Mathieu Desnoyers
[not found] ` <69a53ec2ce184af29c4cae58e0b2fb57@AcuMS.aculab.com>
2019-06-14 13:39 ` Mathieu Desnoyers
2019-06-12 14:16 ` Mathieu Desnoyers
2019-06-12 14:22 ` Florian Weimer
2019-06-12 14:36 ` Mathieu Desnoyers
2019-06-12 14:43 ` Florian Weimer
2019-05-03 18:42 ` [PATCH 2/5] glibc: sched_getcpu(): use rseq cpu_id TLS on Linux (v4) Mathieu Desnoyers
2019-05-03 18:42 ` [PATCH 3/5] support record failure: allow use from constructor Mathieu Desnoyers
2019-05-03 18:42 ` [PATCH 4/5] support: implement xpthread key create/delete (v2) Mathieu Desnoyers
2019-05-03 18:42 ` [PATCH 5/5] rseq registration tests (v4) Mathieu Desnoyers
2019-05-20 15:24 ` [PATCH 0/5] Restartable Sequences support for glibc 2.30 Mathieu Desnoyers
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=189377747.3315.1560519247118.JavaMail.zimbra@efficios.com \
--to=mathieu.desnoyers@efficios.com \
--cc=bmaurer@fb.com \
--cc=boqun.feng@gmail.com \
--cc=carlos@redhat.com \
--cc=dalias@libc.org \
--cc=davejwatson@fb.com \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=szabolcs.nagy@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.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).