From owner-p4-projects@FreeBSD.ORG  Tue Sep 22 16:45:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5AC61065694; Tue, 22 Sep 2009 16:45:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A3881065676
	for <perforce@freebsd.org>; Tue, 22 Sep 2009 16:45:43 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 696F58FC08
	for <perforce@freebsd.org>; Tue, 22 Sep 2009 16:45:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8MGjhnS067504
	for <perforce@freebsd.org>; Tue, 22 Sep 2009 16:45:43 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MGjhCb067502
	for perforce@freebsd.org; Tue, 22 Sep 2009 16:45:43 GMT
	(envelope-from stas@freebsd.org)
Date: Tue, 22 Sep 2009 16:45:43 GMT
Message-Id: <200909221645.n8MGjhCb067502@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168783 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Sep 2009 16:45:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=168783

Change 168783 by stas@stas_yandex on 2009/09/22 16:45:41

	- MAP_STACK mappings are anonymous mappings too. This fixes pthread-related
	       failures in valgrind when it misses the allocated stack space.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#7 edit
.. //depot/projects/valgrind/include/vki/vki-freebsd.h#19 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#7 (text+ko) ====

@@ -1993,13 +1993,13 @@
    needDiscard = any_Ts_in_range( a, len );
 
    init_nsegment( &seg );
-   seg.kind   = (flags & VKI_MAP_ANONYMOUS) ? SkAnonC : SkFileC;
+   seg.kind   = (flags & (VKI_MAP_ANONYMOUS | VKI_MAP_STACK)) ? SkAnonC : SkFileC;
    seg.start  = a;
    seg.end    = a + len - 1;
    seg.hasR   = toBool(prot & VKI_PROT_READ);
    seg.hasW   = toBool(prot & VKI_PROT_WRITE);
    seg.hasX   = toBool(prot & VKI_PROT_EXEC);
-   if (!(flags & VKI_MAP_ANONYMOUS)) {
+   if (!(flags & (VKI_MAP_ANONYMOUS | VKI_MAP_STACK))) {
       // Nb: We ignore offset requests in anonymous mmaps (see bug #126722)
       seg.offset = offset;
       if (ML_(am_get_fd_d_i_m)(fd, &dev, &ino, &mode)) {

==== //depot/projects/valgrind/include/vki/vki-freebsd.h#19 (text+ko) ====

@@ -1343,6 +1343,7 @@
 #define VKI_MAP_PRIVATE	0x02		/* Changes are private */
 #define VKI_MAP_FIXED	0x10		/* Interpret addr exactly */
 #define VKI_MAP_NORESERVE	0x0040		/* don't check for reservations */
+#define	VKI_MAP_STACK	0x400
 #define VKI_MAP_ANON	0x1000	/* don't use a file */
 #define	VKI_MAP_ANONYMOUS	VKI_MAP_ANON