From patchwork Fri Mar 20 15:23:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1258997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48kSJC4Mggz9sPF for ; Sat, 21 Mar 2020 02:24:59 +1100 (AEDT) Received: from localhost ([::1]:54186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFJW5-0005NH-Fr for incoming@patchwork.ozlabs.org; Fri, 20 Mar 2020 11:24:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57818) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFJVa-0005Id-Nx for qemu-devel@nongnu.org; Fri, 20 Mar 2020 11:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFJVZ-0007Uy-GM for qemu-devel@nongnu.org; Fri, 20 Mar 2020 11:24:26 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:33409) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFJVZ-0007UG-8H for qemu-devel@nongnu.org; Fri, 20 Mar 2020 11:24:25 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M9Fvl-1jAfD80ZZH-006LV7; Fri, 20 Mar 2020 16:24:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v4 04/32] linux-user: Update TASK_UNMAPPED_BASE for aarch64 Date: Fri, 20 Mar 2020 16:23:40 +0100 Message-Id: <20200320152408.182899-5-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320152408.182899-1-laurent@vivier.eu> References: <20200320152408.182899-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:K0+EDF4+N6CLAt5XB/+SPTU0b5zH6ARXRKD+CHNHjm8JoJ7jFmr hp7W4/1SayBYCAlznLiPNo9ECERuaNNjUfFz9AyKfiLb//rLadddr37SUmNlUwXksvcN1zM Gv0ZhILaTBX0HjSnyuvXemRgGbDgVfNvu7ZEDQPeH+KD3bGxErdUqieH4I/xL4xVOemjLEp LSLyddCqlJg8IxmQzTcvQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:mMxHi3Vi/qw=:4/KMThh4XemcSXpbtDi/j/ Isdy/JP6RCkKltDnFoJte0pc/330Y3aH7IFsfcHFVxi6bkcs3VbYI5sZTl5zuWsKVmc0La+fG 956GQ1Nyf2hQ68TJQj6mU1y4WxavUgYVJjO5v8UsYdkYDH6IZiDkXfS92Sv/M97OBmGlA6K25 xxqYhHrFQJeH3al4karo8c05N2eZ2twa5yGMDDmn7sP/2YpCZt/k7SJ+QE5vL8l8ZaFpJPaEg vDzts3+Xh3r3tNxCzne8PTHv7BKkjZ/c5OqU2YRdNsmMAgD7jYZMDVoExLgyN6R6zPsapZx4g rfwmRfjxdoOxpP1UhR2nyUlQYlNGU/OqnlxF55QiIGIcAX7yhAy0cyUTNjgnW+fpxY0K0u1OV /jqv7JTGH2UZghpn4xi+cekZj4aG6VJgNgbWDIwuGxZzbIfyCl8FxEGe/rxXWTR+/05Tpe8a0 tggGnHioWkErHotQZvKt20W3VZP95GFCD2F6z2yfTcJWXNSjkzySq62KubVreGFUSJ4FF9Rjq ewqWT4pnd9WCxmh2uJhOzbPBzz2s2Jfhp+2igUOPsmEaS3DdLJs3AVLH+qEQ6gqcB2vRlXqO6 +C82LV6NcKcMsaprcl43ux2Iu5QA4+QIUwFOPNCr7oya3XTKcBWqYaTNgmwoxEditKezFyrHq bC1A0Ia9nzrTmIOsYMewyVauVNcCSLUn1/fECWkI/tDiC9AUybHzp4h/hTfRLgZznguD3QfWt Lq3Ev2k1WixTqYBeFGZi+Ud4LCQ7zhxhMCNy1mV238vNQvZA8Cr7A5P2mdpSqCwJ/KQbRTjap ylBZWmAq0ZAI+Rs25D+t3ixtd9I6ypIVXhuP7EiLLiFC50bXrf9nuDsxQ1eMapIWJrvh3Tk X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier , Lirong Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Lirong Yuan This change updates TASK_UNMAPPED_BASE (the base address for guest programs) for aarch64. It is needed to allow qemu to work with Thread Sanitizer (TSan), which has specific boundary definitions for memory mappings on different platforms: https://github.com/llvm/llvm-project/blob/master/compiler-rt/lib/tsan/rtl/tsan_platform.h Signed-off-by: Lirong Yuan Reviewed-by: Laurent Vivier Message-Id: <20200313002813.3857-1-yuanzi@google.com> Signed-off-by: Laurent Vivier --- linux-user/mmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 8685f02e7e90..e37803379747 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -184,7 +184,11 @@ static int mmap_frag(abi_ulong real_start, } #if HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 64 +#ifdef TARGET_AARCH64 +# define TASK_UNMAPPED_BASE 0x5500000000 +#else # define TASK_UNMAPPED_BASE (1ul << 38) +#endif #else # define TASK_UNMAPPED_BASE 0x40000000 #endif