From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PATCH v7 15/31] exec: Rename guest_{addr,range}_valid to *_untagged
Date: Fri, 12 Feb 2021 10:48:46 -0800 [thread overview]
Message-ID: <20210212184902.1251044-16-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210212184902.1251044-1-richard.henderson@linaro.org>
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 <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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 c54069e3cd..ce6ce82618 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));
}
-static inline bool guest_addr_valid(abi_ulong x)
+static inline bool guest_addr_valid_untagged(abi_ulong x)
{
return x <= GUEST_ADDR_MAX;
}
-static inline bool guest_range_valid(abi_ulong start, abi_ulong len)
+static inline bool guest_range_valid_untagged(abi_ulong start, abi_ulong len)
{
return len - 1 <= GUEST_ADDR_MAX && start <= GUEST_ADDR_MAX - len + 1;
}
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index ba122a7903..b3ccffbf0f 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 == 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) == 0;
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index fa1847b2a6..0d8cc27b21 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -213,7 +213,8 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,
g_assert_not_reached();
}
- 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 088c50592c..6690384752 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 = TARGET_PAGE_ALIGN(len);
end = start + len;
- if (!guest_range_valid(start, len)) {
+ if (!guest_range_valid_untagged(start, len)) {
return -TARGET_ENOMEM;
}
if (len == 0) {
@@ -528,7 +528,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
* It can fail only on 64-bit host with 32-bit target.
* On any other target/host host mmap() handles this error correctly.
*/
- if (end < start || !guest_range_valid(start, len)) {
+ if (end < start || !guest_range_valid_untagged(start, len)) {
errno = 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 = TARGET_PAGE_ALIGN(len);
- if (len == 0 || !guest_range_valid(start, len)) {
+ if (len == 0 || !guest_range_valid_untagged(start, len)) {
return -TARGET_EINVAL;
}
@@ -727,9 +727,9 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
int prot;
void *host_addr;
- 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 = ENOMEM;
return -1;
}
@@ -777,7 +777,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
if (host_addr != 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 = mremap(g2h_untagged(old_addr),
new_size, old_size, flags);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 4451f8e4f0..30a5021509 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4608,7 +4608,7 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env,
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;
}
--
2.25.1
next prev parent reply other threads:[~2021-02-12 18:54 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-12 18:48 [PATCH v7 00/31] target-arm: Implement ARMv8.5-MemTag, user mode Richard Henderson
2021-02-12 18:48 ` [PATCH v7 01/31] tcg: Introduce target-specific page data for user-only Richard Henderson
2021-02-12 18:48 ` [PATCH v7 02/31] linux-user: Introduce PAGE_ANON Richard Henderson
2021-02-12 18:48 ` [PATCH v7 03/31] exec: Use uintptr_t for guest_base Richard Henderson
2021-02-12 18:58 ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 04/31] exec: Use uintptr_t in cpu_ldst.h Richard Henderson
2021-02-12 19:05 ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 05/31] exec: Improve types for guest_addr_valid Richard Henderson
2021-02-12 19:07 ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 06/31] linux-user: Check for overflow in access_ok Richard Henderson
2021-02-12 18:48 ` [PATCH v7 07/31] linux-user: Tidy VERIFY_READ/VERIFY_WRITE Richard Henderson
2021-02-12 18:48 ` [PATCH v7 08/31] bsd-user: " Richard Henderson
2021-02-12 18:48 ` [PATCH v7 09/31] linux-user: Do not use guest_addr_valid for h2g_valid Richard Henderson
2021-02-12 18:48 ` [PATCH v7 10/31] linux-user: Fix guest_addr_valid vs reserved_va Richard Henderson
2021-02-12 18:48 ` [PATCH v7 11/31] exec: Introduce cpu_untagged_addr Richard Henderson
2021-02-12 18:48 ` [PATCH v7 12/31] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged Richard Henderson
2021-02-12 18:48 ` [PATCH v7 13/31] linux-user: Explicitly untag memory management syscalls Richard Henderson
2021-02-12 18:48 ` [PATCH v7 14/31] linux-user: Use guest_range_valid in access_ok Richard Henderson
2021-02-12 18:48 ` Richard Henderson [this message]
2021-02-12 18:48 ` [PATCH v7 16/31] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged Richard Henderson
2021-02-12 18:48 ` [PATCH v7 17/31] linux-user: Move lock_user et al out of line Richard Henderson
2021-02-12 20:35 ` Philippe Mathieu-Daudé
2021-02-16 12:57 ` Peter Maydell
2021-02-12 18:48 ` [PATCH v7 18/31] linux-user: Fix types in uaccess.c Richard Henderson
2021-02-12 20:34 ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 19/31] linux-user: Handle tags in lock_user/unlock_user Richard Henderson
2021-02-12 18:48 ` [PATCH v7 20/31] linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE Richard Henderson
2021-02-12 18:48 ` [PATCH v7 21/31] target/arm: Improve gen_top_byte_ignore Richard Henderson
2021-02-12 18:48 ` [PATCH v7 22/31] target/arm: Use the proper TBI settings for linux-user Richard Henderson
2021-02-12 18:48 ` [PATCH v7 23/31] linux-user/aarch64: Implement PR_MTE_TCF and PR_MTE_TAG Richard Henderson
2021-02-12 18:48 ` [PATCH v7 24/31] linux-user/aarch64: Implement PROT_MTE Richard Henderson
2021-02-12 18:48 ` [PATCH v7 25/31] target/arm: Split out syndrome.h from internals.h Richard Henderson
2021-02-12 19:07 ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 26/31] linux-user/aarch64: Pass syndrome to EXC_*_ABORT Richard Henderson
2021-02-12 18:48 ` [PATCH v7 27/31] linux-user/aarch64: Signal SEGV_MTESERR for sync tag check fault Richard Henderson
2021-02-12 18:48 ` [PATCH v7 28/31] linux-user/aarch64: Signal SEGV_MTEAERR for async tag check error Richard Henderson
2021-02-12 18:49 ` [PATCH v7 29/31] target/arm: Add allocation tag storage for user mode Richard Henderson
2021-02-12 18:49 ` [PATCH v7 30/31] target/arm: Enable MTE for user-only Richard Henderson
2021-02-12 18:49 ` [PATCH v7 31/31] tests/tcg/aarch64: Add mte smoke tests Richard Henderson
2021-02-12 19:39 ` [PATCH v7 00/31] target-arm: Implement ARMv8.5-MemTag, user mode no-reply
2021-02-16 13:49 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210212184902.1251044-16-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).