From patchwork Thu Aug 22 18:59:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172057 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1298322ily; Thu, 22 Aug 2019 12:00:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFIsn57Hv5CLk1h3ZvPKubEjxcc/GyzBXISsoD1SQaA91sCCScvL8m+aTbZzAIEDQM/w6n X-Received: by 2002:ac8:1a86:: with SMTP id x6mr1157938qtj.231.1566500414031; Thu, 22 Aug 2019 12:00:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566500414; cv=none; d=google.com; s=arc-20160816; b=ccewvNuV8LBj34V5RkHrTw9p9oqzKd0CLmCaKUUyVzyO/G3rSMxczSkI0hIbPAkIEz WgNI/+3lrQcCiMmyfJ0+gLZf+3Nl/syAVnbmiBX08JMej0/PVgA2UrwXPMW7VDzQpJp4 JeUwtMFIDEk5aykXSGYaLJ2Y/Qm2NFGZjOQmmkdH1ZdWILn70AmfjyvDEqT8qBkauAvT mOxajf/nT+c4ALX7K1UYJIp8odmUzQ//M28TVW7KurWJJV+NjcWqiSNLlg+RPYULKu3y UU/BX3fH8/FFBt0kcmBllwshFC0dSQJwKXp10jpP6+TY+XfHeXGl35Q7C/G8qd75MGbg WCGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1Ly/U6ykcHLVzGazIt39CUi/LITjT+MWMWABpH7UFOY=; b=dhJbQkKfxT39weN8tgq66QkfJi34oyv4e8WoD3+wj7dA7HSlrbDBYNGKnm4zHuFrki Z+jqmBB1S3x3ykWj/c9Ec6dZHO4dxozQ+Uriy8ZKNqiBOKXyNvjKCGcDWwwagBogcG9U xg0Ou1brzJ1untOHAihs7+8clSHiIE7wYFD7eAE3E82bUbmDFMlNMXfn/G3rQomkBTPL qgbfsFq1x0FkW9QfQ5c2jSk15uT/amgfVFclB+SMKvHZ0Z9aP37VRl/BmVemAW1WB+A1 tQwKVKw0r3qDcefF+z+T8Ro8qQs6wFbOuzWKSbyejxZfGCJDEUeEtfDYkt90dcdQ/MGz +WJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=brt0UGnH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m15si392139qvc.139.2019.08.22.12.00.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Aug 2019 12:00:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=brt0UGnH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0sJh-0005Rt-9q for patch@linaro.org; Thu, 22 Aug 2019 15:00:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36957) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0sJ6-0005Pt-T1 for qemu-devel@nongnu.org; Thu, 22 Aug 2019 14:59:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0sJ5-0004Qm-SQ for qemu-devel@nongnu.org; Thu, 22 Aug 2019 14:59:36 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:44764) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0sJ5-0004Pz-Mt for qemu-devel@nongnu.org; Thu, 22 Aug 2019 14:59:35 -0400 Received: by mail-pg1-x542.google.com with SMTP id i18so4182225pgl.11 for ; Thu, 22 Aug 2019 11:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Ly/U6ykcHLVzGazIt39CUi/LITjT+MWMWABpH7UFOY=; b=brt0UGnHo1XONAee1WLeKYbX6nr1rx5j7oiFXVVvG1sBHfuG2ubLZTcyb+R/7Zs1nL scsmqpP2YtZt1Hjqpi/u/z6Hz9DvNUffYn4b3XBy12E5fxKHO4jv6fNAx2Or8QFX2NT6 Jg4jBZmfkrRAy4pd9Km/Y/Kb/czEGTHZBfyxfkuHRdY7kieI80oQhBVY8/M4RnxX2h/2 0d20VOY6sJZ8Uk71Xte7XRQgDY0qHUSfmA0xfhyPRUdLcYiTjWbBqbEgue0/3w3/lSfp +hm1Y15pJed1J8tt4IGzF8wftb1maP0qcWOTm5bCW6sbAF3eVLHtuNarGmJ4il9HYPeq WYMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1Ly/U6ykcHLVzGazIt39CUi/LITjT+MWMWABpH7UFOY=; b=Ly3XPBEcSF7r8MQ8TO/AIHFPqDK6WX1q6jdgwdTWlh7xZ6UPGAWlWQ+/Bu5DTSpgsT wiMwsQLZ0CVvjSkoghmy39g3EEpdd8mORbShCQdySqf8cQStjXyCbF+XnlPehDdz9I+I rrdm9Q9BF2X9YRnjrcTsVnNDvv4BlWa9hwPRRqwF8PJZQuKgQWTmRhYOqdo9KEiqI3ob 0PmyU74/BRDqLWLnVgm8yG5j82c9bf/CEx1NR4l62v5fQJeNWKX7fhW18HC3pXZiychh egaLy83l55Zpxivax/+HLvY3UqQhPm9I0gtB31WZWfos87Vyh0AF7y+XGPuR0PN/TCgf lhSw== X-Gm-Message-State: APjAAAWqeUUOr23YNVR8ZtpZnTRsJts8RHH0MBawdeoOhar9qA7otiH7 Y5OV5VHxePn9ppVzotprdgam/s/NjjM= X-Received: by 2002:a62:1858:: with SMTP id 85mr761268pfy.120.1566500374282; Thu, 22 Aug 2019 11:59:34 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id z14sm287172pjr.23.2019.08.22.11.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2019 11:59:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 22 Aug 2019 11:59:29 -0700 Message-Id: <20190822185929.16891-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190822185929.16891-1-richard.henderson@linaro.org> References: <20190822185929.16891-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH 2/2] linux-user/arm: Adjust MAX_RESERVED_VA for M-profile 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: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Limit the virtual address space for M-profile cpus to 2GB, so that we avoid all of the magic addresses in the top half of the M-profile system map. Signed-off-by: Richard Henderson --- linux-user/arm/target_cpu.h | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h index 279ea532d5..3f79356a07 100644 --- a/linux-user/arm/target_cpu.h +++ b/linux-user/arm/target_cpu.h @@ -19,9 +19,27 @@ #ifndef ARM_TARGET_CPU_H #define ARM_TARGET_CPU_H -/* We need to be able to map the commpage. - See validate_guest_space in linux-user/elfload.c. */ -#define MAX_RESERVED_VA(CPU) 0xffff0000ul +static inline unsigned long arm_max_reserved_va(CPUState *cs) +{ + ARMCPU *cpu = ARM_CPU(cs); + + if (arm_feature(&cpu->env, ARM_FEATURE_M)) { + /* + * There are magic return addresses above 0xfe000000, + * and in general a lot of M-profile system stuff in + * the high addresses. Restrict linux-user to the + * cached write-back RAM in the system map. + */ + return 0x80000000ul; + } else { + /* + * We need to be able to map the commpage. + * See validate_guest_space in linux-user/elfload.c. + */ + return 0xffff0000ul; + } +} +#define MAX_RESERVED_VA arm_max_reserved_va static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp) {