From patchwork Mon Mar 16 16:15:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1255701 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 48h3hL2YCZz9sP7 for ; Tue, 17 Mar 2020 04:49:06 +1100 (AEDT) Received: from localhost ([::1]:44798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDtrM-0005g4-7f for incoming@patchwork.ozlabs.org; Mon, 16 Mar 2020 13:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40160) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDsPa-0007t2-Gn for qemu-devel@nongnu.org; Mon, 16 Mar 2020 12:16:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDsPZ-0007ix-BY for qemu-devel@nongnu.org; Mon, 16 Mar 2020 12:16:18 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:43117) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jDsPZ-0007Xk-1G for qemu-devel@nongnu.org; Mon, 16 Mar 2020 12:16:17 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Ml3ym-1jaoAU0Poi-00lUG3; Mon, 16 Mar 2020 17:16:14 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/38] linux-user: Update TASK_UNMAPPED_BASE for aarch64 Date: Mon, 16 Mar 2020 17:15:21 +0100 Message-Id: <20200316161550.336150-10-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200316161550.336150-1-laurent@vivier.eu> References: <20200316161550.336150-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:62h07PR3cHypYnxBYpK5aT+zdVUE4EF9wifkD4Mxjm7YHgdCYZs NQBNRKCAVkLfP56aey1qO6ZLhZ39OVgYFSxS1GsD+01vEvNEvw7UeOxU4fM361eku0JJedN XfruNhX9MURur9NVRnq+vCL54Z0ViJyZ0u54C2Mo3M3Z+LXA+tD4fYPSal2bjsLR7UiDJvP iajVkdLhgu6bVMmXdsPvQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:1PvXK7PRVVY=:BgNMMkUc7HHRi1HMk0KGJR ChFRnDXm/W5f6gPBelgUrh7/4BFRc1s/R3DddRbozjcVVbm5uah5Lj65/si2VButH3Wa5pP2q sRwxUsKvjOWxUwgc3ROUTnlEgN2LdaTBv+KbZ9x4NWjEehADLbuoJPxP9ldSI99tuNaSlgu8R WIJkAS3uMWIIM//S3jw4xUkaw+/rHPc5Hy0KDeXhIoEVJCph+QqYmtYQSECQHNlreXbhoANN8 kPRFp4cfbOWT9h1Ex/jtOeBM+JupI6i5idSp4w8PiVD2i4u/EqWZ2W+D48iNIz6+4S2wc8X16 dau1iXwovhKYAbjT7M8PmabbBmGvPabBgAK6vlL246h2veEJ9QqO/wkkxfKq0drBj7jDhNE1d pbJmRxWQFMdgWdc/Rvq7IQub+x/CiatOq0fTbQWpERfAk9bSUfA3pUFsxLHvMaJ+M8RXKE3hv 3T1fTnX7URd6hSpkrBYHiUFjDpBfSOjizeM5X2FNYjJ/Oi7E3/S6T3JW1ldugqcCoAIwsoQ3b /9gdodOQ4hWhHgKzAB8ZgoWJv3ac/4yXybhbyrwPtMea8L3cvhjdw/Y+bu/yHIMtrGWpfGN9B alZohfUeYgr6vHQ7avHWMM6rpa02AjKFyaGDT7aVN/NoP/eN/2qJhuEPSyLNx/2K1IsluSskj 6pIh0YZUqfTNUwZ68uIY84cLUNtqwfE9a5bFzSK++9ONYJ9nZ8NxM7NvYbcwEDolcwQEKxFeh KkfsIxgXhc6Bb/XBXTPvyPh2Rbi/C6TJFht1yHAGQTNBAzEnJ+MdKpPHJs9y9+MvEnANxqelg Wg42VMPonfZzzbvR0Dj+yNYix6ulr8UaGeeLtUCmEM5K4jp5ckGVi4LOEkfnW+d9xtbK3vW X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 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