From patchwork Thu Apr 9 21:15:21 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: 185329 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp2323431ilr; Thu, 9 Apr 2020 14:20:36 -0700 (PDT) X-Google-Smtp-Source: APiQypIZzrNpXM/NdZlgGyIkL9MxMl/Nt0hmnk7mWApEOE1yU9LU9s7dNPlBvwYLPn44rGFjN1uZ X-Received: by 2002:a37:c403:: with SMTP id d3mr878862qki.448.1586467236023; Thu, 09 Apr 2020 14:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586467236; cv=none; d=google.com; s=arc-20160816; b=jCX3z/weswINtNc6EfD8KMxa6tPsXeYJcV6MffD/AKayp2mYWMdsBq+h3Llf2O7cnE fl/f4bsWL8JtOZoRFSyr7Oht1wbX98M+NrQAlHyDS0yi/bFePhfwapxnn0Z3M4uUgl3J 2vHE3QHD922ijke0Euo6gE87CYqq3cv8SOABoGecJK+Qz/U8Rf9CTh7dRhnbim8hBdrz H2Mhn+ZX6TSZByI155i4VlEM1HQllDg8cOlaX8A9EVmxzDxSYHFvnq5cdQZ2ngP6aJ85 LBmZ0IjKL/HgnJJZ57kWBxnxJTjmEmpGtNKezElk5aB9JqZvS85FXjOXeB/ZboYiorbg N6Fw== 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=NOU8+nMEIGED2iJZhktWL6KnvYhctO6T5v6pR87w3Mo=; b=kRXsZxGoa2Er1ebYk4ucKEOi3AwPOKuU66TjuGbXh8Odk+xoCeYyPws9/gsIFLMoAj Jm443pyDwfrkAYpUZoo6aiS5LUONxd9E0agIzhr37I5y651IBxqMzPGDHQZiY3OnmmR7 a8a1xjzNes/13cVPrD4Angm9XPryvwtpjSDBCHQ1TQog8M50z4GfDaXKjQquiMsxMbx2 XtRlM2XPBfXrkMrJlmb9KQHXl8k/h/inQsCdRDG8+pyMD5fr65CIiymDvxlSUqgDVXom gpaCP0VtwerGDknMaopvZHB5nQfMnKkJTKtC8N5jTyPpa3tufU2a5w89NZ6Yb8qx4euL 7xcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V9d0Bu6R; 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 67si155563qkm.91.2020.04.09.14.20.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Apr 2020 14:20:36 -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=V9d0Bu6R; 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]:55670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMebD-0000nF-Gq for patch@linaro.org; Thu, 09 Apr 2020 17:20:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42303) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMeWQ-00021K-3J for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMeWO-0005ee-M7 for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:38 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMeWO-0005da-FX for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:36 -0400 Received: by mail-wr1-x443.google.com with SMTP id i10so7401679wrv.10 for ; Thu, 09 Apr 2020 14:15:36 -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=NOU8+nMEIGED2iJZhktWL6KnvYhctO6T5v6pR87w3Mo=; b=V9d0Bu6RvtTqDxTr5JqOE/cxlRXXhnHirbzdTgm0jEO+mH6BsThkbzhFLQF8NmTiid fLhQNdmKv/C2Yzbfd3ONdqUFWtpkqX6iJTH0nmiRNYWcQryA+7sZUzWUb14ZWiqCn35c daaLWDjn0awL2E4uBgKqTtXHmzKrakVaQY0GC/dbv0shfnAYVOkAk8rEhy28hg/sWYPu vVHXy8M4Opshvjjqt2PvdwLV7B9lfJr8zWBz4StWyzkdo2W1SVsfcN++8Nb4JjrvqrFX pTiBipjTAvPdC7QIPVdQGUzZC/XTTVkbGK52jhAh/8bxTmgygFYSAwEmROcQ/lBoUzGy qVnQ== 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=NOU8+nMEIGED2iJZhktWL6KnvYhctO6T5v6pR87w3Mo=; b=D2XQce8APiXFJ7eD0wjm+VcKldEEwI3Z30REjEAKhfAKyz+BFyk4BSGJeBvT6mrVlq 19PfRfdJtu3fpzqtg2wCe+73SZMOqpY7nm0rF2yjTTxqTNsPJE5jqvdznwVJ3Cx7qZbs X+2uKeWexrggNjlnGIBQ0pVCJdDItr8X7Ke/rwX7AxA/zDtZ7bkQ5FN9uN2WlhxpwG47 NBkzBM5aRaJgVW7wmnWL1ryKNOcolov3w8jZAgevAmKApKQHqxRJbyUU5NLNWFJRvD5N 9RDktl4dZsnHsdjsPBUYuD6OyLXzHoCV5gRbuW9du9LeMmm56BoLCf8qM00lehupybux e51g== X-Gm-Message-State: AGi0Pua20hrWgMhCF1KftvZh57LAX3Zll2iBR79Ej8r+8L/x4b53O2nF qV85++6nUR3T5wz3R+zyQ28Sjw== X-Received: by 2002:a5d:4a11:: with SMTP id m17mr1055726wrq.125.1586466935348; Thu, 09 Apr 2020 14:15:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c11sm16635780wrt.24.2020.04.09.14.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 14:15:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 50D8B1FF8F; Thu, 9 Apr 2020 22:15:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/11] accel/tcg: Relax va restrictions on 64-bit guests Date: Thu, 9 Apr 2020 22:15:21 +0100 Message-Id: <20200409211529.5269-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200409211529.5269-1-alex.bennee@linaro.org> References: <20200409211529.5269-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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 , 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 --- include/exec/cpu-all.h | 23 +++++++++++++++++++---- target/alpha/cpu-param.h | 15 ++------------- accel/tcg/translate-all.c | 15 +++++++++------ 3 files changed, 30 insertions(+), 23 deletions(-) -- 2.20.1 diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index b4fb5832c4a..c0c2fa3cc56 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();