From owner-svn-src-all@FreeBSD.ORG  Mon Oct  4 16:02:12 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7FA01065747;
	Mon,  4 Oct 2010 16:02:12 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D6A7D8FC0A;
	Mon,  4 Oct 2010 16:02:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o94G2CDF019221;
	Mon, 4 Oct 2010 16:02:12 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o94G2CkR019219;
	Mon, 4 Oct 2010 16:02:12 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201010041602.o94G2CkR019219@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 4 Oct 2010 16:02:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213406 - head/libexec/rtld-elf/powerpc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Oct 2010 16:02:13 -0000

Author: nwhitehorn
Date: Mon Oct  4 16:02:11 2010
New Revision: 213406
URL: http://svn.freebsd.org/changeset/base/213406

Log:
  Fix two subtle problems in PPC32 RTLD. The first is a concurrency issue
  where long PLT calls in multi-threaded environments could end up with
  incorrect jmptab values. The second is that, after the addition of extended
  PLT support, I forgot to update the PLT icache synchronization code to cover
  the extended PLT instead of just the basic PLT.
  
  MFC after:	10 days

Modified:
  head/libexec/rtld-elf/powerpc/reloc.c

Modified: head/libexec/rtld-elf/powerpc/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc/reloc.c	Mon Oct  4 15:48:03 2010	(r213405)
+++ head/libexec/rtld-elf/powerpc/reloc.c	Mon Oct  4 16:02:11 2010	(r213406)
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <machine/cpu.h>
+#include <machine/cpufunc.h>
 #include <machine/md_var.h>
 
 #include "debug.h"
@@ -481,6 +482,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr
 
 		jmptab = obj->pltgot + JMPTAB_BASE(N);
 		jmptab[reloff] = target;
+		powerpc_mb(); /* Order jmptab update before next changes */
 
 		if (reloff < PLT_EXTENDED_BEGIN) {
 			/* for extended PLT entries, we keep the old code */
@@ -489,7 +491,8 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr
 
 			/* li   r11,reloff */
 			/* b    pltcall  # use indirect pltcall routine */
-			wherep[0] = 0x39600000 | reloff;
+
+			/* first instruction same as before */
 			wherep[1] = 0x48000000 | (distance & 0x03fffffc);
 			__syncicache(wherep, 8);
 		}
@@ -577,7 +580,7 @@ init_pltgot(Obj_Entry *obj)
 	 * Sync the icache for the byte range represented by the
 	 * trampoline routines and call slots.
 	 */
-	__syncicache(pltcall, 72 + N * 8);
+	__syncicache(obj->pltgot, JMPTAB_BASE(N)*4);
 }
 
 void