From patchwork Fri Feb 12 18:48:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 381858 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp3183107jah; Fri, 12 Feb 2021 11:01:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKdxPGSC/FwS2PUcvcTKGjKNy4NUyk6VczCvUG7AL22FB/vwDNDuptNkp9GdAge2O4vorK X-Received: by 2002:a25:c090:: with SMTP id c138mr5795991ybf.314.1613156512575; Fri, 12 Feb 2021 11:01:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613156512; cv=none; d=google.com; s=arc-20160816; b=HsOmMaIM9hE3sKxz7NRMX5BQHIIwwM1NbN+cu8ogCXf/Lj0vEFQHHM6ffMaGSzyGUp G/h6yWRvHMuq6eYyGieWrdqJvFIMM/y3fU7jUWlWm74az0s26kGzwa2ag3TXxI6Cickq r5NXxsMDIcdqXKhew6cEEfLdq3CL7v8mZ/W4Cps1VcEWFCrc+eM5LEsns7PTSSrarkc/ ON0ivQgx0nO/Xq0DQgXiPtOucbzL5jhrc0u1FCVB7i55YkfPg969JSjJbP6RqP6r5kWh KKV7icZr/va41kgtCb9SUTzek7ArdgOG56kLHIF0zPkgehmPH9l+y7D5BaI7hKaBAmtP 75lw== 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=EkdpbP6ZnSTqdRa/S1vfX9RZ5a2dDCb/MaRsUJualVo=; b=wofNH+4jl5hmj65LTePRdiDJHCiQJwKFXdY0KWMQF8FvPKnMsrkOxpp3sUE6vy8vgh kZLocSQslmcbYLj+KS9nattpOKiWqjn4YyDySEwNS5hoWaAl9636un3PrdSVfVpUnTmi 4vE6rxBwZUC2Ten+ay1FF9WVLJr4WQ3BjRwhtuI/gcf+nnSZ9d9jB98HGk+KWPIivPRG V7hdJ1quM0PT9NlO3Qux+s8c0arJjBjMW+esaSCfoSJmx4hnfGUbPaNfPCrsHeqLIx36 DZTAZAVrmMS7RNz/kONl/V4k5x35li++ZmwBeZdmw0DwEo9YKyeX3MIuMkOUnfaRktcc qZQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ov1xpKiY; 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=pass (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 t16si5528322ybb.291.2021.02.12.11.01.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Feb 2021 11:01:52 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=ov1xpKiY; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAdhO-0002w1-Ul for patch@linaro.org; Fri, 12 Feb 2021 14:01:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAdVU-0001fl-NV for qemu-devel@nongnu.org; Fri, 12 Feb 2021 13:49:32 -0500 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:34641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lAdVH-0007mw-SD for qemu-devel@nongnu.org; Fri, 12 Feb 2021 13:49:32 -0500 Received: by mail-pf1-x434.google.com with SMTP id m6so81876pfk.1 for ; Fri, 12 Feb 2021 10:49:19 -0800 (PST) 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=EkdpbP6ZnSTqdRa/S1vfX9RZ5a2dDCb/MaRsUJualVo=; b=ov1xpKiYchnKJNCRkQiuG0GwRW/R1/TQvoHkpfqt3fWL8c3kh1O+J89GJLV2j336jk ynGY+0vJyq3Zdtl1gLqSB03nrslhcfOQeBRb4FCYRWDnH0XKJLRS00NXqFSnj2m28u4a IU4dE9s04IJMEqmkS2wM3EZziwl7XZfnqt5TZxVrIYY4rWXziZyq/+Twjxaq3T9yOchi oDA6Uqiry3JrfAHajOZgTW/SF4NXzEOLLbfiJn+/AMBh4s6iVJuSyBpW2H0BzkjDdyPk yNFxHYSdcMkPKXTIAM1UH7UJcse9dev9AJCQKglDmn90tftvtOx26cy/LavWLwNLmxgk XDFw== 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=EkdpbP6ZnSTqdRa/S1vfX9RZ5a2dDCb/MaRsUJualVo=; b=lR0EyGKRtbQHf+AFPHl+rmFawWsLNCPSrCYPKl4fiPE/Ms6nTpP9isMeq6+p0sOgNh AfUDw3AUBKhyE+C99s2fNevIMKAoIAXoVs2NjaVpggLnGD0c5mEW0o3i+xJm1Pd7d2Ws I4ZiInrUTuQ/sFdj7cSGeB3SBGFDsJmRIhMHMbDLMaNnmyLOBWrTR8bBiDBQZYOOfEPD 28KUyAKcbPRHbPV5U1W3Srb3MyuxNqYCOcglJqB4u/JlgNqTTQLYQIuNbLMYk6xNJGW1 45E9MYr2gHptxVI0brWeBfIGV5exJD1cWJTcHEj7VAPUwOB22XowBeVx/QRUbkAJ0xeH 9H9A== X-Gm-Message-State: AOAM530m8icKNtZ5OVrUg6eFzcGfWqGpE6+z2RPbruLAzc4bC4OZX9Cm 3sRUf6HUKBzAkbGxmRfsVUrpQHwAurL1LQ== X-Received: by 2002:a65:4942:: with SMTP id q2mr1629888pgs.34.1613155758222; Fri, 12 Feb 2021 10:49:18 -0800 (PST) Received: from localhost.localdomain (174-21-150-71.tukw.qwest.net. [174.21.150.71]) by smtp.gmail.com with ESMTPSA id k5sm9427618pfi.31.2021.02.12.10.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Feb 2021 10:49:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 10/31] linux-user: Fix guest_addr_valid vs reserved_va Date: Fri, 12 Feb 2021 10:48:41 -0800 Message-Id: <20210212184902.1251044-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210212184902.1251044-1-richard.henderson@linaro.org> References: <20210212184902.1251044-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.google.com 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We must always use GUEST_ADDR_MAX, because even 32-bit hosts can use -R to restrict the memory address of the guest. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 4e6ef3d542..e62f4fba00 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -72,11 +72,10 @@ typedef uint64_t abi_ptr; /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ #define g2h(x) ((void *)((uintptr_t)(abi_ptr)(x) + guest_base)) -#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS -#define guest_addr_valid(x) (1) -#else -#define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX) -#endif +static inline bool guest_addr_valid(abi_ulong x) +{ + return x <= GUEST_ADDR_MAX; +} static inline bool guest_range_valid(abi_ulong start, abi_ulong len) {