From patchwork Fri May 15 14:43:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 186845 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp501252ilb; Fri, 15 May 2020 07:46:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuXjw9SRj0ov3YNH+qDP27f5yrqAJfCgQIvtcskX0962b1B6NPOxuhllWz9PMZHbWveL2W X-Received: by 2002:a05:6214:8cd:: with SMTP id da13mr3764388qvb.76.1589554005327; Fri, 15 May 2020 07:46:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589554005; cv=none; d=google.com; s=arc-20160816; b=vn6loG4TJt74AnFLeiClATA4ydCfzVmo7hTcEcAO2Nv7T2NbJ0/Gaeo9vhlhjGuElr M0MwxwFyQ+A9V1fgZZ6dwY7PvCN9rYRXut6TMX/s8clkUwqur/ug9JKOH3FwDDdfA+dE gLXlpcRLlVzEE8FvYAC9P13LkW1ASlvXBJ4Ptiq3hr1FG8WSnMqi9NzZDOZmXqNhKANg e9W7+vagmpAcEMGU/aF9aUKKxYywxooH92Fy7VySHkdqaUuJCYLge6ucVnePIZqvUAEN QlmCb+sg+KjQE2ZB2AwGFU15xBgYL7P+9Zuh/JpMWNZ0/MJ591x78EFItctdL6plfUd1 D+7g== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NBIpR/SKBX2U0msLKof2GONE3NjLw6IkuS84AThlKu8=; b=pnQpm/Hx5kU+htai5QHcV/Rm0PIARHt5jjS7UF63uwZHY/UOW3FHnUdx0SbGDXK/MA QTR72t0VjevHdZibZbGOHl5EHHNrip31C5Ue4l4cZTVErqWTca45Wi1bSp+UQ3K8EDQS 4tGIFZFCOJAkRRkotcXU6lOMUn60+T8piqYI0VFZkKxIJC2hk0PWvWPKokX5UNoINFak u264YbUEqBoG7o4qJU9w+h/x/83Qrnx/o+gXgLIi5oH81Khj+VS4Y8ylZzHPpi9zU7yS ZPPyFsIial4znu/jo6b6vGBUSDYn2KW79OOKrjqU74p2RS1g1RQjro1M+oREVXne8fcc WYxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zICfkdDS; 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 bc10si1210298qvb.155.2020.05.15.07.46.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 May 2020 07:46:45 -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=zICfkdDS; 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]:51382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZbbo-0004wS-Ox for patch@linaro.org; Fri, 15 May 2020 10:46:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZbZQ-0002Jq-3O for qemu-devel@nongnu.org; Fri, 15 May 2020 10:44:16 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZbZP-0000yh-0A for qemu-devel@nongnu.org; Fri, 15 May 2020 10:44:15 -0400 Received: by mail-wr1-x42c.google.com with SMTP id i15so3810089wrx.10 for ; Fri, 15 May 2020 07:44:14 -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 :mime-version:content-transfer-encoding; bh=NBIpR/SKBX2U0msLKof2GONE3NjLw6IkuS84AThlKu8=; b=zICfkdDS8h09FVj3XSxst0oeWEiM3esfVa4ePQdWih8m+D3xVmc2IETlhzrKvSnoUi UUmEZ9pR+XJado5715qwNQTNt3EVcYobKaLlRRTUu3srNd4m+9JsVrKbk8kU71WI/UEk 6iPpufEJxpkFjjb4tB6f3IYClcHD67LF2WpLCkWn9WPf2tklrdo1tIrMFzz+qEzxqA69 oHDbD/vOOvn9+MVllMJf4D9kq6WHicZCWZO7Xn4YrOmo9t5KhoT8r0JSNAePQCkTRp8W I2ybuKBS4ar7AgFHNgGE4itDz+Qb1PnEXFA2QeAWYxKPhl4YRrykY7Pc2rqHCobqnF6B cbLQ== 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:mime-version:content-transfer-encoding; bh=NBIpR/SKBX2U0msLKof2GONE3NjLw6IkuS84AThlKu8=; b=F6ScnKNUFONkbghE4xCAlZH9RO2vzGvWQ1y2jTfco7cFeHzrGEgnhZt4NY7pncU6FW KMCrlcs0mes0EjzV1KyAOwBoIc2Oymmc/SoT5bZDAdKpXDJav74uxswn1fRgfi604ilK YWcLA7guVvo6+tIYC2uyPwRq8NkeZIlR/JRTiM+dJvxTUMZvggpuUDBWsu2WTA7914Yz jyndUE9FRVe6NV3gQaPclaziEn0/d0Bwv5JMSXP768QcawQq/4khBy/bdh3eTxBeKumq WL3K8si0MVlwgcT0LXu8hkAJmZ7IQJhTdfVE3ZDuc0F3u9UrviZPZb1nIQ7+1McUuPzQ tfNQ== X-Gm-Message-State: AOAM532QVgERgbG3M+zaBMsci5gfZWdDzfZd0+OovOTMGYlomCpAThOD yyJgQ/G9ApTXsOc1NfQYccuK/g== X-Received: by 2002:a5d:480a:: with SMTP id l10mr4557713wrq.318.1589553853590; Fri, 15 May 2020 07:44:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n7sm3929502wro.94.2020.05.15.07.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 07:44:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A055F1FF91; Fri, 15 May 2020 15:44:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 05/13] accel/tcg: Relax va restrictions on 64-bit guests Date: Fri, 15 May 2020 15:43:57 +0100 Message-Id: <20200515144405.20580-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200515144405.20580-1-alex.bennee@linaro.org> References: <20200515144405.20580-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We cannot at present limit a 64-bit guest to a virtual address space smaller than the host. It will mostly work to ignore this limitation, except if the guest uses high bits of the address space for tags. But it will certainly work better, as presently we can wind up failing to allocate the guest stack. Widen our user-only page tree to the host or abi pointer width. Remove the workaround for this problem from target/alpha. Always validate guest addresses vs reserved_va, as there we control allocation ourselves. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20200513175134.19619-7-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0895a57881a..d14374bdd49 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,27 @@ extern unsigned long guest_base; extern bool have_guest_base; extern unsigned long reserved_va; -#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS -#define GUEST_ADDR_MAX (~0ul) +/* + * Limit the guest addresses as best we can. + * + * When not using -R reserved_va, we cannot really limit the guest + * to less address space than the host. For 32-bit guests, this + * acts as a sanity check that we're not giving the guest an address + * that it cannot even represent. For 64-bit guests... the address + * might not be what the real kernel would give, but it is at least + * representable in the guest. + * + * TODO: Improve address allocation to avoid this problem, and to + * avoid setting bits at the top of guest addresses that might need + * to be used for tags. + */ +#if MIN(TARGET_VIRT_ADDR_SPACE_BITS, TARGET_ABI_BITS) <= 32 +# define GUEST_ADDR_MAX_ UINT32_MAX #else -#define GUEST_ADDR_MAX (reserved_va ? reserved_va - 1 : \ - (1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1) +# define GUEST_ADDR_MAX_ (~0ul) #endif +#define GUEST_ADDR_MAX (reserved_va ? reserved_va - 1 : GUEST_ADDR_MAX_) + #else #include "exec/hwaddr.h" diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h index 692aee27ca9..1153992e42a 100644 --- a/target/alpha/cpu-param.h +++ b/target/alpha/cpu-param.h @@ -10,22 +10,11 @@ #define TARGET_LONG_BITS 64 #define TARGET_PAGE_BITS 13 -#ifdef CONFIG_USER_ONLY -/* - * ??? The kernel likes to give addresses in high memory. If the host has - * more virtual address space than the guest, this can lead to impossible - * allocations. Honor the long-standing assumption that only kernel addrs - * are negative, but otherwise allow allocations anywhere. This could lead - * to tricky emulation problems for programs doing tagged addressing, but - * that's far fewer than encounter the impossible allocation problem. - */ -#define TARGET_PHYS_ADDR_SPACE_BITS 63 -#define TARGET_VIRT_ADDR_SPACE_BITS 63 -#else + /* ??? EV4 has 34 phys addr bits, EV5 has 40, EV6 has 44. */ #define TARGET_PHYS_ADDR_SPACE_BITS 44 #define TARGET_VIRT_ADDR_SPACE_BITS (30 + TARGET_PAGE_BITS) -#endif + #define NB_MMU_MODES 3 #endif diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 9924e66d1f7..e4f703a7e6d 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -173,8 +173,13 @@ struct page_collection { #define TB_FOR_EACH_JMP(head_tb, tb, n) \ TB_FOR_EACH_TAGGED((head_tb)->jmp_list_head, tb, n, jmp_list_next) -/* In system mode we want L1_MAP to be based on ram offsets, - while in user mode we want it to be based on virtual addresses. */ +/* + * In system mode we want L1_MAP to be based on ram offsets, + * while in user mode we want it to be based on virtual addresses. + * + * TODO: For user mode, see the caveat re host vs guest virtual + * address spaces near GUEST_ADDR_MAX. + */ #if !defined(CONFIG_USER_ONLY) #if HOST_LONG_BITS < TARGET_PHYS_ADDR_SPACE_BITS # define L1_MAP_ADDR_SPACE_BITS HOST_LONG_BITS @@ -182,7 +187,7 @@ struct page_collection { # define L1_MAP_ADDR_SPACE_BITS TARGET_PHYS_ADDR_SPACE_BITS #endif #else -# define L1_MAP_ADDR_SPACE_BITS TARGET_VIRT_ADDR_SPACE_BITS +# define L1_MAP_ADDR_SPACE_BITS MIN(HOST_LONG_BITS, TARGET_ABI_BITS) #endif /* Size of the L2 (and L3, etc) page tables. */ @@ -2497,9 +2502,7 @@ void page_set_flags(target_ulong start, target_ulong end, int flags) /* This function should never be called with addresses outside the guest address space. If this assert fires, it probably indicates a missing call to h2g_valid. */ -#if TARGET_ABI_BITS > L1_MAP_ADDR_SPACE_BITS - assert(end <= ((target_ulong)1 << L1_MAP_ADDR_SPACE_BITS)); -#endif + assert(end - 1 <= GUEST_ADDR_MAX); assert(start < end); assert_memory_lock();