From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/7743 Path: news.gmane.org!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: ppc soft-float regression Date: Fri, 22 May 2015 02:23:46 -0400 Message-ID: <20150522062346.GK17573@brightrain.aerifal.cx> References: <20150517080321.GL16123@waldemar-brodkorb.de> <20150517100218.GA2754@euler> <20150517163723.GP17573@brightrain.aerifal.cx> <20150517175021.GA2171@euler> <20150517181556.GA23050@euler> <20150517195622.GA4761@euler> <20150518183929.GA6370@euler> <20150518201043.GX17573@brightrain.aerifal.cx> <20150518201422.GY17573@brightrain.aerifal.cx> <20150518220731.GA31132@euler> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="eheScQNz3K90DVRs" X-Trace: ger.gmane.org 1432275854 27892 80.91.229.3 (22 May 2015 06:24:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 22 May 2015 06:24:14 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-7755-gllmg-musl=m.gmane.org@lists.openwall.com Fri May 22 08:24:08 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1YvgNI-0005EX-4a for gllmg-musl@m.gmane.org; Fri, 22 May 2015 08:24:04 +0200 Original-Received: (qmail 17834 invoked by uid 550); 22 May 2015 06:24:02 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 17795 invoked from network); 22 May 2015 06:24:01 -0000 Content-Disposition: inline In-Reply-To: <20150518220731.GA31132@euler> User-Agent: Mutt/1.5.21 (2010-09-15) Original-Sender: Rich Felker Xref: news.gmane.org gmane.linux.lib.musl.general:7743 Archived-At: --eheScQNz3K90DVRs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 19, 2015 at 12:07:31AM +0200, Felix Janda wrote: > Rich Felker wrote: > > On Mon, May 18, 2015 at 04:10:43PM -0400, Rich Felker wrote: > > > OK I've looked at this and I understand what's happening. PowerPC does > > > not have a separate relocation type for GOT entries; instead it uses > > > the same relocation type used for address constants global data. These > > > do not get re-processed after the main program and libraries are > > > added, because unlike GOT slots, they have addends, and if the addend > > > is inline (using REL rather than RELA) then it's already been > > > clobbered by the early relocation phase and can't easily be recovered. > > > > > > I see three possible solutions: > > > > > > 1. Treat R_PPC_ADDR32 as a GOT relocation instead of a regular > > > symbolic relocation in data. This would suppress the addend (giving > > > wrong address) if inline addends (REL) were used, but in practice > > > powerpc aways uses RELA. I consider this a hack, and perhaps risky, > > > since in principle someone could make powerpc binaries with REL. > > > > > > 2. Re-process not just GOT type relocs, but also any RELA > > > (non-inline-addend) relocs again on the second pass. This would > > > work as long as powerpc only uses RELA, and if REL is ever used, > > > the worst that would happen is the current bug (losing environ, > > > etc.) rather than silently wrong relocations in global data. This > > > approach is not a hack, but I consider it something of an > > > incomplete fix. > > > > > > 3. Re-process all symbolic relocations. For REL-type (inline addend), > > > we have to recover the original addend, which can be done by > > > calling find_sym again, but using ldso instead of the current > > > library chain head as the context to search for the symbol in, then > > > subtracting the resulting address to get back the original addend. > > > > > > I like the third solution best, even though it incurs a small code > > > size cost and a performance cost for archs using REL, because it's > > > completely robust against any weird ways some archs might end up using > > > relocations. The expected number of such relocations is tiny anyway; > > > on my i386 builds it's 14. > > > > > > If option 3 proves to be difficult or costly, however, we could > > > consider option 2 as a temporary measure to get powerpc working. It > > > wouldn't even need to be reverted, because option 3 includes/subsumes > > > the work that would be done for option 2. > > > > Attached is a patch to implement option 2. I'll probably commit it > > soon anyway but here is it in case you want to test sooner. I verified > > it fixes the test program on powerpc for me. > > Thanks for the quick fix! The new commit fixes also the other segfaults > I've seen. Attached is a patch that finishes the job by completing option 3. I haven't tested it much yet so I'll hold off on committing it for a while but it seems to work fine (not break anything) on i386. Rich --eheScQNz3K90DVRs Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="reprocess_all_syms.diff" diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 93595a0..485bd4f 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -280,12 +280,17 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri def.dso = dso; } - int gotplt = (type == REL_GOT || type == REL_PLT); - if (dso->rel_update_got && !gotplt && stride==2) continue; - - addend = stride>2 ? rel[2] - : gotplt || type==REL_COPY ? 0 - : *reloc_addr; + if (stride > 2) { + addend = rel[2]; + } else if (type==REL_GOT || type==REL_PLT || type==REL_COPY) { + addend = 0; + } else { + addend = *reloc_addr; + if (dso->rel_update_got) { + struct symdef old = find_sym(&ldso, name, 0); + addend -= (size_t)ldso.base+old.sym->st_value; + } + } sym_val = def.sym ? (size_t)def.dso->base+def.sym->st_value : 0; tls_val = def.sym ? def.sym->st_value : 0; --eheScQNz3K90DVRs--