[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/21] linux-user: Do not use guest_addr_valid for h2g_valid
From: |
Richard Henderson |
Subject: |
[PATCH v3 09/21] linux-user: Do not use guest_addr_valid for h2g_valid |
Date: |
Fri, 15 Jan 2021 12:46:33 -1000 |
This is the only use of guest_addr_valid that does not begin
with a guest address, but a host address being transformed to
a guest address.
We will shortly adjust guest_addr_valid to handle guest memory
tags, and the host address should not be subjected to that.
Move h2g_valid adjacent to the other h2g macros.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
v3: Ditch type changes; retain true for HLB <= GAM (pmm).
---
include/exec/cpu_ldst.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 5e8878ee9b..4e6ef3d542 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -77,13 +77,16 @@ typedef uint64_t abi_ptr;
#else
#define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX)
#endif
-#define h2g_valid(x) guest_addr_valid((uintptr_t)(x) - guest_base)
static inline bool guest_range_valid(abi_ulong start, abi_ulong len)
{
return len - 1 <= GUEST_ADDR_MAX && start <= GUEST_ADDR_MAX - len + 1;
}
+#define h2g_valid(x) \
+ (HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS || \
+ (uintptr_t)(x) - guest_base <= GUEST_ADDR_MAX)
+
#define h2g_nocheck(x) ({ \
uintptr_t __ret = (uintptr_t)(x) - guest_base; \
(abi_ptr)__ret; \
--
2.25.1
- [PATCH v3 01/21] tcg: Introduce target-specific page data for user-only, (continued)
- [PATCH v3 01/21] tcg: Introduce target-specific page data for user-only, Richard Henderson, 2021/01/15
- [PATCH v3 02/21] linux-user: Introduce PAGE_ANON, Richard Henderson, 2021/01/15
- [PATCH v3 03/21] exec: Use uintptr_t for guest_base, Richard Henderson, 2021/01/15
- [PATCH v3 07/21] linux-user: Tidy VERIFY_READ/VERIFY_WRITE, Richard Henderson, 2021/01/15
- [PATCH v3 05/21] exec: Improve types for guest_addr_valid, Richard Henderson, 2021/01/15
- [PATCH v3 04/21] exec: Use uintptr_t in cpu_ldst.h, Richard Henderson, 2021/01/15
- [PATCH v3 09/21] linux-user: Do not use guest_addr_valid for h2g_valid,
Richard Henderson <=
- [PATCH v3 08/21] bsd-user: Tidy VERIFY_READ/VERIFY_WRITE, Richard Henderson, 2021/01/15
- [PATCH v3 11/21] exec: Add support for TARGET_TAGGED_ADDRESSES, Richard Henderson, 2021/01/15
- [PATCH v3 06/21] linux-user: Check for overflow in access_ok, Richard Henderson, 2021/01/15
- [PATCH v3 12/21] linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE, Richard Henderson, 2021/01/15