From patchwork Tue Mar 17 15:50:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1256589 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 48hd5k6044z9sPR for ; Wed, 18 Mar 2020 02:54:34 +1100 (AEDT) Received: from localhost ([::1]:35286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEEY4-0000hK-Dr for incoming@patchwork.ozlabs.org; Tue, 17 Mar 2020 11:54:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEEVI-0004jg-QX for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEEVH-0007A4-JS for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:51:40 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:58169) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEEVC-00074I-Tg for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:51:35 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N8onQ-1jK1n00q0c-015moE; Tue, 17 Mar 2020 16:51:32 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 09/37] linux-user: Update TASK_UNMAPPED_BASE for aarch64 Date: Tue, 17 Mar 2020 16:50:48 +0100 Message-Id: <20200317155116.1227513-10-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200317155116.1227513-1-laurent@vivier.eu> References: <20200317155116.1227513-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:VpaJU59AIPv4rBbxgxCk9XEvAnAIat9XyRL9WouSEjiUJMHWOA4 3bN9wKn7H/qd5Zm+R3dJYMZ2Vk+/2HeYcLd/tqfza2tSpZePCerGW1s7Kkw6D6Oxivyofdm VzLT4M8zkg4G2UF9WPeqzsFQfXRFWYAUJp8RyfxHijQX4v5YS60ZW0xnhsmNjoVvTU8Ejqd 6AWsdqkvwxdMmaKanONbw== X-UI-Out-Filterresults: notjunk:1; V03:K0:bo2fGl5hh3E=:HGQxFXzkwAiYZqUnDAeRRO X2OTuYV8pSdLvK4E3SDk0aEkuRxUH/7h9krxiy42JnQtOJIb0l/Pke8plVk6zmWJcqIemHsGG 9D2sfUSv9diOCsWcLf3Dxe8p2pF3oHqtlnvr5SvdNuwdrC7771f5rgkSvXwxnxZG7BuH0FYLG rmPmGu1q2M+p+EvncdAYWA8RCLSkPJfpiVQFKBfnslK+Tt+APGXZxrd4qTl+vjRCTMUe9ADvS BuNxrO2BQseCyEgp5jzENloaAEv+GPw3Ii4OVXn3gPfY5DNdzwyasdI9IzKDuxo0t5rB9Iwwc DXbrvZCeJ1sXA4FsTFHdJ7S+K1GDInyuX/IEPQFGprpa6yaHatry9qex9WYVUARzwaI+Ij3rI H7M9MIgaRlwKYxocXpD2tXHwPbg1b7uw8Lj8aLDamwUfSxyp2kFfJjUAWWxn8EfKJ1YIfOzWW 1KQYLU/y0YSpUfOJEUrIP/cbJe9lpv9TfJVztBVlxll8OVet0h5ZVuUooz6WGjOFtR4h7faTU YS/godcOgnU0PiAbuBckyIusqqaMbCMqQcVsMKpgdQbwqpB8hYUyRSi7vU8loV5P75Xucftnw vV+78FvwpBPPSg4uYyGTwKudSb0dPWuRyCZnwxXZ4HJU7oHSBC75qgKdINZtbwGYvjshTVUXs zfht8a5WtoCw9DYznY6sEtBzTbSQc1Gzs9GRCRT/BkYT97tQo/YSoERY8hhzLGDo7uWvh+Gyi qBb9NeLkhI6Y5X5KuUzTyVDoDH9vlevSFVYn/9GqdVkz283E6eqIzRrcWe0o0EITkQON6qit1 R3Rrmec0M54jHC62iCoehzI5+7XvNLP6/lPKqiSlp4XokI8icz0pnMPZKsA8U5gNgLaOJJF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 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