From nobody Wed Apr 16 08:11:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1613050698; cv=none; d=zohomail.com; s=zohoarc; b=drTm3qbQ3evdzSSPyX8N+CfuZ50AQqWHoFAiQX48qQUvA8zr9u28iUJ80bnZJ9waoLvyNY7+rQSm/ixRULHX+5+ZF1frXwpohtnFfcJtubsxiJEyBb8Zqn/4tmYcTSrGLp8tPY2u3mGLxtpf/EuMk+/pyq6EjhijsViSELJuAhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613050698; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YgxGpzJeSkPHs78f+HAWSg84qQk3nAuymHYPvqcfEew=; b=RIbMqlevt/xj2YBqJi2G/DSF+Gy+zsG8czL30/sML2XxU9MCX+4+a583r/ANj8xB2o/envb69hHrWT2hvItwQglpLNyn+1uLSsicgvx900beEp0ARHOzmEuoNjJn+JArJvLIURxr9HSb/LTDDJmli3XtfYxw1NZSIYd4Uhht5Cw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613050698112550.6068256683666; Thu, 11 Feb 2021 05:38:18 -0800 (PST) Received: from localhost ([::1]:57234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lACAi-0003CL-Tq for importer@patchew.org; Thu, 11 Feb 2021 08:38:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lABZB-0008JU-Ev for qemu-devel@nongnu.org; Thu, 11 Feb 2021 07:59:30 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:36252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lABZ4-0008VP-EK for qemu-devel@nongnu.org; Thu, 11 Feb 2021 07:59:28 -0500 Received: by mail-wm1-x331.google.com with SMTP id i9so5657353wmq.1 for ; Thu, 11 Feb 2021 04:59:21 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id g15sm4955716wrx.1.2021.02.11.04.59.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 04:59:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YgxGpzJeSkPHs78f+HAWSg84qQk3nAuymHYPvqcfEew=; b=SKA5o95AQwH7UouHpQB7V3PltzTJlfwjHc+1XEPaztb2pBnxlMeuw+LmM6GHqt+5Qk aMswFnrkadeyRGjdnluXcNFTtiRGcWeXyK1X/veenLap82HWt8xvi602cKS6DBv+gTZy C0EqvF2IDRYa8SvVO/0Fr3/dcp42BNfgnrqLdvom/yvPiKnQXfx+B5WKMK1MRdwnUt78 rm3C2FNWzn8Zb0/QFba+nt05cvncfcORvBkn+PNsaWM3A6bAadv7Qa695wS9rNixnFJm UOwE1Lj591W26bFoUgnLMSOhf/NjVQtvTLOZfQIFz0/5Lq7ZfttmBmKnjyKpKY90Xg+w pMPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YgxGpzJeSkPHs78f+HAWSg84qQk3nAuymHYPvqcfEew=; b=ZJy3pVKSsUKIh9Q51RvSGP7j9IkKSn6Y7/jX50rniPPC7YjWb7BoAUDtxXNfIRL8Aa 7HTib1idSvEpYutEnVSiKZ26jf1S4WNkPBHvEdTo2FW1BFco2LCtf+j0DaPVlbeSX1q2 r5wauPQ354qe6DdNrt79LIMObi4k3X22cCTpsjETxCefRjDrdhKbR5mGlpfarn2dDs0I dHY5JcAOT2tSNgZe7Mpwm2sXtawpYGULyxMsAuKcUo2qx+i7Opg4UxNpS9ceZ5NV4Hal T65c54rzM5gkxSmZKkIuB5bLR3XJIqwfDidBWDFntkBYpkk7x03bxJw5zS2uRtYNBMua PlMw== X-Gm-Message-State: AOAM531lp84JuES2ptmAeoprhZXTjC9Pb8li96pfV4oKEd3iCxFgTXVJ KvrESvyzLXg5X0FrzEyvh4TCB+1K7HUhJQ== X-Google-Smtp-Source: ABdhPJxfMB4N2suHNwo+o28MNbBD/ly7w0MavfVUZNQYOjNNc5Q1FzRQcN269Iljomf95N/ErbxVoA== X-Received: by 2002:a1c:f604:: with SMTP id w4mr5131853wmc.39.1613048361170; Thu, 11 Feb 2021 04:59:21 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/45] exec: Rename guest_{addr,range}_valid to *_untagged Date: Thu, 11 Feb 2021 12:58:39 +0000 Message-Id: <20210211125900.22777-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210211125900.22777-1-peter.maydell@linaro.org> References: <20210211125900.22777-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Richard Henderson The places that use these are better off using untagged addresses, so do not provide a tagged versions. Rename to make it clear about the address type. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20210210000223.884088-16-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- include/exec/cpu_ldst.h | 4 ++-- linux-user/qemu.h | 4 ++-- accel/tcg/user-exec.c | 3 ++- linux-user/mmap.c | 12 ++++++------ linux-user/syscall.c | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index c54069e3cd0..ce6ce826182 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -87,12 +87,12 @@ static inline void *g2h(CPUState *cs, abi_ptr x) return g2h_untagged(cpu_untagged_addr(cs, x)); } =20 -static inline bool guest_addr_valid(abi_ulong x) +static inline bool guest_addr_valid_untagged(abi_ulong x) { return x <=3D GUEST_ADDR_MAX; } =20 -static inline bool guest_range_valid(abi_ulong start, abi_ulong len) +static inline bool guest_range_valid_untagged(abi_ulong start, abi_ulong l= en) { return len - 1 <=3D GUEST_ADDR_MAX && start <=3D GUEST_ADDR_MAX - len = + 1; } diff --git a/linux-user/qemu.h b/linux-user/qemu.h index ba122a79039..b3ccffbf0fa 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -494,8 +494,8 @@ extern unsigned long guest_stack_size; static inline bool access_ok(int type, abi_ulong addr, abi_ulong size) { if (size =3D=3D 0 - ? !guest_addr_valid(addr) - : !guest_range_valid(addr, size)) { + ? !guest_addr_valid_untagged(addr) + : !guest_range_valid_untagged(addr, size)) { return false; } return page_check_range((target_ulong)addr, size, type) =3D=3D 0; diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index fa1847b2a61..0d8cc27b213 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -213,7 +213,8 @@ static int probe_access_internal(CPUArchState *env, tar= get_ulong addr, g_assert_not_reached(); } =20 - if (!guest_addr_valid(addr) || page_check_range(addr, 1, flags) < 0) { + if (!guest_addr_valid_untagged(addr) || + page_check_range(addr, 1, flags) < 0) { if (nonfault) { return TLB_INVALID_MASK; } else { diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 088c50592cf..6690384752f 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -119,7 +119,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int= target_prot) } len =3D TARGET_PAGE_ALIGN(len); end =3D start + len; - if (!guest_range_valid(start, len)) { + if (!guest_range_valid_untagged(start, len)) { return -TARGET_ENOMEM; } if (len =3D=3D 0) { @@ -528,7 +528,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, in= t target_prot, * It can fail only on 64-bit host with 32-bit target. * On any other target/host host mmap() handles this error correct= ly. */ - if (end < start || !guest_range_valid(start, len)) { + if (end < start || !guest_range_valid_untagged(start, len)) { errno =3D ENOMEM; goto fail; } @@ -669,7 +669,7 @@ int target_munmap(abi_ulong start, abi_ulong len) if (start & ~TARGET_PAGE_MASK) return -TARGET_EINVAL; len =3D TARGET_PAGE_ALIGN(len); - if (len =3D=3D 0 || !guest_range_valid(start, len)) { + if (len =3D=3D 0 || !guest_range_valid_untagged(start, len)) { return -TARGET_EINVAL; } =20 @@ -727,9 +727,9 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong ol= d_size, int prot; void *host_addr; =20 - if (!guest_range_valid(old_addr, old_size) || + if (!guest_range_valid_untagged(old_addr, old_size) || ((flags & MREMAP_FIXED) && - !guest_range_valid(new_addr, new_size))) { + !guest_range_valid_untagged(new_addr, new_size))) { errno =3D ENOMEM; return -1; } @@ -777,7 +777,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong ol= d_size, =20 if (host_addr !=3D MAP_FAILED) { /* Check if address fits target address space */ - if (!guest_range_valid(h2g(host_addr), new_size)) { + if (!guest_range_valid_untagged(h2g(host_addr), new_size))= { /* Revert mremap() changes */ host_addr =3D mremap(g2h_untagged(old_addr), new_size, old_size, flags); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 4451f8e4f08..30a5021509e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4608,7 +4608,7 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_en= v, return -TARGET_EINVAL; } } - if (!guest_range_valid(shmaddr, shm_info.shm_segsz)) { + if (!guest_range_valid_untagged(shmaddr, shm_info.shm_segsz)) { return -TARGET_EINVAL; } =20 --=20 2.20.1