From patchwork Thu Feb 28 19:56:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 224166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 4B6F72C02CF for ; Fri, 1 Mar 2013 06:57:09 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1362686230; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To: References:MIME-Version:Content-Type:Content-Disposition: In-Reply-To:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=a2htjcpUvCpOmYFHp+myVympytE=; b=uaedzlOrfTFF9R3 +TNwALY9DjxX1aX4gsirpzjVQn76qO2BX4sayuwDT34jrkhVDpwuuXa+FuRSCWH0 S7HWFBCy/CPtBb+3GBoWvlETeWnuTpMshPTiUDAo9FYCUoKd0zoSrvJLJ2G37dG6 uQykSlkoikjs1vRMRVsRNvc6+SZw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=D96K9y+zlBaEDKw9o8qHC4xk6ZafNrxiez+CPeU+HKMWCncpEWvuE7A+YYg0PI VOYXxgdRtmevGIS0FiVTPDRwIXkpcDg/UMuPnlGwYd4eQrLlawd900RY5oreAOWx Wg5rLMl3KK4pyzotjW7yjbcU+qlH2OnzkGlwTCe8V4qJ8=; Received: (qmail 13715 invoked by alias); 28 Feb 2013 19:56:55 -0000 Received: (qmail 13704 invoked by uid 22791); 28 Feb 2013 19:56:54 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 28 Feb 2013 19:56:50 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1SJuo2L032133 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Feb 2013 14:56:50 -0500 Received: from zalov.cz (vpn1-4-4.ams2.redhat.com [10.36.4.4]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1SJumsd031280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 28 Feb 2013 14:56:49 -0500 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.cz (8.14.5/8.14.5) with ESMTP id r1SJulJK024908; Thu, 28 Feb 2013 20:56:47 +0100 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id r1SJulRQ024907; Thu, 28 Feb 2013 20:56:47 +0100 Date: Thu, 28 Feb 2013 20:56:47 +0100 From: Jakub Jelinek To: Konstantin Serebryany Cc: Ian Lance Taylor , GCC Patches , Dodji Seketeli , Dmitry Vyukov , Evgeniy Stepanov Subject: Re: libsanitizer merge from upstream r175042 Message-ID: <20130228195647.GV12913@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <20130213151914.GU4385@tucnak.redhat.com> <20130214084804.GD1215@tucnak.zalov.cz> <20130214121913.GH1215@tucnak.zalov.cz> <20130215082604.GN1215@tucnak.zalov.cz> <20130222163211.GM1215@tucnak.zalov.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On Thu, Feb 28, 2013 at 04:30:13PM +0400, Konstantin Serebryany wrote: > I am sorry, I missed this message. > Indeed, the change looks safe, > http://llvm.org/viewvc/llvm-project?rev=176250&view=rev Thanks, here is what I've committed to gcc: 2013-02-28 Jakub Jelinek * asan/asan_mapping.h (kMidMemEnd): Increase to 0x4fffffffffULL. * asan/asan_rtl.cc (__asan_init): Increase kMidMemEnd to 0x4fffffffffULL. Jakub --- libsanitizer/asan/asan_mapping.h (revision 176249) +++ libsanitizer/asan/asan_mapping.h (revision 176250) @@ -32,13 +32,13 @@ // || `[0x000000040000, 0x01ffffffffff]` || ShadowGap || // // Special case when something is already mapped between -// 0x003000000000 and 0x004000000000 (e.g. when prelink is installed): +// 0x003000000000 and 0x005000000000 (e.g. when prelink is installed): // || `[0x10007fff8000, 0x7fffffffffff]` || HighMem || // || `[0x02008fff7000, 0x10007fff7fff]` || HighShadow || -// || `[0x004000000000, 0x02008fff6fff]` || ShadowGap3 || -// || `[0x003000000000, 0x003fffffffff]` || MidMem || -// || `[0x00087fff8000, 0x002fffffffff]` || ShadowGap2 || -// || `[0x00067fff8000, 0x00087fff7fff]` || MidShadow || +// || `[0x005000000000, 0x02008fff6fff]` || ShadowGap3 || +// || `[0x003000000000, 0x004fffffffff]` || MidMem || +// || `[0x000a7fff8000, 0x002fffffffff]` || ShadowGap2 || +// || `[0x00067fff8000, 0x000a7fff7fff]` || MidShadow || // || `[0x00008fff7000, 0x00067fff7fff]` || ShadowGap || // || `[0x00007fff8000, 0x00008fff6fff]` || LowShadow || // || `[0x000000000000, 0x00007fff7fff]` || LowMem || @@ -131,7 +131,7 @@ extern uptr AsanMappingProfile[]; // difference between fixed and non-fixed mapping is below the noise level. static uptr kHighMemEnd = 0x7fffffffffffULL; static uptr kMidMemBeg = 0x3000000000ULL; -static uptr kMidMemEnd = 0x3fffffffffULL; +static uptr kMidMemEnd = 0x4fffffffffULL; #else SANITIZER_INTERFACE_ATTRIBUTE extern uptr kHighMemEnd, kMidMemBeg, kMidMemEnd; // Initialized in __asan_init. --- libsanitizer/asan/asan_rtl.cc (revision 176249) +++ libsanitizer/asan/asan_rtl.cc (revision 176250) @@ -459,7 +459,7 @@ void __asan_init() { #if ASAN_LINUX && defined(__x86_64__) && !ASAN_FIXED_MAPPING if (!full_shadow_is_available) { kMidMemBeg = kLowMemEnd < 0x3000000000ULL ? 0x3000000000ULL : 0; - kMidMemEnd = kLowMemEnd < 0x3000000000ULL ? 0x3fffffffffULL : 0; + kMidMemEnd = kLowMemEnd < 0x3000000000ULL ? 0x4fffffffffULL : 0; } #endif