From patchwork Thu Aug 22 18:59:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172059 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1299574ily; Thu, 22 Aug 2019 12:01:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzfkzot2OWHmdeTtOtgW6LkjMub8c8Q5LDfFcsUOBI7LSfVOziPJSlAcUtqkXtP57bo1+9T X-Received: by 2002:a17:906:5044:: with SMTP id e4mr753078ejk.268.1566500469459; Thu, 22 Aug 2019 12:01:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566500469; cv=none; d=google.com; s=arc-20160816; b=kIJd50t7impaOceAGdVX4TPRYihjvlhSdSvBlijS1uZzoSk5BbiY3muj62VwHr8n9Y D/UM+QQvMi8iURmPgPKeQHt/qFWlItxvnV3vnBwOTzqS/sWC0+j+b5HMA4UvEeV2enOm MnNiHnPrxdRkvjqsoATbxb7gZkxVX1dt0QrsOT3hgiElayCfnlhOxOKgj8k1otVHOREH OJWILC4AeCCOyfLgtdpPf4vxjwkP83wkkr+JE001Li7VFrn1kYO0o26DNpC5hqNPEIj9 H8+INwWa6o2Zk7s0q4HhAYSKjdMDMoToqLH/GkjEqKWPzJsznb08xIMUhHdjrGOI/X9N VRFg== 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=JEmEzPFUR0isRb5JQ5Z7wSqHYLVLETQrUR8Yc9g4NhM=; b=wpK9n3ynFGFbPXL+wWAPiNwNf59hY3yO5Ona0Xt18BniMYADrOqXf1FMTQ6dpWvE/v mskd+uIKv4ZO8vOmxB2C/+mEsXlIZR5Hnbs2P3i/Y6s5zWoGPChi1JMl6CTXW4m8B3eN EniuSvVwLYpH7ZqIv7l2cPB4B536L5xXltw+Z0jNJqKb8OeK/kfhlozRyJ3eDIAorpIs MGnFXJqoWZWJgfZQb3KNVSXdO4SE9Dvyz75rmzoAa91tLot/VonkHoJHFqyzX9fMWsZ3 Lgh1fIuatMR9qIx9MVUIjdpgtALYadg/OSNFW3HMP6hVVZb7lV2UXJ2k8mzzX1vpPf9U 8fdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=abEnu8Ck; 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 n16si348300edd.416.2019.08.22.12.01.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Aug 2019 12:01:09 -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=abEnu8Ck; 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]:47212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0sKZ-0005RQ-SB for patch@linaro.org; Thu, 22 Aug 2019 15:01:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36945) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0sJ6-0005Ps-9o for qemu-devel@nongnu.org; Thu, 22 Aug 2019 14:59:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0sJ5-0004Q2-3O for qemu-devel@nongnu.org; Thu, 22 Aug 2019 14:59:36 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:39599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0sJ4-0004PB-Gm for qemu-devel@nongnu.org; Thu, 22 Aug 2019 14:59:34 -0400 Received: by mail-pf1-x442.google.com with SMTP id f17so4559603pfn.6 for ; Thu, 22 Aug 2019 11:59:34 -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=JEmEzPFUR0isRb5JQ5Z7wSqHYLVLETQrUR8Yc9g4NhM=; b=abEnu8CkM/9kBWuTfT9N7ZLJPePRAqPsXyr3fG9kz5XWj6F33cXwt8kaf+k5b8yx/g V/bu2G08j5BX/U9GkdzUKamffjAdOB92eL5pW/gyPjmYzUkTgGxKqDsotWuSxyw/tPEB 6QbHHzqpzzEMob27e3qTMIqufm9y2znOHnlISWdin1LTuqcgnNjtZyGc/gUhoYp68KtL BtdP4k2pIJR5Cw287fskR+AjvdWYEBKAW3gVEKbf+SvNhI210rVFJnyCBbqp2vmHMnZG CWn5s9Xx5kk50xuRxQI1nXw///uP5szjMX3VIKyRRRkQMVu0kR4uJMxloVGqPtc2o1f+ k5BA== 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=JEmEzPFUR0isRb5JQ5Z7wSqHYLVLETQrUR8Yc9g4NhM=; b=ll8qJ56VSN9W2FCb5x5yPd0e7yQMLsoKUpR+J2uzhc1ckvCMGKRfjzMpK26uJzglot pqQDZHPN5oAqYk2QAqkjCkg0jnk9jX9a1jfFUyw8tP/NLeba4bxyW515kpwKJmQ2/Jij gsKi3t/aoZkb+49c0Tl+ZgoNk4ChrGbBINHh/MeSRlSgEVQjuJeIZQJibDL+PMNKug3Y NCjaC6o4l2ymDiXd+2/C0W9QXki4TiDyTSQBtZwiZ53j0j20ASJQoLFMKxZrxpc1t8VK Yg+ErWXf621UbYEG/GrbCT+wa2nMTSaz8DSK0s5yl/lp61JCagAn7JKceGusarBosvZ5 FHUQ== X-Gm-Message-State: APjAAAVHZtrN6isIIQWgaRR+IkEh5muqh+G/sVCtY1hbopo7IccjPMCr KfuLNcrDMtwwWz6wkf8q90fHy8gVjsc= X-Received: by 2002:a63:4e05:: with SMTP id c5mr597564pgb.396.1566500372874; Thu, 22 Aug 2019 11:59:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2019 11:59:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 22 Aug 2019 11:59:28 -0700 Message-Id: <20190822185929.16891-2-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::442 Subject: [Qemu-devel] [PATCH 1/2] linux-user: Pass CPUState to MAX_RESERVED_VA 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" Turn the scalar macro into a functional macro. Move the creation of the cpu up a bit within main() so that we can pass it to the invocation of MAX_RESERVED_VA. Delay the validation of the -R parameter until MAX_RESERVED_VA is computed. So far no changes to any of the MAX_RESERVED_VA macros to actually use the cpu in any way, but ARM will need it. Signed-off-by: Richard Henderson --- linux-user/arm/target_cpu.h | 2 +- linux-user/main.c | 43 +++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 19 deletions(-) -- 2.17.1 diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h index 8a3764919a..279ea532d5 100644 --- a/linux-user/arm/target_cpu.h +++ b/linux-user/arm/target_cpu.h @@ -21,7 +21,7 @@ /* We need to be able to map the commpage. See validate_guest_space in linux-user/elfload.c. */ -#define MAX_RESERVED_VA 0xffff0000ul +#define MAX_RESERVED_VA(CPU) 0xffff0000ul static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp) { diff --git a/linux-user/main.c b/linux-user/main.c index 47917bbb20..35da3bf14c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -78,12 +78,12 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ -# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) +# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) # else -# define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) +# define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif # else -# define MAX_RESERVED_VA 0 +# define MAX_RESERVED_VA(CPU) 0 # endif #endif @@ -357,8 +357,7 @@ static void handle_arg_reserved_va(const char *arg) unsigned long unshifted = reserved_va; p++; reserved_va <<= shift; - if (reserved_va >> shift != unshifted - || (MAX_RESERVED_VA && reserved_va > MAX_RESERVED_VA)) { + if (reserved_va >> shift != unshifted) { fprintf(stderr, "Reserved virtual address too big\n"); exit(EXIT_FAILURE); } @@ -607,6 +606,7 @@ int main(int argc, char **argv, char **envp) int i; int ret; int execfd; + unsigned long max_reserved_va; error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); @@ -672,24 +672,31 @@ int main(int argc, char **argv, char **envp) /* init tcg before creating CPUs and to get qemu_host_page_size */ tcg_exec_init(0); - /* Reserving *too* much vm space via mmap can run into problems - with rlimits, oom due to page table creation, etc. We will still try it, - if directed by the command-line option, but not by default. */ - if (HOST_LONG_BITS == 64 && - TARGET_VIRT_ADDR_SPACE_BITS <= 32 && - reserved_va == 0) { - /* reserved_va must be aligned with the host page size - * as it is used with mmap() - */ - reserved_va = MAX_RESERVED_VA & qemu_host_page_mask; - } - cpu = cpu_create(cpu_type); env = cpu->env_ptr; cpu_reset(cpu); - thread_cpu = cpu; + /* + * Reserving too much vm space via mmap can run into problems + * with rlimits, oom due to page table creation, etc. We will + * still try it, if directed by the command-line option, but + * not by default. + */ + max_reserved_va = MAX_RESERVED_VA(cpu); + if (reserved_va != 0) { + if (max_reserved_va && reserved_va > max_reserved_va) { + fprintf(stderr, "Reserved virtual address too big\n"); + exit(EXIT_FAILURE); + } + } else if (HOST_LONG_BITS == 64 && TARGET_VIRT_ADDR_SPACE_BITS <= 32) { + /* + * reserved_va must be aligned with the host page size + * as it is used with mmap() + */ + reserved_va = max_reserved_va & qemu_host_page_mask; + } + if (getenv("QEMU_STRACE")) { do_strace = 1; }